diff --git a/src/api/incomeMeetingApi.js b/src/api/incomeMeetingApi.js
index d546f17..af2702b 100644
--- a/src/api/incomeMeetingApi.js
+++ b/src/api/incomeMeetingApi.js
@@ -14,11 +14,15 @@ const createQcCode = (params) => getAction('/meeting/payMeeting/createBase64',pa
// 收入合同的新增会员项目的查询
const queryContractMemberProject = (params) => getAction('/jero/memberProject/queryListByNotCompany',params)
+// 通过单位名称校验是否标协会员
+const validateStandard = (params) => getAction('/meeting/internalMeetingSituation/checkMember',params)
+
export {
getUserInfo,
getMeetInfoById,
getAllWorkProjects,
getSingUpUserInfo,
createQcCode,
- queryContractMemberProject
+ queryContractMemberProject,
+ validateStandard
}
diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index eef544e..f94e6ac 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -16,7 +16,7 @@
-
+
diff --git a/src/utils/validateOnly.js b/src/utils/validateOnly.js
index f89e8d5..16ed013 100644
--- a/src/utils/validateOnly.js
+++ b/src/utils/validateOnly.js
@@ -3,8 +3,8 @@ import {phoneReg, isEmail, chineseReg} from '@/utils/validate'
// 手机校验的错误信息提示
const phoneErrMsg = {
- err1: '请输入手机号码',
- err2: '请输入正确格式的手机号码'
+ err1: '请输入手机号',
+ err2: '请输入正确格式的手机号'
}
// 邮箱校验错误提示信息
const emailErrMsg = {
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 526b6cf..e3de30b 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -634,6 +634,7 @@ export default {
* 审核
* */
handleAudit(record) {
+ this.$refs.auditModal.title = '审核凭证'
this.$refs.auditModal.open(record, false)
},
/*
diff --git a/src/views/incomePayments/meetManage/modules/AuditModal.vue b/src/views/incomePayments/meetManage/modules/AuditModal.vue
index 4187dd8..44559dd 100644
--- a/src/views/incomePayments/meetManage/modules/AuditModal.vue
+++ b/src/views/incomePayments/meetManage/modules/AuditModal.vue
@@ -1,77 +1,79 @@
+ :title="title"
+ :width="width"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="关闭">
报名信息
- {{model.companyName}}
+ {{ model.companyName }}
- {{model.companyContactName}}
+ {{ model.companyContactName }}
- {{model.phone}}
+ {{ model.phone }}
- {{model.identity_dictText}}
+ {{ model.identity_dictText }}
- {{model.checkInHotel_dictText}}
+ {{ model.checkInHotel_dictText }}
- {{model.arrivalTime}}
+ {{ model.arrivalTime }}
- {{model.departureTime}}
+ {{ model.departureTime }}
- {{model.payMode_dictText}}
+ {{ model.payMode_dictText }}
- {{model.needInvoice_dictText}}
+ {{ model.needInvoice_dictText }}
-
-
-
-
+
+
+
+
+
-
+
- {{model.orderCode}}
+ {{ model.orderCode }}
审核
-
+
-
+
- 通过
+ 通过
驳回
@@ -82,11 +84,11 @@
{e.target.value = (e.target.value + '').trim()}"/>
+ placeholder="请输入审核说明"
+ :auto-size="{ minRows: 3, maxRows: 6 }"
+ :maxLength='200'
+ v-decorator="['checkRemark',validatorRules.checkRemark]"
+ @change="e => {e.target.value = (e.target.value + '').trim()}"/>
@@ -157,53 +159,53 @@ export default {
// 审核凭证
check: '/meeting/payMeetingSituation/check',
// 审核报名信息
- checkSignUp:'/meeting/payMeetingSituation/checkRegister'
+ checkSignUp: '/meeting/payMeetingSituation/checkRegister'
},
// 其他会议url
otherMeetingUrl: {
// 审核凭证
check: '/meeting/ohterMeetingSituation/check',
// 审核报名信息
- checkSignUp:'/meeting/ohterMeetingSituation/checkRegister'
+ checkSignUp: '/meeting/ohterMeetingSituation/checkRegister'
},
// 工作组会议url
workGroupMeetingUrl: {
// 审核凭证
check: '/meeting/workGroupMeetingSituation/check',
// 审核报名信息
- checkSignUp:'/meeting/workGroupMeetingSituation/checkRegister'
+ checkSignUp: '/meeting/workGroupMeetingSituation/checkRegister'
},
// 分标委会议url
committeeMeetingUrl: {
// 审核凭证
check: '/meeting/committeeMeetingSituation/check',
// 审核报名信息
- checkSignUp:'/meeting/committeeMeetingSituation/checkRegister'
+ checkSignUp: '/meeting/committeeMeetingSituation/checkRegister'
},
// 国际研讨会url
internalMeetingUrl: {
// 审核凭证
check: '/meeting/internalMeetingSituation/check',
// 审核报名信息
- checkSignUp:'/meeting/internalMeetingSituation/checkRegister'
+ checkSignUp: '/meeting/internalMeetingSituation/checkRegister'
},
// 标协会议url
standardsMeetingUrl: {
// 审核凭证
check: '/meeting/standardsMeetingSituation/check',
// 审核报名信息
- checkSignUp:'/meeting/standardsMeetingSituation/checkRegister'
+ checkSignUp: '/meeting/standardsMeetingSituation/checkRegister'
},
// 审核结果选择
- checkBool:false,
+ checkBool: false,
// 是否是审核报名信息
- checkSignBool:false,
+ checkSignBool: false,
// 参会人id
- signUpPersonId:'',
+ signUpPersonId: '',
}
},
methods: {
- open(record,signUp) {
+ open(record, signUp) {
this.form.resetFields()
this.visible = true
this.signUpPersonId = record.id
@@ -211,7 +213,7 @@ export default {
// 控制行程信息显示 审核凭证不显示
this.checkSignBool = signUp || false
// 会议类型不同 url不同
- this.url = Object.assign({},this.createUrlByMeetingType(this.$route.query.meetingType))
+ this.url = Object.assign({}, this.createUrlByMeetingType(this.$route.query.meetingType))
console.log(record)
},
close() {
@@ -225,10 +227,10 @@ export default {
if (!err) {
that.confirmLoading = true
let httpurl = ''
- if(that.checkSignBool){
+ if (that.checkSignBool) {
// 审核报名信息的接口
- httpurl = this.url.checkSignUp
- }else {
+ httpurl = this.url.checkSignUp
+ } else {
// 审核凭证的接口
httpurl = this.url.check
}
@@ -250,9 +252,9 @@ export default {
}
})
},
- querySingUpUserInfo(){
- getSingUpUserInfo({id:this.signUpPersonId}).then(res => {
- if(res.success){
+ querySingUpUserInfo() {
+ getSingUpUserInfo({id: this.signUpPersonId}).then(res => {
+ if (res.success) {
this.model = res.result
}
})
@@ -263,25 +265,30 @@ export default {
/*
* 选择审核结果
* */
- changeCheck(e){
+ changeCheck(e) {
console.log(e)
// 审核结果选择拒绝 审核说明必填
- if(e.target.value === '1'){
+ if (e.target.value === '1') {
this.checkBool = false
- }else if(e.target.value === '2'){
+ } else if (e.target.value === '2') {
this.checkBool = true
}
},
/*
* 根据会议类型不同的url
* */
- createUrlByMeetingType(meetingType){
- switch (meetingType){
- case '1': return this.workGroupMeetingUrl
- case '2': return this.standardsMeetingUrl
- case '3': return this.internalMeetingUrl
- case '4': return this.otherMeetingUrl
- case '5': return this.committeeMeetingUrl
+ createUrlByMeetingType(meetingType) {
+ switch (meetingType) {
+ case '1':
+ return this.workGroupMeetingUrl
+ case '2':
+ return this.standardsMeetingUrl
+ case '3':
+ return this.internalMeetingUrl
+ case '4':
+ return this.otherMeetingUrl
+ case '5':
+ return this.committeeMeetingUrl
}
}
}
@@ -316,7 +323,8 @@ export default {
.color-999 {
color: #999;
}
+
.color-black {
- color:black;
+ color: black;
}
diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue
index 625fce6..30a7238 100644
--- a/src/views/mailManagement/BillMail.vue
+++ b/src/views/mailManagement/BillMail.vue
@@ -161,7 +161,9 @@ export default {
align: 'center',
width: 200,
dataIndex: 'invoiceAmount',
- scopedSlots: { customRender: 'text' }
+ customRender: (text, record) => (
+
+ )
},
{
title: '项目负责人',
diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue
index 2dbf221..c1cf270 100644
--- a/src/views/mailManagement/ContractMail.vue
+++ b/src/views/mailManagement/ContractMail.vue
@@ -9,12 +9,12 @@
-
+
-
+
@@ -126,56 +126,58 @@ export default {
align: 'center',
width: 300,
dataIndex: 'contractNum',
- scopedSlots: { customRender: 'htmlSlot' }
+ scopedSlots: { customRender: 'text' }
},
{
title: '合同名称',
align: 'center',
width: 300,
dataIndex: 'contractName',
- scopedSlots: { customRender: 'projectName' }
+ scopedSlots: { customRender: 'text' }
},
{
title: '签订单位',
align: 'center',
width: 300,
dataIndex: 'signedCompanyTemporaryName',
- scopedSlots: { customRender: 'projectName' }
+ scopedSlots: { customRender: 'text' }
},
{
title: '负责人',
align: 'center',
width: 300,
dataIndex: 'principalName',
- scopedSlots: { customRender: 'projectName' }
+ scopedSlots: { customRender: 'text' }
},
{
title: '合同总金额',
align: 'center',
width: 200,
dataIndex: 'contractAmount',
- scopedSlots: { customRender: 'projectName' }
+ customRender: (text, record) => (
+
+ )
},
{
title: '邮寄联系人',
align: 'center',
width: 300,
dataIndex: 'liaisonMan',
- scopedSlots: { customRender: 'projectName' }
+ scopedSlots: { customRender: 'text' }
},
{
title: '联系人电话',
align: 'center',
width: 200,
dataIndex: 'mobile',
- scopedSlots: { customRender: 'projectName' }
+ scopedSlots: { customRender: 'text' }
},
{
title: '状态',
align: 'center',
width: 200,
dataIndex: 'postStatus_dictText',
- scopedSlots: { customRender: 'projectName' }
+ scopedSlots: { customRender: 'text' }
},
{
title: '打印',
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index c43f1c9..3141ab0 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -181,7 +181,8 @@ export default {
width: 150,
dataIndex: 'receivableAmount',
customRender: (text, record) => (
- )
+
+ )
}, {
title: '实收金额',
align: 'center',
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index fc220f9..d479f9f 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -282,13 +282,17 @@ export default {
align: 'center',
dataIndex: 'receivableAmount',
width: 180,
- scopedSlots: { customRender: 'text' }
+ customRender: (text, record) => (
+
+ )
}, {
title: '实收金额',
align: 'center',
dataIndex: 'paidAmount',
width: 180,
- scopedSlots: { customRender: 'text' }
+ customRender: (text, record) => (
+
+ )
}, {
title: '打包',
align: 'center',
@@ -536,7 +540,6 @@ export default {
&-filename {
cursor: pointer;
- color: #069f99;
}
}
}
diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue
index aae1c4a..e0fe879 100644
--- a/src/views/signUp/SignUpPage.vue
+++ b/src/views/signUp/SignUpPage.vue
@@ -223,7 +223,7 @@