From fbca58c6cb7d00f8786830b3b0cfb7a2eba25ae2 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 9 Sep 2021 20:15:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=83=85=E5=86=B5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=B9=E6=8E=A5=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incomePayments/meetManage/Attendance.vue  | 33 ++++++++++++++-----
 .../modules/BatchSetDockerModal.vue           | 32 ++++++++----------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 0a3b6d6..8bd0b0a 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -170,6 +170,7 @@
           size="middle"
           bordered
           rowKey="id"
+          :scroll="{x:true}"
           :columns="columns"
           :dataSource="dataSource"
           :pagination="ipagination"
@@ -264,71 +265,84 @@ export default {
           title: '参会单位',
           align: 'center',
           dataIndex: 'companyName',
-          scopedSlots: {customRender: 'htmlSlot'}
+          scopedSlots: {customRender: 'htmlSlot'},
+          width: 180,
         },
         {
           title: '参会人员',
           align: 'center',
           dataIndex: 'companyContactName',
+          width: 80,
         },
         {
           title: '应收金额',
           align: 'center',
-          dataIndex: 'amountReceivable'
+          dataIndex: 'amountReceivable',
+          width: 100,
         },
         {
           title: '实收金额',
           align: 'center',
-          dataIndex: 'paidAmount'
+          dataIndex: 'paidAmount',
+          width: 100,
         },
         {
           title: '缴费方式',
           align: 'center',
-          dataIndex: 'payMode_dictText'
+          dataIndex: 'payMode_dictText',
+          width: 100,
         },
         {
           title: '是否签到',
           align: 'center',
-          dataIndex: 'checkIn'
+          dataIndex: 'checkIn',
+          width: 100,
         },
         {
           title: '打包',
           align: 'center',
           dataIndex: 'pack',
+          width: 80,
           scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '需要发票',
           align: 'center',
           dataIndex: 'needInvoice',
+          width: 80,
           scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '到账',
           align: 'center',
+          width: 80,
           dataIndex: 'inAccount',
           scopedSlots: {customRender: 'status'}
         },
         {
           title: '开票',
           align: 'center',
+          width: 80,
           dataIndex: 'makeInvoice',
           scopedSlots: {customRender: 'status'}
         },
         {
           title: '邮寄',
           align: 'center',
+          width: 80,
           dataIndex: 'mail',
           scopedSlots: {customRender: 'status'}
         },
         {
           title: '对接人',
           align: 'center',
+          width: 100,
           dataIndex: 'dockName'
         },
         {
           title: '操作',
           align: 'center',
+          fixed:'right',
           scopedSlots: {customRender: 'action'}
         },
       ],
@@ -446,15 +460,16 @@ export default {
         this.$message.warn('请选择一条记录')
         return
       }
-      let flag = this.selectionRows.some(item => {
-        return item.meetingType !== 3
-      })
+      // let flag = this.selectionRows.some(item => {
+      //   return item.meetingType !== 3
+      // })
+      let flag =  this.currentMeetingInfo.meetingType !== '3'
       if (flag) {
         this.$message.warn('只有研讨会议才可设置对接人')
         return
       } else {
         // 打开模态框
-        this.$refs.batchSetDockerModal.open()
+        this.$refs.batchSetDockerModal.open(this.selectedRowKeys)
       }
     },
     /*
diff --git a/src/views/incomePayments/meetManage/modules/BatchSetDockerModal.vue b/src/views/incomePayments/meetManage/modules/BatchSetDockerModal.vue
index 4cbf024..55592a3 100644
--- a/src/views/incomePayments/meetManage/modules/BatchSetDockerModal.vue
+++ b/src/views/incomePayments/meetManage/modules/BatchSetDockerModal.vue
@@ -13,7 +13,7 @@
           <a-col :xl="24" :sm="24">
             <a-form-item label="会议对接人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <select-principal placeholder="请选择会议对接人"
-                                v-decorator="['directorId']"></select-principal>
+                                v-decorator="['dockId',validatorRules.dockId]"></select-principal>
             </a-form-item>
           </a-col>
         </a-row>
@@ -51,28 +51,23 @@ export default {
         sm: {span: 18}
       },
       validatorRules: {
-        projectName: {
-          rules: [{required: true, message: '请输入会员项目'}],
-          validateTrigger: 'blur'
-        },
-        particularYear: {
-          rules: [{required: true, message: '请选择年份'}],
-          validateTrigger: ['change', 'blur']
-        },
-        directorId: {
-          rules: [{required: true, message: '请选择负责人'}],
-          validateTrigger: ['change', 'blur']
+        dockId: {
+          rules: [{required: true, message: '请选择会议对接人'}],
+          validateTrigger: ['change']
         }
       },
+      // 列表选择的key值
+      meetingSituationIds:[],
       url: {
-        add: '/jero/memberProject/add',
-        edit: '/jero/memberProject/edit',
+        add: '/meeting/payMeetingSituation/addDock',
       }
     }
   },
   methods: {
-    open() {
+    open(meetingSituationIds) {
+      this.form.resetFields()
       this.visible = true
+      this.meetingSituationIds = [...meetingSituationIds]
     },
     close() {
       this.$emit('close')
@@ -81,11 +76,12 @@ export default {
     handleOk() {
       const that = this
       // 触发表单验证
-      this.form.validateFields((err, values) => {
+      that.form.validateFields((err, values) => {
         if (!err) {
-          let httpurl = ''
+          let httpurl = that.url.add
           let method = 'post'
-          const formData = Object.assign(this.model, values)
+          const formData = Object.assign({}, values)
+          formData.meetingSituationIds = this.meetingSituationIds
           console.log('表单提交数据', formData)
           httpAction(httpurl, formData, method).then((res) => {
             if (res.success) {