From d160300db14d535e4b32d1226edee999735be5d2 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Sat, 18 Sep 2021 14:13:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E5=85=B3?= =?UTF-8?q?=E8=81=94=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/SelectMemberProjectModule.vue | 69 ++++++++++++------- .../incomePayments/meetManage/Attendance.vue | 4 +- .../SafeguardStardsMemberList.vue | 18 +++++ 3 files changed, 66 insertions(+), 25 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue index 28e2a0e..6ea556b 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue @@ -9,11 +9,10 @@ cancelText="关闭">
- + - @@ -56,7 +55,8 @@ class="j-table-force-nowrap"> @@ -89,7 +89,8 @@ class="j-table-force-nowrap"> @@ -153,17 +154,22 @@ export default { title: '会员项目', align: 'center', dataIndex: 'projectName', - scopedSlots: {customRender: 'htmlSlot'} + width: 200, + scopedSlots: {customRender: 'text'}, }, { title: '负责人', align: 'center', - dataIndex: 'directorName' + dataIndex: 'directorName', + scopedSlots: {customRender: 'text'}, + width: 200, }, { title: '创建时间', align: 'center', - dataIndex: 'createTime' + dataIndex: 'createTime', + scopedSlots: {customRender: 'text'}, + width: 200, }, ], //标协会员表头 @@ -181,23 +187,22 @@ export default { { title: '项目名称', align: 'center', - dataIndex: '', - width: 100, - // scopedSlots: {customRender: 'text'}, - + dataIndex: 'projectName', + width: 200, + scopedSlots: {customRender: 'text'}, }, { title: '会员编号', align: 'center', dataIndex: 'memberNo', - width: 160, + width: 200, scopedSlots: {customRender: 'text'}, }, { title: '单位名称', align: 'center', dataIndex: 'companyName', - width: 160, + width: 200, scopedSlots: {customRender: 'text'}, }, { @@ -205,18 +210,21 @@ export default { align: 'center', dataIndex: 'memberType_dictText', width: 80, + scopedSlots: {customRender: 'text'} }, { title: '会员性质', align: 'center', dataIndex: '', width: 80, + // scopedSlots: {customRender: 'text'} }, { title: '联系人', align: 'center', dataIndex: 'liaisonMan', width: 80, + scopedSlots: {customRender: 'text'} }, { title: '邮箱', @@ -230,47 +238,49 @@ export default { align: 'center', dataIndex: 'phone', width: 80, + scopedSlots: {customRender: 'text'} }, { title: '会员状态', align: 'center', dataIndex: 'memberStatus_dictText', width: 80, + scopedSlots: {customRender: 'text'} }, { title: '打包', align: 'center', dataIndex: 'pack', scopedSlots: {customRender: 'status-pack'}, - width: 60, + width: 80, }, { title: '需要发票', align: 'center', dataIndex: 'invoiceRequirements', scopedSlots: {customRender: 'status-pack'}, - width: 60, + width: 80, }, { title: '到账', align: 'center', dataIndex: 'inAccount', scopedSlots: {customRender: 'status'}, - width: 60, + width: 80, }, { title: '开票', align: 'center', dataIndex: 'makeInvoice', scopedSlots: {customRender: 'status'}, - width: 60, + width: 80, }, { title: '邮寄', align: 'center', dataIndex: 'mail', scopedSlots: {customRender: 'status'}, - width: 60, + width: 80, } ], labelCol: { @@ -282,15 +292,19 @@ export default { sm: {span: 10} }, url: { - list: '/jero/memberProject/page', + list: '/jero/memberProject/queryListByCompany', }, + // 默认激活的tab页 + activeKey:'1', disableMixinCreated: true, // 项目类型 4-会员项目 5-标协会员 projectType: 4, contractId: '', // 收入合同id // 打包状态 pack: '', - contractInfo:{} + contractInfo:{}, + // 企业id + companyId:'' } }, methods: { @@ -300,6 +314,13 @@ export default { // 保存合同id 与打包状态 this.contractId = record.id this.pack = record.pack + // 保存企业id + this.companyId =record.signedCompany.id + this.filters = { + companyId:this.companyId, + contractId:this.contractId, + projectType:'4' + } this.loadData() this.visible = true }, @@ -333,22 +354,24 @@ export default { }) }, handleCancel() { + this.activeKey = '1' this.close() }, /* * 切换类型 * */ callback(val) { + this.activeKey =val // 2是标协会员 if (val === '2') { this.projectType = 5 - this.url.list = '/member/tbMemberProjectSubitem/page' + this.filters.projectType = '5' this.loadData(1) } // 1是会员项目 if (val === '1') { - this.projectType = 5 - this.url.list = '/jero/memberProject/page' + this.projectType = 4 + this.filters.projectType = '4' this.loadData(1) } }, diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 363a672..9c374d6 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -78,8 +78,8 @@ @click="copy(signUpHerfUrl)">复制 - 签到二维码复制 + 签到二维码 + diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue index b17dfa7..ab3ed7b 100644 --- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue @@ -181,6 +181,24 @@ export default { dataIndex: 'registerTime', scopedSlots: { customRender: 'text' }, }, + { + title: '应收金额', + align: 'center', + dataIndex: 'amountReceivable', + scopedSlots: { customRender: 'text' }, + }, + { + title: '实收金额', + align: 'center', + dataIndex: 'paidAmount', + scopedSlots: { customRender: 'text' }, + }, + { + title: '注册时间', + align: 'center', + dataIndex: 'registerTime', + scopedSlots: { customRender: 'text' }, + }, { title: '打包', align: 'center',