From b5a48a5d0d65692c9cd076e1e3b52a885d636378 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 6 Mar 2024 14:27:54 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=B8=BA=E5=85=AC=E7=94=A8=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BC=9A=E5=91=98=E6=9D=83=E7=9B=8A=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=9B=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E4=B8=BA=E6=96=B0=E5=A2=9E=E7=9A=84?= =?UTF-8?q?=E7=A8=8E=E9=A2=9D=E5=92=8C=E6=9C=AA=E7=A8=8E=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=BC=95=E5=85=A5=E6=B7=B7=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProjectDetailModal.vue | 4 +- .../SafeguardStardsMemberList.vue | 4 +- .../modules/SafeguardMemberModal.vue | 38 ++++++--------- .../modules/SafeguardStardsMemberModal.vue | 48 +++++++++---------- 4 files changed, 42 insertions(+), 52 deletions(-) diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 89d6a78..a4b50a8 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -86,8 +86,8 @@ - -
+ +

会员权益

diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue index 15f1bb2..9b163f3 100644 --- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue @@ -190,7 +190,7 @@ - + @@ -214,6 +214,7 @@ import SafeguardStardsMemberModal from './modules/SafeguardStardsMemberModal' import { getStardsMemberProjectById, memberDrawTicket } from '@/api/incomePaymentsApi' import MemberEquityModal from './modules/MemberEquityModal' import MemberCopyModal from './modules/MemberCopyModal' +import { ProjectTypeEnums } from '@/enums/commonEnums' export default { name: 'SafeguardStardsMemberList', @@ -229,6 +230,7 @@ export default { }, data() { return { + ProjectTypeEnums, detailTitleList: [ { title: '标协会员项目', diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue index 33e9bc3..3d90c5b 100644 --- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue +++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue @@ -41,10 +41,7 @@ :init-contacts="selectPerson" placeholder="请选择企业联系人" @change="changetPerson" - v-decorator="[ - 'companyContactId', - validatorRules.companyContactId, - ]" + v-decorator="['companyContactId',validatorRules.companyContactId,]" :maxLength="50" ref="selectContacts" @ok="addContactsOk" @@ -80,10 +77,7 @@ placeholder="请输入待确收金额" :maxLength="50" @change="changeReceivableAmount" - v-decorator="[ - 'amountReceivable', - validatorRules.amountReceivable, - ]" + v-decorator="['amountReceivable',validatorRules.amountReceivable,]" @blur="addZero" > 元 @@ -91,8 +85,12 @@ - + @@ -107,7 +105,8 @@ @blur="addZero" read-only disabled - @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"> + @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}" + > 元 @@ -124,7 +123,8 @@ disabled @blur="addZero" read-only - @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"> + @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}" + > 元 @@ -214,11 +214,7 @@ placeholder="请输入收费通知号" :maxLength="50" v-decorator="['chargeNoticeNo', validatorRules.chargeNoticeNo]" - @change=" - (e) => { - e.target.value = (e.target.value + '').trim(); - } - " + @change="(e) => {e.target.value = (e.target.value + '').trim()}" > @@ -252,11 +248,7 @@ :auto-size="{ minRows: 3, maxRows: 6 }" :maxLength="200" v-decorator="['remark']" - @change=" - (e) => { - e.target.value = (e.target.value + '').trim(); - } - " + @change="(e) => {e.target.value = (e.target.value + '').trim()}" /> @@ -283,7 +275,7 @@ import { money } from '@/utils/validate' import { checkAssociatedProject } from '@/utils/projectCheck' import SelectRevenueContract from '../../../../components/tools/SelectRevenueContract' import JDictSelectTag from '@comp/dict/JDictSelectTag' -import {CalcAmountMixin} from '@/mixins/CalcAmountMixin' +import { CalcAmountMixin } from '@/mixins/CalcAmountMixin' import JDate from '@/components/tools/JDate' export default { diff --git a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue index e7fc55d..393719e 100644 --- a/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue +++ b/src/views/incomePayments/memberManage/modules/SafeguardStardsMemberModal.vue @@ -69,7 +69,7 @@ - + - - 元 + + + + + 元 + @@ -113,7 +114,7 @@ - + @@ -148,7 +149,7 @@ - + - + - + @@ -296,9 +289,11 @@ import { money } from '@/utils/validate' import { httpAction } from '@/api/manage' import { MemberNature, IncomeMethod } from '@/enums/commonEnums' import {checkAssociatedProject} from '@/utils/projectCheck' +import { CalcAmountMixin } from '@/mixins/CalcAmountMixin' export default { name: 'SafeguardStardsMemberModal', + mixins: [CalcAmountMixin], components: { JUpload, JDate, @@ -392,6 +387,7 @@ export default { validateTrigger: 'change' } }, + ysjeKey: 'amountReceivable', // 来款方式 incomePaysType: 3, // 选中的会员单位