From bdd6e2d034c993293206fe59790d5e6fde798f9b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 21 Dec 2022 00:06:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=A0=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=8D=95=E6=8D=AE=E5=BE=80=E6=9D=A5=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E6=97=A0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/DialogcChangeNewOrder.vue  | 30 ++++++++++++-------
 .../business/stockOrderNewDistribution.vue    |  3 +-
 .../business/stockOrderNewSelectProduct.vue   |  5 ++++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/views/business/DialogcChangeNewOrder.vue b/src/views/business/DialogcChangeNewOrder.vue
index ebe0af2..6063acf 100644
--- a/src/views/business/DialogcChangeNewOrder.vue
+++ b/src/views/business/DialogcChangeNewOrder.vue
@@ -99,7 +99,7 @@
                     <el-form-item class="query-form-item" prop="fromCorp"
                                   v-if="curAction.corpType ==0 ">
                         <el-select
-                            v-model="formData.fromCorp"
+                            v-model="formData.fromCorpId"
                             filterable
                             remote
                             clearable="true"
@@ -113,17 +113,17 @@
                                 v-for="item in fromOptions"
                                 :key="item.name"
                                 :label="item.name"
-                                :value="item"
+                                :value="item.erpId"
                             >
                                 <span style="float: left">{{ item.name }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item class="query-form-item" prop="fromCorp"
+                    <el-form-item class="query-form-item" prop="fromCorpId"
                                   v-if="curAction.corpType ==1">
 
 
-                        <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" @change="getFormStorageCode"
+                        <el-select v-model="formData.fromCorpId" placeholder="请选择分库" clearable="true" @change="getFormStorageCode"
                         >
                             <el-option
                                 v-for="item in fromSubStorageOptions"
@@ -197,6 +197,7 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {stockOrderChange, stockOrderDetail} from "@/api/inout/stockOrder";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {convertDate} from  "@/utils/date"
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     name: "DialogcChangeNewOrder",
@@ -254,7 +255,7 @@ export default {
                 this.$message.error("当前分库不能为空");
                 return;
             }
-            if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromSubInvCode)) {
+            if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorpId)) {
                 this.$message.error('往来单位分库不能为空');
                 return;
             }
@@ -263,7 +264,7 @@ export default {
                 return;
             }
 
-            if (this.formData.locStorageCode === this.formData.fromCorp || this.formData.invWarehouseCode === this.formData.fromSubInvCode) {
+            if (this.formData.locStorageCode === this.formData.fromCorpId || this.formData.invWarehouseCode === this.formData.fromSubInvCode) {
                 this.$message.error("当前仓库和往来仓库不能相同！");
                 return;
             }
@@ -305,8 +306,12 @@ export default {
                     this.loading = false;
                 });
         },
-        getFormStorageCode(){
-            // this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
+        getFormStorageCode(subInvId){
+            this.fromSubStorageOptions.forEach(item => {
+                if (subInvId === item.code) {
+                    this.formData.fromCorp = item.name;
+                }
+            });
         },
 
         locCHange() {
@@ -408,9 +413,12 @@ export default {
             }
         },
 
-        unitChange(row) {
-            this.formData.fromCorpId = row.erpId;
-            this.formData.fromCorp = row.name;
+        unitChange(erpId) {
+            this.fromOptions.forEach(item => {
+                if (erpId === item.erpId) {
+                    this.formData.fromCorp = item.name;
+                }
+            })
         },
         actionChange(item) {
             this.curAction = this.getActionItem(item);
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index f23d5e6..3f8d3d5 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -715,7 +715,6 @@ export default {
             });
         },
         selectProductFunction(event) {
-
             if (event == null) {
             } else {
                 event.target.select();
@@ -750,7 +749,6 @@ export default {
                         locStorageCode: this.formData.locStorageCode,
                         invWarehouseCode: this.formData.invWarehouseCode,
                     };
-                    debugger
                     if (!isBlank(this.formData.unitIdFk) && this.formData.unitIdFk === this.formData.corpId) {
                         this.invQueryData.corpId = this.formData.corpId;
                     }
@@ -764,6 +762,7 @@ export default {
                     this.selectInvProductVisible = true;
                 } else {
                     this.invQueryData.corpId = this.formData.corpId;
+                    this.thisData.noInvOut = this.formData.noInvOut;
                     this.selectProductVisible = true;
                 }
                 return;
diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue
index 4e25c75..f5bcc19 100644
--- a/src/views/business/stockOrderNewSelectProduct.vue
+++ b/src/views/business/stockOrderNewSelectProduct.vue
@@ -314,6 +314,10 @@ export default {
                 this.listQuery.companyName = this.data.formData.corpName;
             }
 
+            if (this.data !== undefined && this.data.noInvOut !== undefined && this.data.noInvOut == true) {
+                this.listQuery.companyName = null;
+            }
+
             if (this.filterType != null && this.filterType === 2) {
                 filterAllProduct(this.listQuery)
                     .then((response) => {
@@ -428,6 +432,7 @@ export default {
     components: {udiRlDetailDialog},
 
     created() {
+        console.log(this.data)
         if (this.$isNotBlank(this.data)) {
             // this.listQuery.nameCode = this.data.udi;
             // if (this.data.billType != null) {