From dc722756f2b2ee0fad277356a245730dfefa206b Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Thu, 20 Jul 2023 17:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20"=E5=BA=94=E6=94=B6=E9=87=91=E9=A2=9D"?= =?UTF-8?q?=E6=94=B9=E6=88=90"=E5=BE=85=E7=A1=AE=E6=94=B6=E9=87=91?= =?UTF-8?q?=E9=A2=9D"=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProjectDetailModal.vue | 2 +- src/components/tools/StatusSlot.vue | 6 +++--- src/mixins/CalcAmountMixin.js | 14 +++++++------- .../modules/ExpenditureContractModule.vue | 4 ++-- .../modules/AddMemberProject.vue | 10 +++++----- .../modules/AssociatedProject.vue | 2 +- .../modules/RevenueContractDetail.vue | 2 +- .../modules/RevenueContractModule.vue | 16 ++++++++-------- .../modules/SelectMeetingProjectModule.vue | 2 +- .../modules/SelectProjectModule.vue | 2 +- src/views/dashboard/ThreeYearEcharts.vue | 4 ++-- .../ArriveAndInvoivingList.vue | 6 +++--- .../dunning/DunningList.vue | 2 +- .../incomePayments/meetManage/Attendance.vue | 4 ++-- .../meetManage/OtherMeetingForm.vue | 10 +++++----- .../CertificateMaintenanceList.vue | 2 +- .../memberManage/SafeguardMemberList.vue | 2 +- .../memberManage/SafeguardStardsMemberList.vue | 2 +- .../modules/SafeguardMemberModal.vue | 6 +++--- .../packManagement/PackProjectMaintenance.vue | 6 +++--- .../modules/BatchIncomePaymentModule.vue | 2 +- .../modules/BatchInvoicingModule.vue | 2 +- .../modules/PackProjectSelectProjectModule.vue | 2 +- .../GeneralProjectManagement.vue | 2 +- .../WorkingGroupMemberUnitMaintenance.vue | 2 +- .../modules/GeneralProjectModule.vue | 18 +++++++++--------- .../modules/WorkingGroupMemberUnitModule.vue | 8 ++++---- .../screen/incomePayments/ThreeYearEcharts.vue | 4 ++-- 28 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 5e96448..e3610a4 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -15,7 +15,7 @@ - + diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue index e665515..8d613de 100644 --- a/src/components/tools/StatusSlot.vue +++ b/src/components/tools/StatusSlot.vue @@ -76,10 +76,10 @@ export default { status() { if (this.statuObj.amountReceivable === '0.00' || this.statuObj.receivableAmount === '0.00') { if (this.statusType) { - // 应收金额为0 未到账 未邮寄 未开票的状态 + // 待确收金额为0 未到账 未邮寄 未开票的状态 return zero } else { - // 应收金额为0 打包 与需要开票的状态 打包与需要开票 只有√和×的状态 + // 待确收金额为0 打包 与需要开票的状态 打包与需要开票 只有√和×的状态 if (this.statusNo === 0) { return error } else if (this.statusNo === 1 || this.statusNo === 2) { @@ -89,7 +89,7 @@ export default { } } else { - // 应收金额不为0 都正常判断 + // 待确收金额不为0 都正常判断 if (this.statusNo === 0) { // 开票或邮寄时，不需要发票 if ((this.statusKey === 'bill' || this.statusKey === 'mail') && this.statuObj.needInvoice === 0) { diff --git a/src/mixins/CalcAmountMixin.js b/src/mixins/CalcAmountMixin.js index 41ac257..8df93bb 100644 --- a/src/mixins/CalcAmountMixin.js +++ b/src/mixins/CalcAmountMixin.js @@ -6,12 +6,12 @@ export const CalcAmountMixin = { data() { return { - ysjeKey:'receivableAmount',// 应收金额的表单key值 + ysjeKey:'receivableAmount',// 待确收金额的表单key值 } }, methods:{ /** - * 改变应收金额 计算税额 未税金额 + * 改变待确收金额 计算税额 未税金额 * */ changeReceivableAmount(e){ e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim() @@ -20,7 +20,7 @@ export const CalcAmountMixin = { }) }, /** - * 改变税率计算税额 应收金额 + * 改变税率计算税额 待确收金额 * */ changeRate(){ this.$nextTick(() => { @@ -28,16 +28,16 @@ export const CalcAmountMixin = { }) }, /** - * 根据应收金额、税率计算税额 、未税金额 + * 根据待确收金额、税率计算税额 、未税金额 * */ calcAmount(){ - // 获取应收金额 + // 获取待确收金额 let ysje = Number(this.form.getFieldValue(this.ysjeKey)) // 获取税率 let rate = this.form.getFieldValue('taxRate') * 1 - // 计算未税金额 未税金额 = 应收金额 * (税率 + 1) + // 计算未税金额 未税金额 = 待确收金额 * (税率 + 1) let wsje = (ysje / (rate + 1)).toFixed(2) - // 计算税额 税额 = 应收金额 - 未税金额 保留两位小数 + // 计算税额 税额 = 待确收金额 - 未税金额 保留两位小数 let se = (ysje - Number(wsje)).toFixed(2) // 表单赋值 this.form.setFieldsValue({ diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index d16d5cd..282752c 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -329,7 +329,7 @@ export default { contractAmountNum: null, // 合同总金额 inputNoTaxAmount: null, // 未税金额 amountReceivedNum: null, // 已收金额 - accountsReceivableNum: null, // 应收金额 + accountsReceivableNum: null, // 待确收金额 isPackage: false, labelCol: { xs: { span: 24 }, @@ -727,7 +727,7 @@ export default { this.form.setFieldsValue({ contractAmount: contractNum }) }, /** - * 应收金额输入 + * 待确收金额输入 * @param value */ accountsReceivableChange(e) { diff --git a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue index 7d6ec07..fd16d77 100644 --- a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue +++ b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue @@ -50,8 +50,8 @@ - - + @@ -265,16 +265,16 @@ export default { this.close() }, /* - * 校验应收金额 + * 校验待确收金额 * */ validateMoney(rule,value,callback){ if(value === '' || value === undefined || value === null){ - callback('请输入应收金额') + callback('请输入待确收金额') } if(value && money(value)){ callback() }else { - callback('应收金额格式错误') + callback('待确收金额格式错误') } }, diff --git a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue index 3046159..c84fd36 100644 --- a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue +++ b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue @@ -77,7 +77,7 @@ export default { width: 280, scopedSlots: { customRender: 'text' } }, { - title: '应收金额', + title: '待确收金额', align: 'center', dataIndex: 'receivableAmount', width: 250, diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue index e0beda3..de63248 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue @@ -268,7 +268,7 @@ export default { accountInfoList: [ { fieldName: 'accountsReceivableAmount', - title: '应收金额' + title: '待确收金额' }, { fieldName: 'amountReceived', title: '已收金额' diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index bb1895b..ec520f7 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -166,8 +166,8 @@
- - + 0 且 未收金额 < 应收金额，部分付款状态 + // 未收金额 > 0 且 未收金额 < 待确收金额，部分付款状态 } else if (Number(this.model.outstandingAmount) > 0 && Number(this.model.outstandingAmount) < Number(this.accountsReceivableNum)) { this.model.accountStatus = '2' - // 未收金额 === 应收金额，未付款状态 + // 未收金额 === 待确收金额，未付款状态 } else if (Number(this.model.outstandingAmount) === Number(this.accountsReceivableNum)) { this.model.accountStatus = '1' } @@ -838,7 +838,7 @@ export default { callback('请输入签订合同总金额') break case 'accountsReceivableAmount': - callback('请输入应收金额') + callback('请输入待确收金额') break case 'noTaxAmount': callback('请输入未税金额') diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index edd6e34..c06f06a 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -170,7 +170,7 @@ export default { scopedSlots: { customRender: 'text' } }, { - title: '应收金额', + title: '待确收金额', align: 'center', dataIndex: 'amountReceivable', width: 200, diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index be359d5..07ca596 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -205,7 +205,7 @@ export default { dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { - title: '应收金额', + title: '待确收金额', align: 'center', width: 100, dataIndex: 'receivableAmount' diff --git a/src/views/dashboard/ThreeYearEcharts.vue b/src/views/dashboard/ThreeYearEcharts.vue index 53878d4..2876273 100644 --- a/src/views/dashboard/ThreeYearEcharts.vue +++ b/src/views/dashboard/ThreeYearEcharts.vue @@ -110,7 +110,7 @@ export default { this.initEcharts(res.result) // 将接口数据 转化成表格数据形式 let tableData = [ - {indexName: '应收金额'}, + {indexName: '待确收金额'}, ] dataSource.map((item, index) => { let dataIndex = 'key' + index @@ -265,7 +265,7 @@ export default { }, series: [ { - name: '应收金额', + name: '待确收金额', data: this.echartsData.allMoney, type: 'bar', barMaxWidth: 60, diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index 83b2bd9..ad50206 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -326,7 +326,7 @@ export default { dataIndex: 'contactsTemporaryName', scopedSlots: {customRender: 'contact'} }, { - title: '应收金额', + title: '待确收金额', align: 'center', width: 100, dataIndex: 'receivableAmount', @@ -504,9 +504,9 @@ export default { } // 来款 if (operateType === 'incomePayment') { - // 是否存在应收金额为0的项目 + // 是否存在待确收金额为0的项目 if (arr.some(item => Number(item.receivableAmount) === 0)) { - reject('存在应收金额为0的项目！') + reject('存在待确收金额为0的项目！') } } resolve(arr) diff --git a/src/views/financialManagement/dunning/DunningList.vue b/src/views/financialManagement/dunning/DunningList.vue index 05ec930..bb095da 100644 --- a/src/views/financialManagement/dunning/DunningList.vue +++ b/src/views/financialManagement/dunning/DunningList.vue @@ -139,7 +139,7 @@ export default { dataIndex: 'contactsTemporaryName', scopedSlots: { customRender: 'text' } }, { - title: '应收金额', + title: '待确收金额', align: 'center', width: 100, dataIndex: 'receivableAmount' diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 5091d42..bb56d94 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -389,7 +389,7 @@ export default { scopedSlots: { customRender: 'person' } }, { - title: '应收金额', + title: '待确收金额', align: 'center', dataIndex: 'amountReceivable', width: 100 @@ -767,7 +767,7 @@ export default { this.$message.warn('请选择一条记录') return } - // 应收金额为0 不需要发票 打包 都不可以开发票 + // 待确收金额为0 不需要发票 打包 都不可以开发票 console.log(this.selectionRows) // 只能选择相同的单位进行合并开票 if (this.selectionRows.length > 0) { diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue index 40dc2bd..5d39bd3 100644 --- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue +++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue @@ -53,14 +53,14 @@ - +