From 5c3b48db5ab284046394f56b6872846131c8656b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 4 Jan 2023 11:47:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F2.0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/UdiInfoManage.vue | 4 ++++ src/views/purchase/supCertificationAdd.vue | 4 ++-- .../purchase/supManufacturerEditDialog.vue | 18 ++---------------- src/views/thrsys/thrOrderNew.vue | 6 ++++-- src/views/warehouse/DialogcChangeNewOrder.vue | 8 ++++++-- src/views/warehouse/IONewOrder.vue | 1 + src/views/warehouse/stockOrderDelSearch.vue | 6 ++++++ .../warehouse/stockOrderEditDistribution.vue | 5 +++-- src/views/warehouse/stockOrderEditor.vue | 3 +++ src/views/warehouse/stockOrderNew.vue | 2 ++ .../warehouse/stockOrderNewDistribution.vue | 1 + 11 files changed, 34 insertions(+), 24 deletions(-) diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index 371fc68..3709e4c 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -1207,6 +1207,10 @@ export default { this.loading = false; this.detailList = response.data || []; this.detailList.forEach((item, index, array) => { + this.detailList[index].isAdavence=item.adavence + this.detailList[index].isDisable=item.disable + this.detailList[index].useMuti=item.useMuti + if (item.zxxsbzbhsydysl > 1) { this.isUseDyCheck = true; } diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue index c872e3b..6dce3bc 100644 --- a/src/views/purchase/supCertificationAdd.vue +++ b/src/views/purchase/supCertificationAdd.vue @@ -470,8 +470,8 @@ export default { onReset2() { this.registrationQuery = { - customerId: null, - manufacturerIdFk: null, + customerId: this.registrationQuery.customerId, + manufacturerIdFk: this.registrationQuery.manufacturerIdFk, recordProductName: "", recordCode: "", recordPeopleName: "", diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue index 5a4045e..bdfceb9 100644 --- a/src/views/purchase/supManufacturerEditDialog.vue +++ b/src/views/purchase/supManufacturerEditDialog.vue @@ -511,21 +511,7 @@ export default { }, methods: { onModifySubmit(type) { - - //判断本企业产品是否是通过审核的 - let query = { - customerId: this.$store.getters.customerId - } - getCompany(query) - .then((response) => { - if(response.data.auditStatus!=1){ - this.$message.error("本企业信息还未通过审核!"); - return; - }else{ - this.addOrModifyCompany(type); - }}).catch(() => { - - }); + this.addOrModifyCompany(type); }, addOrModifyCompany (type){ @@ -559,7 +545,7 @@ export default { this.certLoading = true; filterCompanyCert(this.certQuery) .then((response) => { - + this.certLoading = false; this.certList = response.data.list || []; this.certTotal=response.data.total diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index 144d194..2670f5e 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -806,8 +806,10 @@ export default { this.formData.corpName = row.name; }, - subStorageChange(code) { - this.formData.locStorageCode= this.subInvList.find(item => item.code == code).parentId + 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.getBusType(); this.findSubStorageMethod(); }, diff --git a/src/views/warehouse/DialogcChangeNewOrder.vue b/src/views/warehouse/DialogcChangeNewOrder.vue index 230ef2e..3f4c460 100644 --- a/src/views/warehouse/DialogcChangeNewOrder.vue +++ b/src/views/warehouse/DialogcChangeNewOrder.vue @@ -297,8 +297,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.warehouseName; + } + }); }, locCHange() { diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue index 68b9ba0..1ac7b39 100644 --- a/src/views/warehouse/IONewOrder.vue +++ b/src/views/warehouse/IONewOrder.vue @@ -431,6 +431,7 @@ export default { } }, getBusType() { + this.filterQuery.locStorageCode= this.subInvList.find(item => item.code == this.filterQuery.invWarehouseCode).parentId let query = { code: this.filterQuery.invWarehouseCode, enabled: true, diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index 38d514d..b701c9f 100644 --- a/src/views/warehouse/stockOrderDelSearch.vue +++ b/src/views/warehouse/stockOrderDelSearch.vue @@ -603,6 +603,9 @@ export default { this.total = response.data.total || 0; } else { this.$message.error(response.message); + this.list = []; + this.total = 0; + this.detailList = []; } }) @@ -793,6 +796,9 @@ export default { } }, getBusType() { + if(this.subInvList.length>0){ + this.query.locStorageCode= this.subInvList.find(item => item.code == this.query.invWarehouseCode).parentId + } let query = { code: this.query.invWarehouseCode, enabled: true, diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue index 14b008e..57a20fd 100644 --- a/src/views/warehouse/stockOrderEditDistribution.vue +++ b/src/views/warehouse/stockOrderEditDistribution.vue @@ -62,7 +62,6 @@ - @@ -89,7 +88,7 @@ - +
当前分库： @@ -576,6 +575,8 @@ export default { }; this.selectInvProductVisible = true; } else { + this.invQueryData.corpId = this.formData.corpId; + this.thisData.noInvOut = this.formData.noInvOut; this.selectProductVisible = true; } diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue index c1a88aa..6f8af35 100644 --- a/src/views/warehouse/stockOrderEditor.vue +++ b/src/views/warehouse/stockOrderEditor.vue @@ -634,6 +634,9 @@ export default { this.query.page = 1; this.getList(); + //清空详情数据 + this.detailQuery.page=1 + this.detailTotal=0 if (this.query.status === "202") { this.haveDistributionVisible = true; } else { diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue index 638a5d5..bb7045d 100644 --- a/src/views/warehouse/stockOrderNew.vue +++ b/src/views/warehouse/stockOrderNew.vue @@ -657,6 +657,8 @@ export default { this.detailList = []; } else { this.$message.error(response.message); + this.list = []; + this.total = 0; } }) diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index 02a3917..ad5d21e 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -569,6 +569,7 @@ export default { if (this.orderEditor) { this.thisData.orderId = this.formData.id } + this.invQueryData.corpId = this.formData.corpId; this.selectProductVisible = true; return; }