Browse Source

设备管理 设备列表 制造商改为选择

DESKTOP-O04BTUJ\muzen 3 years ago
parent
commit
0ded88e5ce
1 changed files with 14 additions and 10 deletions
  1. 14 10
      src/views/device/list/detail.vue

+ 14 - 10
src/views/device/list/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="form" :rules="rules" ref="form" label-width="120px" size="small" :disabled="disabled">
+    <el-form :model="form" :rules="rules" ref="form" label-width="120px" :disabled="disabled">
       <el-form-item label="设备型号:" prop="clientType">
         <el-input v-model="form.clientType" placeholder="请输入设备型号" />
       </el-form-item>
@@ -20,7 +20,10 @@
         <el-input v-model="form.filter" placeholder="请输入设备过滤内容"></el-input>
       </el-form-item>
       <el-form-item label="制造商:" prop="manufacturer">
-        <el-input v-model="form.manufacturer" placeholder="请输入设备制造商" />
+        <el-select v-model="form.manufacturer" placeholder="请选择设备制造商" clearable>
+          <el-option v-for="item in dict.type.dev_manu_facturer" :key="item.value" :label="item.label"
+            :value="item.value" />
+        </el-select>
       </el-form-item>
       <el-form-item label="设备类型:" prop="categoryId">
         <el-select v-model="form.categoryId" placeholder="请选择设备类型">
@@ -71,7 +74,8 @@
                 :value="item.type" />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="item.type !== 2 && item.type !== 4" label="连接方式:" :prop="`typeList.${index}.connectType`"
+          <el-form-item v-if="item.type !== 2 && item.type !== 4" label="连接方式:"
+            :prop="`typeList.${index}.connectType`"
             :rules="{required: true, message: '请选择连接方式', trigger: 'change'}">
             <el-select v-model="item.connectType" placeholder="请选择连接方式">
               <el-option v-for="item in dict.type.dev_connect_type" :key="item.value" :label="item.label"
@@ -108,11 +112,11 @@
             @click="getDelete(item.type, index)" />
         </div>
       </Draggable>
+      <el-form-item>
+        <el-button @click="getCancel">取消</el-button>
+        <el-button v-if="disabled === false" type="primary" @click="getSubmit">提交</el-button>
+      </el-form-item>
     </el-form>
-    <div class="form-btn">
-      <el-button size="mini" @click="getCancel">取消</el-button>
-      <el-button v-if="disabled === false" size="mini" type="primary" @click="getSubmit">提交</el-button>
-    </div>
   </div>
 </template>
 
@@ -125,7 +129,7 @@ import Editor from "@/components/Editor/index"
 import Draggable from 'vuedraggable'
 
 export default {
-  dicts: ['dev_upgrade_type', 'hot_yes_no', 'dev_list_type', 'dev_connect_type'],
+  dicts: ['dev_upgrade_type', 'hot_yes_no', 'dev_list_type', 'dev_connect_type', 'dev_manu_facturer'],
   mixins: [category],
   components: {
     Upload,
@@ -265,7 +269,7 @@ export default {
             deviceEdit(this.form).then((res) => {
               if (res.code === 0) {
                 this.$message.success("修改成功!");
-                this.$tab.closeOpenPage("/device/list");
+                this.getCancel()
               }
             });
           } else {
@@ -273,7 +277,7 @@ export default {
             deviceAdd(this.form).then((res) => {
               if (res.code === 0) {
                 this.$message.success("提交成功!");
-                this.$tab.closeOpenPage("/device/list");
+                this.getCancel()
               }
             });
           }