From 371c4fa8f56bff7ea395ade67792b5204dbeed5a Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Tue, 17 Dec 2024 15:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.js            |  2 ++
 src/views/partner/device.vue | 25 ++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/utils/dict.js b/src/utils/dict.js
index bebda61..b9e0fc3 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -239,6 +239,8 @@ export const DICT_TYPE = {
   //类型
   BALANCE_CHANGE_TYPE:"balance_change_type",
 
+  // ----------检测相关------------
+  INS_EQU_TYPE: 'ins_equ_type',
 
 }
 
diff --git a/src/views/partner/device.vue b/src/views/partner/device.vue
index 991d589..afb7733 100644
--- a/src/views/partner/device.vue
+++ b/src/views/partner/device.vue
@@ -25,6 +25,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="设备类型" prop="type">
+        <el-select v-model="queryParams.type">
+          <el-option v-for="item in this.getDictDatas(DICT_TYPE.INS_EQU_TYPE)" :key="item.value" :value="item.value" :label="item.label"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="检定时间">
         <el-date-picker
           v-model="daterangeNextCheckTime"
@@ -94,6 +99,11 @@
       <el-table-column label="设备名称" align="center" prop="equName" />
       <el-table-column label="设备型号" align="center" prop="equModel" />
       <el-table-column label="设备编号" align="center" prop="equNumber" />
+      <el-table-column label="设备类别" align="center" prop="type">
+        <template slot-scope="scope">
+          <DictTag :type="DICT_TYPE.INS_EQU_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
       <el-table-column label="设备检定周期" align="center" prop="equZq" />
       <el-table-column label="有效期" align="center" prop="validTime" width="180">
         <template slot-scope="scope">
@@ -151,6 +161,11 @@
         <el-form-item label="设备编号" prop="equNumber">
           <el-input v-model="form.equNumber" placeholder="请输入设备编号" />
         </el-form-item>
+        <el-form-item label="设备类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类别">
+            <el-option v-for="item in this.getDictDatas(DICT_TYPE.INS_EQU_TYPE)" :key="item.value" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="设备检定周期" prop="equZq">
           <el-input v-model="form.equZq" placeholder="请输入设备检定周期" />
         </el-form-item>
@@ -184,9 +199,15 @@
 
 <script>
   import { listEquInfo, getEquInfo, delEquInfo, addEquInfo, updateEquInfo } from "./api/device";
+  import {DICT_TYPE} from "@/utils/dict";
 
   export default {
     name: "EquInfo",
+    computed: {
+      DICT_TYPE() {
+        return DICT_TYPE
+      }
+    },
     data() {
       return {
         // 遮罩层
@@ -217,6 +238,7 @@
           equModel: null,
           equNumber: null,
           nextCheckTime: null,
+          type: null
         },
         // 表单参数
         form: {},
@@ -263,7 +285,8 @@
           createTime: null,
           createBy: null,
           updateTime: null,
-          updateBy: null
+          updateBy: null,
+          type: null
         };
         this.resetForm("form");
       },