From 51e962b2d4860c2ac54fb75491f759173b9121a7 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 22 Jun 2022 21:55:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=89=AB=E7=A0=81=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=A1=E9=AA=8C=E5=BC=82=E5=B8=B8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=EF=BC=8C=E6=89=80=E5=B1=9E=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userManage/registerManage.vue | 20 ++++++--------------
 src/views/warehouse/IOCheckErrOrder.vue |  3 ++-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue
index b652a78..c161add 100644
--- a/src/views/userManage/registerManage.vue
+++ b/src/views/userManage/registerManage.vue
@@ -262,9 +262,10 @@
                             >
                                 <el-option
                                     v-for="item in sOptions"
-                                    :key="idx"
+                                    :key="id"
                                     :label="item.name"
-                                    :value="item">
+                                    :value="item.id">
+                                    <span>{{item.name}}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -410,9 +411,9 @@
             },
             selectOne(event) {
                 this.rowData.companyName = event.name;
-                this.rowData.companyId = event.value;
+                this.rowData.companyId = event.id;
                 this.checkQuery.companyName = event.name;
-                this.checkQuery.companyId = event.value;
+                this.checkQuery.companyId = event.id;
                 this.sSelectStatus = true;
             },
             remoteMethod(query) {
@@ -425,9 +426,8 @@
                     };
                     getBasicUnitMaintains2(tQuery)
                         .then((response) => {
-                            console.log(response)
                             this.sLoading = false;
-                            this.sOptions = response.data.list;
+                            this.sOptions = response.data.list
                         })
                         .catch(() => {
                             this.sLoading = false;
@@ -442,7 +442,6 @@
             },
 
             handleCheckedChange(val) {
-                console.log(val);
             },
 
             handleSizeChange(val) {
@@ -454,7 +453,6 @@
                 this.getList();
             },
             findMethod(query) {
-                console.log(query);
                 this.fromOptions = [];
                 let cQuery = {
                     key: query,
@@ -487,21 +485,16 @@
                     });
             },
             checkDialog(row) {
-                console.log(this.checkQuery.roles);
                 this.check = row.roles;
                 this.checkQuery = {
                     id: row.id + "",
                     checkType: 1,
                     roles: row.roles,
                 };
-                console.log(
-                    this.check + "---" + row.roles + "---" + this.checkQuery.roles
-                );
                 this.rowData = row;
                 if (this.registerConfigMap.companyCheckStatus) {
                     this.sValue = this.rowData.companyName;
                 }
-                console.log(this.rowData);
                 this.centerDialogVisible = true;
             },
 
@@ -547,7 +540,6 @@
                 authCustomerRoles()
                     .then((response) => {
                         this.roles = response.data.list || [];
-                        console.log("888---" + this.checkQuery.roles);
                     })
                     .catch(() => {
                         this.checkQuery.roles = [];
diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 1332538..1c9d642 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -570,6 +570,7 @@ export default {
                 status: null,
                 startTime: "",
                 endTime: "",
+                locStorageCode: null
             },
             detailQuery: {
                 orderId: "",
@@ -774,7 +775,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             filterOrder(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.total = response.data.total || 0;
@@ -1062,6 +1062,7 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    console.log(this.storageList);
                     if (this.storageList.length > 0) {
                         this.filterQuery.locStorageCode = this.storageList[0].code;
                         this.getList();