From 69894599c98613b2d7e2557d265d3e157bb13aae Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 22 Oct 2021 15:21:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=9A=84=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=B8=8E=E6=9D=A5=E6=AC=BE=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=20=20=E6=A0=87=E5=8D=8F?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=88=97=E5=AE=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/SelectMemberProjectModule.vue | 6 +++--- .../modules/SafeguardMemberModal.vue | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue index 49733b8..688a6e7 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue @@ -226,21 +226,21 @@ export default { title: '联系人', align: 'center', dataIndex: 'liaisonMan', - width: 80, + width: 200, scopedSlots: {customRender: 'text'} }, { title: '邮箱', align: 'center', dataIndex: 'email', - width: 160, + width: 200, scopedSlots: {customRender: 'text'}, }, { title: '手机', align: 'center', dataIndex: 'phone', - width: 80, + width: 100, scopedSlots: {customRender: 'text'} }, { diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue index 47cea26..e34218b 100644 --- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue +++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue @@ -23,6 +23,7 @@ v-decorator="['companyId', validatorRules.companyId]" @change="companyChange" :maxLength="50" + :disabled="disabledCompany" > @@ -117,6 +118,7 @@ 合同 收费通知 @@ -134,6 +136,7 @@ placeholder="请输入合同号" :maxLength="50" v-decorator="['contractNo', validatorRules.contractNo]" + :disabled="isAssociatedContract" @change=" (e) => { e.target.value = (e.target.value + '').trim(); @@ -221,6 +224,7 @@ import CompanySelect from '@comp/company/CompanySelect' import SelectContacts from '@comp/company/SelectContacts' import {addZero} from '@/utils/util' import {money} from '@/utils/validate' +import {checkAssociatedProject} from '@/utils/projectCheck' export default { name: 'SafeguardMemberModal', @@ -307,6 +311,8 @@ export default { add: '/jero/memberProjectSubitem/add', edit: '/jero/memberProjectSubitem/edit', }, + disabledCompany: false, // 企业是否可以编辑 + isAssociatedContract: false, // 是否已关联合同 } }, methods: { @@ -330,6 +336,16 @@ export default { clearTimeout(this.timer) } this.form.resetFields() + // 判断企业是否可以编辑,项目来款、开票、邮寄、打包、关联合同后,企业不可更改 + if (record.id) { + // 验证项目是否关联收入合同 + checkAssociatedProject(record.id).then(res => { + this.disabledCompany = this.disabledChargeCompany || res || (!!record.inAccount && record.inAccount !== 0) || (!!record.makeInvoice && record.makeInvoice !== 0) || (!!record.mail && record.mail !== 0) + this.isAssociatedContract = res + }) + } else { + this.disabledCompany = this.disabledChargeCompany + } // 如果没有id 就是新增 新增需要将上级的项目收费通知与文件回显 let flag = Object.prototype.hasOwnProperty.call(record, 'id') @@ -390,7 +406,10 @@ export default { close() { this.incomePaysType = 3 this.$emit('close') + this.disabledCompany = false + this.isAssociatedContract = false this.visible = false + clearTimeout(this.timer) }, handleOk() {