From a0e2060caa30b4675e768f25ddee533ff1f4eb15 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/purApplyEditDiaolog.vue | 49 +- src/views/purchase/purPlanDetailDialog.vue | 14 +- src/views/purchase/purPlanEditDialog.vue | 51 +- src/views/purchase/pureApplyDetailDialog.vue | 59 +- src/views/thrsys/thrOrderNew.vue | 1910 ++++++++--------- 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 +- 15 files changed, 1035 insertions(+), 1150 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 f33087f..3c1f7dc 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -394,22 +394,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() { @@ -421,8 +406,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) { @@ -455,7 +442,7 @@ export default { this.$store.commit(types.RECEIVE_LOCSUBINVNAME, this.locSubInvName); } - this.getStorage(); + } }) .catch(() => { @@ -546,6 +533,7 @@ export default { }, }, created() { + this.getBreadcrumb(); this.getCompanyData(); // this.getStorage(); diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue index 8d0a20e..73385f0 100644 --- a/src/views/purchase/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApplyEditDiaolog.vue @@ -62,18 +62,7 @@ - - - {{ item.name }} - - - {{ item.name }} + {{ item.warehouseName }} @@ -291,9 +281,7 @@ export default { if(this.formData.billDate=="" || this.formData.billDate==null){ return this.$message.error("单据日期不能为空！"); } - if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){ - return this.$message.error("仓库不能为空！"); - } + if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ return this.$message.error("分库不能为空！"); } @@ -385,6 +373,9 @@ export default { this.getList(); } }, + setWarehouseName(obj){ + this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId; + }, deleteCodeArray(index, row) { this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { confirmButtonText: "确定", @@ -441,26 +432,10 @@ export default { this.total = 0; }); }, - - - getStorage() { - this.storageList = []; - filterAllByUser() - .then((response) => { - this.storageList = response.data || []; - if (this.storageList != null && this.storageList.length == 1) { - this.formData.locStorageCode = this.storageList[0].code; - } - this.findSubInvs(); - - }) - .catch(() => { - }); - }, findSubInvs() { this.subInvList = []; let query = { - pcode: this.formData.locStorageCode + filter:3 }; filterSubByInv(query) .then((response) => { @@ -472,13 +447,7 @@ export default { .catch(() => { }); }, - locInChange(item) { - if (this.formData.invWarehouseCode != null) { - this.formData.invWarehouseCode = ""; - } - this.formData.locStorageCode = item; - this.findSubInvs(); - }, + }, filters: {}, mounted() { @@ -508,7 +477,7 @@ export default { }; this.orderEditor = false; } - this.getStorage(); + this.findSubInvs(); this.codeArray = []; }, }; diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue index 21272a5..76cd197 100644 --- a/src/views/purchase/purPlanDetailDialog.vue +++ b/src/views/purchase/purPlanDetailDialog.vue @@ -62,18 +62,8 @@ - - - {{ item.name }} - - - - - - {{ item.name }} - - - {{ item.name }} + {{ item.warehouseName }} + @@ -319,9 +311,7 @@ export default { if(this.formData.billType=="" || this.formData.billType==null){ return this.$message.error("采购类型不能为空！"); } - if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){ - return this.$message.error("采购仓库不能为空！"); - } + if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ return this.$message.error("采购分库不能为空！"); } @@ -374,6 +364,10 @@ export default { this.thisData.stockOrderLists = this.codeArray; this.selectProductVisible = true; }, + setLocStorageCode(obj){ + debugger +  this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId; + }, closeDialogC2(rData) { this.selectProductVisible = false; this.thisData = {}; @@ -465,26 +459,10 @@ export default { this.total = 0; }); }, - - - getStorage() { - this.storageList = []; - filterAllByUser() - .then((response) => { - this.storageList = response.data || []; - if (this.storageList != null && this.storageList.length == 1) { - this.formData.locStorageCode = this.storageList[0].code; - } - this.findSubInvs(); - - }) - .catch(() => { - }); - }, findSubInvs() { this.subInvList = []; let query = { - pcode: this.formData.locStorageCode + filter:3 }; filterSubByInv(query) .then((response) => { @@ -496,13 +474,6 @@ export default { .catch(() => { }); }, - locInChange(item) { - if (this.formData.invWarehouseCode != null) { - this.formData.invWarehouseCode = ""; - } - this.formData.locStorageCode = item; - this.findSubInvs(); - }, getBusType() { let query = { enable: false, @@ -544,7 +515,7 @@ export default { }; this.orderEditor = false; } - this.getStorage(); + this.findSubInvs(); this.getBusType(); this.codeArray = []; }, diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue index bbc406c..739347a 100644 --- a/src/views/purchase/pureApplyDetailDialog.vue +++ b/src/views/purchase/pureApplyDetailDialog.vue @@ -61,20 +61,7 @@ - - - - {{ item.name }} - - - {{ item.name }} + {{ item.warehouseName }} - + @@ -97,18 +85,7 @@ - - - {{ item.name }} - - - {{ item.name }} + {{ item.warehouseName }} @@ -438,6 +416,9 @@ export default { }); }, + setTargetInv(obj){ +  this.formData.targetInv= this.targetSubInvList.find(item => item.code == obj).parentId; + }, getStockOrderDetailList() { this.loading = true; listApplyDetail(this.query) //查找该单号下的所有条码 @@ -455,15 +436,7 @@ export default { }, - getStorage() { - this.storageList = []; - filterAllByUser() - .then((response) => { - this.storageList = response.data || []; - }) - .catch(() => { - }); - }, + findSubInvs() { this.subInvList = []; let query = { @@ -472,7 +445,7 @@ export default { filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; - if (this.subInvList != null && this.subInvList.length == 1) { + if (this.subInvList != null && this.subInvList.length == 1) {getStorage this.formData.invWarehouseCode = this.subInvList[0].code; } }) @@ -498,7 +471,7 @@ export default { findTargetSubInvs() { this.targetSubInvList = []; let query = { - pcode: this.formData.targetInv + filter:3 }; filterSubByInv(query) .then((response) => { @@ -512,13 +485,7 @@ export default { }, - locInChange(item) { - if (this.formData.targetSubInv != null) { - this.formData.targetSubInv = ""; - } - this.formData.targetInv = item; - this.findTargetSubInvs(); - }, + getBusType() { let query = { @@ -561,8 +528,8 @@ export default { }; this.orderEditor = false; } - this.getStorage(); this.findSubInvs(); + this.findTargetSubInvs(); this.getTargetStorage(); this.codeArray = []; this.getBusType(); diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue index 22f4095..14ad352 100644 --- a/src/views/thrsys/thrOrderNew.vue +++ b/src/views/thrsys/thrOrderNew.vue @@ -1,317 +1,296 @@ - - - - - - + } + + + + + + \ No newline at end of file diff --git a/src/views/warehouse/DialogSelectInv.vue b/src/views/warehouse/DialogSelectInv.vue index c028357..bd66853 100644 --- a/src/views/warehouse/DialogSelectInv.vue +++ b/src/views/warehouse/DialogSelectInv.vue @@ -104,7 +104,8 @@ export default { findSubInvByInv() { this.subInvList = []; let query = { - pcode: this.userInfo.locInvCode + pcode: this.userInfo.locInvCode, + filter:3 }; filterSubByInv(query) .then((response) => { 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(); }