From 04f7cff829a07b0751b5d07a4e7594c4d9611519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 15 Dec 2022 15:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=97=E6=9D=90=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/stockOrderNew.vue             |  3 +++
 src/views/business/stockOrderNewDistribution.vue | 12 +++++++++---
 src/views/purchase/supCompanyAduditDialog.vue    |  2 +-
 src/views/thrsys/thrOrderNew.vue                 |  3 +++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue
index e48d965..50109a2 100644
--- a/src/views/business/stockOrderNew.vue
+++ b/src/views/business/stockOrderNew.vue
@@ -602,6 +602,8 @@ export default {
                 this.query.startTime = null;
                 this.query.endTime = null;
             }
+            //重置页码
+            this.query.page=1
             this.getList();
             if (this.query.status === "502") {
                 this.haveNewDistributionVisible = true;
@@ -698,6 +700,7 @@ export default {
         getStockOrderDetailList(row) {
             if (this.$isNotBlank(row)) {
                 this.detailQuery.orderIdFk = row.id;
+                this.detailQuery.page=1
                 this.formData = row;
             }
             this.detailLoading = true;
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index d507c41..b765be6 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -117,7 +117,7 @@
                         <el-form-item class="query-form-item" prop="fromCorp"
                                       v-if="curAction.corpType ==1">
 
-                            <el-select v-model="formData.fromSubInvCode" placeholder="请选择仓库" clearable="true"
+                            <el-select v-model="formData.fromSubInvCode" @change="getFormSubInv" placeholder="请选择仓库" clearable="true"
                                        :disabled="codeArray.length>0"
                             >
                                 <el-option
@@ -416,6 +416,7 @@ import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehou
 import dialogInvProduct from "../inventory/DialogInvProduct"
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
+import {filterDepts} from "@/api/auth/authDept"
 
 export default {
     name: "idQuery",
@@ -665,8 +666,6 @@ export default {
                     obj.reCount = obj.count;
                 });
             }
-
-
             insertStockOrderWeb(tQuery)
                 .then(response => {
                     this.loading = false;
@@ -682,6 +681,11 @@ export default {
                     this.loading = false;
                 })
         },
+        getFormSubInv(){
+           //插入往来名称和id
+            this.formData.corpName= this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).name
+            this.formData.corpId= this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).code
+        },
         submit(formName) {
             if (this.total < 1) {
                 this.$message.warning('未添加产品');
@@ -1212,6 +1216,7 @@ export default {
         },
 
         subStorageChange() {
+            this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
             this.findSubStorageMethod();
             this.getBusType();
         },
@@ -1296,6 +1301,7 @@ export default {
 
         this.findSubInvs();
         this.findSubStorageMethod();
+        this.findDeptMethod();
         this.codeArray = [];
         this.closeConfirmFunction(false);
     },
diff --git a/src/views/purchase/supCompanyAduditDialog.vue b/src/views/purchase/supCompanyAduditDialog.vue
index f276f19..5f5027f 100644
--- a/src/views/purchase/supCompanyAduditDialog.vue
+++ b/src/views/purchase/supCompanyAduditDialog.vue
@@ -506,7 +506,7 @@ export default {
             this.certQuery.customerId = this.inputQuery.customerId;
             this.certQuery.type = 1;
             this.certQuery.auditStatus=25;
-            
+
             filterCompanyCert(this.certQuery)
                 .then((response) => {
                     this.certLoading = false;
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 76c8724..eff776d 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -479,7 +479,10 @@ export default {
             this.findSubStorageMethod();
         },
         subStorageChange(item) {
+
             this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
+            this.formData.corpId=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).code
+            this.formData.corpName=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).warehouseName
             this.findSubStorageMethod();
             this.getBusType();
         },