diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue index 96f9ff5..deb699b 100644 --- a/src/components/form/InstallmentForm.vue +++ b/src/components/form/InstallmentForm.vue @@ -67,6 +67,7 @@ import JDate from '../tools/JDate' import pick from 'lodash.pick' import { addZero } from '../../utils/util' +import { money } from '../../utils/validate' export default { name: 'InstallmentForm', @@ -89,11 +90,11 @@ export default { validateTrigger: 'blur' }, accountsReceivableAmount: { - rules: [{ required: true, message: '请输入金额' }], + rules: [{ required: true, validator: this.checkMoney }], validateTrigger: 'blur' }, paidAmount: { - rules: [{ required: false, message: '请输入金额' }], + rules: [{ required: false, validator: this.checkMoney }], validateTrigger: 'blur' } }, @@ -147,6 +148,25 @@ export default { this.$emit('ok', values) } }) + }, + /** + * 校验金额格式 + * @param rules + * @param value + * @param callback + */ + checkMoney(rules, value, callback) { + if (value) { + if (money(value)) { + callback() + return + } + callback('请输入正确格式的金额') + } + if (rules.field === 'accountsReceivableAmount') { + callback('请输入金额') + } + callback() } } } diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index 9396337..204373c 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -650,6 +650,9 @@ export default { case 'accountsReceivableAmount': callback('请输入应收金额') break + case 'noTaxAmount': + callback('请输入未税金额') + break case 'amountReceived': callback('请输入已收金额') break diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 3b79e87..d2d76e3 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -36,7 +36,7 @@ @change="handleSignedCompanyChange"> - + { this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear')) this.confirmLoading = false @@ -535,18 +536,12 @@ export default { }) }, handleCancle() { - this.model = this.temporaryModel - // 处理联系人信息回显 - this.isCancel = true - this.model.signedContactsId = this.model.signedContactsTemporaryId - this.selectedContact = { - id: this.model.signedContactsTemporaryId, - name: this.model.signedContactsTemporaryName + if (this.model.id) { + this.edit(this.model.id) + } else { + this.form.resetFields() + this.$refs.installmentForm.form.resetFields() } - this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear')) - this.confirmLoading = false - }) }, installmentFormOk(value) { this.installmentList = value.installmentList @@ -762,6 +757,9 @@ export default { case 'accountsReceivableAmount': callback('请输入应收金额') break + case 'noTaxAmount': + callback('请输入未税金额') + break case 'amountReceived': callback('请输入已收金额') break diff --git a/src/views/mailManagement/modules/MailContractModal.vue b/src/views/mailManagement/modules/MailContractModal.vue index e73d1de..4f2af1e 100644 --- a/src/views/mailManagement/modules/MailContractModal.vue +++ b/src/views/mailManagement/modules/MailContractModal.vue @@ -29,6 +29,8 @@ diff --git a/src/views/mailManagement/modules/MailModal.vue b/src/views/mailManagement/modules/MailModal.vue index dc219a9..07a8c81 100644 --- a/src/views/mailManagement/modules/MailModal.vue +++ b/src/views/mailManagement/modules/MailModal.vue @@ -29,6 +29,8 @@ diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue index 4d93ce8..345b3d3 100644 --- a/src/views/projectManagement/GeneralProjectManagement.vue +++ b/src/views/projectManagement/GeneralProjectManagement.vue @@ -179,12 +179,16 @@ export default { title: '应收金额', align: 'center', width: 150, - dataIndex: 'receivableAmount' + dataIndex: 'receivableAmount', + customRender: (text, record) => ( + ) }, { title: '实收金额', align: 'center', width: 150, - dataIndex: 'paidAmount' + dataIndex: 'paidAmount', + customRender: (text, record) => ( + ) }, { title: '负责人', align: 'center', diff --git a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue index 53a74df..e8727fb 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue @@ -37,6 +37,7 @@ @@ -56,6 +57,7 @@ diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index 49a5799..63d6ba6 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -114,7 +114,7 @@ - + @@ -171,6 +172,7 @@ @@ -327,7 +329,7 @@ export default { }, needInvoice: { rules: [{ required: true, message: '请选择发票类型' }], - validateTrigger: 'blur' + validateTrigger: 'change' } }, chargeWayType: null,