计量器具台账修改

.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径  http://192.168.188.200:48080  https://iot.deepoil.cc  http://172.26.0.56:48080
-VITE_BASE_URL='https://iot.deepoil.cc:5443'
+VITE_BASE_URL='http://172.26.0.56:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

src/views/pms/qhse/deviceCert/DeviceCertForm.vue

@@ -396,6 +396,7 @@ const confirmSelectDevice = () => {
   formData.value.deviceId = selectedDevice.value.id
   formData.value.deviceName = selectedDevice.value.deviceName
   formData.value.deptId = selectedDevice.value.deptId
+  formData.value.deviceCode = selectedDevice.value.deviceCode
   closeDeviceDialog()
 }
 

src/views/pms/qhse/index.vue

@@ -134,6 +134,7 @@
               </zm-table-column>
               <zm-table-column label="名称" align="center" prop="measureName" fixed="left" />
               <zm-table-column label="编码" align="center" prop="measureCode" fixed="left" />
+              <zm-table-column label="序列号" align="center" prop="serialNo" fixed="left" />
               <zm-table-column label="部门名称" align="center" prop="deptName" />
               <zm-table-column label="计量单位" align="center" prop="measureUnit" />
               <zm-table-column label="责任人" align="center" prop="dutyPerson" />
@@ -215,17 +216,23 @@
       :model="formData"
       :rules="formRules"
       v-loading="formLoading"
-      label-width="120px">
+      label-width="auto">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="计量器具名称" prop="measureName">
             <el-input v-model="formData.measureName" placeholder="请输入计量器具名称" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="责任人" prop="dutyPerson">
             <el-input v-model="formData.dutyPerson" placeholder="请输入责任人" />
           </el-form-item>
+        </el-col> -->
+
+        <el-col :span="12">
+          <el-form-item label="序列号" prop="serialNo">
+            <el-input v-model="formData.serialNo" placeholder="请输入序列号" />
+          </el-form-item>
         </el-col>
       </el-row>
 
@@ -243,27 +250,43 @@
               placeholder="请选择所在部门" />
           </el-form-item>
         </el-col>
+
         <el-col :span="12">
+          <el-form-item label="责任人" prop="dutyPerson">
+            <el-input v-model="formData.dutyPerson" placeholder="请输入责任人" />
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="12">
           <el-form-item label="品牌" prop="brand">
             <el-input v-model="formData.brand" placeholder="请输入品牌" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
 
       <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="品牌" prop="brand">
+            <el-input v-model="formData.brand" placeholder="请输入品牌" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="规格型号" prop="modelName">
             <el-input v-model="formData.modelName" placeholder="请输入规格型号" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="单位" prop="measureUnit">
             <el-input v-model="formData.measureUnit" placeholder="请输入单位" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
 
       <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="计量单位" prop="measureUnit">
+            <el-input v-model="formData.measureUnit" placeholder="请输入计量单位" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="分类" prop="classify">
             <el-select
@@ -279,7 +302,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="价格" prop="measurePrice">
             <el-input-number
               v-model="formData.measurePrice"
@@ -288,10 +311,20 @@
               placeholder="请输入价格"
               style="width: 100%" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
 
       <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="价格" prop="measurePrice">
+            <el-input-number
+              v-model="formData.measurePrice"
+              :precision="2"
+              :step="1"
+              placeholder="请输入价格"
+              style="width: 100%" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="采购日期" prop="buyDate">
             <el-date-picker
@@ -302,39 +335,20 @@
               style="width: 100%" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="formData.remark" type="textarea" placeholder="请输入描述" />
           </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
-        <!-- <el-col :span="12">
-          <el-form-item label="有效期" prop="validity">
-            <el-date-picker
-              v-model="formData.validity"
-              type="date"
-              value-format="x"
-              placeholder="请选择有效期"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="12">
-          <el-form-item label="证书编码" prop="measureCertNo">
-            <el-input v-model="formData.measureCertNo" placeholder="请输入证书编码" />
-          </el-form-item>
         </el-col> -->
       </el-row>
 
-      <!-- <el-row :gutter="20">
-        <el-col :span="12">
+      <el-row :gutter="20">
+        <el-col :span="24">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="formData.remark" type="textarea" placeholder="请输入描述" />
           </el-form-item>
         </el-col>
-      </el-row> -->
+      </el-row>
     </el-form>
 
     <template #footer>
@@ -531,7 +545,7 @@ const formData = ref({
   deptId: '',
   measureCode: '',
   // validity: null, // 有效期
-
+  serialNo: '',
   measurePrice: 0, // 价格
   measureCertNo: ''
 })
@@ -644,7 +658,7 @@ const handleAdd = () => {
   isEdit.value = false
   dialogTitle.value = '新增台账'
   resetForm()
-  formData.value.deptId = userStore.getUser.deptId // 默认选择当前用户的部门
+  formData.value.deptId = queryParams.deptId || userStore.getUser.deptId
   dialogVisible.value = true
 }