From d100f66e67571c516d4eb7635c5ef933bff1bba7 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 9 Aug 2022 18:55:31 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BasicEntrutsRece.vue | 617 +++++++++--------- src/views/basic/UdiInfoManage.vue | 1 + .../basic/basicCompanyProductsImport.vue | 23 +- src/views/inventory/DialogInvProduct.vue | 9 +- src/views/inventory/invUdiTraceOrder.vue | 2 +- src/views/thrsys/thrOrderNew.vue | 4 +- src/views/warehouse/AdditionalOrder.vue | 10 +- src/views/warehouse/IOCheckErrOrder.vue | 15 +- src/views/warehouse/IONewOrder.vue | 41 +- src/views/warehouse/IOSearchOrder.vue | 4 +- src/views/warehouse/IOWaitOrder.vue | 20 +- src/views/warehouse/addHosOrder.vue | 17 +- src/views/warehouse/code.vue | 2 +- src/views/warehouse/errorCode.vue | 20 - src/views/warehouse/stockHospOrderNew.vue | 78 +-- src/views/warehouse/stockOrder.vue | 2 +- src/views/warehouse/stockOrderDelSearch.vue | 17 - src/views/warehouse/stockOrderEdit.vue | 1 + .../warehouse/stockOrderEditDistribution.vue | 6 +- src/views/warehouse/stockOrderEditor.vue | 26 +- .../warehouse/stockOrderNewDistribution.vue | 11 +- .../warehouse/stockOrderQRCodeDetail.vue | 18 +- 22 files changed, 424 insertions(+), 520 deletions(-) diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index 5e09e65..aeb2de3 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -1,334 +1,357 @@ diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue index d95a5d4..6a5b098 100644 --- a/src/views/basic/UdiInfoManage.vue +++ b/src/views/basic/UdiInfoManage.vue @@ -79,6 +79,7 @@ v-loading="loading" :data="list" style="width: 100%" + highlight-current-row key="1" @selection-change="handleSelectionChange" > diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue index 2574361..15d6104 100644 --- a/src/views/basic/basicCompanyProductsImport.vue +++ b/src/views/basic/basicCompanyProductsImport.vue @@ -15,17 +15,17 @@ - - - - {{ item.sysName }} - - - + + + + + + + + + + + @@ -558,6 +558,7 @@ 以使用单元数量入库 diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue index dbf7d50..d7e663e 100644 --- a/src/views/inventory/DialogInvProduct.vue +++ b/src/views/inventory/DialogInvProduct.vue @@ -97,7 +97,7 @@ export default { type: Function, required: true, }, - invQueryData:{ + invQueryData: { type: Object, required: true, } @@ -115,6 +115,7 @@ export default { supId: null, unitFk: null, invStorageCode: null, + invWarehouseCode: null, }, detailQuery: { code: null, @@ -325,8 +326,12 @@ export default { created() { this.getBusType(); let query = this.$route.query; - this.filterQuery.invStorageCode = this.invQueryData.locStorageCode; + this.filterQuery = Object.assign(this.filterQuery, query); + + + this.filterQuery.invStorageCode = this.invQueryData.locStorageCode; + this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode; this.filterQuery.limit = parseInt(this.filterQuery.limit); // 加载表格数据 this.getList(); diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue index 65368fc..b269756 100644 --- a/src/views/inventory/invUdiTraceOrder.vue +++ b/src/views/inventory/invUdiTraceOrder.vue @@ -250,7 +250,7 @@ @@ -417,7 +419,9 @@ @@ -911,11 +919,6 @@ export default { }); }, intentDetail(row) { - // this.$router.push({ - // path: "../inout/detail", - // query: { id: row.id }, - // }); - this.codeDetailVisible = true; this.idQuery.id = row.id; }, diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue index 1e4282e..3c8d0bc 100644 --- a/src/views/warehouse/IONewOrder.vue +++ b/src/views/warehouse/IONewOrder.vue @@ -73,7 +73,7 @@ 合并单据 - 新增订单 + 新增单据 异常单据 @@ -83,6 +83,7 @@ @@ -221,7 +222,7 @@ { - if (unit !== obj.fromCorp) { - this.$message.warning("往来单位不一致！"); + + + + for(let index in repeatData){ + if (action !== repeatData[index].action) { + this.$message.warning("业务类型不一致！"); return; } - if (action !== obj.action) { - this.$message.warning("业务类型不一致！"); + if (unit !== repeatData[index].fromCorp) { + this.$message.warning("往来单位不一致！"); return; } - orderList.push(obj.id); - }); + + orderList.push(repeatData[index].id); + } let tquery = { orderList: orderList, + type: 2, }; this.$confirm( diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue index 4129b33..dfb0385 100644 --- a/src/views/warehouse/IOSearchOrder.vue +++ b/src/views/warehouse/IOSearchOrder.vue @@ -80,7 +80,7 @@ 查询 - 导出单据 + @@ -350,7 +350,7 @@ { - if (unit !== obj.fromCorp) { - this.$message.warning("往来单位不一致！"); + + + for (let index in repeatData) { + if (action !== repeatData[index].action) { + this.$message.warning("业务类型不一致！"); return; } - if (action !== obj.action) { - this.$message.warning("业务类型不一致！"); + if (unit !== repeatData[index].fromCorp) { + this.$message.warning("往来单位不一致！"); return; } - orderList.push(obj.id); - }); + orderList.push(repeatData[index].id); + } + let tquery = { orderList: orderList, + type: 1, }; this.$confirm( diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index d545d76..73fef8e 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -364,6 +364,8 @@ @@ -393,6 +397,8 @@ :title="editTitle" :visible.sync="editCodeVisible" append-to-body width="70%" + :close-on-click-modal="false" + :close-on-press-escape="false" v-if="editCodeVisible" > - + diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue index 014fbc0..b144edb 100644 --- a/src/views/warehouse/errorCode.vue +++ b/src/views/warehouse/errorCode.vue @@ -29,7 +29,6 @@ > - - - - - - - - @@ -295,7 +277,6 @@ export default { }); }, intentBack() { - // this.$router.push({path:'../readme/detail',query:{id:row.corpOrderId}}); this.$router.go(-1); }, //绑定数据 @@ -355,7 +336,6 @@ export default { rowStyle({row, rowIndex}) { let rowBackground = {}; if (row.supId == null || row.relId == null) { - //rowBackground.background="#f6f5ee"; rowBackground.color = '#f60303'; } diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index 7cd707b..fad741e 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -560,9 +560,9 @@ export default { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); } - if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { - return this.$message.error('生产日期与失效日期不能全部为空'); - } + // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { + // return this.$message.error('生产日期与失效日期不能全部为空'); + // } } @@ -740,7 +740,6 @@ export default { selectProductFunction(event) { if (event == null) { - // this.$refs.inputRef.focus(); } else { event.target.select(); } @@ -771,12 +770,14 @@ export default { if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) { this.invQueryData = { locStorageCode: this.formData.locStorageCode, + invWarehouseCode: this.formData.invWarehouseCode, }; this.selectInvProductVisible = true; } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) { this.invQueryData = { locStorageCode: this.formData.corpId, + invWarehouseCode: this.formData.fromSubInvCode, }; this.selectInvProductVisible = true; } else { @@ -800,7 +801,6 @@ export default { code: this.code, customerId: store.getters.customerId, }; - stockOrderDetailQueryProduct(tQuery).then((response) => { this.loading = false; if (response.code === 20000) { @@ -835,12 +835,9 @@ export default { } } else { this.$message.warning(response.message); - // this.focusNext('inputRef'); if (this.$isNotBlank(event)) { event.target.select(); } - // event.target.select(); - // event.currentTarget.select(); } }); @@ -870,35 +867,13 @@ export default { this.focusNext('iCount'); - // let sc = this.selectedIndex + 'reCount'; - // const _this = this; - // this.$nextTick(() => { - // setTimeout(function() { - // console.log(sc); - // console.log(_this.$refs[sc]); - // console.log(_this.$refs[sc].focus()); - // _this.$refs[sc].focus(); - // }, 1) - // // this.$refs['inputBatchNoRef'][0].focus() - // }) - }, - iCountChange() { - // console.log(this.iCount) - // this.currentRow.count = this.iCount; - // this.currentRow.reCount = this.iCount; }, iCountEnterFunction() { if (this.$isNotBlank(this.currentRow)) { this.currentRow.count = this.iCount; - // this.currentRow.reCount = this.iCount; } this.focusNext('inputRef'); }, - tableCountChange(row) { - if (this.$isNotBlank(row)) { - // row.count = row.reCount; - } - }, tableRowClassName({row, rowIndex}) { row.index = rowIndex; }, @@ -990,13 +965,6 @@ export default { if (this.$isBlank(row.batchNo)) { return this.$message.error('批次号不能为空'); } - // if (this.$isBlank(row.productDate)) { - // return this.$message.error('生产日期不能为空'); - // } - // if (this.$isBlank(row.expireDate)) { - // return this.$message.error('失效日期不能为空'); - // } - this.$refs.multipleTable.setCurrentRow(); this.currentRow = {}; this.selectedIndex = ""; @@ -1035,7 +1003,6 @@ export default { this.detailLoading = false; if (response.code === 20000) { this.$message.success(response.data); - // this.getStockOrderDetailList(); this.codeArray.splice(index, 1); } else { this.$message.error(response.message); @@ -1062,21 +1029,6 @@ export default { cancelButtonText: "取消", type: "warning", }).then(() => { - // let tQuery = { - // id: row.id - // } - // this.detailLoading = true; - // copyStockOrderDetail(tQuery) - // .then((response) => { - // this.detailLoading = false; - // if (response.code === 20000) { - // this.$message.success("复制成功"); - // this.getStockOrderDetailList(); - // } else { - // this.$message.error(response.message); - // } - // }); - let rData = JSON.parse(JSON.stringify(row)); rData.id = null; if (this.codeArray.length === 0) { @@ -1128,23 +1080,6 @@ export default { intentBack() { this.$router.go(-1); }, - // generateBillNo() { - // let tQuery = { - // action: this.formData.billType - // } - // this.loading = true; - // stockOrderGenerateBillNo(tQuery) - // .then((response) => { - // this.loading = false; - // if (response.code === 20000) { - // this.formData.billNo = response.data; - // // this.formData.billdate = parseTime(new Date(), '{y}{m}{d}'); - // this.formData.billdate = new Date(); - // } else { - // this.closeDialog(true); - // } - // }); - // }, getBusType() { let query = { code: this.formData.invWarehouseCode, @@ -1233,8 +1168,6 @@ export default { this.getBusType(); }, invChange() { - /*if (this.$isNotBlank(this.formData.invWarehouseCode)) - this.formData.invWarehouseCode = null;*/ this.findSubInvs(); }, @@ -1289,7 +1222,6 @@ export default { this.iCount = 0; this.orderEditor = false; this.formData.billdate = new Date(); - // this.generateBillNo(); } this.findMethod(); this.getBusType(); diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue index 492c41e..6165fb4 100644 --- a/src/views/warehouse/stockOrder.vue +++ b/src/views/warehouse/stockOrder.vue @@ -332,7 +332,7 @@ @@ -81,10 +80,6 @@ :data="list" style="width: 100%; " highlight-current-row @row-click="getStockOrderDetailList" ref="multipleTable"> - @@ -105,20 +100,8 @@ - - - - -