From 2ce93681fd2feb73d0d707b6aee526f84edba623 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 3 Jul 2024 11:24:13 +0800
Subject: [PATCH] =?UTF-8?q?2024-07-03=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80-=E5=9C=A8=E6=A3=80=E6=9F=A5=E9=A1=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E6=97=B6=E5=80=99=E5=8A=A0=E5=85=A5=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=92=8C=E9=87=8D=E7=BD=AE+?=
 =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/inspectionPlan/index.vue | 39 +++++++++++++++++++++--
 src/views/device/spotCheckPlan/index.vue  | 39 +++++++++++++++++++++--
 src/views/device/upkeepOrder/index.vue    |  3 --
 src/views/device/upkeepPlan/index.vue     | 39 +++++++++++++++++++++--
 4 files changed, 108 insertions(+), 12 deletions(-)

diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index 8271e281..c346c4a4 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -442,7 +442,25 @@
           <!-- 选择设备、巡检项目 -->
           <div class="my-step-body" v-if="inspectionPlanStep==1">
             <el-row>
-              <el-col class="my-step-mar" :span="1.5">
+              <el-col class="my-step-mar" :span="24">
+                <el-input
+                  placeholder="请输入名称并按回车查询"
+                  v-model="equipmentItemSearch"
+                  class="input-with-select"
+                  style="width: 400px"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="equipmentItemQuery"
+                  ></el-button>
+                </el-input>
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="equipmentItemReset"
+                >重置</el-button>
                 <el-button
                   type="primary"
                   plain
@@ -663,6 +681,8 @@ export default {
   dicts: ['device_loop_type', 'sys_normal_disable'],
   data() {
     return {
+      equipmentItemSearch: '',//检查项搜索框值
+      equipmentItemList:[],
       // 设备组线
       groupLineList:[],
       // 加载
@@ -801,9 +821,20 @@ export default {
     this.getList();
   },
   methods: {
+    equipmentItemQuery() {
+      const tableData = this.form.equipmentItem;
+      this.form.equipmentItem = this.equipmentItemList;//整个表重新赋值
+      this.form.equipmentItem = tableData.filter(
+        (data) => !this.equipmentItemSearch || data.equipmentCode.toLowerCase().includes(this.equipmentItemSearch.toLowerCase())
+      )
+    },
+
+    equipmentItemReset() {
+       this.form.equipmentItem = this.equipmentItemList;
+       this.equipmentItemSearch = '';
+    },
     // 选择工作中心
     changeCenter() {
-
     },
     // 改变巡检周期事件
     changeArray(e) {
@@ -1007,6 +1038,7 @@ export default {
         if (this.form.equipmentItem[i].equipmentCode == e.equipmentCode) {
           this.form.equipmentItem.splice(i, 1);
         }
+        this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表
       }
     },
     // 选择设备确认按钮
@@ -1036,7 +1068,7 @@ export default {
         for (let i = 0; i < response.data.length; i++) {
           this.form.equipmentItem.push(response.data[i]);
         }
-
+        this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表
         this.selectEqu = false;
       })
 
@@ -1252,6 +1284,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.equipmentItem = this.equipmentItemList;//整个表重新赋值
           if (this.selectPersonList.length == 0) {
             this.$message({
               message: "请请选择人员！",
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index 47b5d03b..f2f177f4 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -461,7 +461,25 @@
           <!-- 选择设备、点检项目 -->
           <div class="my-step-body" v-if="spotCheckStep==1">
             <el-row>
-              <el-col class="my-step-mar" :span="1.5">
+              <el-col class="my-step-mar" :span="24">
+                <el-input
+                  placeholder="请输入名称并按回车查询"
+                  v-model="equipmentItemSearch"
+                  class="input-with-select"
+                  style="width: 400px"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="equipmentItemQuery"
+                  ></el-button>
+                </el-input>
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="equipmentItemReset"
+                >重置</el-button>
                 <el-button
                   type="primary"
                   plain
@@ -470,7 +488,7 @@
                   选择设备
                 </el-button>
               </el-col>
-            </el-row>
+          </el-row>
             <el-table
               border
               :data="form.equipmentItem"
@@ -697,6 +715,8 @@ export default {
 	dicts: ['device_loop_type', 'sys_normal_disable','device_yes_no'],
 	data() {
 		return {
+      equipmentItemSearch: '',//检查项搜索框值
+      equipmentItemList:[],
       // 设备组线
       groupLineList:[],
       // 表单校验
@@ -840,6 +860,18 @@ export default {
     this.setWorkCenter();
 	},
   methods: {
+    equipmentItemQuery() {
+      const tableData = this.form.equipmentItem;
+      this.form.equipmentItem = this.equipmentItemList;//整个表重新赋值
+      this.form.equipmentItem = tableData.filter(
+        (data) => !this.equipmentItemSearch || data.equipmentCode.toLowerCase().includes(this.equipmentItemSearch.toLowerCase())
+      )
+    },
+
+    equipmentItemReset() {
+       this.form.equipmentItem = this.equipmentItemList;
+       this.equipmentItemSearch = '';
+    },
     // 获取工作中心
     setWorkCenter() {
       getWorkCenter().then(response => {
@@ -1052,6 +1084,7 @@ export default {
         if (this.form.equipmentItem[i].equipmentCode == e.equipmentCode) {
           this.form.equipmentItem.splice(i, 1);
         }
+        this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表
       }
     },
     // 选择设备确认按钮
@@ -1081,7 +1114,7 @@ export default {
         for (let i = 0; i < response.data.length; i++) {
           this.form.equipmentItem.push(response.data[i]);
         }
-
+        this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表
         this.selectEqu = false;
       })
 
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index d886df22..6e8df8aa 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -1265,9 +1265,6 @@
             <el-descriptions-item label="是否停机保养">{{
               workVO.order.shutDown
             }}</el-descriptions-item>
-            <el-descriptions-item label="保养人工号">{{
-              workVO.order.planPerson
-            }}</el-descriptions-item>
             <el-descriptions-item label="保养人姓名">{{
               workVO.order.planPersonName
             }}</el-descriptions-item>
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index a35971d2..d2d45d7f 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -498,7 +498,25 @@
           <!-- 选择设备、保养项 -->
           <div class="my-step-body" v-if="this.upkeepSteps==1">
             <el-row>
-              <el-col class="my-step-mar" :span="1.5">
+              <el-col class="my-step-mar" :span="24">
+                <el-input
+                  placeholder="请输入名称并按回车查询"
+                  v-model="equipmentItemSearch"
+                  class="input-with-select"
+                  style="width: 400px"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="equipmentItemQuery"
+                  ></el-button>
+                </el-input>
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="equipmentItemReset"
+                >重置</el-button>
                 <el-button
                   type="primary"
                   plain
@@ -507,7 +525,7 @@
                   选择设备
                 </el-button>
               </el-col>
-            </el-row>
+          </el-row>
             <el-table
               border
               :data="form.equipmentItem"
@@ -905,6 +923,8 @@ export default {
   dicts: ['device_loop_type', 'sys_normal_disable','device_upkeep_type'],
   data() {
     return {
+      equipmentItemSearch: '',//检查项搜索框值
+      equipmentItemList:[],
       // 设备组线
       groupLineList:[],
       // 备件选择list
@@ -1071,6 +1091,18 @@ export default {
     this.setWorkCenter();
   },
   methods: {
+    equipmentItemQuery() {
+      const tableData = this.form.equipmentItem;
+      this.form.equipmentItem = this.equipmentItemList;//整个表重新赋值
+      this.form.equipmentItem = tableData.filter(
+        (data) => !this.equipmentItemSearch || data.equipmentCode.toLowerCase().includes(this.equipmentItemSearch.toLowerCase())
+      )
+    },
+
+    equipmentItemReset() {
+       this.form.equipmentItem = this.equipmentItemList;
+       this.equipmentItemSearch = '';
+    },
     // 备件选择btn
     choseSpareBtn(){
       // 清理缓存
@@ -1395,6 +1427,7 @@ export default {
         if (this.form.equipmentItem[i].equipmentCode == e.equipmentCode) {
           this.form.equipmentItem.splice(i, 1);
         }
+        this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表
       }
     },
     // 选择设备确认按钮
@@ -1425,7 +1458,7 @@ export default {
           for (let i = 0; i < response.data.length; i++) {
             this.form.equipmentItem.push(response.data[i]);
           }
-
+          this.equipmentItemList = this.form.equipmentItem;//用equipmentItemList当暂时的存储表
           this.selectEqu = false;
         })
       }else {