From cc9bc91e45e10513c79e4a5cc4167da88438717a Mon Sep 17 00:00:00 2001 From: beyond <931414026@qq.com> Date: Sat, 18 Apr 2020 14:10:29 +0800 Subject: [PATCH 1/4] beyond 4.18 --- src/views/Stockenter/components/MyArrival.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Stockenter/components/MyArrival.vue b/src/views/Stockenter/components/MyArrival.vue index 66b31ef7..dcaf65a7 100644 --- a/src/views/Stockenter/components/MyArrival.vue +++ b/src/views/Stockenter/components/MyArrival.vue @@ -379,7 +379,7 @@ export default { color: item.color, basicQuantity: (Number(item.arrivalQuantity) - Number(item.hadStorageQuantity)).toFixed(2), actualEnterQuantity: (Number(item.arrivalQuantity) - Number(item.hadStorageQuantity)).toFixed(2), - enterPrice: (item.includeTaxPrice).toFixed(2), + enterPrice: item.includeTaxPrice, taxRate: (item.taxRate).toFixed(2), enterMoney: '0.00', remarks: '', @@ -391,7 +391,7 @@ export default { hadStorageQuantity: item.hadStorageQuantity } }) - console.log(arrivalDetail) + console.log('arrivalDetail', arrivalDetail) this.$emit('arrival', arrivalDetail) this.$emit('allarrivalinfo', this.choosedata) } From c5246dbcda0a5f29273c4c24460de7efa613956c Mon Sep 17 00:00:00 2001 From: tczjx58520 <2283600185@qq.com> Date: Sat, 18 Apr 2020 15:20:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?4.18=20=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/OutFactory/OutFactoryList.vue | 10 +++---- src/views/OutFactory/components/MyDetail.vue | 28 +++++++++----------- src/views/OutFactory/components/MyDialog.vue | 18 +++++-------- 3 files changed, 24 insertions(+), 32 deletions(-) diff --git a/src/views/OutFactory/OutFactoryList.vue b/src/views/OutFactory/OutFactoryList.vue index 3f9e35a7..90a23e6c 100644 --- a/src/views/OutFactory/OutFactoryList.vue +++ b/src/views/OutFactory/OutFactoryList.vue @@ -45,15 +45,15 @@ width="55" fixed="left" align="center"/> - + - - + diff --git a/src/views/OutFactory/components/MyDetail.vue b/src/views/OutFactory/components/MyDetail.vue index 334c91ac..45875406 100644 --- a/src/views/OutFactory/components/MyDetail.vue +++ b/src/views/OutFactory/components/MyDetail.vue @@ -207,7 +207,6 @@ export default { } }, created() { - this.getlist() }, beforeCreate() { _that = this @@ -215,13 +214,20 @@ export default { methods: { // 根据id选中 selectFromId(showList, selectList) { - if (selectList) { - for (const i in showList) { - if (selectList.findIndex(item => item.productCode === showList[i].code) > -1) { - this.$refs.multipleTable.toggleRowSelection(showList[i], true) + this.$refs.multipleTable.clearSelection() + this.$nextTick(() => { + if (selectList) { + console.log('showList和selectList', showList, selectList) + for (const i in showList) { + if (selectList.findIndex(item => item.productCode === showList[i].code) > -1) { + console.log('选中==================', i, showList[i]) + this.$refs.multipleTable.toggleRowSelection(showList[i], true) + } else { + this.$refs.multipleTable.toggleRowSelection(showList[i], false) + } } } - } + }) return showList }, getlist() { @@ -254,15 +260,7 @@ export default { // 搜索 handleFilter() { this.getemplist.pagenum = 1 - productlist(this.getemplist).then(res => { - if (res.data.ret === 200) { - this.list = res.data.data.content.list - this.total = res.data.data.content.totalCount - // this.restFilter() - } else { - // this.restFilter() - } - }) + this.getlist() }, // 批量操作 handleSelectionChange(rows) { diff --git a/src/views/OutFactory/components/MyDialog.vue b/src/views/OutFactory/components/MyDialog.vue index ddf7572f..1ec6d4b3 100644 --- a/src/views/OutFactory/components/MyDialog.vue +++ b/src/views/OutFactory/components/MyDialog.vue @@ -1,5 +1,5 @@ @@ -636,12 +636,32 @@ export default { } }, // 通过折扣计算折扣额 - getdiscountRate(row) { + getdiscountRate(row, scope) { + console.log('执行了') if (row.discountRate === 0) { row.discountMoney = 0 } else { row.discountMoney = (row.includeTaxPrice * row.quantity * (row.discountRate / 100)).toFixed(2) } + if (row !== '' && row !== null && row !== undefined && scope.$index === 0) { + if (row.discountRate !== '' && row.discountRate !== null && row.discountRate !== undefined) { + for (let i = 0; i < this.list2.length; i++) { + this.list2[i].temp = i + } + for (let i = row.temp; i < this.list2.length; i++) { + console.log('this.list2[i].discountRate', this.list2[i].discountRate) + if (this.list2[i].discountRate !== null && this.list2[i].discountRate !== 0 && this.list2[i].discountRate !== '' && this.list2[i].discountRate !== undefined) { + // this.list2[i].requireDate = row.requireDate + // this.list2[i].requireQuantity = row.requireQuantity + } else { + console.log(222) + // this.list2[i].requireDate = row.requireDate + this.list2[i].discountRate = row.discountRate + } + } + console.log(row) + } + } }, // 通过税率计算含税价 gettaxRate(row) { From 7394bb6373fc0149c275eb4bc19de3cc63a4bd7d Mon Sep 17 00:00:00 2001 From: beyond <931414026@qq.com> Date: Sat, 18 Apr 2020 16:56:52 +0800 Subject: [PATCH 4/4] beyond 4.18.2 --- src/views/CheckReport/components/DetailReport4.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/CheckReport/components/DetailReport4.vue b/src/views/CheckReport/components/DetailReport4.vue index 9633e1ec..d05b86c7 100644 --- a/src/views/CheckReport/components/DetailReport4.vue +++ b/src/views/CheckReport/components/DetailReport4.vue @@ -24,6 +24,11 @@ {{ scope.row.unit }} + + +