diff --git a/public/development_address_config.js b/public/development_address_config.js index 5235604..f808a9e 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -12,10 +12,12 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 window._CONFIG["onlinePreviewDomainURL"] = "http://localhost:8012/onlinePreview"; -// 会议管理报名二维码地址 +// 会议管理报名二维码地址 小程序生成二维码用的 window._CONFIG["singUpQRCodeURL"] = "http://localhost:3000/signupentrance" // 会议管理签到二维码地址 微信扫描二维码 跳转的 地址 要么全大写 要么全小写 window._CONFIG["singInQRCodeURL"] = "http://10.10.10.46:8055/signinurl" +// 页面显示用的会议报名二维码连接 +window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn:8066/' // 票据打印--寄件人单位名称 window._CONFIG["sendCompanyName"] = "中汽标准所" diff --git a/public/production_address_config.js b/public/production_address_config.js index a7ed54e..b307bc4 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -15,6 +15,8 @@ window._CONFIG["onlinePreviewDomainURL"] = "http://10.10.10.46:8012/onlinePrevie window._CONFIG["singUpQRCodeURL"] = "http://10.10.10.46:8055/signupentrance" // 会议管理签到二维码地址 微信扫描二维码 跳转的 地址 要么全大写 要么全小写 window._CONFIG["singInQRCodeURL"] = "http://10.10.10.46:8055/signinurl" +// 页面显示用的会议报名二维码连接 +window._CONFIG["singInQRCodeHref"]= 'http://cwp.catarc.org.cn:8066/' // 票据打印--寄件人单位名称 window._CONFIG["sendCompanyName"] = "中汽标准所" diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index ca1a5d2..5cd97f0 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -233,37 +233,37 @@ export default { }, { title: '项目负责人', align: 'center', - width: 280, + width: 140, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '来款单位', align: 'center', - width: 280, + width: 240, dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { title: '企业联系人', align: 'center', - width: 280, + width: 200, dataIndex: 'contactsTemporaryName', scopedSlots: { customRender: 'text' } }, { title: '应收金额', align: 'center', - width: 120, + width: 100, dataIndex: 'receivableAmount', scopedSlots: { customRender: 'text' } }, { title: '实收金额', align: 'center', - width: 120, + width: 100, dataIndex: 'paidAmount', scopedSlots: { customRender: 'text' } }, { title: '缴费凭证状态', align: 'center', - width: 160, + width: 120, dataIndex: 'paymentStatus_dictText', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index b8ead9b..920174b 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -92,11 +92,11 @@ - {{ signUpHerfUrl }} + {{ showSignUpHref }} 报名二维码复制 + @click="copy(showSignUpHref)">复制 签到二维码 @@ -652,7 +652,11 @@ export default { // 2021-11-26 客户变更 要微信扫描签到二维码跳转程序去签到 signInUrl() { return `${window._CONFIG['singInQRCodeURL']}?scansign=${this.$route.query.id}` - } + }, + // 页面先使用的 报名地址 + showSignUpHref(){ + return `${ window._CONFIG['singInQRCodHref'] }?id=${ this.$route.query.id }` + }, }, methods: { selectIdentity(){ diff --git a/src/views/incomePayments/meetManage/meetingValidate.js b/src/views/incomePayments/meetManage/meetingValidate.js index 7e8d761..34faa7d 100644 --- a/src/views/incomePayments/meetManage/meetingValidate.js +++ b/src/views/incomePayments/meetManage/meetingValidate.js @@ -13,7 +13,7 @@ export default { }, meetingFiles:{ rules: [ - { required: false, message: '请上传会议通知' }, + { required: true, message: '请上传会议通知' }, ], validateTrigger:['change'] }, @@ -85,7 +85,7 @@ export default { }, contactPerson:{ rules: [ - { required: false, message: '请输入酒店联系人' }, + { required: true, message: '请输入酒店联系人' }, ], validateTrigger:['blur'] }