diff --git a/public/production_address_config.js b/public/production_address_config.js index 659c110..1cb19a3 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -20,3 +20,4 @@ window._CONFIG['singUpQRCodeURL'] = 'http://10.10.10.46:8055/signupentrance' window._CONFIG["memberURL"] = "/memberApi"; // 会员系统的静态文件的地址 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static"; +window._CONFIG["memberDomianWebSocketURL"] = "http://10.0.10.78:9000/memberApi"; diff --git a/src/api/memberManage.js b/src/api/memberManage.js index ecd09da..cd962cf 100644 --- a/src/api/memberManage.js +++ b/src/api/memberManage.js @@ -169,7 +169,6 @@ export function getFileAccessHttpUrl(avatar,subStr) { return avatar }else{ if(avatar && avatar.length>0 && avatar.indexOf('[') === -1){ - console.log('window._CONFIG[\'memberStaticDomainURL\']=======', window._CONFIG['memberStaticDomainURL']) return window._CONFIG['memberStaticDomainURL'] + '/' + avatar } } diff --git a/src/api/standardsAssociationApi.js b/src/api/standardsAssociationApi.js index cd6ad1e..3491a56 100644 --- a/src/api/standardsAssociationApi.js +++ b/src/api/standardsAssociationApi.js @@ -17,7 +17,7 @@ const previewPdf = (file) => { // return `${process.env.BASE_URL}pdfjs/web/viewer.html?file=` + encodeURIComponent(url) + '&.pdf' // const token = Vue.ls.get(ACCESS_TOKEN) // todo 先写死token - const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzkzNzY3MzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.FvA0UgdKJm1m0rbkaS4CX72-GozZVPDmcZ296FvaBfQ' + const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' const fileFullUrl = `${window._CONFIG['memberDomianWebSocketURL']}/sys/common/download/${file.id}?token=${token}&fullfilename=${file.fileName}` console.log(fileFullUrl, '$$$$$$$$') let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` @@ -35,11 +35,49 @@ const getEncryptedString = () => getAction('/sys/getRSAPublicKey', {}) // 通过文件的id获取文件的名称 const getFilesByIds = (params) => getAction('/sys/common/static/getFilesByIds', params) +// 验证企业是否存在 +const checkOnlyCompany = (params) => getAction('/memberInfo/memberInfo/checkOnlyCompany', params) +// 会员变更单位名称 +const changeCompany = (params) => postAction('/memberInfo/companyNameRecord/add', params) +// 会员编辑变更单位全称 +const changeCompanyEdit = (params) => postAction('/memberInfo/companyNameRecord/edit', params) +// 字典标签专用(通过code获取字典数组) +const ajaxGetDictItems = (code, params) => getAction(`/sys/dict/getDictItems/${code}`, params) +/****证书管理列表页所用接口-开始 ****/ +const getLastPaymentByMemberId = (params) => getAction('/paymentInfo/getLastPaymentByMemberId', params) +const getCertificateByMemberId = (params) => getAction('/vinCertificate/vinCertificate/getCertificateByMemberId', params) +/****证书管理列表页所用接口-结束 ****/ + +/****会员缴费 列表页所用接口-开始 ****/ +const getMemberInfoById = (params) => getAction('/memberInfo/memberInfo/queryById', params) +const getCheckInfo = (params) => getAction('/paymentInfo/paymentCheckinfo/queryByPaymentId', params) +const getByMemberTime = (params) => getAction('/threshold/thresholdSetting/getByMemberTime', params) +// 会员下载缴费通知单 +const downNewestNotice = (params) => getAction('/approvalDocumentNumber/approvalDocumentNumber/queryLatest', params) +/****会员缴费 列表页所用接口-结束 ****/ +/****证书缴费 列表页所用接口-开始 ****/ +// 证书缴费 +const getCertificateById = (params) => getAction('/vinCertificate/vinCertificate/getCertificateById', params) + +/****证书缴费 列表页所用接口-结束 ****/ export { queryCommonProjectById, queryApprovalNo, previewPdf, getEncryptedString, - getFilesByIds + getFilesByIds, + checkOnlyCompany, + changeCompany, + changeCompanyEdit, + ajaxGetDictItems, + getLastPaymentByMemberId, + getCertificateByMemberId, + + getMemberInfoById, + getCheckInfo, + getByMemberTime, + downNewestNotice, + + getCertificateById } diff --git a/src/assets/imgs/standardsAssociation/certificate/cam.png b/src/assets/imgs/standardsAssociation/certificate/cam.png new file mode 100644 index 0000000..6f365fc Binary files /dev/null and b/src/assets/imgs/standardsAssociation/certificate/cam.png differ diff --git a/src/assets/imgs/standardsAssociation/certificate/wmi.png b/src/assets/imgs/standardsAssociation/certificate/wmi.png new file mode 100644 index 0000000..e02b1d4 Binary files /dev/null and b/src/assets/imgs/standardsAssociation/certificate/wmi.png differ diff --git a/src/components/standardsAssociation/JDictSelectTag.vue b/src/components/standardsAssociation/JDictSelectTag.vue new file mode 100644 index 0000000..782928c --- /dev/null +++ b/src/components/standardsAssociation/JDictSelectTag.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/components/standardsAssociation/JImageUpload.vue b/src/components/standardsAssociation/JImageUpload.vue index 3c4bf07..2e3da7e 100644 --- a/src/components/standardsAssociation/JImageUpload.vue +++ b/src/components/standardsAssociation/JImageUpload.vue @@ -115,7 +115,7 @@ export default { created() { // const token = Vue.ls.get(ACCESS_TOKEN) //TODO 暂时将token写成固定值,后续再做动态 - const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzkzNzY3MzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.FvA0UgdKJm1m0rbkaS4CX72-GozZVPDmcZ296FvaBfQ' + const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' this.headers = { 'X-Access-Token': token } }, methods: { diff --git a/src/components/standardsAssociation/JMultiSelectTag.vue b/src/components/standardsAssociation/JMultiSelectTag.vue new file mode 100644 index 0000000..244088f --- /dev/null +++ b/src/components/standardsAssociation/JMultiSelectTag.vue @@ -0,0 +1,132 @@ + + + diff --git a/src/components/standardsAssociation/JSearchSelectTag.vue b/src/components/standardsAssociation/JSearchSelectTag.vue new file mode 100644 index 0000000..5399a1b --- /dev/null +++ b/src/components/standardsAssociation/JSearchSelectTag.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/components/standardsAssociation/JUpload.vue b/src/components/standardsAssociation/JUpload.vue new file mode 100644 index 0000000..bb0cc79 --- /dev/null +++ b/src/components/standardsAssociation/JUpload.vue @@ -0,0 +1,539 @@ + + + + + diff --git a/src/config/router.config.js b/src/config/router.config.js index c97673c..022f957 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -172,7 +172,7 @@ export const routerData = [ keepAlive: false, internalOrExternal: false, componentName: 'MemberInfo', - title: '会员信息' + title: '会员缴费' }, name: 'standardsAssociation/PaymentInfo/MemberInfo', path: '/standardsAssociation/PaymentInfo/MemberInfo', @@ -184,7 +184,7 @@ export const routerData = [ keepAlive: false, internalOrExternal: false, componentName: 'CertificateInfo', - title: '证书信息' + title: '证书缴费' }, name: 'standardsAssociation/PaymentInfo/CertificateInfo', path: '/standardsAssociation/PaymentInfo/CertificateInfo', @@ -386,4 +386,4 @@ export const routerData = [ name: 'council-detail-page', id: '12' } -] \ No newline at end of file +] diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index 749ddc4..b1e7e05 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -20,8 +20,10 @@ export const JeroListMixin = { lastQueryParam: {}, /* 数据源 */ dataSource:[], - // 做一步转换,方便会员系统的使用 + // 做一步转换,方便会员系统使用自己内部的方法 getAction, + deleteAction, + getFileAccessHttpUrl, /* 分页参数 */ ipagination:{ current: 1, @@ -184,7 +186,7 @@ export const JeroListMixin = { content: '是否删除选中数据?', onOk: function () { that.loading = true - deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => { + that.deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => { if (res.success) { that.$message.success(res.message) // 判断当前删除的数据是否是最后一页的全部数据,如果是的话页码减一 @@ -215,7 +217,7 @@ export const JeroListMixin = { title: '确认删除', content: '确定要删除此条数据吗?', onOk: function() { - deleteAction(that.url.delete, {id: id}).then((res) => { + that.deleteAction(that.url.delete, {id: id}).then((res) => { if (res.success) { that.$message.success(res.message) // 判断当前删除的数据是否是最后一页的最后一条数据,如果是的话页码减一 @@ -339,7 +341,7 @@ export const JeroListMixin = { if(text && text.indexOf(',')>0){ text = text.substring(0,text.indexOf(',')) } - return getFileAccessHttpUrl(text) + return this.getFileAccessHttpUrl(text) }, /* 文件下载 */ // update--autor:lvdandan-----date:20200630------for:修改下载文件方法名uploadFile改为downloadFile------ @@ -352,7 +354,7 @@ export const JeroListMixin = { if(text.indexOf(',')>0){ text = text.substring(0,text.indexOf(',')) } - let url = getFileAccessHttpUrl(text) + let url = this.getFileAccessHttpUrl(text) window.open(url) }, /* diff --git a/src/mixins/RangeDateMixin.js b/src/mixins/RangeDateMixin.js index 1b910a1..bff0173 100644 --- a/src/mixins/RangeDateMixin.js +++ b/src/mixins/RangeDateMixin.js @@ -21,7 +21,12 @@ export const RangeDateMixin = { return false } // console.log(endValue.valueOf(),'endValue.valueOf()') - return startValue.valueOf() > endValue.valueOf() + 86400000 + if(this.rangeDateFormat.begin === 'YYYY-MM-DD') { + return startValue.valueOf() > endValue.valueOf() + 86400000 + } else { + return startValue.valueOf() > endValue.valueOf() + } + }, disabledEndDate(endValue) { diff --git a/src/utils/memberRequest.js b/src/utils/memberRequest.js index 3c46e0c..5d6f0ad 100644 --- a/src/utils/memberRequest.js +++ b/src/utils/memberRequest.js @@ -102,7 +102,7 @@ const err = (error) => { service.interceptors.request.use(config => { // const token = Vue.ls.get(ACCESS_TOKEN) //TODO 暂时将token写成固定值,后续再做动态 - const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MzkzNzY3MzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.FvA0UgdKJm1m0rbkaS4CX72-GozZVPDmcZ296FvaBfQ' + const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' if (token) { config.headers[ 'X-Access-Token' ] = token // 让每个请求携带自定义 token 请根据实际情况自行修改 } diff --git a/src/views/standardsAssociation/BasicInfo.vue b/src/views/standardsAssociation/BasicInfo.vue index 314a1a2..e836b09 100644 --- a/src/views/standardsAssociation/BasicInfo.vue +++ b/src/views/standardsAssociation/BasicInfo.vue @@ -1,48 +1,48 @@