diff --git a/src/api/standardsAssociationApi.js b/src/api/standardsAssociationApi.js index f5248c6..d493e26 100644 --- a/src/api/standardsAssociationApi.js +++ b/src/api/standardsAssociationApi.js @@ -9,7 +9,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types' const TokenKey = 'X-Access-Token' // 标协会员-基本信息-调用来款系统的接口 -const queryCommonProjectById = (param) => incomeGetAction('/project/payCommonProject/queryCompanyById', param) +const getMemberBaseInfo = (param) => incomeGetAction('/company/payContactsManagement/baseInfo', param) // pdf预览网址 const previewPdf = (file) => { @@ -60,8 +60,9 @@ const getCertificateById = (params) => getAction('/vinCertificate/vinCertificate /****证书缴费 列表页所用接口-结束 ****/ + export { - queryCommonProjectById, + getMemberBaseInfo, queryApprovalNo, previewPdf, getEncryptedString, @@ -78,5 +79,6 @@ export { getByMemberTime, downNewestNotice, - getCertificateById + getCertificateById, + } diff --git a/src/components/standardsAssociation/JUpload.vue b/src/components/standardsAssociation/JUpload.vue index bb0cc79..2bc083a 100644 --- a/src/components/standardsAssociation/JUpload.vue +++ b/src/components/standardsAssociation/JUpload.vue @@ -52,8 +52,8 @@ import Vue from 'vue' import {ACCESS_TOKEN} from '@/store/mutation-types' -import {getFileAccessHttpUrl, downloadFile} from '@/api/manage' -import {getFileInfo} from '@/api/api' +import {getFileAccessHttpUrl, downloadFile} from '@/api/memberManage' +import {getFilesByIds} from '@/api/standardsAssociationApi' // eslint-disable-next-line no-undef // const Base64 = require('js-base64').Base64 @@ -260,7 +260,7 @@ export default { if (this.returnId) { for (let a = 0; a < uploadFiles.length; a++) { if (uploadFiles[a].status === 'done') { - arr.push(uploadFiles[a].response.result.id) + arr.push((uploadFiles[a].response || {}).message) } else { return } @@ -332,7 +332,8 @@ export default { fileList = fileList.map((file) => { if (file.response) { // let reUrl = `${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.response.result.fileName}`; - file.url = getFileAccessHttpUrl(file.response.result.id) + file.url = getFileAccessHttpUrl(file.response.message) + file.fileName = file.name } return file }) @@ -399,9 +400,9 @@ export default { getFileInfo(id) { return new Promise(resolve => { let result = {} - getFileInfo({id: id}).then(res => { + getFilesByIds({ids: id}).then(res => { if (res.success) { - result = res.result + result = res.result[0] } }).finally(() => { resolve(result) @@ -429,7 +430,8 @@ export default { * @param file */ myDownload(file) { - downloadFile(`sys/common/download/${file.response.result.id}`, file.name) + console.log('file--------', file) + downloadFile(`sys/common/static/${file.response.result.id}`, file.name) }, /** * 单个文件的预览功能 @@ -437,7 +439,7 @@ export default { */ myPreview(file) { if (file && file.url) { - const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` + const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/static/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` window.open(url) diff --git a/src/views/standardsAssociation/BasicInfo.vue b/src/views/standardsAssociation/BasicInfo.vue index e836b09..836249c 100644 --- a/src/views/standardsAssociation/BasicInfo.vue +++ b/src/views/standardsAssociation/BasicInfo.vue @@ -1,59 +1,65 @@ @@ -84,14 +110,16 @@ export default { @import '~@assets/less/common.less'; .member-basic-info { - position: relative; margin-bottom: 20px; - display: flex; - flex-direction: row; - justify-content: space-between; font-size: 14px; color: #999; opacity: 1; + /deep/.ant-spin-container{ + position: relative; + display: flex; + flex-direction: row; + justify-content: space-between; + } .panel-cell { flex: 1; diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue index c45a0b3..fe83716 100644 --- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue +++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue @@ -146,6 +146,7 @@ :number="1" :disabled="checkFlag||detailFlag" bizPath="payment" + :return-id="true" v-decorator="['paymentRecord',{ rules: validatorRules.paymentRecord1.rules, initialValue:paymentRecord}]" :trigger-change="true"> diff --git a/src/views/standardsAssociation/memberInfo/CertificateInfo.vue b/src/views/standardsAssociation/memberInfo/CertificateInfo.vue index 9a89833..6abbc2a 100644 --- a/src/views/standardsAssociation/memberInfo/CertificateInfo.vue +++ b/src/views/standardsAssociation/memberInfo/CertificateInfo.vue @@ -136,6 +136,7 @@ export default { align: 'center', dataIndex: 'certificateStatus', customRender: function(text) { + text = Number(text) if (text === 1) { return '已绑定' } else if (text === 2) { diff --git a/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue b/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue index ab5b4e8..b75e72a 100644 --- a/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue +++ b/src/views/standardsAssociation/memberInfo/modules/MemberInfoModal.vue @@ -920,7 +920,7 @@ import JMultiSelectTag from '@/components/dict/JMultiSelectTag' // import { RangeDateMixin } from '@/mixins/RangeDateMixin' // import ChangeCompanyModal from '@views/member/memberInfo/modules/ChangeCompanyModal' // import PreViewImgModal from '@views/member/paymentInfo/modules/PreViewImgModal' -import { downApproveFile } from '@api/api' +import { downApproveFile } from '@/api/api' export default { name: 'MemberInfoModal', diff --git a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue index 2e24d30..e208366 100644 --- a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue +++ b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue @@ -3540,6 +3540,7 @@ export default { that.$emit('ok') that.close() } else { + that.$message.warning(res.message) that.loadData() } })