diff --git a/public/development_address_config.js b/public/development_address_config.js index 2f0c060..158dfc0 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -1,6 +1,7 @@ /** * 防止打包部署时路径被写死-开发环境的配置项 */ +const incomeUrl = 'http://localhost:21826' window._CONFIG = {}; window._CONFIG["domianURL"] = "/jero-boot"; // 路由转发 devServer // websocket连接的地址 @@ -26,3 +27,6 @@ window._CONFIG["memberDomianWebSocketURL"] = "http://10.0.1.9:9000/api"; // 查看物流信息 window._CONFIG["lookExpressDomainURL"] = "http://localhost:3001/lookExpressInfo"; + +// 来款企业端-注册标协会员页面 +window._CONFIG['memberRegisterUrl'] = `${incomeUrl}/user/member-register` diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js index 58a332e..0660fe3 100644 --- a/public/local_production_address_config.js +++ b/public/local_production_address_config.js @@ -1,6 +1,7 @@ /** * 防止打包部署时路径被写死-开发环境的配置项 */ +const incomeUrl = 'http://bxxt.hzwlsoft.com' window._CONFIG = {}; window._CONFIG["domianURL"] = "/jero-boot"; // 路由转发 devServer // websocket连接的地址 @@ -24,4 +25,7 @@ window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/co window._CONFIG["memberDomianWebSocketURL"] = "http://139.9.235.66/memberApi"; // 查看物流信息 -window._CONFIG["lookExpressDomainURL"] = "http://bxxt.hzwlsoft.com/lookExpressInfo"; \ No newline at end of file +window._CONFIG["lookExpressDomainURL"] = "http://bxxt.hzwlsoft.com/lookExpressInfo"; + +// 来款企业端-注册标协会员页面 +window._CONFIG['memberRegisterUrl'] = `${incomeUrl}/user/member-register` \ No newline at end of file diff --git a/public/production_address_config.js b/public/production_address_config.js index a484fac..4a8e0cd 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -1,6 +1,7 @@ /** * 防止打包部署时路径被写死-生产环境的配置项 */ +const incomeUrl = 'http://cwp.catarc.org.cn' window._CONFIG = {}; window._CONFIG["domianURL"] = "/jero-boot"; // 路由转发 devServer // websocket连接的地址 @@ -22,7 +23,10 @@ window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn/signupentrance' window._CONFIG["memberURL"] = "/memberApi"; // 会员系统的静态文件的地址 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static"; -window._CONFIG["memberDomianWebSocketURL"] = "http://cwp.catarc.org.cn/memberApi"; +window._CONFIG["memberDomianWebSocketURL"] = incomeUrl + "/memberApi"; // 查看物流信息 window._CONFIG["lookExpressDomainURL"] = "http://cwp.catarc.org.cn/lookExpressInfo"; + +// 来款企业端-注册标协会员页面 +window._CONFIG['memberRegisterUrl'] = `${incomeUrl}/user/member-register` diff --git a/src/config/router.config.js b/src/config/router.config.js index 6e35e7a..c41c91a 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -148,6 +148,20 @@ export const routerData = [ name: 'data-member', id: '6' }, + // 标协会员 只是显示当前企业的信息，方便相关人员注册 + { + path: '/BasicInfoFromIncome', + component: 'standardsAssociation/BasicInfoFromIncome', + route: '1', + meta: { + icon: 'team', // 菜单前图标 + componentName: 'SubBidCommittee', + keepAlive: false, + title: '标协会员' // 菜单名称 + }, + name: 'BasicInfoFromIncome', + id: '17', + }, { redirect: null, path: '/standardsAssociation', @@ -357,8 +371,9 @@ export const routerData = [ keepAlive: false, internalOrExternal: false, componentName: 'ApprovalDocumentNumberList', - title: '收费通知' + title: '收费通知', }, + hidden: true, name: 'member-standardsAssociation-approvalDocumentNumberList', path: '/standardsAssociation/approvalDocumentNumberList', route: '1' diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 73011d9..1091d75 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -14,6 +14,7 @@ import { welcome } from '@/utils/util' import { getAction } from '@/api/manage' import { routerData } from '@/config/router.config' + const user = { state: { token: '', @@ -216,6 +217,7 @@ const user = { */ GetPermissionList({ commit }) { return new Promise((resolve, reject) => { + let currentRouterData = JSON.parse(JSON.stringify(routerData)) let menuData = [] /**判断用户角色**/ let userIdentity @@ -241,9 +243,9 @@ const user = { // 通过roleCode === 3 判断是否显示人员信息 let allMenuData = [] if(userInfo.roleCode + '' !== '3' ){ - allMenuData = routerData.filter(menu => menu.id !== '16') + allMenuData = currentRouterData.filter(menu => menu.id !== '16') }else { - allMenuData = routerData + allMenuData = currentRouterData } /**判断用户角色-end*/ @@ -251,22 +253,26 @@ const user = { // 不是标协会员，则不显示标协会员的全部菜单 case '0': menuData = allMenuData.filter(tt => tt.id.indexOf('standards') === -1) + // menuData = allMenuData break // 是标协会员企业管理员，显示系统全部菜单 case '1': - menuData = allMenuData + menuData = allMenuData.filter(tt => tt.id !== '17') break // 是标协会员但不是企业管理员，不显示标协会员下的会员管理、证书管理、缴费信息、理事会四个菜单 case '2': - routerData.forEach(item => { + currentRouterData.forEach(item => { if (item.children && item.children.length > 0) { let tt = item tt.children = item.children.filter(aa => (aa.id.indexOf('standardsMemberManagement') === -1 && aa.id.indexOf('standardsCertificateManagement') === -1 && aa.id.indexOf('standardsPaymentInfo') === -1 && aa.id.indexOf('standardsCouncil'))) menuData.push(tt) } else { - menuData.push(item) + if(item.id !== '17') { + menuData.push(item) + } } }) + console.log('--menuData--------', menuData) break // 是标协会员理事，不显示标协会员下的会员管理、证书管理、缴费信息三个菜单 case '3' : @@ -276,7 +282,9 @@ const user = { tt.children = item.children.filter(aa => (aa.id.indexOf('standardsMemberManagement') === -1 && aa.id.indexOf('standardsCertificateManagement') === -1 && aa.id.indexOf('standardsPaymentInfo') === -1)) menuData.push(tt) } else { - menuData.push(item) + if(item.id !== '17') { + menuData.push(item) + } } }) break diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index c8f063d..3228128 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -588,6 +588,9 @@

会议资料

+
+ 资料上传 +
@@ -601,6 +604,7 @@ +
+ +
+ +
+
秘书处信息
+
+
+ 挂靠单位： + 中国汽车技术研究中心有限公司标准化研究院 +
+
+ 地址： + {{ secretariatInfo.address }} +
+
+ 联系人： + {{ secretariatInfo.contactPerson }} +
+
+ 联系人电话： + {{ secretariatInfo.contactPhone }} +
+
+ 联系人邮箱： + {{ secretariatInfo.contactMail }} +
+
+
+
+
本企业信息
+
+ + 编辑 + + +
+
+
+ 企业名称： + {{ memberInfo.companyName|| loginUserInfo.companyName }} +
+
+ 如若需要注册企业会员，请前往网站注册 +
+ +
+
+ + +
+ + + + + diff --git a/src/views/standardsAssociation/MemberManagement.vue b/src/views/standardsAssociation/MemberManagement.vue index 43cf960..aa3013b 100644 --- a/src/views/standardsAssociation/MemberManagement.vue +++ b/src/views/standardsAssociation/MemberManagement.vue @@ -191,9 +191,9 @@ export default { }, methods: { // 会员批复文件下载 - uploadApproveFile(val) { + async uploadApproveFile(val) { const url = `/memberInfo/memberInfo/downloadApprovalPdf?companyName=${encodeURIComponent(val.companyName)}&memberId=${val.id}` - downloadFile(url, '会员批复文件.pdf') + await downloadFile(url, '会员批复文件.pdf') }, // tab按钮的切换 switchNav(index) { diff --git a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue index c636ff5..b680081 100644 --- a/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue +++ b/src/views/standardsAssociation/PaymentInfo/modules/PaymentInfoModal.vue @@ -51,8 +51,9 @@ 缴费信息 + {{ newestNoticeInfo.chargeNoticeName