From a32c778f6a26993707bd4a5ca139715d9f3eb510 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 11 Jul 2022 11:39:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91=E5=89=AF?= =?UTF-8?q?=E7=90=86=E4=BA=8B=E4=BC=9A=E9=95=BF=E7=BC=B4=E8=B4=B9=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomePaymentsApi.js | 8 +- .../standardsAssociation/JImageUpload.vue | 3 +- .../PaymentInfo/MemberInfo.vue | 15 +- .../PaymentInfo/modules/PaymentInfoModal.vue | 770 ++---------------- 4 files changed, 68 insertions(+), 728 deletions(-) diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index 7c18aae..dd9e526 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -41,10 +41,12 @@ const queryContactByName = (param) => getAction('/company/payContactsManagement/ // 检查当前登录人是否是 理事会成员 或者分标委成员 const checkMember = (param) => getAction('/meeting/payMeetingSituation/checkMember', param) -// 会员一年期的缴费的费用 -const commonMemberCost = '2000' + +// 会员一年期的缴费的费用 type 1是副理事单位 +const commonMemberCost = (type) => { return type === 1 ? '5000' : '2000' } + // 会员五年期的缴费的费用 -const vipMemberCost = '10000' +const vipMemberCost = (type) => { return type === 1 ? '25000' : '5000' } // 判断当前企业是否是内部企业 const judgeInternalEnterprise = (param) => getAction('/company/payCompanyManagement/getInternalEnterprise', param) diff --git a/src/components/standardsAssociation/JImageUpload.vue b/src/components/standardsAssociation/JImageUpload.vue index b97618c..5504713 100644 --- a/src/components/standardsAssociation/JImageUpload.vue +++ b/src/components/standardsAssociation/JImageUpload.vue @@ -176,8 +176,9 @@ export default { } this.picUrl = false let fileList = info.fileList + if (info.file.status === 'done') { - if (this.number > 0) { + if (!this.isMultiple && this.number > 0) { fileList = fileList.slice(-this.number) } if (info.file.response.success) { diff --git a/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue b/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue index 36103e0..a771ff6 100644 --- a/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue +++ b/src/views/standardsAssociation/PaymentInfo/MemberInfo.vue @@ -211,7 +211,7 @@ export default { dataIndex: 'billNumber' }, { - title: '缴费类型', + title: '会员类型', align: 'center', dataIndex: 'paymentType_dictText' }, @@ -235,16 +235,6 @@ export default { align: 'center', dataIndex: 'paymentAmount' }, - // { - // title: '网员服务费', - // align: 'center', - // dataIndex: 'serviceCharge' - // }, - // { - // title:'证书个数', - // align:"center", - // dataIndex: 'certificatesNum' - // }, { title: '缴费时间', align: 'center', @@ -294,7 +284,7 @@ export default { dataIndex: 'companyName' }, { - title: '缴费类型', + title: '会员类型s', align: 'center', dataIndex: 'paymentType_dictText' }, @@ -349,7 +339,6 @@ export default { scopedSlots: { customRender: 'action' } } ] - console.log(res.message) } }) }, diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue index ba6d472..533f4bd 100644 --- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue +++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue @@ -126,8 +126,13 @@ - VIP会员 - 普通会员 + + @@ -296,13 +301,6 @@
- - - - - - - - - + + @@ -454,284 +451,7 @@
-
- 绑定证书 - -
-
- -
- -
- - - - - - - - - - 世界制造厂识别代号(WMI)证书 - - 企业名称代号证书 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 是 - 否 - - - - - -
-
-
- - - -
- - - - - - - - - - - - - -
-
- - - - - - - - - - - - - -
-
@@ -790,7 +510,6 @@ import JImageUpload from '@/components/standardsAssociation/JImageUpload' import JDictSelectTag from '@/components/standardsAssociation/JDictSelectTag' import { getMemberInfoById, - getCertificateByMemberId, getCheckInfo, getByMemberTime, downNewestNotice @@ -798,8 +517,6 @@ import { import JUpload from '@/components/standardsAssociation/JUpload' import PreViewImgModal from './PreViewImgModal' import { commonMemberCost, vipMemberCost } from '@api/incomePaymentsApi' -// import { USER_INFO } from '@/store/mutation-types' -// import Vue from 'vue' export default { name: 'PaymentInfoModal', components: { @@ -875,8 +592,6 @@ export default { message: '请输入合法的金额数字,最多2位小数,11位正数' } ], validateTrigger: 'blur', - initialValue: commonMemberCost - }, paymentTime: { rules: [{ required: true, message: '请选择缴费时长' }], @@ -886,7 +601,7 @@ export default { rules: [{ required: true, message: '请选择缴费日期' }], validateTrigger: ['blur', 'change'] }, - paymentRecord: { rules: [{ required: true, message: '请上传缴费凭证' }] }, + paymentRecord: { rules: [{ required: true, message: '请上传缴费凭证/付款说明' }] }, paymentRecord1: { rules: [{ required: true, message: '请上传打包协议' }] }, headerName: { rules: [ @@ -932,13 +647,6 @@ export default { ], validateTrigger: 'blur' }, - // 证书部分 - effectDate: { - rules: [{ - required: true, validator: this.checkEffectDate - }] - }, - invalidDate: { rules: [{ required: true, validator: this.checkInvalidDate }] }, invoiceAddress: { rules: [{ required: true, message: '请输入单位地址' }], validateTrigger: 'blur' }, invoicePhone: { rules: [{ required: true, validator: this.handleInvoicePhoneCheck }], validateTrigger: 'blur' }, depositBank: { rules: [{ required: true, message: '请输入开户银行' }], validateTrigger: 'blur' }, @@ -951,8 +659,6 @@ export default { }, // 缴费时长 5年vip会员 为true 1年普通会员为 false typeFlag: false, - // 证书代码code - cellFlag: [], // 缴费表头 payColumns: [ { @@ -1022,11 +728,8 @@ export default { endTime: '', // 申请证书 selectedRowKeys: [], - // 证书信息 - dataSource: [], count: 2, // 证书列表 - // 证书列表 columns: [ { title: '序号', @@ -1168,13 +871,11 @@ export default { /* 核对凭证*/ handleCheck(record) { this.checkFlag = true - // this.cellFlag= true; this.show(record) }, /* 查看*/ detail(record) { this.detailFlag = true - // this.cellFlag= true; this.show(record) }, async show(record) { @@ -1198,10 +899,8 @@ export default { } // 证书信息 // 查找证书信息 - await this.getCertificate(this.memberId) + // await this.getCertificate(this.memberId) // 证书部分选择的数据 - this.model.certificateArr = this.certificate - this.model.certificate = this.certificate this.startTime = this.model.effectiveDate ? this.model.effectiveDate : '' this.endTime = this.model.invalidationDate ? this.model.invalidationDate : '' // 发票选择 @@ -1236,27 +935,24 @@ export default { // 获取审核信息 this.getCheckInfo(record.id) if (!this.addFlag) { - // this.cellFlag = true; this.memberId = this.model.memberId - this.loadMember() } else { this.memberId = this.userId - this.loadMember() - this.model.certificate = this.certificate } - var type = this.model.paymentTime - this.changgeType(type) + // 获取会员信息 + await this.loadMember() this.visible = true - this.model.memberId = this.memberId - if (this.model.certificatesNum > 0) { - this.certificatesFlag = true - } else { - this.certificatesFlag = false + // 获取会员 类型 1年 五年的 + // let type = this.model.paymentTime + // 新增 设置 初始缴费金额 + if(!this.model.id){ + // 判断是否是 副理事单位 + this.$nextTick( () => { + this.form.setFieldsValue({paymentAmount:commonMemberCost(this.memberType)}) + }) } - // 查找证书信息 - await this.getCertificate(this.memberId) - // 选择证书 数据 - this.model.certificateArr = this.certificate + + this.model.memberId = this.memberId this.startTime = this.model.effectiveDate ? this.model.effectiveDate : '' this.endTime = this.model.invalidationDate ? this.model.invalidationDate : '' @@ -1293,8 +989,6 @@ export default { this.dataSource = [] this.checkInfo = [] this.detailFlag = false - this.selectedRowKeys = [] - this.cellFlag = [] this.invoiceRequirementsFlag = false this.paymentMethodFlag = false this.headerName = '' @@ -1308,6 +1002,7 @@ export default { this.endTime = '' this.isCash = '' this.submitFlag = false + this.initVal = 1 }, handleOk() { console.log(1111) @@ -1338,25 +1033,6 @@ export default { } else { this.model.paymentStatus = 1 } - this.model.certificate = [] - // 这个判断是防止没有勾选而提交证书的 - if (this.selectedRowKeys.length > 0 && values.certificateArr) { - for (let i = 0; i < this.selectedRowKeys.length; i++) { - let opeIndex = Number(this.selectedRowKeys[i]) - let ele = values.certificateArr[opeIndex] - // 操作是否需要备案通知书 - if (ele.noticeOfFiling) { - ele.noticeOfFiling = ele.noticeOfFiling === '是' && 1 || 0 - } - // 证书类型 - ele.certificate = this.dataSource[opeIndex].certificate - ele.id = this.dataSource[opeIndex].id || '' - // 证书附件certificateImg 生效时间effectDate 失效时间invalidDate -- 字段本身存在 - this.model.certificate.push(ele) - } - } - - this.model.certificatesNum = this.selectedRowKeys.length const formData = Object.assign(this.model, values) if (this.typeFlag) { formData.paymentType = 1 @@ -1402,49 +1078,6 @@ export default { this.model.headerName = this.headerName this.model.taxNumber = this.taxNumber this.model.companyName = this.companyName - this.model.certificate = [] - // 这个判断是防止没有勾选而提交证书的 - if (this.selectedRowKeys.length > 0 && values.certificateArr) { - for (let i = 0; i < this.selectedRowKeys.length; i++) { - let opeIndex = Number(this.selectedRowKeys[i]) - let ele = values.certificateArr[opeIndex] - // 操作是否需要备案通知书 - if (ele.noticeOfFiling) { - ele.noticeOfFiling = ele.noticeOfFiling === '是' && 1 || 0 - } - // 证书类型 - ele.certificate = this.dataSource[opeIndex].certificate - ele.id = this.dataSource[opeIndex].id || '' - // 证书附件certificateImg 生效时间effectDate 失效时间invalidDate -- 字段本身存在 - this.model.certificate.push(ele) - } - // for (var i = 0; i < this.selectedRowKeys.length; i++) { - // if (this.dataSource[this.selectedRowKeys[i]].noticeOfFiling) { - // if (this.dataSource[this.selectedRowKeys[i]].noticeOfFiling === '是') { - // this.dataSource[this.selectedRowKeys[i]].noticeOfFiling = 1 - // } else if (this.dataSource[this.selectedRowKeys[i]].noticeOfFiling === '否') { - // this.dataSource[this.selectedRowKeys[i]].noticeOfFiling = 0 - // } - // } - // this.model.certificate.push(this.dataSource[this.selectedRowKeys[i]]) - // } - } - // 将证书附件 生效时间 失效时间 绑定在对应的证书上 - // if (this.model.certificate.length > 0) { - // this.model.certificate.forEach((item, index) => { - // if (index === 0) { - // item.certificateImg = values.certificateImg1 - // item.effectDate = values.effectDate1 - // item.invalidDate = values.invalidDate1 - // } - // if (index === 1) { - // item.certificateImg = values.certificateImg2 - // item.effectDate = values.effectDate2 - // item.invalidDate = values.invalidDate2 - // } - // }) - // } - this.model.certificatesNum = this.selectedRowKeys.length const formData = Object.assign(this.model, values) // 客户要去掉网员服务费字段,但是后端没有去掉校验,所以前端写死 formData.serviceCharge = 0 @@ -1474,69 +1107,57 @@ export default { popupCallback(row) { this.form.setFieldsValue(pick(row, 'billNumber', 'companyName', 'paymentType', 'validPeriod', 'paymentTime', 'paymentAmount', 'certificatesNum', 'submissionTime', 'checkTime', 'paymentStatus', 'paymentMethod', 'paymentRecord', 'invoiceRequirements', 'headerName', 'taxNumber', 'invoiceAddress', 'invoicePhone', 'depositBank', 'bankAccount', 'checkResult', 'checkMark', 'checkMember', 'checkMemberId', 'memberId', 'certificate', 'address', 'postcode')) }, - certificateCheckChange() { - this.$forceUpdate() - }, // 根据会员id获取会员信息 loadMember() { - getMemberInfoById({ id: this.memberId }).then((res) => { - if (res.success) { - var memberInfo = res.result - this.companyName = memberInfo.companyName - this.liaisonMan = memberInfo.liaisonMan - this.mobile = memberInfo.mobile - this.address = memberInfo.address - this.postcode = memberInfo.postcode - this.taxNumber = memberInfo.taxNo - this.invoiceInfoObj.invoiceAddress = memberInfo.invoiceAddress - this.invoiceInfoObj.invoicePhone = memberInfo.invoicePhone - this.invoiceInfoObj.depositBank = memberInfo.depositBank - this.invoiceInfoObj.bankAccount = memberInfo.bankAccount - this.headerName = memberInfo.invoiceInfo - this.memberType = memberInfo.memberNature - switch (memberInfo.memberNature) { - case 1: - this.memberNature = '副理事单位' - break - case 2: - this.memberNature = '理事单位' - break + return new Promise(resolve => { + getMemberInfoById({ id: this.memberId }).then((res) => { + if (res.success) { + let memberInfo = res.result + this.companyName = memberInfo.companyName + this.liaisonMan = memberInfo.liaisonMan + this.mobile = memberInfo.mobile + this.address = memberInfo.address + this.postcode = memberInfo.postcode + this.taxNumber = memberInfo.taxNo + this.invoiceInfoObj.invoiceAddress = memberInfo.invoiceAddress + this.invoiceInfoObj.invoicePhone = memberInfo.invoicePhone + this.invoiceInfoObj.depositBank = memberInfo.depositBank + this.invoiceInfoObj.bankAccount = memberInfo.bankAccount + this.headerName = memberInfo.invoiceInfo + this.memberType = memberInfo.memberNature + switch (memberInfo.memberNature) { + case 1: + this.memberNature = '副理事单位' + break + case 2: + this.memberNature = '理事单位' + break - case 3: - this.memberNature = '会员单位' - break - default: - break + case 3: + this.memberNature = '会员单位' + break + default: + break + } + resolve(res.result) + } else { + console.log(res.message) } - } else { - console.log(res.message) - } + }) }) }, /* 缴费时长选择*/ changgeType(value) { this.initVal = value - console.log('----', this.initVal) const { form } = this if (Number(value) === 2) { // 5年 this.typeFlag = true - form.setFieldsValue({ 'paymentType': 1, 'paymentAmount': vipMemberCost }) - this.$nextTick(() => { - form.setFieldsValue({ 'certificateArr': this.model.certificateArr }) - }) + form.setFieldsValue({ 'paymentType': 1, 'paymentAmount': vipMemberCost(this.memberType) }) } else { this.typeFlag = false - form.setFieldsValue({ 'paymentType': 0, 'paymentAmount': commonMemberCost }) - } - if (this.addFlag) { - this.model.address = this.address - this.model.postcode = this.postcode - - } else { - this.address = this.model.address - this.postcode = this.model.postcode + form.setFieldsValue({ 'paymentType': 0, 'paymentAmount': commonMemberCost(this.memberType) }) } }, @@ -1545,150 +1166,6 @@ export default { this.checkResult = e.target.value }, - // table选择 - onSelectChange(selectedRowKeys) { - this.selectedRowKeys = selectedRowKeys - this.certificatesNum = this.selectedRowKeys.length - }, - - /* 证书识别代码编辑框*/ - onCellChange(key, dataIndex, value) { - const dataSource = [...this.dataSource] - const target = dataSource.find(item => item.key === key) - if (target) { - target[dataIndex] = value - this.dataSource = dataSource - } - }, - - /* 禁止证书选择*/ - getCheckboxProps(record) { - return ({ - props: { - // chargeType 1是免费 2是付费 certificateStatus 证书状态 对应证书管理的证书状态 - disabled: this.detailFlag || this.checkFlag || record.certificateStatus === 0 || record.certificateStatus === 6 || record.certificateStatus === 1 || record.certificateStatus === 3 || record.certificateStatus === 2 || record.chargeType === 2, - // 某几项默认选中(R: 当state等于1时) - defaultChecked: record.id - } - }) - }, - /* 图片预览 */ - getImgView(text) { - if (text && text.indexOf(',') > 0) { - text = text.substring(0, text.indexOf(',')) - } - return getFileAccessHttpUrl(text) - }, - // 模态框预览 - openView(val) { - this.$refs.previewModal.openPre(val) - }, - /* 查找证书信息*/ - getCertificate() { - return new Promise(resolve => { - const that = this - this.dataSource = [] - getCertificateByMemberId({ id: that.memberId }).then((res) => { - var source = [ - { - id: '', - key: 0, - index: '1', - certificate: '世界制造厂识别代号(WMI)证书', - certificate_code: '', - text: '1d81baf9b47a59afd9cee4df3731574i' - }, - { - id: '', - key: 1, - index: '2', - certificate: '企业名称代号证书', - certificate_code: '', - text: '1d81baf9b47a59afd9cee4df37315775' - } - ] - if (res.success) { - this.cellFlag = [] - this.dataSource = [] - if (this.addFlag || that.memberType === 1) { - if (res.result.length !== 0) { - this.dataSource = res.result - this.certificatesNum = res.result.length - } else { - this.dataSource = source - this.certificatesNum = 0 - } - this.dataSource.forEach((value, index) => { - if (value.noticeOfFiling === 1) { - value.noticeOfFiling = '是' - } else if (value.noticeOfFiling === 0) { - value.noticeOfFiling = '否' - } - if (value.certificate_code) { - this.cellFlag.push(true) - } else { - this.cellFlag.push(false) - } - if (value.id) { - this.selectedRowKeys.push(value.key) - } - }) - } else { - this.dataSource = res.result - this.certificatesNum = res.result.length - if (this.certificatesNum > 0) { - this.dataSource.forEach((value, index) => { - if (value.noticeOfFiling === 1) { - value.noticeOfFiling = '是' - } else if (value.noticeOfFiling === 0) { - value.noticeOfFiling = '否' - } - if (value.certificate_code) { - this.cellFlag.push(true) - } else { - this.cellFlag.push(false) - } - if (value.id) { - this.selectedRowKeys.push(value.key) - } - // 回显 证书附件 生效日期 失效日期 - if (index === 0) { - this.$nextTick(() => { - this.form.setFieldsValue({ - 'certificateImg1': value.certificateImg, - 'effectDate1': value.effectDate, - 'invalidDate1': value.invalidDate - }) - }) - } - if (index === 1) { - this.$nextTick(() => { - this.form.setFieldsValue({ - 'certificateImg2': value.certificateImg, - 'effectDate2': value.effectDate, - 'invalidDate2': value.invalidDate - }) - }) - } - }) - } else { - this.dataSource = source - } - } - this.certificate = this.dataSource - } else { - this.cellFlag = [false, false] - this.dataSource = source - this.certificatesNum = 0 - this.certificate = this.dataSource - } - }).finally(() => { - resolve() - }) - }) - - }, - /* 查找审核信息*/ getCheckInfo(recordId) { this.checkInfo = [] @@ -1703,10 +1180,8 @@ export default { getByMemberTime(rule, value, callback) { const paymentAmount = this.form.getFieldValue('paymentAmount') const type = this.form.getFieldValue('paymentTime') - console.log(paymentAmount, type) this.form.resetFields(['paymentAmount', 'paymentTime']) this.form.setFieldsValue({ 'paymentAmount': paymentAmount, 'paymentTime': type }) - console.log('44444', this.addFlag, !this.paymentMethodFlag) // 打包不验证金额 if (!this.paymentMethodFlag) { if (type === undefined) { @@ -1810,133 +1285,6 @@ export default { callback() } }, - // 校验 证书识别代码 - checkCertificateCode(rule, value, callback) { - if (this.selectedRowKeys.length === 0) { - callback() - return - } - let index = rule.field.includes('1') && 1 || 0 - if (rule.field) { - let ele = this.dataSource[index].certificate_code - if (ele) { - if (!value) { - callback(new Error('请输入证书识别代码')) - return - } - let pattern = /^((?![\u4E00-\u9FA5]).)*$/ - if (!pattern.test(value)) { - callback(new Error('不能输入汉字')) - return - } - callback() - return - } else { - callback() - return - } - } - - }, - // 校验 生效日期 - checkEffectDate(rule, value, callback) { - if (this.selectedRowKeys.length === 0) { - callback() - return - } - let index = rule.field.includes('1') && 1 || 0 - if (rule.field) { - let ele = this.dataSource[index].certificate_code - if (ele) { - if (!value) { - callback(new Error('请选择生效日期')) - return - } - callback() - return - } else { - callback() - return - } - } - }, - //校验 失效日期 - checkInvalidDate(rule, value, callback) { - if (this.selectedRowKeys.length === 0) { - callback() - return - } - let index = rule.field.includes('1') && 1 || 0 - if (rule.field) { - let ele = this.dataSource[index].certificate_code - if (ele) { - if (!value) { - callback(new Error('请选择失效日期')) - return - } - let ck = this.form.getFieldValue('certificateArr[' + index + '].effectDate') - if (ck) { - if (value < ck) { - callback(new Error('失效日期不能早于生效日期')) - return - } - callback() - return - } - callback() - return - } else { - callback() - return - } - } - }, - - // 校验证书附件 - checkCertificateImg(rule, value, callback) { - if (this.selectedRowKeys.length === 0) { - callback() - return - } - let index = rule.field.includes('1') && 1 || 0 - if (rule.field) { - let ele = this.dataSource[index].certificate_code - if (ele) { - if (!value) { - // callback(new Error('请上传证书附件')) - callback() - return - } - callback() - return - } else { - callback() - return - } - } - }, - // 校验 备案通知书 - checkNoticeOfFiling(rule, value, callback) { - if (this.selectedRowKeys.length === 0) { - callback() - return - } - let index = rule.field.includes('1') && 1 || 0 - if (rule.field) { - let eleIndex = this.selectedRowKeys.findIndex(tt => (tt + '') === (index + '')) - if (eleIndex > -1) { - if (!value) { - callback(new Error('请选择备案通知书')) - return - } - callback() - return - } else { - callback() - return - } - } - } } }