From 545ea43c0f1c31e761c8121885f5796bac198d13 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Wed, 30 Jul 2025 16:28:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisCommissionQuote/index.vue | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/views/emis/emisCommissionQuote/index.vue b/src/views/emis/emisCommissionQuote/index.vue index 0671bc1d..4b2babfd 100644 --- a/src/views/emis/emisCommissionQuote/index.vue +++ b/src/views/emis/emisCommissionQuote/index.vue @@ -256,10 +256,10 @@ @@ -365,6 +365,15 @@ export default { created() { this.getList(); }, + //watch 监听blOpen + watch: { + 'queryParams.blOpen': { + handler(newVal, oldVal) { + this.getList(); + }, + immediate: true + } + }, methods: { /** 查询员工提成方案报价列表 */ getList() { From 64d8ee7cc6da637fab59dd2969e2aa9efaa1b7f2 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Wed, 30 Jul 2025 18:03:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E8=B0=83=E6=95=B4=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/emisWaybillAjustApply/adjustPanel.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index 9635f0b4..81e8c248 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -347,7 +347,7 @@ - + newValue this.form==>",this.form); console.log("====>newValue this.form.packType==>",this.form.packType); @@ -1599,6 +1600,7 @@ export default { this.form.payee=item.payee; this.form.salesmen=item.salesmen; } + this.calcBillFee() }, initData(){ From 194a9cca53e65a3c7361243115e4a47f41921533 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 31 Jul 2025 09:53:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BF=9B=E4=BB=93=E5=AF=B9=E8=B4=A7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=BA=BF=E8=B7=AF=E4=BA=A7=E5=93=81=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/emisWarehouseIn/panel/WarehouseInPanel.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue index c42b1224..a9ba661e 100644 --- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue +++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue @@ -234,12 +234,12 @@ - + - + @@ -848,6 +848,12 @@ export default { if (j === 'waybillDetail.paymentType') { return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']); } + if(j === 'waybillDetail.transLineTypeName'){ + return v['waybillDetail']['transLineTypeName']; + } + if(j === 'waybillDetail.productTypeName'){ + return v['waybillDetail']['productTypeName']; + } return v[j] })) }, From 71b7278bcd008c913f0901a1250820213a572504 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 31 Jul 2025 10:47:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=9C=88=E8=AF=84?= =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salesMonthlyReview/draftSubmitReview.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/emis/salesMonthlyReview/draftSubmitReview.vue b/src/views/emis/salesMonthlyReview/draftSubmitReview.vue index e6d34d6f..5fed38e3 100644 --- a/src/views/emis/salesMonthlyReview/draftSubmitReview.vue +++ b/src/views/emis/salesMonthlyReview/draftSubmitReview.vue @@ -2,8 +2,8 @@
@@ -69,7 +69,7 @@ href="/static/tpl/imp_trans_quote.xls">下载导入Excel模板
{{ - fileName }} {{ uploadExcelDataInfo }}
+ fileName }} {{ uploadExcelDataInfo }} @@ -110,7 +110,7 @@ export default { // 总条数 total: 0, // 报价列表表格数据 - emisQuotePriceList: [], + list: [], tmpDataList: [], selectionList: [], selectionIndexList: [], @@ -211,7 +211,7 @@ export default { let loadingInstance = this.$loading({ text: '正在解析 ' + _index + ' 数据...' }) - this.emisQuotePriceList = []; + this.list = []; this.tmpDataList = []; // 组装提交的数据 for (let index = 0; index < results.length; index++) { @@ -277,7 +277,7 @@ export default { return; } - this.emisQuotePriceList = this.emisQuotePriceList.concat(this.tmpDataList); + this.list = this.list.concat(this.tmpDataList); this.tmpDataList = []; @@ -310,9 +310,9 @@ export default { let that = this; this.$modal.confirm('是否确认删除').then(function () { that.selectionList.forEach((item, index) => { - that.emisQuotePriceList.forEach((v, i) => { + that.list.forEach((v, i) => { if (item.index === v.index) { - that.emisQuotePriceList.splice(i, 1) + that.list.splice(i, 1) } }) }) From 202bc576f5d375fb7f27e51a720ba93558ce1bb1 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Thu, 31 Jul 2025 11:21:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A1=E6=8F=90?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E9=85=8D=E7=BD=AE=E6=97=B6=E9=97=B4=E3=80=81?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/emis/salesCommissionRatio/editForm.vue | 4 ++++ src/views/emis/salesCommissionRatio/index.vue | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/src/views/emis/salesCommissionRatio/editForm.vue b/src/views/emis/salesCommissionRatio/editForm.vue index 7cbd0a30..176cecf7 100644 --- a/src/views/emis/salesCommissionRatio/editForm.vue +++ b/src/views/emis/salesCommissionRatio/editForm.vue @@ -51,6 +51,7 @@ type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间" + @change="changeEndDate" /> @@ -147,6 +148,9 @@ export default { }); } }, + changeEndDate(val){ + this.form.endDate = val.split(' ')[0] + ' 23:59:59'; + }, // 取消按钮 cancel() { this.reset(); diff --git a/src/views/emis/salesCommissionRatio/index.vue b/src/views/emis/salesCommissionRatio/index.vue index c2d1fd75..2983019b 100644 --- a/src/views/emis/salesCommissionRatio/index.vue +++ b/src/views/emis/salesCommissionRatio/index.vue @@ -260,6 +260,15 @@ export default { return '停用'; } } + if(j === 'salesExecutiveRatio'){ + return v[j] + '%'; + } + if(j === 'salesmenRatio'){ + return v[j] + '%'; + } + if(j === 'salesSupportRatio'){ + return v[j] + '%'; + } return v[j] })) },