From d3761159e696c80cdd1c3d0fe1abf5ea61784ce9 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 25 Jul 2022 15:45:08 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E7=AC=AC=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BC=9A=E8=AE=AE=20url=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../incomePayments/meetManage/modules/AuditModal.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue index 3990316..bd68dd0 100644 --- a/src/views/incomePayments/meetManage/modules/AuditModal.vue +++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue @@ -226,15 +226,20 @@ export default { methods: { open(record, signUp) { this.form.resetFields() - this.visible = true + this.signUpPersonId = this.situationId ? this.situationId : record.id this.querySingUpUserInfo() // 控制行程信息显示 审核凭证不显示 this.checkSignBool = signUp || false let meetingType = this.meetingType ? this.meetingType+'' :this.$route.query.meetingType + // prop meetingType 第一次传进来值拿不到 + if(Object.prototype.hasOwnProperty.call(record,'meetingType')){ + meetingType = record.meetingType + '' + } // 会议类型不同 url不同 this.url = Object.assign({}, this.createUrlByMeetingType(meetingType)) - console.log(record) + this.visible = true + console.log( this.url,this.url) }, close() { this.$emit('close') From 76ecc88c6d974b79efc97651776fad230605532b Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Wed, 27 Jul 2022 14:09:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArriveAndInvoivingList.vue | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 3e08e21..c9037d4 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -51,12 +51,14 @@ - + - + @@ -133,9 +135,10 @@ + 审核 - + @@ -194,7 +198,7 @@ diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/PreComeModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue similarity index 58% rename from src/views/financialManagement/arriveAndInvoicing/modules/PreComeModule.vue rename to src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue index 711863a..51816c9 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/PreComeModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue @@ -16,6 +16,20 @@ + + + + + + @@ -48,8 +62,22 @@ import {addZero} from '../../../../utils/util' import { getPayConfirmList, addPayConfirm, editPayConfirm } from '../../../../api/incomePaymentsApi' export default { - name: 'PreComeModule', + name: 'ConfirmModule', components: {JDate}, + props:{ + // 项目id + projectId: { + type: String, + required: false, + default: null + }, + // 项目类型 + projectType: { + type: [Number, String], + required: false, + default: null + }, + }, data() { return { title: '确认信息', @@ -72,6 +100,14 @@ export default { rules: [{required: true, validator: this.checkMoney}], validateTrigger: 'blur' }, + noTaxAmount: { + rules: [{required: true, validator: this.checkNoTaxMoney}], + validateTrigger: 'blur' + }, + tax: { + rules: [{required: true, validator: this.checkTaxMoney}], + validateTrigger: 'blur' + }, paymentDate: { rules: [{required: true, message: '请选择确认日期'}], validateTrigger: 'change' @@ -81,6 +117,29 @@ export default { }, methods: { addZero, + add(projectInfo, isFirst) { + + let currentDate = new Date() + let paymentDate = currentDate.getFullYear() + '-' + (currentDate.getMonth() + 1) + '-' + currentDate.getDate() + let record = { paymentDate } + //判断当前新增的是第一个阶段，并且有已开票金额则，默认回显已开票金额为确认金额 + if(isFirst && projectInfo.invoiceAmount) { + // 已确认金额 默认回显为 开票金额 + record.amountReceived = projectInfo.invoiceAmount + let obj = this.calcOtherNumber(record.amountReceived) + record = {...record, ...obj} + } + this.edit(record, projectInfo) + }, + // edit(record) { + // this.form.resetFields() + // this.model = Object.assign({}, record) + // this.getMailContactPostalCode() + // this.visible = true + // this.$nextTick(() => { + // this.form.setFieldsValue(pick(this.model, 'invoiceAmount', 'billNo', 'billDate', 'remark')) + // }) + // }, show(record) { this.form.resetFields() this.projectInfo = Object.assign({}, record) @@ -88,10 +147,13 @@ export default { this.getInfoById(record.id) this.visible = true }, - edit(record) { + edit(record, projectInfo) { + this.form.resetFields() this.model = Object.assign({}, record) + this.projectInfo = Object.assign({}, projectInfo) + this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'amountReceived', 'paymentDate', 'remark')) + this.form.setFieldsValue(pick(this.model, 'amountReceived', 'tax', 'noTaxAmount','paymentDate', 'remark')) }) }, getInfoById(id) { @@ -123,7 +185,7 @@ export default { values.projectType = this.projectInfo.projectType const obj = Object.assign(this.model, values) let okHttpMethod - if (this.isEdit) { + if (this.model.id) { okHttpMethod = editPayConfirm(obj) } else { okHttpMethod = addPayConfirm(obj) @@ -157,16 +219,46 @@ export default { * @param rules * @param value * @param callback + * @param name --校验字段的名字 + * */ - checkMoney(rules, value, callback) { + checkMoneyTemplate(rules, value, callback, name) { if (value) { if (money(value)) { callback() } callback('请输入合法的金额数字,最多2位小数,10位整数') } - callback('请输入确认金额') - } + callback(`请输入${name}`) + }, + /** + * 校验金额格式 + */ + checkMoney(rules, value, callback) { + this.checkMoneyTemplate(rules, value, callback, '确认金额') + }, + checkNoTaxMoney(rules, value, callback) { + this.checkMoneyTemplate(rules, value, callback, '未税金额') + }, + checkTaxMoney(rules, value, callback) { + this.checkMoneyTemplate(rules, value, callback, '税额') + }, + // 总金额做相关的处理 + addZeroAmount(event) { + this.addZero(event) + let finalValue = event.target.value + // 计算未税金额和税额的值 + let obj = this.calcOtherNumber(finalValue) + // console.log(event.target.value ) + this.$nextTick(() => { + this.form.setFieldsValue(obj) + }) + }, + calcOtherNumber(amount) { + let noTaxAmount = (amount / 1.06).toFixed(2) // 未税金额 + let tax = (amount - noTaxAmount).toFixed(2) // 税额 + return {noTaxAmount, tax} + }, } } diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue new file mode 100644 index 0000000..843c4a9 --- /dev/null +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmStageModule.vue @@ -0,0 +1,250 @@ + + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue index 8fba2ce..b2eaea3 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue @@ -15,6 +15,20 @@ + + + + + + @@ -108,6 +122,14 @@ export default { rules: [{ required: true, validator: this.checkMoney }], validateTrigger: 'blur' }, + noTaxAmount: { + rules: [{required: true, validator: this.checkNoTaxMoney}], + validateTrigger: 'blur' + }, + tax: { + rules: [{required: true, validator: this.checkTaxMoney}], + validateTrigger: 'blur' + }, billNo: { rules: [{ required: true, message: '请输入开票号' }], validateTrigger: 'blur' @@ -132,7 +154,7 @@ export default { this.getMailContactPostalCode() this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'invoiceAmount', 'billNo', 'billDate', 'remark')) + this.form.setFieldsValue(pick(this.model, 'invoiceAmount', 'tax', 'noTaxAmount', 'billNo', 'billDate', 'remark')) }) }, getMailContactPostalCode() { @@ -203,16 +225,45 @@ export default { * @param rules * @param value * @param callback + * @param name --校验字段的名字 + * */ - checkMoney(rules, value, callback) { + checkMoneyTemplate(rules, value, callback, name) { if (value) { if (money(value)) { callback() } callback('请输入合法的金额数字,最多2位小数,10位整数') } - callback('请输入到账金额') - } + callback(`请输入${name}`) + }, + + // 校验金额格式 + checkMoney(rules, value, callback) { + this.checkMoneyTemplate(rules, value, callback, '开票金额') + }, + checkNoTaxMoney(rules, value, callback) { + this.checkMoneyTemplate(rules, value, callback, '未税金额') + }, + checkTaxMoney(rules, value, callback) { + this.checkMoneyTemplate(rules, value, callback, '税额') + }, + // 总金额做相关的处理 + addZeroAmount(event) { + this.addZero(event) + let finalValue = event.target.value + // 计算未税金额和税额的值 + let obj = this.calcOtherNumber(finalValue) + // console.log(event.target.value ) + this.$nextTick(() => { + this.form.setFieldsValue(obj) + }) + }, + calcOtherNumber(amount) { + let noTaxAmount = (amount / 1.06).toFixed(2) // 未税金额 + let tax = (amount - noTaxAmount).toFixed(2) // 税额 + return {noTaxAmount, tax} + }, } } diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index 6253971..fd0abfb 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -132,6 +132,7 @@ 取消打包 开票 + 确认收入 @@ -176,6 +177,14 @@ :project-type="selectProjectType" :project-name="selectProjectName" @ok="modalFormOk"> + + @@ -195,6 +204,7 @@ import ArriveStageModule from '../financialManagement/arriveAndInvoicing/modules import InvoicingStageModule from '../financialManagement/arriveAndInvoicing/modules/InvoicingStageModule' import { getPackCompanyById, batchRemovePackProject, removePackProject } from '../../api/incomePaymentsApi' import ProjectDetailModal from '../../components/ProjectDetailModal' +import ConfirmStageModule from '../financialManagement/arriveAndInvoicing/modules/ConfirmStageModule' export default { name: 'PackProjectMaintenance', @@ -207,7 +217,8 @@ export default { BatchInvoicingModule, ArriveStageModule, InvoicingStageModule, - ProjectDetailModal + ProjectDetailModal, + ConfirmStageModule }, mixins: [JeroListMixin], data() { @@ -339,7 +350,7 @@ export default { dataIndex: 'action', align: 'center', fixed: 'right', - width: 180, + width: 280, scopedSlots: { customRender: 'action' } } ], @@ -350,6 +361,7 @@ export default { incomeVisible: false, // 批量来款对话框开启状态 arriveStageVisible: false, // 来款阶段对话框开启状态 invoicingStageVisible: false, // 开票阶段对话框开启状态 + confirmStageVisible: false, // 确认收入阶段对话框开启状态 selectProjectId: null, // 选中项目id selectProjectType: null, // 选中项目类型 selectProjectName: null, // 选中项目名称 @@ -559,7 +571,18 @@ export default { } resolve(arr) }) - } + }, + /** + * 确认收入 -（记录跨年度提前来款） + * @param record + */ + confirmPayment(record) { + this.selectProjectType = record.projectType + this.selectProjectId = record.id + this.confirmStageVisible = true + this.$refs.confirmStageModule.show(record) + + }, } } From d165d428cbe9aa618758bbbb06e48fa04193ddfe Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Mon, 1 Aug 2022 15:36:20 +0800 Subject: [PATCH 5/8] =?UTF-8?q?[add]=20-=E5=85=A8=E6=89=80=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97=E7=9A=84=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WholePaymentsStatistics.vue | 203 ++++++++++++++++++ src/views/statisticalReport/statisticData.js | 24 +-- 2 files changed, 215 insertions(+), 12 deletions(-) create mode 100644 src/views/statisticalReport/WholePaymentsStatistics.vue diff --git a/src/views/statisticalReport/WholePaymentsStatistics.vue b/src/views/statisticalReport/WholePaymentsStatistics.vue new file mode 100644 index 0000000..dc3f366 --- /dev/null +++ b/src/views/statisticalReport/WholePaymentsStatistics.vue @@ -0,0 +1,203 @@ + + + + + + \ No newline at end of file diff --git a/src/views/statisticalReport/statisticData.js b/src/views/statisticalReport/statisticData.js index 460ac2b..bdde6b2 100644 --- a/src/views/statisticalReport/statisticData.js +++ b/src/views/statisticalReport/statisticData.js @@ -1,14 +1,14 @@ export const MonthData = [ - {name: '1月', value: '01'}, - {name: '2月', value: '02'}, - {name: '3月', value: '03'}, - {name: '4月', value: '04'}, - {name: '5月', value: '05'}, - {name: '6月', value: '06'}, - {name: '7月', value: '07'}, - {name: '8月', value: '08'}, - {name: '9月', value: '09'}, - {name: '10月', value: '10'}, - {name: '11月', value: '11'}, - {name: '12月', value: '12'}, + {name: '1月', value: '01', key: 'January'}, + {name: '2月', value: '02', key: 'February'}, + {name: '3月', value: '03', key: 'March'}, + {name: '4月', value: '04', key: 'April'}, + {name: '5月', value: '05', key: 'May'}, + {name: '6月', value: '06', key: 'June'}, + {name: '7月', value: '07', key: 'July'}, + {name: '8月', value: '08', key: 'August'}, + {name: '9月', value: '09', key: 'September'}, + {name: '10月', value: '10', key: 'October'}, + {name: '11月', value: '11', key: 'November'}, + {name: '12月', value: '12', key: 'December'}, ] \ No newline at end of file From af8fda0b3d6052282d46fdbea00cf4569ebaf7ca Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 5 Aug 2022 10:48:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[update]=20-=E7=A8=8E=E9=A2=9D+=E6=9C=AA?= =?UTF-8?q?=E7=A8=8E=E9=87=91=E9=A2=9D=3D=20=E6=80=BB=E9=A2=9D=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ArriveModule.vue | 40 ++--------- .../modules/ConfirmModule.vue | 43 ++---------- .../modules/InvoicingModule.vue | 42 ++---------- .../modules/TaxOperateMixin.js | 68 +++++++++++++++++++ 4 files changed, 84 insertions(+), 109 deletions(-) create mode 100644 src/views/financialManagement/arriveAndInvoicing/modules/TaxOperateMixin.js diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue index 39bef6d..4b11113 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue @@ -22,14 +22,14 @@ @@ -54,14 +54,15 @@ diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue index 51816c9..9c23e27 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ConfirmModule.vue @@ -23,14 +23,14 @@ @@ -55,15 +55,16 @@ diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue index b2eaea3..af920b2 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue @@ -22,14 +22,14 @@ @@ -61,14 +61,15 @@ diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/TaxOperateMixin.js b/src/views/financialManagement/arriveAndInvoicing/modules/TaxOperateMixin.js new file mode 100644 index 0000000..4a9fca7 --- /dev/null +++ b/src/views/financialManagement/arriveAndInvoicing/modules/TaxOperateMixin.js @@ -0,0 +1,68 @@ +/*换入税率操作的相关方法*/ + +import {money} from '../../../../utils/validate' + +export const TaxOperateMixin = { + data() { + return { + taxRate: 0.06, // 税率 + } + }, + + methods: { + /** + * 校验金额格式 + * @param rules + * @param value + * @param callback + * @param name --校验字段的名字 + * + */ + checkMoneyTemplate(rules, value, callback, name) { + if (value) { + if (money(value)) { + callback() + } + callback('请输入合法的金额数字,最多2位小数,10位整数') + } + callback(`请输入${name}`) + }, + // 总金额做相关的处理 + addZeroAmount(event) { + this.addZero(event) + let finalValue = event.target.value + // 计算未税金额和税额的值 + let obj = this.calcOtherNumber(finalValue) + // console.log(event.target.value ) + this.$nextTick(() => { + this.form.setFieldsValue(obj) + }) + }, + /** + * 税额\未税金额 失去焦点的事件 + * @param event --失去焦点的event ,存储当前input 的值 + * @param keyName -- 想互斥 数字 对应的key值 + * @param amountKeyName--当前dom 中 存储金额的字段的key值 + * + */ + addZeroTaxOrNo(event, keyName, amountKeyName) { + console.log('-----addZeroTaxOrNo---', event.target.value) + this.addZero(event) + let amount = this.form.getFieldValue(amountKeyName) + if(!amount) return + let finalValue = event.target.value + let otherVlaue = (amount - finalValue).toFixed(2) + this.$nextTick(() => { + this.form.setFieldsValue({[keyName]: otherVlaue}) + }) + + }, + // 通过金额 计算 税额、未税金额 + calcOtherNumber(amount) { + let noTaxAmount = (amount / (1 + this.taxRate)).toFixed(2) // 未税金额 + let tax = (amount - noTaxAmount).toFixed(2) // 税额 + return {noTaxAmount, tax} + }, + } + +} From bc1d4cb50a4ab81d61ae72e12c2a7ada130966c8 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 5 Aug 2022 12:07:26 +0800 Subject: [PATCH 7/8] =?UTF-8?q?[update]=20-=E6=89=93=E5=8C=85=E3=80=81?= =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=20?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E7=9A=84=E5=B1=95=E7=A4=BA=EF=BC=9B=E6=89=93?= =?UTF-8?q?=E5=8C=85=E7=AE=A1=E7=90=86=20=E3=80=90=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E5=85=A5=E3=80=91=E6=8C=89=E9=92=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tools/StatusSlot.vue | 21 ++++++++++++++++--- .../ArriveAndInvoivingList.vue | 20 ++++++++++++++++-- .../modules/ArriveModule.vue | 12 +++++++++++ .../modules/InvoicingModule.vue | 2 +- .../packManagement/PackProjectMaintenance.vue | 18 ++++++++++++++-- 5 files changed, 65 insertions(+), 8 deletions(-) diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue index ecc2013..e665515 100644 --- a/src/components/tools/StatusSlot.vue +++ b/src/components/tools/StatusSlot.vue @@ -58,7 +58,7 @@ export default { required: false }, // 当前需要转换key的属性, 悬浮显示实际具体内容信息时需要 - // paymentRecord 来款 mail -- 邮寄 bill--开票 + // paymentRecord 来款 confirm-确认收入 mail -- 邮寄 bill--开票 statusKey: { type: String, required: false, @@ -106,6 +106,9 @@ export default { } else { return finished } + } else if(this.statusNo === 4) { + // 确认收入莫名其妙的出现了 4， 所以修改成 全部确认的样式 + return finished } } }, @@ -129,9 +132,16 @@ export default { // 到账、开票、邮寄 的时候，请求接口获得相应的数据 // 判断条件 tooltip显示、 有不同的统计状态，统计状态值不为0 没有请求过详情数据 if (visible && this.statusType && this.statusNo && !this.hasInfo) { - this.getInfoFunc({ id: this.statuObj.id }).then(res => { + let idKey = this.statusKey === 'confirm' && 'projectId' || 'id' + this.getInfoFunc({ [idKey]: this.statuObj.id }).then(res => { if (res.success) { - let arr = res.result[this.opeStatusKey] || [] + let arr = [] + if(this.statusKey === 'confirm') { + // 确认收入单独的实现逻辑 + arr = res.result || [] + } else { + arr = res.result[this.opeStatusKey] || [] + } let result = [] arr.map(tt => { result.push(this.showTemplate(tt)) @@ -139,6 +149,7 @@ export default { // 对tooltip中的文字进行替换 this.currentTitle = result.join('\n') this.hasInfo = true + } }) } @@ -165,6 +176,10 @@ export default { if (item.sendDate || item.postNo) { result = `${ item.sendDate }新增邮寄信息，邮寄单号：${ item.postNo }` } + } else if (this.statusKey === 'confirm') { + if (item.paymentDate || item.amountReceived) { + result = `${ item.paymentDate }确认收入${ item.amountReceived }元` + } } return result } diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 715ad52..f4a6628 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -119,6 +119,11 @@ + + +