From de5762c689340b56e264eafabe851671fee0579c Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 18 Jul 2022 10:49:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=B6=85=E7=BA=A7=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9F=A5=E7=9C=8B=E8=A1=A5=E5=BD=95=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=97=A0=E5=BD=93=E5=89=8D=E4=BB=93=E5=BA=93=E5=92=8C=E5=88=86?=
 =?UTF-8?q?=E5=BA=93=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoManageSp.vue         |  6 +++++-
 src/views/warehouse/AdditionalOrder.vue     | 19 ++-----------------
 src/views/warehouse/addOrder.vue            |  3 ---
 src/views/warehouse/stockOrderDelSearch.vue |  2 +-
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue
index 721002f..5ccca72 100644
--- a/src/views/basic/UdiInfoManageSp.vue
+++ b/src/views/basic/UdiInfoManageSp.vue
@@ -1082,10 +1082,14 @@ export default {
 
         lockProducts(status) {
             let selectData = this.multipleSelection;
+            if (selectData.length === 0) {
+                this.$message.warning("请选择需要操作的器械信息！");
+                return;
+            }
             let postQuery = {
                 ids: [],
                 lockStatus: status,
-            }
+            };
             selectData.forEach((row) => {
                 postQuery.ids.push(row.rlId);
             });
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index 99bb9ce..c769a75 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -82,16 +82,8 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
-                    <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
-                    <template slot-scope="scope">
-                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
-                    </template>
-                </el-table-column>
+                <el-table-column label="当前仓库" prop="invName" width="150"></el-table-column>
+                <el-table-column label="当前分库" prop="subInvName" width="120"></el-table-column>
                 <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <i class="el-icon-time"></i>
@@ -413,7 +405,6 @@ export default {
         },
 
         selectUnit(row) {
-            console.log(row.id);
             this.unitUpdateQuery.id = this.curIndex;
             this.unitUpdateQuery.fromCorp = row.name;
             this.unitUpdateQuery.fromCorpId = row.erpId;
@@ -433,7 +424,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             orderListError(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.total = response.data.total || 0;
@@ -499,10 +489,7 @@ export default {
 
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
-            var corpOrderId = mOrder.remark;
-
             this.errorDetail = mOrder.remark;
-            console.log(corpOrderId + "  " + mOrder + "  " + mOrder.remark);
             this.dialogVisible = true;
         },
 
@@ -518,7 +505,6 @@ export default {
                 .then((response) => {
                     this.busTypes = response.data.list || [];
                     this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
                 })
                 .catch(() => {
                 });
@@ -569,7 +555,6 @@ export default {
             }
         },
         addOrders(row) {
-            console.log(row)
             this.idQuery.id = '';
             this.idQuery.actDate = '';
             this.idQuery.corpOrderId = '';
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index f7ea5c4..c092095 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -768,7 +768,6 @@ export default {
                         this.formData.codeFillCheck = this.curAction.codeFillCheck;
                     }
                     this.getStorage(this.formData.billType);
-                    // this.getList();
                 })
                 .catch(() => {
                 });
@@ -801,11 +800,9 @@ export default {
         },
         getStorage(event) {
             let query = {
-                // advanceType: this.getActionName(event),
                 spUse: true,
             };
             this.storageList = [];
-            // this.formData.locStorageCode = null;
             filterAll(query)
                 .then((response) => {
                     this.storageList = response.data || [];
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 02d0952..8bb09f6 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -406,7 +406,7 @@ export default {
             sourceMap: {
                 "1": "web端新增单据",
                 "2": "第三方系统",
-                "3": "平衡补录单据",
+                "3": "扫码单据转换",
             },
             isSp: store.getters.customerId,
             detailFormVisible: false,