From eb82dda218e0ff33e09e628b1cfb8f87fdb600ed Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 6 Mar 2024 16:35:33 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E6=88=90=E5=91=98=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomePaymentsApi.js | 4 +- src/enums/commonEnums.js | 6 +- .../SafeguardStardsMemberList.vue | 88 ++++--- .../memberManage/StardsMemberProjectList.vue | 10 +- .../memberManage/StardsMemberStatistics.vue | 246 ++++++++++++++++++ .../modules/SafeguardStardsMemberModal.vue | 70 ++--- 6 files changed, 340 insertions(+), 84 deletions(-) create mode 100644 src/views/incomePayments/memberManage/StardsMemberStatistics.vue diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index f8f0216..56390b2 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -149,9 +149,9 @@ const draftGroupPublishRemind = (param) => postAction('/meeting/draftGroupMeetin // 2024年2月变更 // 标协会员-会员管理 相关接口 // 根据id获取标协会员项目信息 -const getStardsMemberProjectById = (params) => getAction('', params) +const getStardsMemberProjectById = (params) => getAction('/member/tbMemberProject/queryById', params) // 标协会员单位信息-提票 -const memberDrawTicket = (params) => getAction('', params) +const memberDrawTicket = (params) => getAction('/member/tbMemberProjectSubitem/ticketCollection', params) // 标协会员单位信息-复制 const memberCopy = (params) => getAction('', params) diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index baa1879..6093942 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -45,9 +45,9 @@ export const MemberNature = { // 来款方式 export const IncomeMethod = { - notHave: { name: '无', value: '1'}, - contract: { name: '合同', value: '2'}, - noticeOfCharge: { name: '收费通知', value: '3'}, + notHave: { name: '无', value: 1}, + contract: { name: '合同', value: 2}, + noticeOfCharge: { name: '收费通知', value: 3}, } // 是否 diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue index 9b163f3..7b0091a 100644 --- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue @@ -19,7 +19,7 @@
备注：
-
{{ stardsMemberDetail.remarks }}
+
{{ stardsMemberDetail.remark }}
@@ -45,7 +45,7 @@ @@ -64,34 +64,34 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 查询 @@ -192,7 +192,7 @@ - + @@ -234,32 +234,32 @@ export default { detailTitleList: [ { title: '标协会员项目', - fieldName: '' + fieldName: 'projectName' },{ title: '运行年份', - fieldName: '' + fieldName: 'year' }, { title: '负责人', - fieldName: '' + fieldName: 'directorId_dictText' }, { title: '收费标准', - fieldName: '' + fieldName: 'chargeStandard' }, { title: '收费通知号', - fieldName: '' + fieldName: 'chargeNoticeNo' }, { title: '收费通知', - fieldName: '', + fieldName: 'chargeNoticeFileId', type: 'file' }, { title: '理事会收费标准', - fieldName: '' + fieldName: 'councilChargeStandard' }, { title: '理事会收费通知号', - fieldName: '' + fieldName: 'councilChargeNoticeNo' }, { title: '理事会收费通知', - fieldName: '', + fieldName: 'councilChargeNoticeFileId', type: 'file' } ], @@ -309,8 +309,8 @@ export default { { title: '预估到账日期', align: 'center', - dataIndex: 'paidAmount', - scopedSlots: { customRender: 'allMoney' } + dataIndex: 'estimatedArrivalDate', + scopedSlots: { customRender: 'text' } }, { title: '打包', @@ -339,13 +339,13 @@ export default { { title: '确收', align: 'center', - dataIndex: 'mail', + dataIndex: 'confirmGet', scopedSlots: { customRender: 'status-mail' }, }, { title: '提票', align: 'center', - dataIndex: 'mail', + dataIndex: 'ticketCollection', scopedSlots: { customRender: 'status-mail' }, }, { @@ -359,12 +359,14 @@ export default { url: { list: '/member/tbMemberProjectSubitem/page', exportXlsUrl: '/member/tbMemberProjectSubitem/exportXls', + delete: '/member/tbMemberProjectSubitem/delete', + deleteBatch: '/member/tbMemberProjectSubitem/deleteBatch' } } }, - created() { - this.filters.projectId = this.$route.query.id - this.getStardsMemberProjectInfo(this.$route.query.id) + created () { + this.filters.projectId = this.$route.query.projectId + this.getStardsMemberProjectInfo(this.$route.query.projectId) this.loadData(1) }, methods: { diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue index ac6b2f9..ccd7e6e 100644 --- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue +++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue @@ -54,9 +54,9 @@ - + + + 编辑 @@ -117,7 +117,7 @@ export default { { title: '负责人', align: 'center', - dataIndex: 'directorName', + dataIndex: 'directorId_dictText', scopedSlots: {customRender: 'text'} }, { @@ -144,7 +144,7 @@ export default { this.$router.push({ path: '/incomePayments/memberManage/SafeguardStardsMemberList', query: { - id:record.id, + projectId: record.id, projectName:record.projectName } }) diff --git a/src/views/incomePayments/memberManage/StardsMemberStatistics.vue b/src/views/incomePayments/memberManage/StardsMemberStatistics.vue new file mode 100644 index 0000000..45f6baf --- /dev/null +++ b/src/views/incomePayments/memberManage/StardsMemberStatistics.vue @@ -0,0 +1,246 @@ + + + + + \ No newline at end of file diff --git a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue index 393719e..4d65a95 100644 --- a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue +++ b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue @@ -41,10 +41,7 @@ :init-contacts="selectPerson" placeholder="请选择企业联系人" @change="changetPerson" - v-decorator="[ - 'companyContactId', - validatorRules.companyContactId, - ]" + v-decorator="['liaisonManId',validatorRules.liaisonManId,]" :maxLength="50" ref="selectContacts" @ok="addContactsOk" @@ -96,6 +93,7 @@ - + @@ -214,7 +212,7 @@ @@ -248,7 +246,7 @@ :multiple="false" :return-id="true" :number="1" - v-decorator="['chargeNoticeFileId']" + v-decorator="['chargeNoticeId']" :trigger-change="true" > @@ -310,6 +308,12 @@ export default { default: () => { return {} } + }, + // 会员项目id + projectId: { + type: String, + required: false, + default: '' } }, data() { @@ -341,11 +345,11 @@ export default { rules: [{ required: true, message: '请选择会员单位' }], validateTrigger: 'blur' }, - contractNo: { + contractNum: { rules: [{ required: true, message: '请选择合同号' }], validateTrigger: 'change' }, - companyContactId: { + liaisonManId: { rules: [{ required: true, message: '请选择企业联系人' }], validateTrigger: 'change' }, @@ -377,7 +381,7 @@ export default { rules: [{ required: true, message: '请输入收费通知号' }], validateTrigger: 'blur' }, - needInvoice: { + invoiceRequirements: { rules: [{ required: true, message: '请选择发票类型' }], validateTrigger: ['change', 'blur'], initialValue: 0 @@ -398,8 +402,8 @@ export default { selectMailPerson: null, timer: null, url: { - add: '/jero/memberProjectSubitem/add', - edit: '/jero/memberProjectSubitem/edit' + add: '/member/tbMemberProjectSubitem/add', + edit: '/member/tbMemberProjectSubitem/edit' }, disabledCompany: false, // 企业是否可以编辑 isAssociatedContract: false // 是否已关联合同 @@ -428,7 +432,7 @@ export default { } // 合同作废后合同号是null，这里置为undefined - record.contractNo = record.contractNo || undefined + record.contractNum = record.contractNum || undefined this.model = Object.assign({}, record) // 编辑状态下的企业与联系人的回显 if (record.companyId) { @@ -454,25 +458,25 @@ export default { pick( this.model, 'companyId', - 'companyContactId', + 'liaisonManId', 'postContactId', 'amountReceivable', 'taxRate', 'tax', 'noTaxAmount', 'estimatedArrivalDate', - 'needInvoice', + 'invoiceRequirements', 'paymentMethod', - 'contractNo', + 'contractNum', 'chargeNoticeNo', - 'chargeNoticeFileId', + 'chargeNoticeId', 'remark' ) ) // 查找企业联系人，找不到就置空 this.$refs.selectContacts.getContactsList().finally(() => { - if (!this.$refs.selectContacts.contactsList.find(item => item.id === this.model.companyContactId)) { - this.form.setFieldsValue({ companyContactId: undefined }) + if (!this.$refs.selectContacts.contactsList.find(item => item.id === this.model.liaisonManId)) { + this.form.setFieldsValue({ liaisonManId: undefined }) } }) // 查找邮寄联系人，找不到就置空 @@ -495,27 +499,31 @@ export default { }, // 会员性质改变 memberNatureChange (value) { + console.log(this.baseInfo, value) if (value === MemberNature.viceChairmanUnit.value) { // 是副理事长单位, 带出会员信息的理事会收费标准、理事会收费通知号、理事会收费通知作为待确收金额，收费通知号，收费通知 + // 待确收金额带入会员的理事会收费标准 this.form.setFieldsValue({ - amountReceivable: this.baseInfo.amountReceivable + amountReceivable: this.baseInfo.councilChargeStandard }) + this.changeReceivableAmount({target: {value: this.baseInfo.councilChargeStandard}}) // 来款方式是收费通知，带出会员信息的理事会收费通知号、理事会收费通知作为收费通知号，收费通知 - if (this.form.getFieldValue('incomePaysType') === IncomeMethod.noticeOfCharge.value) { + if (this.form.getFieldValue('paymentMethod') === IncomeMethod.noticeOfCharge.value) { this.form.setFieldsValue({ - chargeNoticeFileId: this.baseInfo.chargeNoticeFileId, - chargeNoticeNo: this.baseInfo.chargeNoticeNo + chargeNoticeId: this.baseInfo.councilChargeNoticeFileId, + chargeNoticeNo: this.baseInfo.councilChargeNoticeNo }) } } else { // 是历史单位或者会员单位, 带出会员信息的收费标准、收费通知号、收费通知作为待确收金额，收费通知号，收费通知 + // 待确收金额带入会员的收费标准 this.form.setFieldsValue({ - amountReceivable: this.baseInfo.amountReceivable + amountReceivable: this.baseInfo.chargeStandard }) // 来款方式是收费通知，带出会员信息的收费通知号、收费通知作为收费通知号，收费通知 - if (this.form.getFieldValue('incomePaysType') === IncomeMethod.noticeOfCharge.value) { + if (this.form.getFieldValue('paymentMethod') === IncomeMethod.noticeOfCharge.value) { this.form.setFieldsValue({ - chargeNoticeFileId: this.baseInfo.chargeNoticeFileId, + chargeNoticeId: this.baseInfo.chargeNoticeFileId, chargeNoticeNo: this.baseInfo.chargeNoticeNo }) } @@ -550,8 +558,8 @@ export default { httpurl += this.url.edit } const formData = Object.assign(this.model, values) - formData.companyId = values.companyId.id - formData.projectId = this.$store.state.currentProjetcInfo.id + console.log(formData) + formData.projectId = this.projectId httpAction(httpurl, formData, 'post') .then((res) => { if (res.success) { @@ -584,12 +592,12 @@ export default { return } // 清除合同号 - this.form.setFieldsValue({ contractNo: undefined }) + this.form.setFieldsValue({ contractNum: undefined }) this.selectedCompany = Object.assign({}, val) // 切换企业清空两个联系人 this.form.setFieldsValue({ - companyContactId: undefined, + liaisonManId: undefined, postContactId: undefined }) },