Merge branch 'qhse_person' of shuzhihua/pms-iot-vue into master

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

@@ -21,6 +21,30 @@
           </el-form-item>
         </el-col>
 
+        <!-- <el-col :span="12">
+          <el-form-item label="证书编号" prop="certNo">
+            <el-input v-model="formData.certNo" placeholder="请输入证书编号" />
+          </el-form-item>
+        </el-col> -->
+        <el-col :span="12">
+          <el-form-item label="设备编码" prop="deviceCode">
+            <el-input v-model="formData.deviceCode" placeholder="请输入设备编码" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- <el-col :span="12">
+          <el-form-item label="设备编码" prop="deviceCode">
+            <el-input v-model="formData.deviceCode" placeholder="请输入设备编码" />
+          </el-form-item>
+        </el-col> -->
+        <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model="formData.deviceName" placeholder="请输入设备名称" />
+          </el-form-item>
+        </el-col>
+
         <el-col :span="12">
           <el-form-item label="证书编号" prop="certNo">
             <el-input v-model="formData.certNo" placeholder="请输入证书编号" />
@@ -110,13 +134,25 @@
   <Dialog title="选择设备" v-model="deviceDialogVisible" width="70%">
     <ContentWrap>
       <el-form class="-mb-15px" :model="deviceQueryParams" :inline="true">
+        <el-form-item label="部门" prop="deptId">
+          <el-tree-select
+            v-model="deviceQueryParams.deptId"
+            :data="deptList"
+            :props="defaultProps"
+            node-key="id"
+            filterable
+            clearable
+            check-strictly
+            placeholder="请选择部门"
+            class="!w-200px" />
+        </el-form-item>
         <el-form-item label="设备名称" prop="deviceName">
           <el-input
             v-model="deviceQueryParams.deviceName"
             placeholder="请输入设备名称"
             clearable
             @keyup.enter="handleDeviceQuery"
-            class="!w-200px" />
+            class="!w-150px" />
         </el-form-item>
         <el-form-item label="设备编码" prop="deviceCode">
           <el-input
@@ -124,7 +160,7 @@
             placeholder="请输入设备编码"
             clearable
             @keyup.enter="handleDeviceQuery"
-            class="!w-200px" />
+            class="!w-150px" />
         </el-form-item>
         <el-form-item>
           <el-button @click="handleDeviceQuery">
@@ -209,13 +245,16 @@ const createDefaultFormData = () => ({
   certTime: undefined,
   certExpire: undefined,
   file: '',
-  remark: ''
+  remark: '',
+  deviceCode: ''
 })
 
 const formData = ref(createDefaultFormData())
 
 const formRules = reactive({
-  deviceId: [{ required: true, message: '关联设备不能为空', trigger: 'blur' }],
+  // deviceId: [{ required: true, message: '关联设备不能为空', trigger: 'blur' }],
+  deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+  deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
   certNo: [{ required: true, message: '证书编号不能为空', trigger: 'blur' }],
   certOrg: [{ required: true, message: '检测单位不能为空', trigger: 'blur' }],
   certTime: [{ required: true, message: '检测日期不能为空', trigger: 'blur' }],
@@ -289,6 +328,7 @@ const selectedDevice = ref<any>(null)
 const deviceQueryParams = reactive({
   pageNo: 1,
   pageSize: 10,
+  deptId: undefined as number | undefined,
   deviceName: undefined as string | undefined,
   deviceCode: undefined as string | undefined
 })
@@ -315,6 +355,7 @@ const handleDeviceQuery = () => {
 }
 
 const resetDeviceQuery = () => {
+  deviceQueryParams.deptId = undefined
   deviceQueryParams.deviceName = undefined
   deviceQueryParams.deviceCode = undefined
   handleDeviceQuery()
@@ -327,6 +368,7 @@ const handleDeviceRadioChange = (row: any) => {
 
 const selectDevice = () => {
   deviceDialogVisible.value = true
+  deviceQueryParams.deptId = formData.value.deptId as number | undefined
   selectedDeviceId.value = formData.value.deviceId as number | undefined
   selectedDevice.value =
     selectedDeviceId.value && formData.value.deviceName