From 43dc6ebd489de1efe70fe05d48ec2a31013083e2 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 17 Sep 2021 18:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=A0=87=E5=A7=94=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E8=B7=B3=E8=BD=AC=E5=8F=82=E4=BC=9A=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/OtherMeetingForm.vue           | 28 ++++++++++++---
 .../meetManage/SignUpInfoEdit.vue             |  4 +++
 .../projectManagement/CommitteeMeeting.vue    | 35 +++++++++++++------
 3 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
index b933fbf..552d2fd 100644
--- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue
+++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue
@@ -54,7 +54,7 @@
         <a-col :xxl="8" :xl="12" :sm="24" v-if="identifyType === 2 && !payModeBool ">
           <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input placeholder="请输入邮编"
-                     :maxLength='50'
+                     @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}" :maxLength="50"
                      v-decorator="[ 'postContacCode']"></a-input>
           </a-form-item>
         </a-col>
@@ -90,7 +90,15 @@
             <j-image-upload v-decorator="['paymentRecord']" :return-id="true"></j-image-upload>
           </a-form-item>
         </a-col>
-
+        <!--缴费方式为线上的需要上传 -->
+        <a-col :xxl="8" :xl="12" :sm="24" v-if="onlinePayModeBool">
+          <a-form-item label="订单号后四位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入订单号后四位"
+                     :maxLength='4'
+                     @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
+                     v-decorator="[ 'housiwei',validatorRules.housiwei]"></a-input>
+          </a-form-item>
+        </a-col>
       </a-row>
     </template>
   </a-form>
@@ -134,9 +142,9 @@ export default {
       required: false
     },
     // 会议费用是否为0
-    meetingCostBool:{
-      type:Boolean,
-      required:false,
+    meetingCostBool: {
+      type: Boolean,
+      required: false,
     }
   },
   data() {
@@ -161,6 +169,8 @@ export default {
       },
       // 缴费方式为打包
       payModeBool: false,
+      // 缴费方式为线上缴费
+      onlinePayModeBool:false,
       // 回显的邮寄联系人
       selectPostPerson: null,
       validatorRules: {
@@ -175,6 +185,10 @@ export default {
         needInvoice: {
           rules: [{required: true, message: '请选择发票类型'}],
           validateTrigger: 'change'
+        },
+        housiwei:{
+          rules: [{required: true, message: '请输入订单号后四位'}],
+          validateTrigger: 'blur'
         }
       }
     }
@@ -229,6 +243,10 @@ export default {
       } else {
         this.payModeBool = false
       }
+      // 缴费方式为线上 要输入订单后四位
+      if(e.target.value === 2){
+        this.onlinePayModeBool = true
+      }
     },
     /*
     * 编辑回显值
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index a5aa379..6f1e3b3 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -263,6 +263,10 @@ export default {
           if(record.payMode === 3){
             this.$refs.formother.payModeBool = true
           }
+          // 缴费方式为线上的需要回显订单号后四位
+          if(record.payMode === 2){
+            this.$refs.formother.onlinePayModeBool = true
+          }
           this.$refs.formother.setFormVal(this.model)
         }
         //国际研讨会的嘉宾前三个的编辑回显值
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index b89bff2..bbbbb47 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -97,13 +97,13 @@
           @change="handleTableChange"
           class="j-table-force-nowrap">
 
-          <!--        工作组名称-->
-          <template slot="projectName" slot-scope="text, record">
-            <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
+          <template slot="htmlSlot" slot-scope="text,record">
+            <div class="primary-color" @click="toAttendance(record)">{{ text }}</div>
           </template>
 
           <template slot="text" slot-scope="text">
-            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+            <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
+            <span v-else></span>
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
@@ -182,47 +182,48 @@ export default {
           align: 'center',
           dataIndex: 'meetingType_dictText',
           width: 100,
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '负责人',
           align: 'center',
           dataIndex: 'directorName',
           width: 160,
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '召开时间',
           align: 'center',
           dataIndex: 'startTime',
           width: 160,
-          customRender: function (text, record) {
-            return `${record.startTime}~${record.endTime}`
-          }
+          customRender: (text, record) => (<j-ellipsis value={record.startTime  + record.endTime} length={20}></j-ellipsis>)
         },
         {
           title: '召开地点',
           align: 'center',
           dataIndex: 'venue',
           width: 160,
-          customRender: function (text, record) {
-            return text + '/' + record.address
-          }
+          customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
         },
         {
           title: '年份',
           align: 'center',
           dataIndex: 'particularYear',
           width: 100,
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '已提醒',
           align: 'center',
           dataIndex: 'remind_dictText',
           width: 100,
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '创建时间',
           align: 'center',
           dataIndex: 'createTime',
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '操作',
@@ -266,7 +267,7 @@ export default {
     * 新增
     * */
     handleAdd() {
-      // 分表委的新增应该是需要分表委的i
+      // 分表委的新增应该是需要分表委的id
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
         query: {
@@ -288,6 +289,18 @@ export default {
         }
       })
     },
+    /*
+     * 参会情况
+     * */
+    toAttendance(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/Attendance',
+        query: {
+          id: record.id,
+          meetingName: record.meetingName
+        }
+      })
+    },
     /*
     * 发布
     * */