From e87c5a19ac1c8fde422a82115ab1631e1b0bb29f Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 18 Jul 2022 11:18:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=A1=A5=E5=BD=95=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/AdditionalOrder.vue |  2 ++
 src/views/warehouse/addOrder.vue        | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index c769a75..66f5916 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -559,6 +559,8 @@ export default {
             this.idQuery.actDate = '';
             this.idQuery.corpOrderId = '';
             this.idQuery.billType = row.action;
+            this.idQuery.invName = row.invName;
+            this.idQuery.subInvName = row.subInvName;
             if (row.id !== null && row.id !== undefined && row.id !== '') {
                 this.idQuery.id = row.id;
                 this.idQuery.actDate = row.actDate;
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index c092095..d9e627f 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -90,7 +90,11 @@
                         </div>
                     </el-col>
 
-                    <el-col :span="8">
+                    <el-col :span="8" v-if="corpOrderIdDisabled">
+                        <el-input disabled v-model="formData.invName"></el-input>
+                    </el-col>
+
+                    <el-col :span="8"  v-if="!corpOrderIdDisabled">
                         <el-form-item prop="locStorageCode">
                             <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" clearable
                                        @change="locCHange"
@@ -106,13 +110,18 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+
                     <el-col :span="2">
                         <div class="ao-text">
                             <span>当前分库：</span>
                         </div>
                     </el-col>
 
-                    <el-col :span="8">
+                    <el-col :span="8" v-if="corpOrderIdDisabled">
+                        <el-input disabled v-model="formData.subInvName"></el-input>
+                    </el-col>
+
+                    <el-col :span="8" v-if="!corpOrderIdDisabled">
                         <el-form-item prop="locStorageCode">
                             <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" clearable
                                        :disabled="corpOrderIdDisabled">
@@ -379,6 +388,8 @@ export default {
                 vailInv: null,
                 subInvCode: null,
                 fromSubInvCode: null,
+                invName: null,
+                subInvName: null
             },
             formRules: {
                 temp: [
@@ -923,6 +934,8 @@ export default {
             this.formData.invWarehouseCode = this.idQuery.invWarehouseCode;
             this.corpOrderIdDisabled = true;
             this.formData.preCheck = this.idQuery.preCheck;
+            this.formData.invName = this.idQuery.invName;
+            this.formData.subInvName = this.idQuery.subInvName;
             if (this.addType == "edit") {
                 this.visiblV = 1;
             }