Merge remote-tracking branch 'origin/branch1210' into branch1210

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' }
         }, {

src/views/incomePayments/meetManage/Attendance.vue

@@ -92,11 +92,11 @@
       </div>
       <a-row class="flex-col">
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>报名链接：</label><span>{{ signUpHerfUrl }}</span>
+          <label>报名链接：</label><span>{{ showSignUpHref }}</span>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
           <label>报名二维码：</label><img class="qr-code" :src="signUpQRCode" alt="报名二维码"/><i class="copy primary-color"
-                                                                                        @click="copy(signUpHerfUrl)">复制</i>
+                                                                                        @click="copy(showSignUpHref)">复制</i>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
           <label>签到二维码：</label><img class="qr-code" :src="signInQRCode" alt="签到二维码"/>
@@ -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(){

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']
   }