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-form-item label="设备型号" prop="deviceModel">
-          <el-input v-model="form.deviceModel" placeholder="请输入装置模型" />
+          <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: [],
       // 非单个禁用
@@ -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: {

src/views/hardware/productList/index.vue

@@ -258,7 +258,7 @@ export default {
         productId: "",
         productType: "",
         productName: "",
-        status: "0",
+        status: "",
       };
       this.nodeForm = {
         productId: "",

src/views/hardware/projectList/index.vue

@@ -33,7 +33,8 @@
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">修改
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">
+                修改
               </el-button>
               <el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['system:project:remove']">删除</el-button>
@@ -49,8 +50,11 @@
           <el-form-item label="项目名称" prop="projectName">
             <el-input v-model="form.projectName" placeholder="请输入项目名称" />
           </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
+          <el-form-item label="客户" prop="userId">
-          <el-input v-model="form.createTime" placeholder="请输入创建时间" />
+            <el-select v-model="form.userId" clearable placeholder="请选择" @change="userIdChange">
+              <el-option v-for="item in userSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="状态">
             <el-input v-model="form.status" />
@@ -67,10 +71,12 @@
 
 <script>
 import { list, info, add, update, del, select } from "@/api/hardware/project";
+import { userSelect } from "@/api/system/user";
 export default {
   name: "ProjectList",
   data () {
     return {
+      userSelectList: [],
       // 选中数组
       ids: [],
       // 非多个禁用
@@ -95,11 +101,21 @@ export default {
       rules: {
         projectName: [
           { required: true, message: "项目名称不能为空", trigger: "blur" },
-        ]
+        ],
+        userId: [
+          { required: true, message: "客户不能为空", trigger: "blur" },
+        ],
       },
     }
   },
   created () {
+    userSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.userSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
     this.getList();
   },
   methods: {