diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 69ab32d..98aa888 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -24,6 +24,9 @@ const getWorkingGroupUnderStudyProject = (param) => getAction('/payResearchProje
// 缴费凭证审核记录
const getAuditProofRecords = (param) => getAction('/paymentCheck/payPaymentCheck/amountReceivedSubList', param)
+// 检查当前登录人是否是 理事会成员 或者分标委成员
+const checkMember = (param) => getAction('/meeting/payMeetingSituation/checkMember', param)
+
export {
queryCommonProjectById,
getMeetInfoById,
@@ -36,5 +39,6 @@ export {
getCouncilDetailById,
getCommitteeUnderStudyProject,
getWorkingGroupUnderStudyProject,
- getAuditProofRecords
+ getAuditProofRecords,
+ checkMember
}
diff --git a/src/components/standardsAssociation/JImageUpload.vue b/src/components/standardsAssociation/JImageUpload.vue
index 413774e..b97618c 100644
--- a/src/components/standardsAssociation/JImageUpload.vue
+++ b/src/components/standardsAssociation/JImageUpload.vue
@@ -114,7 +114,7 @@ export default {
},
created() {
const token = Vue.ls.get(ACCESS_TOKEN)
- //TODO 暂时将token写成固定值,后续再做动态
+ //暂时将token写成固定值,后续再做动态
// const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA'
this.headers = { 'X-Access-Token': token }
},
diff --git a/src/utils/memberRequest.js b/src/utils/memberRequest.js
index 80382fb..3c09762 100644
--- a/src/utils/memberRequest.js
+++ b/src/utils/memberRequest.js
@@ -101,7 +101,6 @@ const err = (error) => {
// request interceptor
service.interceptors.request.use(config => {
const token = Vue.ls.get(ACCESS_TOKEN)
- //TODO 暂时将token写成固定值,后续再做动态
// const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA'
if (token) {
config.headers[ 'X-Access-Token' ] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 847d81a..3ab9bbc 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -599,7 +599,7 @@ import PreviewFile from '@comp/jero/PreviewFile'
import FileTable from '@/views/MessagePage/modules/FileTable'
import JEllipsis from '@comp/jero/JEllipsis'
import { getMeetInfoById, queryCommonProjectById } from '@api/incomePaymentsApi'
-import { getSingUpUserInfo } from '@api/incomePaymentsApi'
+import { getSingUpUserInfo, checkMember } from '@api/incomePaymentsApi'
import JImageUpload from '@comp/jero/JImageUpload'
import '@/assets/less/TableExpand.less'
import SignStep from './modules/SignStep'
@@ -692,7 +692,7 @@ export default {
// 显示更多的开票邮寄信息
showMoreInfo: false,
- // showDetailBool:true
+ showDetailBool:true
}
},
computed: {
@@ -704,35 +704,48 @@ export default {
return '女'
}
},
- // 是否显示文件查看
- showDetailBool(){
- //todo 增加判断,等后端接口开发完成后再做处理
- //先判断当前的会议类型,如果会议是分标委会议或者理事会会议 需要判断当前人是否是 分标委成员或者理事会成员,
- if(this.meetingInfo.meetingType === MeetingTypeEnums.committee.index || this.meetingInfo.meetingType === MeetingTypeEnums.council.index) {
- // 判断是否是成员,如果是成员返回true 否则进行下面的判断
- // if(this.judgeIsMember()) {
- // return true
- // }
- }
- if((this.situationInfo.checkResult == 1 && this.situationInfo.registerCheckResult == 1)){
- return true
- }else{
- return false
- }
- },
// 收费二维码 src
paymentQrCodeSrc() {
return `${window._CONFIG['domianURL']}/sys/common/download/${this.model.paymentQrCode}`
}
},
+ watch: {
+ model() {
+ this.changeShowDetailBool()
+ },
+ situationInfo() {
+ this.changeShowDetailBool()
+ }
+ },
methods: {
+ // 是否显示文件查看
+ changeShowDetailBool(){
+ //todo 增加判断,等后端接口开发完成后再做处理
+ //先判断当前的会议类型,如果会议是分标委会议或者理事会会议 需要判断当前人是否是 分标委成员或者理事会成员,
+ if (this.model.meetingType === MeetingTypeEnums.committee.index || this.model.meetingType === MeetingTypeEnums.council.index) {
+ // 判断是否是成员,如果是成员返回true 否则进行下面的判断
+ if (this.judgeIsMember()) {
+ this.showDetailBool = true
+ return
+ }
+ }
+ if((this.situationInfo.checkResult == 1 && this.situationInfo.registerCheckResult == 1)){
+ this.showDetailBool = true
+ }else{
+ this.showDetailBool = false
+ }
+ },
// 判断是否是 分标委成员或者理事会成员
judgeIsMember() {
return new Promise(resolve => {
- getSingUpUserInfo().then(res => {
+ const params = {
+ meetingType: this.model.meetingType,
+ meetingId: this.model.id,
+ }
+ checkMember(params).then(res => {
if (res.success) {
- resolve(true)
+ resolve(res.result)
} else {
resolve(false)
}
diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index 6642c21..ba8fdca 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -119,7 +119,7 @@
+ v-show="Number(record.certificateStatus) === 4 ||Number(record.certificateStatus) === 5 || Number(record.certificateStatus) === 7 ">
续费