设备台账调整

src/views/pms/device/BrandList.vue

@@ -118,6 +118,12 @@ const handleRowClick = (row) => {
 };
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
+  queryParams.pageNo = 1
+  queryParams.label = ''
+  queryParams.status = undefined
+  await getList()
+  // 查询字典（精简)列表
+  dictTypeList.value = await DictTypeApi.getSimpleDictTypeList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const getList = async () => {
@@ -145,12 +151,6 @@ const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
-/** 初始化 **/
-onMounted(async () => {
-  await getList()
-  // 查询字典（精简)列表
-  dictTypeList.value = await DictTypeApi.getSimpleDictTypeList()
-})
 </script>
 <style lang="scss">
 .no-label-radio .el-radio__label {

src/views/pms/device/CustomerList.vue

@@ -140,7 +140,9 @@
   })
   const open = async (type: string) => {
     dialogVisible.value = true
-
+    queryParams.name = undefined
+    selectedRow.value = null
+    await getList();
   }
   defineExpose({ open }) // 提供 open 方法，用于打开弹窗
   const getList = async () => {
@@ -168,13 +170,6 @@
     queryFormRef.value.resetFields()
     handleQuery()
   }
-  onMounted(async ()=>{
-    selectedRow.value = null
-    // customerType.value = type
-    //
-    // dialogTitle.value = type==='supplier'?'供应商':'制造商';
-    await getList();
-  })
 </script>
 <style scoped lang="scss">
 

src/views/pms/device/IotDeviceForm.vue

@@ -25,17 +25,6 @@
               <el-input v-model="formData.deviceName" placeholder="请输入设备名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="品牌" prop="brandName">
-              <el-select
-                clearable
-                v-model="formData.brandName"
-                @clear="brandClear"
-                placeholder="请输入品牌"
-                @click="openForm"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="所在部门" prop="deptId">
               <el-tree-select
@@ -94,6 +83,17 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="品牌" prop="brandName">
+              <el-select
+                clearable
+                v-model="formData.brandName"
+                @clear="brandClear"
+                placeholder="请输入品牌"
+                @click="openForm"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="8" >
             <div style="display: flex;flex-direction: row">
               <el-form-item label="规格型号" prop="model" style="width: 86%">
@@ -422,7 +422,7 @@ const formRules = reactive({
   assetClass: [{ required: true, message: '资产类别不能为空', trigger: 'blur' }],
   deviceCode: [{ required: true, message: '资产编码不能为空', trigger: 'blur' }],
   deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
-  brand: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
+  brandName: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
   deptId: [{ required: true, message: '所在部门不能为空', trigger: 'blur' }],
   deviceStatus: [{ required: true, message: '设备状态不能为空', trigger: 'blur' }],
   assetProperty: [{ required: true, message: '资产性质不能为空', trigger: 'blur' }],
@@ -613,7 +613,9 @@ onMounted(async () => {
       formLoading.value = false
     }
   } else {
-    formData.value.deptId = Number(deptId)
+    if (deptId) {
+      formData.value.deptId = Number(deptId)
+    }
     formType.value = 'create';
   }
 })