diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue index bbc020a..85e6d39 100644 --- a/src/components/form/InstallmentForm.vue +++ b/src/components/form/InstallmentForm.vue @@ -90,13 +90,9 @@ export default { validateTrigger: 'blur' }, paidAmount: { - rules: [{ required: true, message: '请输入金额'}], + rules: [{ required: false, message: '请输入金额'}], validateTrigger: 'blur' }, - paidTime: { - rules: [{ required: true, message: '请选择实收时间'}], - validateTrigger: 'blur' - } }, index: 1, installmentList: [], diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index 5ab1fad..2ab4388 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -261,8 +261,8 @@ export default { selectedContact: null, rateNum: null, contractAmountNum: null, - amountReceivedNum: null, - accountsReceivableNum: null, + amountReceivedNum: null, // 已收金额 + accountsReceivableNum: null, // 应收金额 isPackage: false, labelCol: { xs: { span: 24 }, @@ -278,7 +278,7 @@ export default { validateTrigger: 'blur' }, contractName: { - rules: [{ required: true, message:'请输入合同名称' }], + rules: [{ required: true, message: '请输入合同名称' }], validateTrigger: 'blur' }, signedCompany: { @@ -343,18 +343,25 @@ export default { if (res.success) { let record record = res.result + // 回显企业 record.signedCompany = { id: record.signedCompanyTemporaryId, companyName: record.signedCompanyTemporaryName } + // 回显联系人 this.selectedCompany = record.signedCompany record.signedContactsId = record.signedContactsTemporaryId this.selectedContact = { id: record.signedContactsTemporaryId, name: record.signedContactsTemporaryName } - this.$refs.installmentForm.initInstallmentList(record.listInstallment) this.model = Object.assign({}, record) + // 回显负责人部门 + this.principalChange(this.model.principalId) + // 回显分期信息 + this.$refs.installmentForm.initInstallmentList(this.model.listInstallment) + // 回显打包年份 + this.isPackage = this.model.pack === 1 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 @@ -593,7 +600,7 @@ export default { callback('请输入已收金额') break } - }, + } } } diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue index 6e7a618..29c142f 100644 --- a/src/views/projectManagement/modules/GeneralProjectModule.vue +++ b/src/views/projectManagement/modules/GeneralProjectModule.vue @@ -65,7 +65,8 @@ v-decorator="['contactsId',validatorRules.contactsId]" :maxLength='50' ref="selectContacts" - @ok="addContactsOk"> + @ok="addContactsOk" + @change="contactsChange"> @@ -424,6 +425,20 @@ export default { }, addMailContactsOk() { this.$refs.selectContacts.getContactsList() + }, + /** + * 联系人、邮寄联系人联动 + * @param value + */ + contactsChange(value) { + let mailContact = Object.values(this.form.getFieldValue(['mailContactsId']))[0] + // 邮寄联系人非undefined时赋值 + if (!mailContact) { + this.model.mailContactsId = value + this.$nextTick(() => { + this.form.setFieldsValue(pick(this.model, 'mailContactsId')) + }) + } } } } diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index 93deea2..9d03b53 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -44,7 +44,8 @@ v-decorator="['contactsIdOne',validatorRules.contactsIdOne]" :maxLength='50' ref="selectContacts1" - @ok="addContactsOneOk"> + @ok="addContactsOneOk" + @change="contactsChange"> @@ -564,6 +565,20 @@ export default { return } callback() + }, + /** + * 企业联系人1、邮寄联系人联动 + * @param value + */ + contactsChange(value) { + let mailContact = Object.values(this.form.getFieldValue(['mailContactsId']))[0] + // 邮寄联系人非undefined时赋值 + if (!mailContact) { + this.model.mailContactsId = value + this.$nextTick(() => { + this.form.setFieldsValue(pick(this.model, 'mailContactsId')) + }) + } } } }