From 5867c1386d58af75e95ffe0b80631f422d44fa99 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, 24 Nov 2022 10:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.json | 4 +- src/views/basic/BasicEntrutsReceModify.vue | 3 +- src/views/home/index.vue | 26 ++++--------- src/views/purchase/purPlanDetailDialog.vue | 14 +------ src/views/warehouse/DialogSelectInv.vue | 3 +- src/views/warehouse/DialogcChangeNewOrder.vue | 3 +- src/views/warehouse/addHosOrder.vue | 7 ++-- src/views/warehouse/addOrder.vue | 4 +- src/views/warehouse/stockHospOrderNew.vue | 38 ++++++++++--------- .../warehouse/stockOrderEditDistribution.vue | 4 +- .../warehouse/stockOrderNewDistribution.vue | 10 +++-- 11 files changed, 52 insertions(+), 64 deletions(-) diff --git a/public/config.json b/public/config.json index f987e7a..21c4bcf 100644 --- a/public/config.json +++ b/public/config.json @@ -1,6 +1,6 @@ { - "BASE_URL": "http://192.168.0.109:9906", - "SERVER_IP": "http://192.168.0.109:9906", + "BASE_URL": "http://192.168.0.41:9996", + "SERVER_IP": "http://192.168.0.41:9996", "hosp_name": "福建省XX市医院" } diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue index 0488d96..a8e451d 100644 --- a/src/views/basic/BasicEntrutsReceModify.vue +++ b/src/views/basic/BasicEntrutsReceModify.vue @@ -216,7 +216,8 @@ export default { findSubInvByInv() { this.subInvList = []; let query = { - pcode: this.inputQuery.curInv + pcode: this.inputQuery.curInv, + filter:3 }; filterSubByInv(query) .then((response) => { diff --git a/src/views/home/index.vue b/src/views/home/index.vue index aea9e80..a71c997 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -398,22 +398,7 @@ export default { this.company = response.data; }); }, - getStorage() { - this.storageList = []; - filterAllByUser() - .then((response) => { - if (response.code == 20000) { - this.storageList = response.data || []; - if (this.storageList != null && this.storageList.length == 1) { - this.userInfo.locInvCode = this.storageList[0].code; - } - this.findSubInvByInv(); - } - - }) - .catch(() => { - }); - }, + locCHange() { @@ -425,8 +410,10 @@ export default { findSubInvByInv() { this.subInvList = []; - - filterSubByInv() + let query = { + filter:3 + }; + filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; if (this.subInvList != null && this.subInvList.length == 1) { @@ -459,7 +446,7 @@ export default { this.$store.commit(types.RECEIVE_LOCSUBINVNAME, this.locSubInvName); } - this.getStorage(); + } }) .catch(() => { @@ -550,6 +537,7 @@ export default { }, }, created() { + this.getBreadcrumb(); this.getCompanyData(); // this.getStorage(); diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue index 53d7fa3..437ae8a 100644 --- a/src/views/purchase/purPlanDetailDialog.vue +++ b/src/views/purchase/purPlanDetailDialog.vue @@ -62,18 +62,8 @@ - - - {{ item.name }} - - - { diff --git a/src/views/warehouse/DialogcChangeNewOrder.vue b/src/views/warehouse/DialogcChangeNewOrder.vue index 9a76567..16cff70 100644 --- a/src/views/warehouse/DialogcChangeNewOrder.vue +++ b/src/views/warehouse/DialogcChangeNewOrder.vue @@ -320,7 +320,8 @@ export default { findSubInvByInv(invCode) { this.subInvList = []; let query = { - pcode: invCode + pcode: invCode, + filter:3 }; filterSubByInv(query) .then((response) => { diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 77035a5..68c15af 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -1000,6 +1000,7 @@ export default { }, findSubStorageMethod(val) { + this. getBusType() ; let cQuery = { code: this.formData.invWarehouseCode, filter: 2, @@ -1018,11 +1019,11 @@ export default { }, - findSubInvByInv(invCode) { + findSubInvByInv() { this.subInvList = []; let query = { - + filter:3 }; filterSubByInv(query) .then((response) => { @@ -1222,7 +1223,7 @@ export default { this.findStorageMethod(); } } - this.findSubInvByInv(this.formData.locStorageCode); + this.findSubInvByInv(); this.findSubStorageMethod(); this.getBusType(); diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 63c4ec7..48aa454 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -764,7 +764,7 @@ export default { this.formData.vailInv = this.curAction.vailInv; this.formData.codeFillCheck = this.curAction.codeFillCheck; } - this.getStorage(this.formData.billType); + }) .catch(() => { }); @@ -773,7 +773,7 @@ export default { findSubInvByInv(invCode) { this.subInvList = []; let query = { - pcode: invCode + filter:3 }; filterSubByInv(query) .then((response) => { diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index f0c5603..39a8f51 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -116,9 +116,7 @@ - - - { - this.storageList = response.data || []; - - }) - .catch(() => { - }); - }, + getActionName(action) { for (let i = 0; i < this.busTypes.length; i++) { @@ -687,9 +676,11 @@ export default { }, findSubInvByInv(invCode) { + this.subInvList = []; let query = { - pcode: invCode + pcode: invCode, + filter:3 }; filterSubByInv(query) .then((response) => { @@ -769,8 +760,16 @@ export default { } if (this.$isBlank(event)) { - if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) { - this.$message.error("往来信息和单据类型不能为空！") + if ( this.$isBlank(this.formData.billType)) { + this.$message.error("单据类型不能为空！") + return; + } + if(this.curAction.corpType==1 && this.$isBlank(this.formData.fromSubInvCode)){ + this.$message.error("往来单位不能不能为空！") + return; + } + if(this.curAction.corpType!=1 && this.$isBlank(this.formData.corpName)){ + this.$message.error("往来单位不能不能为空！") return; } if (this.$isBlank(this.formData.invWarehouseCode)) { @@ -1079,6 +1078,10 @@ export default { }); }, + setCorpName(code){ + this.formData.corpId=code + this.formData.corpName= this.fromSubStorageOptions.find(item => item.code == code).name + }, copyDetail(row) { this.$confirm("是否复制该记录?", "提示", { confirmButtonText: "确定", @@ -1265,7 +1268,7 @@ export default { findSubInvs() { this.subInvList = []; let query = { - pcode: this.formData.locStorageCode + filter:3 }; filterSubByInv(query) .then((response) => { @@ -1318,7 +1321,6 @@ export default { } this.findMethod(); this.getBusType(); - this.getStorage(); this.findSubInvByInv(); this.findSubStorageMethod(); this.codeArray = []; diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue index 3f0ea73..14b008e 100644 --- a/src/views/warehouse/stockOrderEditDistribution.vue +++ b/src/views/warehouse/stockOrderEditDistribution.vue @@ -62,7 +62,7 @@ - + @@ -546,7 +546,7 @@ export default { } if (this.$isBlank(event)) { - if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) { + if (this.$isBlank(this.formData.corpName) && this.$isBlank(this.formData.fromSubInvName ==null) || this.$isBlank(this.formData.billType)) { this.$message.error("往来信息和单据类型不能为空！") return; } diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index 049377c..b07f595 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -72,7 +72,7 @@ - { + this.busTypes = response.data.list || []; - this.getStorage(this.formData.billType); }) .catch(() => { }); @@ -1002,6 +1005,7 @@ export default { } + if(this.formData.invWarehouseCode!=null){ this.getBusType(); }