From 33012457c3a3a1d2938950b16098dff3c2ca610d Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 13 Sep 2021 16:51:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E5=8F=91=E5=B8=83=E6=8F=90=E9=86=92=E4=B8=8E=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |  2 +-
 src/components/tools/StatusSlot.vue           |  2 +-
 .../ConferenceMaintenance.vue                 | 88 +++++++++++--------
 .../modules/PublishRemindModal.vue            | 21 ++++-
 4 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index bb51218..17d86d0 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -5,7 +5,7 @@ const getWorkingGroupById = (params) => getAction('/project/payWorkingGroup/quer
 // 判断工作组成员是否设置来款通知
 const getChargeNotice = (param) => getAction('/project/payWorkingGroupSubitem/getCharge', param)
 // 工作组会议的发布提醒
-const publishRemind = (param) => getAction('',param)
+const publishRemind = (param) => postAction('/meeting/payMeeting/publishReminder',param)
 // 通过id获取收入合同信息
 const getRevenueContractById = (param) => getAction('/contract/payIncomeContract/queryById', param)
 // 收入合同审核
diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 8506af9..4d5936f 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -76,7 +76,7 @@ export default {
   computed: {
     // eslint-disable-next-line vue/return-in-computed-property
     status() {
-      if (this.statuObj.amountReceivable === 0) {
+      if (this.statuObj.amountReceivable === '0.00' || this.statuObj.receivableAmount === '0.00' ) {
         if(this.statusType){
           // 应收金额为0  未到账 未邮寄 未开票的状态
           return zero
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index f311a5b..41c3d53 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -59,6 +59,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="已提醒" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag style="width: 100%"
+                                 dict-code="yn"
                                  v-model="queryParam.remind"
                                  placeholder="请选择提醒类型"></j-dict-select-tag>
             </a-form-item>
@@ -86,18 +87,18 @@
     <!--    table表格区域-->
     <div>
       <a-table
-          ref="table"
-          size="middle"
-          bordered
-          rowKey="id"
-          :scroll="{x:true}"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-          @change="handleTableChange"
-          class="j-table-force-nowrap">
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :scroll="{x:true}"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange"
+        class="j-table-force-nowrap">
 
         <!--        工作组名称-->
         <template slot="projectName" slot-scope="text, record">
@@ -109,44 +110,52 @@
         </template>
 
         <span slot="action" class="action-span-cell" slot-scope="text, record">
-          <a @click="uploadFile">上传文件</a>
+          <a @click="uploadFile(record)">上传文件</a>
           <a @click="applyMsg">报名信息</a>
           <a @click="handleEdit(record)">编辑</a>
           <a @click="handleDelete(record.id)">删除</a>
         </span>
       </a-table>
     </div>
-    <publish-remind-modal ref="publishRemindModal" @ok="loadData"></publish-remind-modal>
+    <publish-remind-modal ref="publishRemindModal" @ok="modalFormOk"></publish-remind-modal>
+    <upload-meet-file-modal ref="modalForm" @ok="modalFormOk"></upload-meet-file-modal>
   </a-card>
 </template>
 
 <script>
-import { JeroListMixin } from '@/mixins/JeroListMixin'
+import {JeroListMixin} from '@/mixins/JeroListMixin'
 import {RangeDateMixin} from '@/mixins/RangeDateMixin'
 import JYearDate from '@comp/jero/JYearDate'
 import JDate from '@comp/tools/JDate'
 import moment from 'moment'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import PublishRemindModal from '@views/projectManagement/modules/PublishRemindModal'
+import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal'
 import '@/assets/less/TableExpand.less'
 
 export default {
   name: 'ConferenceMaintenance',
-  components: { JYearDate,JDate,JDictSelectTag,PublishRemindModal },
-  mixins: [JeroListMixin,RangeDateMixin],
+  components: {
+    JYearDate,
+    JDate,
+    JDictSelectTag,
+    PublishRemindModal,
+    UploadMeetFileModal
+  },
+  mixins: [JeroListMixin, RangeDateMixin],
   data() {
     return {
       workingGroupProject: '',
       workingGroupProjectId: '',
-      disableMixinCreated:true,
+      disableMixinCreated: true,
       list: [],
       labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 }
+        xs: {span: 24},
+        sm: {span: 5}
       },
       wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 10 }
+        xs: {span: 24},
+        sm: {span: 10}
       },
       dateKeyObj: {
         beginKey: 'meetingStartTime',
@@ -209,7 +218,7 @@ export default {
         {
           title: '已提醒',
           align: 'center',
-          dataIndex: '',
+          dataIndex: 'remind_dictText',
           width: 100,
         },
         {
@@ -236,7 +245,7 @@ export default {
   created() {
     this.workingGroupProject = this.$route.query.workingGroupProject
     this.workingGroupProjectId = this.$route.query.workingGroupProjectId
-    this.filters.workingGroupId =  this.workingGroupProjectId
+    this.filters.workingGroupId = this.workingGroupProjectId
     this.loadData(1)
   },
   methods: {
@@ -251,26 +260,26 @@ export default {
     /*
     * 新增
     * */
-    handleAdd(){
+    handleAdd() {
       // 记录当前的工作组id
       let currentId = this.$route.query.workingGroupProjectId
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
-        query:{
-          workingGroupProjectId:currentId
+        query: {
+          workingGroupProjectId: currentId
         }
       })
     },
     /*
     * 编辑
     * */
-    handleEdit(record){
+    handleEdit(record) {
       // 记录当前的工作组id
       let currentId = this.$route.query.workingGroupProjectId
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
-        query:{
-          workingGroupProjectId:currentId,
+        query: {
+          workingGroupProjectId: currentId,
           id: record.id,
         }
       })
@@ -279,24 +288,31 @@ export default {
     * 发布提醒
     * */
     publishRemind() {
-      this.$refs.publishRemindModal.open()
-      this.$refs.publishRemindModal.title = '发布-提醒'
+      if (this.selectionRows.length === 0) {
+        this.$message.warn('请选择一个会议')
+        return
+      } else {
+        // 传入选中的会议id
+        this.$refs.publishRemindModal.open(this.selectedRowKeys)
+        this.$refs.publishRemindModal.title = '发布-提醒'
+      }
 
     },
     /*
     * 上传文件
     * */
-    uploadFile() {
-
+    uploadFile(record) {
+      this.$refs.modalForm.edit(record)
     },
     /*
     * 报名信息
     * */
-    applyMsg() {},
+    applyMsg() {
+    },
     /*
     * 创建时间开始禁用
     * */
-    disabledStartCreateDate(startValue){
+    disabledStartCreateDate(startValue) {
       const endValue = this.queryParam.createTime_end && moment(this.queryParam.createTime_end, this.rangeDateFormat.end)
       if (!startValue || !endValue) {
         return false
diff --git a/src/views/projectManagement/modules/PublishRemindModal.vue b/src/views/projectManagement/modules/PublishRemindModal.vue
index 2be755a..945fbd8 100644
--- a/src/views/projectManagement/modules/PublishRemindModal.vue
+++ b/src/views/projectManagement/modules/PublishRemindModal.vue
@@ -111,14 +111,21 @@ export default {
         add: '/project/payCommonProject/add',
         edit: '/project/payCommonProject/edit',
         list: '/project/payWorkingGroupSubitem/list',
-      }
+      },
+      // 会议维护选中的会议
+      selectedMetingList:[],
     }
   },
   methods: {
-    open() {
+    open(meetingList) {
+
+
       this.visible = true
+      // 保存选中的会议
+      this.selectedMetingList = [...meetingList]
+      // 列表需要工作组id参数
       this.filters.workingGroupId = this.$route.query.workingGroupProjectId
-      this.loadData(1)
+      this.searchReset()
     },
     close() {
       this.$emit('close')
@@ -129,16 +136,22 @@ export default {
         this.$message.warn('请至少选择一个成员单位')
         return
       } else {
+        this.confirmLoading =true
         const param = {
-          arr:this.selectionRows
+          meetingIds:this.selectedMetingList,
+          subitemIds:this.selectedRowKeys
         }
         publishRemind(param).then(res => {
           if(res.success){
             this.$message.success(res.message)
+            this.$emit('ok')
+            this.confirmLoading = false
             this.handleCancel()
           }else {
             this.$message.warn(res.message)
           }
+        }).finally(() => {
+          this.confirmLoading = false
         })
       }
     },