From d0bb145ed19e92ec55dd418a479d820208ce4b33 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 18 Dec 2023 15:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=84=E7=BA=BF=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=BB=91=E5=AE=9A=E8=BE=85=E5=8A=A9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=EF=BC=8C=E8=BE=85=E5=8A=A9=E8=AE=BE=E5=A4=87=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 45 ++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 866024f..a73391a 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -1112,6 +1112,11 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      queryAuxiliaryEquipmentParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        equipmentCategory : null,
+      },
       options: [
         {
           status: "1",
@@ -1234,19 +1239,6 @@ export default {
     getList() {
       this.loading = true;
       listEquipment(this.queryParams).then((response) => {
-        this.auxiliaryEquipmentLeftList = [];
-        this.auxiliaryEquipmentRightList = [];
-        for (let i in response.rows) {
-          // 将返回的列表赋值于穿梭框左边列表
-          this.auxiliaryEquipmentLeftList.push({
-            key: response.rows[i].equipmentCode,
-            label: response.rows[i].equipmentName,
-          });
-        }
-        for (let i in response.selected) {
-          this.auxiliaryEquipmentRightList.push(response.selected[i].key);
-          this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList;
-        }
         this.equipmentList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1351,7 +1343,18 @@ export default {
       });
       this.repairRecordSteps = 0;
       this.rightList = [];
+      this.auxiliaryEquipmentLeftList = [];
       this.auxiliaryEquipmentRightList = [];
+      this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
+      listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
+        for (let i in response.rows) {
+          // 将返回的列表赋值于穿梭框左边列表
+          this.auxiliaryEquipmentLeftList.push({
+            key: response.rows[i].equipmentCode,
+            label: response.rows[i].equipmentName,
+          });
+        }
+      });
       this.open = true;
       this.title = "添加设备管理";
     },
@@ -1363,6 +1366,22 @@ export default {
       getWorkCenterList().then((response) => {
         this.options1 = response.rows;
       });
+      this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
+      listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
+        this.auxiliaryEquipmentLeftList = [];
+        this.auxiliaryEquipmentRightList = [];
+        for (let i in response.rows) {
+          // 将返回的列表赋值于穿梭框左边列表
+          this.auxiliaryEquipmentLeftList.push({
+            key: response.rows[i].equipmentCode,
+            label: response.rows[i].equipmentName,
+          });
+        }
+        for (let i in response.selected) {
+          this.auxiliaryEquipmentRightList.push(response.selected[i].key);
+          this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList;
+        }
+      });
       getEquipment(equipmentId).then((response) => {
         this.form = response.data;
         this.rightList = [];