动态模板调整

src/views/pms/device/FileTree.vue

@@ -129,7 +129,6 @@ const handleNodeDrop = async (draggingNode, dropNode, dropType, event) => {
   const targetIndex = dropNode.parent.childNodes.findIndex(n => n.data.id === dropNode.data.id);
   // 更新本地数据
   draggingNode.data.parentId = newParentId;
-  debugger
   console.log(JSON.stringify(draggingNode.data))
   await InfoClassifyApi.IotInfoClassifyApi.removeIotInfoClassify(draggingNode.data)
 };
@@ -185,7 +184,6 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as InfoClassifyApi.IotInfoClassifyVO
-    debugger
     if (formType.value === 'create') {
       data.parentId = nodeInfo.value.id
       data.deviceId = props.deviceId

src/views/pms/device/IotDeviceForm.vue

@@ -84,15 +84,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="规格型号" prop="model">
-              <el-select
+          <el-col :span="6" style="display: flex;flex-direction: row">
+            <el-form-item label="规格型号" prop="model" style="width: 83%">
+              <el-input
                 v-model="formData.model"
-                :model-value="modelLabel"
                 placeholder="请输入规格型号"
-                @click="openModelForm"
               />
             </el-form-item>
+            <el-button type="info" @click="openModelForm">请选择</el-button>
           </el-col>
           <el-col :span="6">
             <el-form-item label="图片" prop="picUrl">
@@ -263,11 +262,11 @@
       <div class="qt-expandable-content" :class="{ 'is-expanded': qtIsExpanded }">
         <el-row>
           <el-col v-for="field in list" :key="field.sort" :span="6">
-            <el-form-item :label="field.name" :prop="field.identifier" :rules="field.rules">
+            <el-form-item :label="field.name" :prop="field.code" :rules="field.rules">
               <!-- 文本输入 -->
               <el-input
                 v-if="field.type === 'text'"
-                v-model="formData[field.identifier]"
+                v-model="formData[field.code]"
                 :placeholder="'请输入' + field.name"
                 :type="field.type || 'text'"
                 clearable
@@ -275,16 +274,16 @@
               />
 
               <el-select
-                v-else-if="field.type === 'select'"
-                v-model="formData[field.identifier]"
+                v-else-if="field.type === 'enum'"
+                v-model="formData[field.code]"
                 :placeholder="'请输入'+field.name"
                 clearable
                 filterable
               >
                 <el-option
-                  v-for="item in field.options"
+                  v-for="item in field.selectOptions.dataSpecsList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
@@ -293,19 +292,19 @@
               <el-input
                 v-else-if="field.type === 'int'"
                 type="number"
-                v-model="formData[field.identifier]"
+                v-model="formData[field.code]"
                 style="width: 150%"
               />
               <el-input
                 v-else-if="field.type === 'double'"
-                v-model="formData[field.identifier]"
-                @input="handleInput(formData[field.identifier], field.identifier)"
+                v-model="formData[field.code]"
+                @input="handleInput(formData[field.code], field.code)"
                 style="width: 150%"
               />
               <!-- 日期选择 -->
               <el-date-picker
                 v-else-if="field.type === 'date'"
-                v-model="formData[field.identifier]"
+                v-model="formData[field.code]"
                 :type="field.type || 'date'"
                 :placeholder="'请输入' + field.name"
                 value-format="YYYY-MM-DD"
@@ -365,7 +364,6 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const brandLabel = ref('') // 表单的类型：create - 新增；update - 修改
-const modelLabel = ref('') // 表单的类型：create - 新增；update - 修改
 const zzLabel = ref('') // 表单的类型：create - 新增；update - 修改
 const supplierLabel = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
@@ -417,7 +415,6 @@ const assetclasschange = () => {
   const assetClass = formData.value.assetClass
   DeviceAttrModelApi.getDeviceAttrModelListByDeviceCategoryId(assetClass).then(res => {
     if (res){
-      debugger
       res.forEach((item) => {
         if (item.requiredFlag) {
           const rule = {required: true, message: item.name+'不能为空', trigger: 'blur'}
@@ -426,6 +423,7 @@ const assetclasschange = () => {
         }
       })
       list.value = res
+      debugger
     } else {
       list.value = []
     }
@@ -439,7 +437,6 @@ const brandChoose = (row) => {
 }
 const modelChoose = (row) => {
   formData.value.model = row.name
-  modelLabel.value = row.value
 }
 const customerChoose = (row) => {
   formData.value[row.customerNature + 'Id'] = row.id

src/views/pms/device/ModelList.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="选择品牌" style="width: 1100px; max-height: 800px">
+  <Dialog v-model="dialogVisible" title="选择规格型号" style="width: 1100px; max-height: 800px">
     <ContentWrap>
       <el-form
         class="-mb-15px"

src/views/pms/device/index.vue

@@ -282,7 +282,6 @@ const resetQuery = () => {
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
   //修改
-  debugger
   if (typeof id === 'number') {
     push({ name: 'DeviceDetailEdit', params: {id } })
     return

src/views/system/dept/DeptForm.vue

@@ -137,7 +137,6 @@ const submitForm = async () => {
       await DeptApi.createDept(data).then(res => {
         DeptApi.getDept(res).then(re => {
           console.log(JSON.stringify(re))
-          debugger
           IotTreeApi.createDeptDeal(re)
         })
       })

src/views/system/tree/index.vue

@@ -267,7 +267,6 @@ const getList = async () => {
   formLoading.value = true
   try {
     // queryParams.deviceId = deviceId.value
-    debugger
     const data = await IotInfoApi.IotInfoApi.getIotInfoFilePage(queryParams)
     list.value = data.list
     total.value = data.total