锁具信息内容

src/views/mes/hw/Lock/index.vue

@@ -9,47 +9,50 @@
       label-width="100px"
     >
       <el-row>
+        <el-form-item label="锁具编码" prop="locksetCode">
+          <el-input
+            v-model="queryParams.locksetCode"
+            placeholder="请输入锁具编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
 
-          <el-form-item label="锁具编码" prop="locksetCode">
-            <el-input
-              v-model="queryParams.locksetCode"
-              placeholder="请输入锁具编码"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="锁具名称" prop="locksetName">
-            <el-input
-              v-model="queryParams.locksetName"
-              placeholder="请输入锁具名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-
+        <el-form-item label="锁具名称" prop="locksetName">
+          <el-input
+            v-model="queryParams.locksetName"
+            placeholder="请输入锁具名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
 
-          <el-form-item label="锁具类型" prop="locksetTypeId">
-            <treeselect style="width: 218px" v-model="form.locksetTypeId" :options="locksetTypeOption" :normalizer="normalizer"
-                        placeholder="选择锁具类型"
-            />
-          </el-form-item>
+        <el-form-item label="锁具类型" prop="locksetTypeName">
+          <treeselect
+            style="width: 218px"
+            v-model="queryParams.locksetTypeId"
+            :options="locksetTypeOption"
+            :normalizer="normalizer"
+            placeholder="选择锁具类型"
+          />
+        </el-form-item>
 
-      </el-row>
-      <el-form-item style="margin-left: 50px">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-        >搜索
-        </el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置
-        </el-button
+        <el-form-item
+          style="margin-left
+        20px"
         >
-      </el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索
+          </el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置
+          </el-button>
+        </el-form-item>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -61,9 +64,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:hw:information:add']"
-        >新增
-        </el-button
-        >
+          >新增
+        </el-button>
       </el-col>
 
       <el-col :span="1.5">
@@ -75,9 +77,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:hw:information:batchremove']"
-        >批量删除
-        </el-button
-        >
+          >批量删除
+        </el-button>
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -90,7 +91,7 @@
       :data="repairList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="锁具编码"
         width="120px"
@@ -104,26 +105,10 @@
         prop="locksetName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column
-        label="锁具类型"
-        align="center"
-        prop="locksetTypeId"
-      />
-      <el-table-column
-        label="锁具NFC"
-        align="center"
-        prop="locksetNfc"
-      />
-      <el-table-column
-        label="锁具RFID"
-        align="center"
-        prop="locksetRfid"
-      />
-      <el-table-column
-        label="物资Id"
-        align="center"
-        prop="materialsId"
-      />
+      <el-table-column label="锁具类型" align="center" prop="locksetTypeName" />
+      <el-table-column label="锁具NFC" align="center" prop="locksetNfc" />
+      <el-table-column label="锁具RFID" align="center" prop="locksetRfid" />
+      <el-table-column label="物资ID" align="center" prop="materialsName" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -148,18 +133,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:hw:information:edit']"
-          >编辑
-          </el-button
-          >
+            >编辑
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:hw:information:remove']"
-          >删除
-          </el-button
-          >
+            >删除
+          </el-button>
           <!--          <el-button size="mini" type="text">预览</el-button>-->
         </template>
       </el-table-column>
@@ -174,16 +157,14 @@
     />
 
     <!-- 添加或修改设备维修单对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="450px"
-      append-to-body
-    >
+    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="锁具类型" prop="locksetTypeId">
-          <treeselect v-model="form.locksetTypeId" :options="locksetTypeOption" :normalizer="normalizer"
-                      placeholder="选择锁具类型"
+          <treeselect
+            v-model="form.locksetTypeId"
+            :options="locksetTypeOption"
+            :normalizer="normalizer"
+            placeholder="选择锁具类型"
           />
         </el-form-item>
         <el-row>
@@ -210,28 +191,28 @@
         </el-row>
 
         <el-form-item label="锁具名称" prop="locksetName">
-          <el-input
-            v-model="form.locksetName"
-            placeholder="请输入锁具名称"
-          />
+          <el-input v-model="form.locksetName" placeholder="请输入锁具名称" />
         </el-form-item>
         <el-form-item label="锁具NFC" prop="locksetNfc">
-          <el-input
-            v-model="form.locksetNfc"
-            placeholder="请输入锁具Nfc"
-          />
+          <el-input v-model="form.locksetNfc" placeholder="请输入锁具Nfc" />
         </el-form-item>
         <el-form-item label="锁具RFID" prop="locksetRfid">
-          <el-input
-            v-model="form.locksetRfid"
-            placeholder="请输入锁具RFID"
-          />
+          <el-input v-model="form.locksetRfid" placeholder="请输入锁具RFID" />
         </el-form-item>
-        <el-form-item label="物资Id" prop="materialsId">
-          <el-input
+        <el-form-item label="物资ID" prop="materialsId">
+          <el-select
             v-model="form.materialsId"
-            placeholder="请输入物资Id"
-          />
+            placeholder="请选择物资ID"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in this.materialsList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -248,17 +229,17 @@ import {
   addLockAPI,
   updateLockAPI,
   delLockAPI,
-  getLockInfoAPI
-
-} from '@/api/mes/Lock/Lock'
-import { genCode } from '@/api/system/autocode/rule'
-import { listLockType } from '@/api/mes/locktype/locktype'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+  getLockInfoAPI,
+} from "@/api/mes/Lock/Lock";
+import { listMaterials } from "@/api/mes/material/information";
+import { genCode } from "@/api/system/autocode/rule";
+import { listLockType } from "@/api/mes/locktype/locktype";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
-  name: 'lock',
-  dicts: ['hardware_status'],
+  name: "lock",
+  dicts: ["hardware_status"],
   components: { Treeselect },
   data() {
     return {
@@ -280,78 +261,89 @@ export default {
       // 设备维修单表格数据
       repairList: [],
       // 弹出层标题
-      title: '',
+      title: "",
       // 是否显示弹出层
       open: false,
       // 查询参数
-      createTime: '',
+      createTime: "",
       queryParams: {
         current: 1,
         size: 10,
-       locksetCode: null,
+        locksetCode: null,
         locksetName: null,
         locksetNfc: null,
         locksetRfid: null,
-        locksetTypeId: null,
+        locksetTypeId: undefined,
         materialsId: null,
+        locksetTypeName: null,
       },
-
+      queryMaterialParams: {
+        current: 1,
+        size: -1,
+      },
+      materialsList: [],
       locksetTypeOption: [],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         locksetCode: [
-          { required: true, message: '锁具编码不能为空', trigger: 'blur' }
+          { required: true, message: "锁具编码不能为空", trigger: "blur" },
         ],
         locksetName: [
-          { required: true, message: '锁具名称不能为空', trigger: 'blur' }
-        ]
+          { required: true, message: "锁具名称不能为空", trigger: "blur" },
+        ],
+        locksetNfc: [
+          { required: true, message: "锁具NFC不能为空", trigger: "blur" },
+        ],
+        locksetRfid: [
+          { required: true, message: "锁具RFID不能为空", trigger: "blur" },
+        ],
       },
       // 日期选择
       pickerOptions: {
         shortcuts: [
           {
-            text: '最近一周',
+            text: "最近一周",
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', [start, end])
-            }
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
           },
           {
-            text: '最近一个月',
+            text: "最近一个月",
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-              picker.$emit('pick', [start, end])
-            }
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
           },
           {
-            text: '最近三个月',
+            text: "最近三个月",
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-              picker.$emit('pick', [start, end])
-            }
-          }
-        ]
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
-      value2: '',
+      value2: "",
       // 新增状态
 
       EditId: 0, //修改判断
-      cascaderOptions: [],// 转换后的数据
-      flatHardwareTypeOption: [] // 用于快速查找
-    }
+      cascaderOptions: [], // 转换后的数据
+      flatHardwareTypeOption: [], // 用于快速查找
+    };
   },
   created() {
-    this.getList()
-    this.getLockTypeList()
-
+    this.getList();
+    this.getLockTypeList();
+    this.getMaterialList();
   },
   methods: {
     // 格式化日期查询数据
@@ -360,54 +352,70 @@ export default {
         // 使用本地时间
         return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(
           2,
-          '0'
-        )}-${String(date.getDate()).padStart(2, '0')}`
+          "0"
+        )}-${String(date.getDate()).padStart(2, "0")}`;
       }
-      return null
+      return null;
+    },
+    getMaterialList() {
+      listMaterials(this.queryMaterialParams).then((response) => {
+        this.materialsList = response.data.records.map((item) => {
+          return {
+            value: item.materialsCabinetId,
+            label: item.materialsName,
+          };
+        });
+
+        console.log(response, this.materialsList, "获取物资信息allList ");
+      });
     },
-    /** 查询设备维修单列表 */
 
+    /** 查询设备维修单列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       // 格式化日期并更新 queryParams
       if (Array.isArray(this.createTime) && this.createTime.length === 2) {
-        this.queryParams.startTime = this.formatDate(this.createTime[0])
-        this.queryParams.endTime = this.formatDate(this.createTime[1])
+        this.queryParams.startTime = this.formatDate(this.createTime[0]);
+        this.queryParams.endTime = this.formatDate(this.createTime[1]);
       }
       // 锁具数据
       listLockAPI(this.queryParams).then((response) => {
-        this.repairList = response.data.records
-        this.total = response.data.total
-        this.loading = false
-      })
-
+        this.repairList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
     // 获取锁具类型-所有
     getLockTypeList() {
       const data = {
         current: 1,
-        size: -1
-      }
-      listLockType(data).then(response => {
-        this.locksetTypeOption = this.handleTree(response.data.records, 'locksetTypeId', 'parentTypeId', 'children')
-        console.log(this.locksetTypeOption, 'this.locksetTypeOption')
-      })
+        size: -1,
+      };
+      listLockType(data).then((response) => {
+        this.locksetTypeOption = this.handleTree(
+          response.data.records,
+          "locksetTypeId",
+          "parentTypeId",
+          "children"
+        );
+        console.log(this.locksetTypeOption, "this.locksetTypeOption");
+      });
     },
     /** 转换部门数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
-        delete node.children
+        delete node.children;
       }
       return {
         id: node.locksetTypeId,
         label: node.locksetTypeName,
-        children: node.children
-      }
+        children: node.children,
+      };
     },
     // 取消按钮
     cancel() {
-      this.open = false
-      this.reset()
+      this.open = false;
+      this.reset();
     },
     // 表单重置
     reset() {
@@ -417,102 +425,102 @@ export default {
         locksetCode: null,
         locksetNfc: null,
         locksetRfid: null,
-        materialsId: null
-      }
+        materialsId: null,
+        locksetTypeName: null,
+      };
 
-      this.autoGenFlag = false
-      this.resetForm('form')
+      this.autoGenFlag = false;
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.current = 1
-      this.getList()
+      this.queryParams.current = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.locksetCode = ''
-      this.queryParams.locksetName = ''
-      this.queryParams.locksetTypeId = ''
+      this.queryParams.locksetCode = "";
+      this.queryParams.locksetName = "";
+      this.queryParams.locksetTypeId = "";
 
-      this.resetForm('queryForm')
-      this.handleQuery()
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.locksetId)
-      this.codes = selection.map((item) => item.locksetCode)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.locksetId);
+      this.codes = selection.map((item) => item.locksetCode);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.EditId = null
-      this.title = '新增锁具信息'
+      this.reset();
+      this.open = true;
+      this.EditId = null;
+      this.title = "新增锁具信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      this.EditId = row.locksetId || this.ids
+      this.reset();
+      this.EditId = row.locksetId || this.ids;
       getLockInfoAPI(this.EditId).then((response) => {
-        console.log(response,'编辑拿到单挑数')
-        this.form = response.data
-        this.open = true
-        this.title = '编辑锁具信息'
-      })
+        console.log(response, "编辑拿到单挑数");
+        this.form = response.data;
+        this.open = true;
+        this.title = "编辑锁具信息";
+      });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs['form'].validate((valid) => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.EditId != null) {
             updateLockAPI(this.form).then((response) => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            })
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
           } else {
-            console.log(this.form, 'form')
+            console.log(this.form, "form");
             addLockAPI(this.form).then((response) => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.EditId = null
-              this.getList()
-            })
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.EditId = null;
+              this.getList();
+            });
           }
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const repairIds = row.locksetId || this.ids
-      const repairCodes = row.locksetCode || this.codes
+      const repairIds = row.locksetId || this.ids;
+      const repairCodes = row.locksetCode || this.codes;
       this.$modal
         .confirm('是否确认删除编码为"' + repairCodes + '"的数据项？')
-        .then(function() {
-          return delLockAPI(repairIds)
+        .then(function () {
+          return delLockAPI(repairIds);
         })
         .then(() => {
-          this.getList()
-          this.$modal.msgSuccess('删除成功')
-        })
-        .catch(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
         })
+        .catch(() => {});
     },
 
     //自动生成编码
     handleAutoGenChange(autoGenFlag) {
       if (autoGenFlag) {
-        genCode('LOCK_CODE').then((response) => {
-          this.form.locksetCode = response
-        })
+        genCode("LOCK_CODE").then((response) => {
+          this.form.locksetCode = response;
+        });
       } else {
-        this.form.locksetCode = null
+        this.form.locksetCode = null;
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style scoped>
 .imgstatus {