LK/income_payments_enterprise_terminal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update]- 会员缴费、证书缴费代码的优化

Browse Source
This commit is contained in:
fengchenchen
2023-07-26 14:57:04 +08:00
parent 320035d78b
commit 04cd4d370a
8 changed files with 205 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enums/memberEnums.js
+7
View File
@@ -31,3 +31,10 @@ export const PaymentMethodEnums = {
pack: { name: '打包会员', index: 2 }, pack: { name: '打包会员', index: 2 },
cash: { name: '现金', index: 3 } cash: { name: '现金', index: 3 }
} }
// 是否需要发票
export const InvoiceRequirementsEnums = {
noNeed: { name: '不需要', index: 0 },
plain: { name: '增值税普通发票', index: 1 },
special: { name: '增值税专用发票', index: 2 }
}
src/views/standardsAssociation/CertificateManagement.vue
+13 -72
View File
@@ -103,25 +103,20 @@
<div slot="action" class="action-span-cell" slot-scope="text, record"> <div slot="action" class="action-span-cell" slot-scope="text, record">
<!-- 待支付 不显示 ,其他状态均显示撤回--> <!-- 待支付 不显示 ,其他状态均显示撤回-->
<a v-if="record.certificateStatus !== CertificateStatusEnums.toPay.index && isMemberFlag " <a v-if="Number(record.certificateStatus) !== CertificateStatusEnums.toPay.index && isMemberFlag "
@click="handleWithdraw(record)">撤回</a> @click="handleWithdraw(record)">撤回</a>
<a @click="handleDetail(record)">查看</a> <a @click="handleDetail(record)">查看</a>
<!-- 已绑定的证书不能续费 已支付已缴费的不能续费 需要流程走完才能续费 v-has="'vin:renew'"--> <!-- 已绑定的证书不能续费 已支付已缴费的不能续费 需要流程走完才能续费 v-has="'vin:renew'"-->
<a v-show="(Number(record.certificateStatus) === 4 ||Number(record.certificateStatus) === 5 || Number(record.certificateStatus) === 7) && isMemberFlag "> <a v-if="(Number(record.certificateStatus) === 4 ||Number(record.certificateStatus) === 5 || Number(record.certificateStatus) === 7) && isMemberFlag " @click="renewCharge(record)">续费</a>
<a href="javascript:;" @click="renewCharge(record)">续费</a>
</a> <a v-if="(isMemberFlag && (record.certificateStatus == 6 && record.chargeType == 2) || record.certificateStatus == 0) && record.paymentStatus !== 4" @click="handleEditRenew(record)">编辑</a>
<a
v-show="(isMemberFlag && (record.certificateStatus == 6 && record.chargeType == 2) || record.certificateStatus == 0) && record.paymentStatus !== 4">
<a href="javascript:;"
@click="((record.certificateStatus == 6 && record.chargeType == 2 && record.paymentStatus !== 4) || record.certificateStatus == 0) && handleEditRenew(record) && isMemberFlag">编辑</a>
</a>
<!-- 会员 只有企业证书才 正常使用 已绑定的证书 可授权申请--> <!-- 会员 只有企业证书才 正常使用 已绑定的证书 可授权申请-->
<a <a
v-show="roleCode === 'member'&& record.certificateType == 2 && (record.certificateStatus == 4 || record.certificateStatus == 1) && isMemberFlag" v-show="roleCode === 'member'&& record.certificateType == 2 && (record.certificateStatus == 4 || record.certificateStatus == 1) && isMemberFlag"
> @click="authorizationFunc(record)"
<a href="javascript:;" @click="authorizationFunc(record)">授权申请</a> >授权申请</a>
</a>
<!-- 管理员上传的缴费会员不能删除 record.paymentStatus !== 4--> <!-- 管理员上传的缴费会员不能删除 record.paymentStatus !== 4-->
<a <a
@@ -155,13 +150,13 @@
<!-- 查看证书--> <!-- 查看证书-->
<CheckCertificateModel ref="checkModalForm"></CheckCertificateModel> <CheckCertificateModel ref="checkModalForm"></CheckCertificateModel>
<!-- 绑定会员 窗口--> <!-- 绑定会员 窗口 --已弃用-- -->
<bind-member-model ref="bindMemberModelForm" @ok="modalFormOk"></bind-member-model> <bind-member-model ref="bindMemberModelForm" @ok="modalFormOk"></bind-member-model>
<!-- 续费 窗口--> <!-- 续费 窗口-->
<renew-charge-model ref="renewChargeModelForm" @ok="modalFormOk"></renew-charge-model> <renew-charge-model ref="renewChargeModelForm" @ok="modalFormOk"></renew-charge-model>
<!-- 换证 窗口--> <!-- 换证 窗口--已弃用---->
<replace-ment-model ref="replaceMentModelForm" @ok="modalFormOk" @affirm="handleAffirm"></replace-ment-model> <replace-ment-model ref="replaceMentModelForm" @ok="modalFormOk" @affirm="handleAffirm"></replace-ment-model>
<!-- 换证确认 窗口--> <!-- 换证确认 窗口-->
@@ -527,26 +522,12 @@ export default {
// if(!(record.chargeType != 1 && record.certificateModality == 3 && record.certificateStatus == 5)){ // if(!(record.chargeType != 1 && record.certificateModality == 3 && record.certificateStatus == 5)){
// return; // return;
// } // }
this.$refs.renewChargeModelForm.isChangeCer = record.certificateType
this.$refs.renewChargeModelForm.edit(record) this.$refs.renewChargeModelForm.edit(record)
// this.$refs.modalForm.title = '续费'
// this.$refs.modalForm.disableSubmit = true
// // 换证显示 1是世界证书
// this.$refs.modalForm.isChangeCer = record.certificateType
// // 证书续费时使用7号窗口
// this.$refs.modalForm.pageType = 7
// this.$refs.modalForm.edit2(record)
}, },
// 换证 // 换证
replacement: function (record) { replacement: function (record) {
this.$refs.replaceMentModelForm.edit(record) this.$refs.replaceMentModelForm.edit(record)
// this.$refs.modalForm.title = '换证'
// this.$refs.modalForm.disableSubmit = true
// // 换证的时候使用8号窗口
// this.$refs.modalForm.pageType = 8
// this.$refs.modalForm.edit3(record)
}, },
// 编辑: 包括免费证书，收费证书，续费，换证 // 编辑: 包括免费证书，收费证书，续费，换证
handleEditRenew: function (record) { handleEditRenew: function (record) {
@@ -555,8 +536,6 @@ export default {
// 证书是否免费 1-免费 2-付费 // 证书是否免费 1-免费 2-付费
record.chargeType = Number(record.chargeType) record.chargeType = Number(record.chargeType)
// 分为续证驳回和 非免费证书申请驳回 chargeType 1是免费证书 2是收费证书 // 分为续证驳回和 非免费证书申请驳回 chargeType 1是免费证书 2是收费证书
// this.$refs.modalForm.title = ''
// this.$refs.modalForm.disableSubmit = true
// certificateStatus --证书状态-待支付 // certificateStatus --证书状态-待支付
if (record.certificateStatus === CertificateStatusEnums.toPay.index) { if (record.certificateStatus === CertificateStatusEnums.toPay.index) {
// 免费证书 // 免费证书
@@ -569,69 +548,31 @@ export default {
freeCount = res.result freeCount = res.result
this.$refs.freeCertificateEditModel.freeCountVin = freeCount + 1 this.$refs.freeCertificateEditModel.freeCountVin = freeCount + 1
this.$refs.freeCertificateEditModel.edit(record) this.$refs.freeCertificateEditModel.edit(record)
// this.$refs.modalForm.freeCountVin = freeCount + 1
// this.$refs.modalForm.title = '新增申请'
// this.$refs.modalForm.disableSubmit = false
// this.$refs.modalForm.pageType = 10
// this.$refs.modalForm.edit5(record)
}) })
return return
} else if (record.certificateModality === 1) { } else if (record.certificateModality === CertificateModalityEnums.changeCert.index) {
// 免费证书换证编辑 // 免费证书换证编辑 --已弃用
this.$refs.FreeCertificateReplaceEditModel.edit(record) this.$refs.FreeCertificateReplaceEditModel.edit(record)
// this.$refs.modalForm.title = '换证'
// this.$refs.modalForm.disableSubmit = true
// // 换证的时候使用13号窗口
// this.$refs.modalForm.pageType = 13
// this.$refs.modalForm.edit8(record)
} }
} else if (record.chargeType === 2 && record.certificateModality === 4) { } else if (record.chargeType === 2 && record.certificateModality === 4) {
// 收费证书编辑 // 收费证书编辑
this.$refs.ChargeCertificateEditModel.edit(record) this.$refs.ChargeCertificateEditModel.edit(record)
// this.$refs.modalForm.title = '新增申请'
// this.$refs.modalForm.disableSubmit = false
// this.$refs.modalForm.pageType = 11
// this.$refs.modalForm.edit6(record)
} else if (record.chargeType === 2 && record.certificateModality === 2) { } else if (record.chargeType === 2 && record.certificateModality === 2) {
// 续费编辑 // 收费证书 - 续费编辑
this.$refs.RenewChargeEditModel.edit(record) this.$refs.RenewChargeEditModel.edit(record)
// this.$refs.modalForm.title = '续费'
// this.$refs.modalForm.disableSubmit = true
// // 证书续费编辑时使用12号窗口
// this.$refs.modalForm.pageType = 12
// this.$refs.modalForm.edit7(record)
} else if (record.chargeType === 2 && record.certificateModality === 1) { } else if (record.chargeType === 2 && record.certificateModality === 1) {
// // 换证编辑 // // 换证编辑--弃用
this.$refs.FreeCertificateReplaceEditModel.edit(record) this.$refs.FreeCertificateReplaceEditModel.edit(record)
// this.$refs.modalForm.title = '换证'
// this.$refs.modalForm.disableSubmit = true
// // 换证的时候使用13号窗口
// this.$refs.modalForm.pageType = 13
// this.$refs.modalForm.edit8(record)
} }
} else { } else {
// 新增证书缴费编辑窗口 // 新增证书缴费编辑窗口
if (record.chargeType === 2 && record.certificateModality === 4 && record.certificateStatus === 6) { if (record.chargeType === 2 && record.certificateModality === 4 && record.certificateStatus === 6) {
this.$refs.ChargeCertificateEditModel.edit(record) this.$refs.ChargeCertificateEditModel.edit(record)
// this.$refs.modalForm.title = '新增申请'
// this.$refs.modalForm.disableSubmit = false
// this.$refs.modalForm.pageType = 11
// this.$refs.modalForm.edit6(record)
} else if (record.chargeType === 2 && record.certificateModality === 2 && record.certificateStatus === 6) { } else if (record.chargeType === 2 && record.certificateModality === 2 && record.certificateStatus === 6) {
// 续费编辑 // 续费编辑
this.$refs.RenewChargeEditModel.edit(record) this.$refs.RenewChargeEditModel.edit(record)
// this.$refs.modalForm.title = '续费'
// this.$refs.modalForm.disableSubmit = true
// // 证书续费编辑时使用12号窗口
// this.$refs.modalForm.pageType = 12
// this.$refs.modalForm.edit7(record)
} }
} }
}, },
src/views/standardsAssociation/PaymentInfo/modules/CombinationPaymentModal.vue
+10 -2
View File
@@ -134,7 +134,7 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>
<!-- 缴费方式为协议会员--> <!-- 缴费方式为打包会员-->
<template v-if="paymentMethodFormValue && paymentMethodFlag"> <template v-if="paymentMethodFormValue && paymentMethodFlag">
<!--<a-col :span="12">--> <!--<a-col :span="12">-->
<!-- <a-form-item label="打包协议" :labelCol="labelCol" :wrapperCol="wrapperCol">--> <!-- <a-form-item label="打包协议" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -553,6 +553,7 @@ import {
import JUpload from '@/components/standardsAssociation/JUpload' import JUpload from '@/components/standardsAssociation/JUpload'
import PreViewImgModal from './PreViewImgModal' import PreViewImgModal from './PreViewImgModal'
import { commonMemberCost, vipMemberCost,upgradeVip,queryContactList,queryPostInfoById,queryContactInfoByMemberId } from '@api/incomePaymentsApi' import { commonMemberCost, vipMemberCost,upgradeVip,queryContactList,queryPostInfoById,queryContactInfoByMemberId } from '@api/incomePaymentsApi'
import {PaymentMethodEnums} from "../../../../enums/memberEnums";
export default { export default {
name: 'PaymentInfoModal', name: 'PaymentInfoModal',
@@ -800,7 +801,7 @@ export default {
invoicePhone: '', // 电话号码 invoicePhone: '', // 电话号码
depositBank: '', // 开户银行 depositBank: '', // 开户银行
bankAccount: '', // 银行账户 bankAccount: '', // 银行账户
invoiceInfoObj: '' // 联行号 linkBankNumber: '' // 联行号
}, },
certificate: [], // 证书信息 certificate: [], // 证书信息
checkInfo: [], // 审核信息 checkInfo: [], // 审核信息
@@ -1158,7 +1159,14 @@ export default {
this.checkResult = 2 this.checkResult = 2
this.model.paymentStatus = 3 this.model.paymentStatus = 3
} else { } else {
// 如果上传了付款凭证 则状态为费用核验中
this.model.paymentStatus = 1 this.model.paymentStatus = 1
// 判断缴费方式 和 是否上传付款凭证，如果没有上传付款凭证，则下一步状态为 待上传，
// 缴费方式是打包会员--上传的状态修改成 待上传
// if(Number(values.paymentMethod) === PaymentMethodEnums.pack.index) {
// this.model.paymentStatus = 4
// }
// this.model.paymentStatus = 1
} }
const formData = Object.assign(this.model, values) const formData = Object.assign(this.model, values)
src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue
+6 -5
View File
@@ -102,7 +102,7 @@
<j-date <j-date
:disabled="checkFlag||detailFlag" :disabled="checkFlag||detailFlag"
date-format="YYYY-MM-DD HH:mm:ss" date-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择缴费时间" placeholder="请选择缴费日期"
v-decorator="['submissionTime',{...validatorRules.submissionTime, initialValue: model.submissionTime}]" v-decorator="['submissionTime',{...validatorRules.submissionTime, initialValue: model.submissionTime}]"
:trigger-change="true" :trigger-change="true"
style="width: 100%" /> style="width: 100%" />
@@ -283,7 +283,7 @@
dictCode="invoice_requirements" dictCode="invoice_requirements"
placeholder="请选择发票" /> placeholder="请选择发票" />
</a-form-item> </a-form-item>
<span v-if="currentSelectInvoiceType === 0" class="other-notice">本选项不提供任何形式的发票凭证</span> <span v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.noNeed.index" class="other-notice">本选项不提供任何形式的发票凭证</span>
</a-col> </a-col>
</a-row> </a-row>
<template v-if="currentSelectInvoiceType"> <template v-if="currentSelectInvoiceType">
@@ -305,13 +305,13 @@
<a-input <a-input
:disabled="checkFlag||detailFlag" :disabled="checkFlag||detailFlag"
@change="event => event.target.value = event.target.value.trim()" @change="event => event.target.value = event.target.value.trim()"
v-decorator="['taxNumber',{ ...validatorRules.taxNumber, initialValue: memberInfo.taxNumber},]" v-decorator="['taxNumber',{ ...validatorRules.taxNumber, initialValue: memberInfo.taxNumber}]"
placeholder="请输入社会统一代码/税号" placeholder="请输入社会统一代码/税号"
:maxLength="50"></a-input> :maxLength="50"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<template v-if="currentSelectInvoiceType === 2"> <template v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.special.index">
<!-- 2021-09-23变更 增加 单位地址 电话号码 开户银行 银行账户 增值税发票的时候存在--> <!-- 2021-09-23变更 增加 单位地址 电话号码 开户银行 银行账户 增值税发票的时候存在-->
<a-row > <a-row >
<a-col :span="12"> <a-col :span="12">
@@ -442,7 +442,7 @@ import {
import PreViewImgModal from './PreViewImgModal' import PreViewImgModal from './PreViewImgModal'
import { commonMemberCost, vipMemberCost,upgradeVip,queryContactInfoByMemberId,queryContactList,queryPostInfoById } from '@api/incomePaymentsApi' import { commonMemberCost, vipMemberCost,upgradeVip,queryContactInfoByMemberId,queryContactList,queryPostInfoById } from '@api/incomePaymentsApi'
import CompanySelect from '@comp/customSelect/CompanySelect' import CompanySelect from '@comp/customSelect/CompanySelect'
import {PaymentMethodEnums} from '../../../../enums/memberEnums' import {InvoiceRequirementsEnums, PaymentMethodEnums} from '../../../../enums/memberEnums'
export default { export default {
name: 'PaymentInfoModal', name: 'PaymentInfoModal',
components: { components: {
@@ -455,6 +455,7 @@ export default {
data() { data() {
return { return {
PaymentMethodEnums, PaymentMethodEnums,
InvoiceRequirementsEnums,
// 会员用户id // 会员用户id
userId: this.$store.getters.userInfo.memberId, userId: this.$store.getters.userInfo.memberId,
isMember: true, isMember: true,
src/views/standardsAssociation/feehandle/FeeHandle.vue
+3 -3
View File
@@ -141,7 +141,7 @@
<!-- 证书缴费的相关操作--> <!-- 证书缴费的相关操作-->
<template v-else> <template v-else>
<a v-if="record.paymentStatus === 4 || record.paymentStatus === 2" href="javascript:;" @click="handleCertificateUploadRecord(record)">上传凭证</a> <a v-if="record.paymentStatus === 4 || record.paymentStatus === 2" @click="handleCertificateUploadRecord(record)">上传凭证</a>
<a @click="handleCertificateDetail(record)">查看</a> <a @click="handleCertificateDetail(record)">查看</a>
</template> </template>
@@ -183,12 +183,12 @@ import CombinationPaymentModal from '@views/standardsAssociation/PaymentInfo/mod
import UploadRecordModal from '@views/standardsAssociation/PaymentInfo/modules/UploadRecordModal' import UploadRecordModal from '@views/standardsAssociation/PaymentInfo/modules/UploadRecordModal'
import CertificatePaymentInfoModal from '../PaymentInfo/modules/CertificatePaymentInfoModal' import CertificatePaymentInfoModal from '../PaymentInfo/modules/CertificatePaymentInfoModal'
import {getAction, postAction, deleteAction} from '@/api/memberManage' import {getAction, deleteAction} from '@/api/memberManage'
import {filterObj} from '../../../utils/util' import {filterObj} from '../../../utils/util'
import {RangeDateMixin} from '@/mixins/RangeDateMixin' import {RangeDateMixin} from '@/mixins/RangeDateMixin'
import {mixinDevice} from '@/utils/mixin' import {mixinDevice} from '@/utils/mixin'
import {downNewestNotice, previewPdf , withDrawPayment} from '../../../api/standardsAssociationApi' import {downNewestNotice, previewPdf , withDrawPayment} from '../../../api/standardsAssociationApi'
import {PaymentMethodEnums} from "../../../enums/memberEnums"; import {PaymentMethodEnums} from '../../../enums/memberEnums'
const columns = [ const columns = [
{ {
src/views/standardsAssociation/memberInfo/PaymentInfo.vue
+3
View File
@@ -159,6 +159,9 @@ export default {
url: { url: {
list: '/paymentInfo/list' list: '/paymentInfo/list'
}, },
filters:{
paymentModuleCategory: 1 // 默认查询会员缴费的信息
},
loading: false, loading: false,
disableMixinCreated: false disableMixinCreated: false
} }
src/views/standardsAssociation/model/RenewChargeEditModel.vue
+79 -75
View File
@@ -102,7 +102,7 @@
<!--缴费方式为电汇或者现金 --> <!--缴费方式为电汇或者现金 -->
<template v-if="paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || paymentMethodFormValue === PaymentMethodEnums.cash.index"> <template v-if="paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || paymentMethodFormValue === PaymentMethodEnums.cash.index">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="缴费凭证/付款说明2" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="缴费凭证/付款说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-image-upload <j-image-upload
isLessThan5M isLessThan5M
isMultiple isMultiple
@@ -127,6 +127,17 @@
</a-row> </a-row>
<!-- 缴费备注-->
<a-row>
<a-col :span="24" class="remark">
<a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
<a-textarea rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" :maxLength="500"></a-textarea>
</a-form-item>
<span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
</a-col>
</a-row>
<!--发票信息 begin--> <!--发票信息 begin-->
<a-divider orientation="left">发票信息</a-divider> <a-divider orientation="left">发票信息</a-divider>
<a-row> <a-row>
@@ -139,11 +150,11 @@
:trigger-change="true" :trigger-change="true"
dictCode="invoice_requirements" dictCode="invoice_requirements"
placeholder="请选择发票"/> placeholder="请选择发票"/>
<span v-if="!invoiceRequirementsFlag" class="apply-code-notice">本选项不提供任何形式的发票凭证</span> <span v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.noNeed.index" class="apply-code-notice">本选项不提供任何形式的发票凭证</span>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<template v-if="invoiceRequirementsFlag"> <template v-if="currentSelectInvoiceType">
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -167,71 +178,63 @@
</a-col> </a-col>
</a-row> </a-row>
<!-- 2021-09-23变更 增加 单位地址 电话号码 开户银行 银行账户 增值税发票的时候存在--> <!-- 2021-09-23变更 增加 单位地址 电话号码 开户银行 银行账户 增值税发票的时候存在-->
<a-row v-if="currentSelectInvoiceType === 2"> <template v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.special.index">
<a-col :span="12"> <a-row >
<a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
@change="event => event.target.value = event.target.value.trim()" <a-input
v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]" @change="event => event.target.value = event.target.value.trim()"
placeholder="请输入单位地址" v-decorator="['invoiceAddress',{ ...validatorRules.invoiceAddress, initialValue:currentMemberInfo.invoiceAddress}]"
:maxLength="50"></a-input> placeholder="请输入单位地址"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
<a-col :span="12"> </a-col>
<a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
v-decorator="['invoicePhone',{ ...validatorRules.invoicePhone, initialValue: currentMemberInfo.invoicePhone}]" <a-input
:trigger-change="true" v-decorator="['invoicePhone',{ ...validatorRules.invoicePhone, initialValue: currentMemberInfo.invoicePhone}]"
@change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}" :trigger-change="true"
placeholder="请输入电话号码" @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
:maxLength="50"></a-input> placeholder="请输入电话号码"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
</a-row> </a-col>
<a-row v-if="currentSelectInvoiceType === 2"> </a-row>
<a-col :span="12"> <a-row >
<a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
@change="event => event.target.value = event.target.value.trim()" <a-input
v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]" @change="event => event.target.value = event.target.value.trim()"
placeholder="请输入开户银行" v-decorator="['depositBank',{ ...validatorRules.depositBank, initialValue:currentMemberInfo.depositBank}]"
:maxLength="50"></a-input> placeholder="请输入开户银行"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
<a-col :span="12"> </a-col>
<a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
@change="(e) => {e.target.value = e.target.value.trim()}" <a-input
v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]" @change="(e) => {e.target.value = e.target.value.trim()}"
placeholder="请输入银行账户" v-decorator="['bankAccount',{ ...validatorRules.bankAccount, initialValue:currentMemberInfo.bankAccount}]"
:maxLength="50"></a-input> placeholder="请输入银行账户"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
</a-row> </a-col>
<a-row v-if="currentSelectInvoiceType === 2"> </a-row>
<a-col :span="12"> <a-row >
<a-form-item label="联行号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="联行号" :labelCol="labelCol" :wrapperCol="wrapperCol">
@change="(e) => {e.target.value = e.target.value.trim()}" <a-input
v-decorator="['linkBankNumber',{ ...validatorRules.linkBankNumber, initialValue:currentMemberInfo.linkBankNumber}]" @change="(e) => {e.target.value = e.target.value.trim()}"
placeholder="请输入联行号" v-decorator="['linkBankNumber',{ ...validatorRules.linkBankNumber, initialValue:currentMemberInfo.linkBankNumber}]"
:maxLength="50"></a-input> placeholder="请输入联行号"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
</a-row> </a-col>
</a-row>
</template>
</template> </template>
<!--发票信息 end--> <!--发票信息 end-->
<!-- 缴费备注-->
<a-row>
<a-col :span="24" class="remark">
<a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
<a-textarea rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" :maxLength="500"></a-textarea>
</a-form-item>
<span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</template> </template>
@@ -252,7 +255,7 @@ import JDictSelectTag from '@comp/standardsAssociation/JDictSelectTag'
import JSearchSelectTag from '@comp/standardsAssociation/JSearchSelectTag' import JSearchSelectTag from '@comp/standardsAssociation/JSearchSelectTag'
import { getAction, httpAction } from '@api/memberManage' import { getAction, httpAction } from '@api/memberManage'
import pick from 'lodash.pick' import pick from 'lodash.pick'
import {PaymentMethodEnums} from '../../../enums/memberEnums' import {InvoiceRequirementsEnums, PaymentMethodEnums} from '../../../enums/memberEnums'
export default { export default {
// 证书续费编辑 窗口 // 证书续费编辑 窗口
@@ -268,6 +271,7 @@ export default {
title: '续费', title: '续费',
loginUserId: this.$store.getters.userInfo.memberId, loginUserId: this.$store.getters.userInfo.memberId,
PaymentMethodEnums, PaymentMethodEnums,
InvoiceRequirementsEnums,
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
pageType: 12, pageType: 12,
@@ -291,7 +295,6 @@ export default {
model: {}, model: {},
// 记录续费证书选择 // 记录续费证书选择
selectType: 1, selectType: 1,
invoiceRequirementsFlag: false,
// 当前选择是否需要发票的值，用于dom的判断 0-无 1-普通发票 2-增值税发票 // 当前选择是否需要发票的值，用于dom的判断 0-无 1-普通发票 2-增值税发票
currentSelectInvoiceType: 0, currentSelectInvoiceType: 0,
validatorRules: { validatorRules: {
@@ -361,7 +364,7 @@ export default {
}, },
paymentMethod: { paymentMethod: {
rules: [{ rules: [{
required: true, message: '请输入缴费方式!' required: true, message: '请选择缴费方式!'
}] }]
}, },
paymentAmount: { paymentAmount: {
@@ -384,7 +387,7 @@ export default {
}, },
paymentRecord: { paymentRecord: {
rules: [{ rules: [{
required: true, message: '请上传缴费凭证/付款说明!' required: false, message: '请上传缴费凭证/付款说明!'
}] }]
}, },
paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] }, paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] },
@@ -500,7 +503,7 @@ export default {
saveRenewChargeCertificate() { saveRenewChargeCertificate() {
this.editHandleRenewChargeCertificateOk() this.editHandleRenewChargeCertificateOk()
}, },
// 添加 证书续费信息 // 暂存 -添加 证书续费信息
editHandleRenewChargeCertificateOk: function() { editHandleRenewChargeCertificateOk: function() {
const that = this const that = this
// 触发表单验证 // 触发表单验证
@@ -563,6 +566,12 @@ export default {
// 触发表单验证 // 触发表单验证
this.form.validateFields((err, values) => { this.form.validateFields((err, values) => {
if (!err) { if (!err) {
// 缴费方式为电汇，汇款凭证必填
if((this.paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || this.paymentMethodFormValue === PaymentMethodEnums.cash.index) && !values.paymentRecord) {
this.$message.warning('请上传缴费凭证/付款说明')
return
}
that.confirmLoading = true that.confirmLoading = true
const httpurl = '/certificatePaymentInfo/addVinChargeInfo' const httpurl = '/certificatePaymentInfo/addVinChargeInfo'
const method = 'post' const method = 'post'
@@ -625,11 +634,6 @@ export default {
// 校验是否选择 要发票 // 校验是否选择 要发票
invoiceRequirementsChange(value) { invoiceRequirementsChange(value) {
this.currentSelectInvoiceType = Number(value) this.currentSelectInvoiceType = Number(value)
if (this.currentSelectInvoiceType !== 0) {
this.invoiceRequirementsFlag = true
} else {
this.invoiceRequirementsFlag = false
}
}, },
handleCancel() { handleCancel() {
this.visible = false this.visible = false
src/views/standardsAssociation/model/RenewChargeModel.vue
+84 -86
View File
@@ -117,7 +117,7 @@
<!--缴费方式为电汇或者现金 --> <!--缴费方式为电汇或者现金 -->
<template v-if="paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || paymentMethodFormValue === PaymentMethodEnums.cash.index"> <template v-if="paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || paymentMethodFormValue === PaymentMethodEnums.cash.index">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="缴费凭证/付款说明2" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="缴费凭证/付款说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-image-upload <j-image-upload
isLessThan5M isLessThan5M
isMultiple isMultiple
@@ -142,6 +142,16 @@
</a-col> </a-col>
</a-row> </a-row>
<!-- 缴费备注-->
<a-row>
<a-col :span="24" class="remark">
<a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
<a-textarea rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" :maxLength="500"></a-textarea>
</a-form-item>
<span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
</a-col>
</a-row>
<!--发票信息 begin--> <!--发票信息 begin-->
<a-divider orientation="left">发票信息</a-divider> <a-divider orientation="left">发票信息</a-divider>
<a-row> <a-row>
@@ -154,11 +164,11 @@
:trigger-change="true" :trigger-change="true"
dictCode="invoice_requirements" dictCode="invoice_requirements"
placeholder="请选择发票"/> placeholder="请选择发票"/>
<span v-if="currentSelectInvoiceType === 0 " class="other-notice">本选项不提供任何形式的发票凭证</span> <span v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.noNeed.index " class="other-notice">本选项不提供任何形式的发票凭证</span>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<template v-if="invoiceRequirementsFlag"> <template v-if="currentSelectInvoiceType">
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="付款单位发票抬头" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -182,73 +192,64 @@
</a-col> </a-col>
</a-row> </a-row>
<!-- 2021-09-23变更 增加 单位地址 电话号码 开户银行 银行账户 增值税发票的时候存在--> <!-- 2021-09-23变更 增加 单位地址 电话号码 开户银行 银行账户 增值税发票的时候存在-->
<a-row v-if="currentSelectInvoiceType === 2"> <template v-if="currentSelectInvoiceType === InvoiceRequirementsEnums.special.index">
<a-col :span="12"> <a-row>
<a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="单位地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
@change="event => event.target.value = event.target.value.trim()" <a-input
v-decorator="['invoiceAddress',{ rules: validatorRules.invoiceAddress.rules, validateTrigger: 'blur', initialValue:currentMemberInfo.invoiceAddress}]" @change="event => event.target.value = event.target.value.trim()"
placeholder="请输入单位地址" v-decorator="['invoiceAddress',{ rules: validatorRules.invoiceAddress.rules, validateTrigger: 'blur', initialValue:currentMemberInfo.invoiceAddress}]"
:maxLength="50"></a-input> placeholder="请输入单位地址"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
<a-col :span="12"> </a-col>
<a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="电话号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
v-decorator="['invoicePhone',{ rules: validatorRules.invoicePhone.rules, initialValue: currentMemberInfo.invoicePhone,validateTrigger: 'blur'}]" <a-input
:trigger-change="true" v-decorator="['invoicePhone',{ rules: validatorRules.invoicePhone.rules, initialValue: currentMemberInfo.invoicePhone,validateTrigger: 'blur'}]"
@change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}" :trigger-change="true"
placeholder="请输入电话号码" @change="(e) => {e.target.value = e.target.value.replace(/[^0-9|-]/g,'')}"
:maxLength="50"></a-input> placeholder="请输入电话号码"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
</a-row> </a-col>
<a-row v-if="currentSelectInvoiceType === 2"> </a-row>
<a-col :span="12"> <a-row>
<a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol">
@change="event => event.target.value = event.target.value.trim()" <a-input
v-decorator="['depositBank',{ rules: validatorRules.depositBank.rules, validateTrigger: 'blur',initialValue:currentMemberInfo.depositBank}]" @change="event => event.target.value = event.target.value.trim()"
placeholder="请输入开户银行" v-decorator="['depositBank',{ rules: validatorRules.depositBank.rules, validateTrigger: 'blur',initialValue:currentMemberInfo.depositBank}]"
:maxLength="50"></a-input> placeholder="请输入开户银行"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
<a-col :span="12"> </a-col>
<a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="银行账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
@change="(e) => {e.target.value = e.target.value.trim()}" <a-input
v-decorator="['bankAccount',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur',initialValue:currentMemberInfo.bankAccount}]" @change="(e) => {e.target.value = e.target.value.trim()}"
placeholder="请输入银行账户" v-decorator="['bankAccount',{ rules: validatorRules.bankAccount.rules, validateTrigger: 'blur',initialValue:currentMemberInfo.bankAccount}]"
:maxLength="50"></a-input> placeholder="请输入银行账户"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
</a-row> </a-col>
<a-row v-if="currentSelectInvoiceType === 2"> </a-row>
<a-col :span="12"> <a-row>
<a-form-item label="联行号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-col :span="12">
<a-input <a-form-item label="联行号" :labelCol="labelCol" :wrapperCol="wrapperCol">
@change="(e) => {e.target.value = e.target.value.trim()}" <a-input
v-decorator="['linkBankNumber',{ rules: validatorRules.linkBankNumber.rules, validateTrigger: 'blur',initialValue:currentMemberInfo.linkBankNumber}]" @change="(e) => {e.target.value = e.target.value.trim()}"
placeholder="请输入联行号" v-decorator="['linkBankNumber',{ rules: validatorRules.linkBankNumber.rules, validateTrigger: 'blur',initialValue:currentMemberInfo.linkBankNumber}]"
:maxLength="50"></a-input> placeholder="请输入联行号"
</a-form-item> :maxLength="50"></a-input>
</a-col> </a-form-item>
</a-row> </a-col>
</a-row>
</template>
</template> </template>
<!--发票信息 end--> <!--发票信息 end-->
<!-- 缴费备注-->
<a-row>
<a-col :span="24" class="remark">
<a-form-item label="备注" :labelCol="labelColText" :wrapperCol="wrapperCol">
<a-textarea rows="5" v-decorator="['paymentMark' ]" placeholder="请输入备注" :maxLength="500"></a-textarea>
</a-form-item>
<span style="color: #bfbfbf">一个缴费单可在多个缴费处上传</span>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</template> </template>
@@ -269,8 +270,7 @@ import JDictSelectTag from '@comp/standardsAssociation/JDictSelectTag'
import JDate from '@comp/tools/JDate' import JDate from '@comp/tools/JDate'
import { getAction, httpAction } from '@api/memberManage' import { getAction, httpAction } from '@api/memberManage'
import pick from 'lodash.pick' import pick from 'lodash.pick'
import {PaymentMethodEnums} from '../../../enums/memberEnums'; import {InvoiceRequirementsEnums, PaymentMethodEnums} from '../../../enums/memberEnums'
import {InvoiceTypeEnums} from "../../../enums/commonEnum";
export default { export default {
// 证书续费 窗口 // 证书续费 窗口
@@ -285,6 +285,7 @@ export default {
data() { data() {
return { return {
PaymentMethodEnums, PaymentMethodEnums,
InvoiceRequirementsEnums,
loginUserId: this.$store.getters.userInfo.memberId, loginUserId: this.$store.getters.userInfo.memberId,
title: '续费', title: '续费',
visible: false, visible: false,
@@ -295,10 +296,9 @@ export default {
// 记录续费证书选择 // 记录续费证书选择
selectType: 1, selectType: 1,
// 当前选中的发票类型 // 当前选中的发票类型
currentSelectInvoiceType: 2, currentSelectInvoiceType: InvoiceRequirementsEnums.special.index,
// form 表单中缴费方式的值 // form 表单中缴费方式的值
paymentMethodFormValue: 1, paymentMethodFormValue: 1,
invoiceRequirementsFlag: false,
form: this.$form.createForm(this), form: this.$form.createForm(this),
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -387,7 +387,7 @@ export default {
}, },
paymentMethod: { paymentMethod: {
rules: [{ rules: [{
required: true, message: '请输入缴费方式!' required: true, message: '请选择缴费方式!'
}] }]
}, },
paymentAmount: { paymentAmount: {
@@ -410,7 +410,7 @@ export default {
}, },
paymentRecord: { paymentRecord: {
rules: [{ rules: [{
required: true, message: '请上传缴费凭证/付款说明!' required: false, message: '请上传缴费凭证/付款说明!'
}] }]
}, },
paymentRecord1: { rules: [{ required: false, message: '请上传打包协议' }] }, paymentRecord1: { rules: [{ required: false, message: '请上传打包协议' }] },
@@ -495,13 +495,10 @@ export default {
this.model = {} this.model = {}
this.model = Object.assign({}, record) this.model = Object.assign({}, record)
this.visible = true this.visible = true
// 是否要发票设置为true 默认全部需要发票;
// this.invoiceRequirementsFlag = true
// 设置默认进来发票选择增值税发票 // 设置默认进来发票选择增值税发票
this.invoiceRequirementsChange(InvoiceTypeEnums.special.index) this.invoiceRequirementsChange(InvoiceRequirementsEnums.special.index)
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'submissionTime', 'paymentMethod', 'paymentRecord', 'paymentAmount', 'invoiceRequirements')) this.form.setFieldsValue(pick(this.model, 'submissionTime', 'paymentMethod', 'paymentRecord', 'paymentAmount', 'invoiceRequirements'))
// this.validateCompanyName()
// 初始化的时候默认不是垫付 // 初始化的时候默认不是垫付
this.validateCompanyNameFlag = true this.validateCompanyNameFlag = true
}) })
@@ -509,11 +506,6 @@ export default {
// 校验是否选择 要发票 // 校验是否选择 要发票
invoiceRequirementsChange(value) { invoiceRequirementsChange(value) {
this.currentSelectInvoiceType = Number(value) this.currentSelectInvoiceType = Number(value)
if (this.currentSelectInvoiceType !== 0) {
this.invoiceRequirementsFlag = true
} else {
this.invoiceRequirementsFlag = false
}
if(value === '2'){ if(value === '2'){
this.validateCompanyName() this.validateCompanyName()
} }
@@ -547,16 +539,22 @@ export default {
this.model.code = originCode this.model.code = originCode
} }
}, },
// 证书续费 // 提交- 证书续费
renewChargeCertificate() { renewChargeCertificate() {
this.handleRenewChargeCertificateOk() this.handleRenewChargeCertificateOk()
}, },
// 添加 证书续费信息 // 暂存-添加 证书续费信息
handleRenewChargeCertificateOk: function() { handleRenewChargeCertificateOk: function() {
const that = this const that = this
// 触发表单验证 // 触发表单验证
this.form.validateFields((err, values) => { this.form.validateFields((err, values) => {
if (!err) { if (!err) {
// 缴费方式为电汇，汇款凭证必填
if((this.paymentMethodFormValue === PaymentMethodEnums.wireTransfer.index || this.paymentMethodFormValue === PaymentMethodEnums.cash.index) && !values.paymentRecord) {
this.$message.warning('请上传缴费凭证/付款说明')
return
}
that.confirmLoading = true that.confirmLoading = true
const httpurl = '/certificatePaymentInfo/addVinChargeInfo' const httpurl = '/certificatePaymentInfo/addVinChargeInfo'
const method = 'post' const method = 'post'
@@ -600,11 +598,11 @@ export default {
}) })
}, },
// 预处理续费信息 // 暂存-预处理续费信息
preSaveRenewChargeCertificate() { preSaveRenewChargeCertificate() {
this.preHandleRenewChargeCertificateOk() this.preHandleRenewChargeCertificateOk()
}, },
// 添加 证书续费信息 // 暂存-添加 证书续费信息
preHandleRenewChargeCertificateOk: function() { preHandleRenewChargeCertificateOk: function() {
const that = this const that = this
// 触发表单验证 // 触发表单验证