up

src/views/hardware/deviceList/index.vue

@@ -80,15 +80,24 @@
         <el-form-item label="设备编码" prop="deviceCode">
           <el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
         </el-form-item>
-        <el-form-item label="类型" prop="deviceType">
+        <el-form-item label="设备类型" prop="deviceType">
           <el-input v-model="form.deviceType" placeholder="请输入设备类型" />
         </el-form-item>
-        <el-form-item label="装置模型" prop="deviceModel">
-          <el-input v-model="form.deviceModel" placeholder="请输入装置模型" />
+        <el-form-item label="设备型号" prop="deviceModel">
+          <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
+        </el-form-item>
+        <el-form-item label="产品" prop="productId">
+          <el-select v-model="form.productId" clearable placeholder="请选择">
+            <el-option v-for="item in productSelectList" :key="item.id" :label="item.productName" :value="item.productId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="国家行政区 省" prop="provinceCode">
           <el-input v-model="form.provinceCode" />
         </el-form-item>
+        <el-form-item label="国家行政区 市" prop="cityCode">
+          <el-input v-model="form.cityCode" />
+        </el-form-item>
         <el-form-item label="国家行政区 区" prop="areaCode">
           <el-input v-model="form.areaCode" />
         </el-form-item>
@@ -110,6 +119,7 @@ import {
   update,
   del,
 } from "@/api/hardware/device";
+import { select as productSelect } from "@/api/hardware/product";
 export default {
   name: "DeviceList",
   components: {
@@ -117,6 +127,8 @@ export default {
   },
   data () {
     return {
+      // 产品下拉列表
+      productSelectList: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -141,7 +153,7 @@ export default {
         },
       ],
       // 表单参数
-      form: { },
+      form: {},
       // 表格数据
       tableData: null,
       // 查询参数
@@ -159,10 +171,20 @@ export default {
         deviceType: [
           { required: true, message: "设备编码不能为空", trigger: "blur" },
         ],
+        productId: [
+          { required: true, message: "产品不能为空", trigger: "blur" },
+        ],
       },
     };
   },
   created () {
+    productSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.productSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
     this.getList();
   },
   methods: {