From 0ba7f89dd7d55e477c2eb2b98ac82ddc4aad6912 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 14 Oct 2021 14:16:06 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessManagement/ContactManagement.vue | 3 +- .../WorkingGroupMemberUnitMaintenance.vue | 2 + .../WorkingGroupProjectManagement.vue | 2 +- .../WorkingGroupMemberSetChargeNotice.vue | 40 +++++++++++-------- .../modules/WorkingGroupMemberUnitModule.vue | 37 +++++++++-------- .../modules/WorkingGroupProjectModule.vue | 10 ++--- 6 files changed, 51 insertions(+), 43 deletions(-) diff --git a/src/views/businessManagement/ContactManagement.vue b/src/views/businessManagement/ContactManagement.vue index 5ec5584..4b7181b 100644 --- a/src/views/businessManagement/ContactManagement.vue +++ b/src/views/businessManagement/ContactManagement.vue @@ -134,7 +134,7 @@ export default { }, { title: '职务', align: 'center', - width: 160, + width: 280, dataIndex: 'post', scopedSlots: { customRender: 'text' } }, { @@ -149,6 +149,7 @@ export default { }, { title: '企业名称', align: 'center', + width: 280, dataIndex: 'companyName', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index acbf850..9bedd60 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -379,6 +379,7 @@ export default { type: 'chargeNoticeA', label: `A：${ this.workingGroupDetail.chargeNoticeNoA }`, value: this.workingGroupDetail.chargeNoticeNoA, + key: this.workingGroupDetail.chargeA, yearCharge: this.workingGroupDetail.yearChargeA, chargeNoticeId: this.workingGroupDetail.chargeNoticeAId } @@ -390,6 +391,7 @@ export default { type: 'chargeNoticeB', label: `B：${ this.workingGroupDetail.chargeNoticeNoB }`, value: this.workingGroupDetail.chargeNoticeNoB, + key: this.workingGroupDetail.chargeB, yearCharge: this.workingGroupDetail.yearChargeB, chargeNoticeId: this.workingGroupDetail.chargeNoticeBId } diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue index d633fa5..6208c54 100644 --- a/src/views/projectManagement/WorkingGroupProjectManagement.vue +++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue @@ -117,7 +117,7 @@ import SelectPrincipal from '@comp/company/SelectPrincipal' import ProgressBar from '@comp/ProgressBar' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png' -import { copyWorkingGroup, checkoutWorkingGroupPrincipal } from '../../api/incomePaymentsApi' +import { copyWorkingGroup } from '../../api/incomePaymentsApi' import { getAction } from '../../api/manage' export default { diff --git a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue index d7deb3c..7408e47 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue @@ -11,8 +11,16 @@ - + + + + {{ item.label }} + + + @@ -146,25 +154,25 @@ export default { * 收费通知号变化, 回显本年应收款和文件 */ handleChargeNoticeChange(e) { - let chargeNoticeNo = e.target.value - this.pickChargeNoticeType(chargeNoticeNo) + let key = e.target.value + this.pickChargeNoticeType(key) }, /** * 匹配显隐 - * @param value + * @param key */ - pickChargeNoticeType(value) { + pickChargeNoticeType(key) { this.chargeNoticeList.forEach(item => { - if (item.value === value) { - if (item.type === 'chargeNoticeA') { - this.selectedChargeNotice = 'A' - this.model.receivableAmount = item.yearCharge - this.model.chargeNoticeId = item.chargeNoticeId - } else { - this.selectedChargeNotice = 'B' - this.model.receivableAmount = item.yearCharge - this.model.chargeNoticeId = item.chargeNoticeId - } + if (item.type === 'chargeNoticeA' && key === 'a') { + this.selectedChargeNotice = 'A' + this.model.receivableAmount = item.yearCharge + this.model.chargeNoticeId = item.chargeNoticeId + this.model.chargeNoticeNo = item.value + } else if (item.type === 'chargeNoticeB' && key === 'b'){ + this.selectedChargeNotice = 'B' + this.model.receivableAmount = item.yearCharge + this.model.chargeNoticeId = item.chargeNoticeId + this.model.chargeNoticeNo = item.value } }) this.$nextTick(() => { diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index 57da0fb..5b62379 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -100,9 +100,9 @@ - + {{ item.label }} @@ -325,7 +325,7 @@ export default { rules: [{ required: true, message: '请输入合同号' }], validateTrigger: 'blur' }, - chargeNoticeNo: { + charge: { rules: [{ required: true, message: '请输入收费通知号' }], validateTrigger: 'blur' }, @@ -400,7 +400,6 @@ export default { this.companyChange(this.selectedCompany) this.form.resetFields() this.model = Object.assign({}, record) - console.log(this.signedContactId) // 是否存在从收入合同传入的签订联系人id this.model.contactsIdOne = this.signedContactId || this.model.contactsTemporaryIdOne || undefined this.model.contactsIdTwo = this.model.contactsTemporaryIdTwo || undefined @@ -426,10 +425,10 @@ export default { } } this.chargeWayType = record.chargeWay - this.pickChargeNoticeType(record.chargeNoticeNo) + this.pickChargeNoticeType(record.charge) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'chargeNoticeNo', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks')) + this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks')) }) }, close() { @@ -512,25 +511,25 @@ export default { * 收费通知号变化, 回显本年应收款和文件 */ handleChargeNoticeChange(e) { - let chargeNoticeNo = e.target.value - this.pickChargeNoticeType(chargeNoticeNo) + let key = e.target.value + this.pickChargeNoticeType(key) }, /** * 匹配收费通知显隐 * @param value */ - pickChargeNoticeType(value) { + pickChargeNoticeType(key) { this.chargeNoticeList.forEach(item => { - if (item.value === value) { - if (item.type === 'chargeNoticeA') { - this.selectedChargeNotice = 'A' - this.model.receivableAmount = item.yearCharge - this.model.chargeNoticeId = item.chargeNoticeId - } else { - this.selectedChargeNotice = 'B' - this.model.receivableAmount = item.yearCharge - this.model.chargeNoticeId = item.chargeNoticeId - } + if (item.type === 'chargeNoticeA' && key === 'a') { + this.selectedChargeNotice = 'A' + this.model.receivableAmount = item.yearCharge + this.model.chargeNoticeId = item.chargeNoticeId + this.model.chargeNoticeNo = item.value + } else if (item.type === 'chargeNoticeB' && key === 'b') { + this.selectedChargeNotice = 'B' + this.model.receivableAmount = item.yearCharge + this.model.chargeNoticeId = item.chargeNoticeId + this.model.chargeNoticeNo = item.value } }) this.$nextTick(() => { diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue index 51d79fb..ad3ea0d 100644 --- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue @@ -93,9 +93,7 @@ - - {