From 114aecd86d1708fe3f63ecdc2ee62c7df0c802fb Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 5 Jan 2024 16:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/device/deviceOrder/index.vue | 2 +-
src/views/device/spotInspectionOrder/index.vue | 6 +++---
src/views/device/upkeepOrder/index.vue | 4 ++--
src/views/system/datasource/authUser.vue | 4 ++--
src/views/wms/equipment/index.vue | 6 ++++++
5 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 8cdbc73..fc8f099 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -44,7 +44,7 @@
/>
-
+
-
+
+
+
@@ -359,8 +361,6 @@
{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}
-
-
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 971c046..b991c90 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -43,8 +43,8 @@
@keyup.enter.native="handleQuery"
/>
-
-
+
+
\ No newline at end of file
+
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 67fae2e..d9997b5 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -1306,6 +1306,7 @@ export default {
label: response.rows[i].materialCode + response.rows[i].materialDesc,
});
}
+ console.log(this.auxiliaryEquipmentRightList)
for (let i in response.selected) {
this.rightList.push(response.selected[i].key);
this.form.rightData = this.rightList;
@@ -1460,6 +1461,7 @@ export default {
this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
+ console.log("listEquipment")
this.auxiliaryEquipmentLeftList = [];
for (let i in response.rows) {
// 将返回的列表赋值于穿梭框左边列表
@@ -1468,9 +1470,11 @@ export default {
label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark,
});
}
+ console.log(this.auxiliaryEquipmentRightList)
});
getEquipment(equipmentId).then((response) => {
+ console.log("getEquipment")
this.form = response.data;
this.rightList = [];
for (let i in response.data.selectedData) {
@@ -1478,12 +1482,14 @@ export default {
this.rightList.push(response.data.selectedData[i].spareCode);
}
this.auxiliaryEquipmentRightList = [];
+ console.log(this.auxiliaryEquipmentRightList)
for (let i in response.data.selectedEquipmentData) {
// 将返回的辅助设备列表赋值于穿梭框右边列表
this.auxiliaryEquipmentRightList.push(
response.data.selectedEquipmentData[i].auxiliaryEquipmentCode
);
}
+ console.log(this.auxiliaryEquipmentRightList)
if (response.data.imageFiles != null) {
var newFiles = [];