From 43388454db1dfa86d7c869aa1336e39f332f3e3d Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 19 Jun 2024 16:35:34 +0800
Subject: [PATCH] =?UTF-8?q?[add=20=E6=B5=B7=E5=A4=96=E4=BC=9A=E8=AE=AE]=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/commonEnums.js                      |   3 +-
 .../meetManage/AddOrDetailMeet.vue            |  27 +-
 .../incomePayments/meetManage/Attendance.vue  |  26 ++
 .../meetManage/SignUpInfoEdit.vue             |   8 +
 .../projectManagement/AllMeetingList.vue      |   2 +
 .../projectManagement/OverseasMeeting.vue     | 350 ++++++++++++++++++
 6 files changed, 411 insertions(+), 5 deletions(-)
 create mode 100644 src/views/projectManagement/OverseasMeeting.vue

diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 59063e2..1fdb7f3 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -72,5 +72,6 @@ export const MeetingTypeEnums = {
   other: { name: '其他会议', value: '4' },
   committee: { name: '分标委会议', value: '5' },
   council: { name: '理事会会议', value: '6' },
-  draftGroup: { name: '起草会会议', value: '7' }
+  draftGroup: { name: '起草会会议', value: '7' },
+  overseas: { name: '海外会议', value: '9' }
 }
\ No newline at end of file
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index b894c5d..18f436d 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -404,12 +404,12 @@
             <template v-if="!isWasic">
               <a-col :xxl="8" :xl="12" :sm="24">
                 <a-form-item label="会议费用" :labelCol="labelCol" :wrapperCol="{ xs: {span: 24},sm: {span: 16}}">
-                  <!-- 起草组会议费用默认0不可修改 -->
+                  <!-- 起草组会议、海外会议费用默认0不可修改 -->
                   <a-input placeholder="请输入会议费用"
                            :maxLength='50'
                            @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
                            @blur="addZero"
-                           :disabled="meetingType === '7'"
+                           :disabled="disabledMeetingCosts"
                            v-decorator="[ 'meetingCosts',validateInviteCode.meetingCosts]"></a-input>
                   <span class="yuan">元/人</span>
                 </a-form-item>
@@ -763,6 +763,15 @@ export default {
     }
   },
   computed: {
+    // 禁用会议费用
+    disabledMeetingCosts () {
+      // 禁用的会议类型
+      const arr = [
+        MeetingTypeEnums.draftGroup.value, // 起草组会议
+        MeetingTypeEnums.overseas.value, // 海外会议
+      ]
+      return arr.includes(this.meetingType)
+    },
     // 是否从工作组会议维护来的
     isWorkGroupMeetType() {
       if (this.$route.query.workingGroupProjectId) {
@@ -922,8 +931,12 @@ export default {
       // 后端需要的注册签到时间
       this.newSignInTime = [this.model.startSignInTime, this.model.endSignInTime]
 
-      // 起草组会议费用默认0
-      if (this.meetingType === '7') {
+      // 起草组会议费用默认0 (海外会议同起草组)
+      const zeroCostscArr = [
+        MeetingTypeEnums.draftGroup.value, // 起草组会议
+        MeetingTypeEnums.overseas.value, // 海外会议
+      ]
+      if (zeroCostscArr.includes(this.meetingType)) {
         this.model.meetingCosts = '0.00'
         this.QRcodeBool = false
       }
@@ -1401,6 +1414,12 @@ export default {
             add: '/meeting/draftGroupMeeting/add',
             edit: '/meeting/draftGroupMeeting/edit'
           }
+        // 海外会议
+        case MeetingTypeEnums.overseas.value:
+          return {
+            add: '',
+            edit: '',
+          }
       }
     },
     /*
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 8f23fa8..1a76d47 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -437,6 +437,7 @@ import { downloadFile } from '../../../api/manage'
 import WasicTopicData from './modules/wasicStaticData'
 import { formatMoney } from '@/utils/formatMoney'
 import {getPayConfirmList} from '@api/incomePaymentsApi'
+import {MeetingTypeEnums} from '@/enums/commonEnums'
 
 
 export default {
@@ -656,6 +657,18 @@ export default {
         auditSignUpInfo: 'draftGroupMeetingSituation:auditSignUp',
         guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag'
       },
+      // 海外会议的参会情况的权限编码
+      overseasMeetingCode: {
+        search: 'overseasMeetingSituation:search',
+        add: 'overseasMeetingSituation:add',
+        export: 'overseasMeetingSituation:export',
+        batchDel: 'overseasMeetingSituation:batchDel',
+        edit: 'overseasMeetingSituation:edit',
+        delete: 'overseasMeetingSituation:delete',
+        auditRecord: 'overseasMeetingSituation:auditCredentials',
+        auditSignUpInfo: 'overseasMeetingSituation:auditSignUp',
+        guestsUploadFileFlag: 'overseasMeetingSituation:guestsUploadFileFlag'
+      },
       disableMixinCreated: true,
       // url: {
       //   list: '/meeting/payMeetingSituation/page',
@@ -720,6 +733,14 @@ export default {
         exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls',
         importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel'
       },
+      // 起草组会议的url
+      overseasMeetingUrl: {
+        list: '',
+        delete: '',
+        deleteBatch: '',
+        exportXlsUrl: '',
+        importExcelUrl: ''
+      },
       // 当前的会议信息详情
       currentMeetingInfo: {},
       meetingType: '',
@@ -832,6 +853,9 @@ export default {
           return  this.councilMeetingUrl
         case '7':
           return this.draftGroupMeetingUrl
+        // 海外会议
+        case MeetingTypeEnums.overseas.value:
+          return this.overseasMeetingUrl
         // 为了解决控制台报错写的
        default:return this.workGroupMeetingUrl
       }
@@ -1036,6 +1060,8 @@ export default {
           return '理事会会议'
         case '7':
           return '起草组会议'
+        case MeetingTypeEnums.overseas.value:
+          return '海外会议'
         default:
           return '其他会议'
       }
diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
index 80e59f2..6092c55 100644
--- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue
@@ -302,6 +302,11 @@ export default {
         add: '/meeting/draftGroupMeetingSituation/add',
         edit:'/meeting/draftGroupMeetingSituation/edit'
       },
+      // 海外会议的url
+      overseasMeetingUrl: {
+        add: '',
+        edit: ''
+      },
       title:'添加参会人',
       // 当前参会企业是否是内部企业
       isInternalEnterprise: false,
@@ -353,6 +358,9 @@ export default {
           return this.councilMeetingUrl
         case '7':
           return this.draftGroupMeetingUrl
+        // 海外会议
+        case MeetingTypeEnums.overseas.value:
+          return this.overseasMeetingUrl
       }
     },
   },
diff --git a/src/views/projectManagement/AllMeetingList.vue b/src/views/projectManagement/AllMeetingList.vue
index c2d331e..028a9a9 100644
--- a/src/views/projectManagement/AllMeetingList.vue
+++ b/src/views/projectManagement/AllMeetingList.vue
@@ -151,6 +151,7 @@ import '@/assets/less/TableExpand.less'
 import JDate from '@comp/tools/JDate'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import moment from 'moment'
+import {MeetingTypeEnums} from '@/enums/commonEnums'
 
 export default {
   name: 'AllMeetingList',
@@ -296,6 +297,7 @@ export default {
       pathMap.set('5','/incomePayments/meetManage/AttendanceCommitteeMeeting')
       pathMap.set('6','/incomePayments/meetManage/AttendanceCouncilMeeting')
       pathMap.set('7','/incomePayments/meetManage/AttendanceDraftGroupMeeting')
+      pathMap.set(MeetingTypeEnums.overseas.value,'/incomePayments/meetManage/AttendanceOverseasMeeting')
       this.$router.push({
         path: pathMap.get(record.meetingType+''),
         query: {
diff --git a/src/views/projectManagement/OverseasMeeting.vue b/src/views/projectManagement/OverseasMeeting.vue
new file mode 100644
index 0000000..21a3d9f
--- /dev/null
+++ b/src/views/projectManagement/OverseasMeeting.vue
@@ -0,0 +1,350 @@
+<template>
+  <div>
+    <page-header-title :img-for-icon="IconImg"></page-header-title>
+    <a-card :bordered="false">
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="会议名称">
+                <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+              <a-form-item label="会议时间">
+                <j-date
+                  placeholder="请选择开始日期"
+                  class="query-group-cust"
+                  v-model="queryParam.meetingStartTime"
+                  :disabled-date="disabledStartDate">
+                </j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date
+                  placeholder="请选择结束日期"
+                  class="query-group-cust"
+                  v-model="queryParam.meetingEndTime"
+                  :disabled-date="disabledEndDate">
+                </j-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="年份">
+                <j-year-date style="width: 100%" placeholder="请选择年份" v-model="queryParam.particularYear"></j-year-date>
+              </a-form-item>
+            </a-col>
+
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="发布状态">
+                <j-dict-select-tag placeholder="请选择发布状态" dict-code="release"
+                                   v-model="queryParam.isRelease"></j-dict-select-tag>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+              <a-form-item label="创建时间">
+                <j-date
+                  placeholder="请选择开始日期"
+                  class="query-group-cust"
+                  v-model="queryParam.createTime_begin"
+                  :disabled-date="disabledStartCreateDate">
+                </j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date
+                  placeholder="请选择结束日期"
+                  class="query-group-cust"
+                  v-model="queryParam.createTime_end"
+                  :disabled-date="disabledEndCreateDate">
+                </j-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search" v-has="'overseasMeeting:search'">查询</a-button>
+              <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 查询区域-END -->
+
+      <!-- 操作按钮区域 -->
+      <div class="table-operator">
+        <a-button @click="handleAdd" type="primary" icon="plus" v-has="'overseasMeeting:add'">新增</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls('海外会议')" v-has="'overseasMeeting:export'">导出
+        </a-button>
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'overseasMeeting:batchDel'">批量删除</a-button>
+        <a-button @click="releaseMeeing" type="primary"  v-has="'overseasMeeting:release'">发布</a-button>
+      </div>
+
+      <!-- table区域-begin -->
+      <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}"
+          class="j-table-force-nowrap"
+          @change="handleTableChange">
+
+          <template slot="htmlSlot" slot-scope="text,record">
+            <j-ellipsis v-if="text" class="primary-color" @click="toAttendance(record)" :value="text"
+                        :length="20"></j-ellipsis>
+            <span v-else></span>
+          </template>
+
+          <template slot="text" slot-scope="text">
+            <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
+            <span v-else></span>
+          </template>
+          <span slot="action" slot-scope="text, record" class="action-span-cell">
+            <!--会议需要发布才能让企业人员看见 已发布状态禁用按钮 -->
+            <!--调整为页面级按钮-->
+            <!-- <a @click="releaseMeeing(record)" v-has=" '' " :disabled="record.isRelease === 1 ">发布</a>-->
+            <a @click="handleUploadFile(record,'1')" v-has="'overseasMeeting:uploadCouncil'">会议纪要</a>
+            <a @click="handleUploadFile(record,'2')" v-has="'overseasMeeting:upload'">上传文件</a>
+            <!--          <a @click="handleSignup(record)">报名信息</a>-->
+            <a @click="handleEdit(record)" v-has="'overseasMeeting:edit'">编辑</a>
+            <a @click="handleDelete(record.id)" v-has="'overseasMeeting:delete'">删除</a>
+        </span>
+        </a-table>
+      </div>
+      <!--    <meet-modal ref="modalForm" @ok="modalFormOk"></meet-modal>-->
+      <upload-meet-file-modal ref="modalForm" @ok="modalFormOk"></upload-meet-file-modal>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import {mixinDevice} from '@/utils/mixin'
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import {RangeDateMixin} from '@/mixins/RangeDateMixin'
+import JYearDate from '@comp/jero/JYearDate'
+import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import IconImg from '@/assets/imgs/icon/icon_other_meeting.png'
+import '@/assets/less/TableExpand.less'
+import JDate from '@comp/tools/JDate'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import moment from 'moment'
+import {MeetingTypeEnums} from '@/enums/commonEnums'
+
+export default {
+  name: 'OverseasMeeting',
+  mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
+  components: {
+    JYearDate,
+    UploadMeetFileModal,
+    PageHeaderTitle,
+    JDate,
+    JDictSelectTag
+  },
+  data() {
+    return {
+      description: '海外会议',
+      IconImg,
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '会议名称',
+          align: 'center',
+          dataIndex: 'meetingName',
+          scopedSlots: {customRender: 'htmlSlot'},
+          width: 220,
+        },
+        {
+          title: '会议类型',
+          align: 'center',
+          dataIndex: 'meetingType_dictText',
+          width: 120,
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '负责人',
+          align: 'center',
+          dataIndex: 'directorName',
+          width: 160,
+          scopedSlots: {customRender: 'text'},
+        },
+        {
+          title: '召开时间',
+          align: 'center',
+          dataIndex: 'startTime',
+          width: 220,
+          customRender: (text, record) => (
+            <j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
+        },
+        {
+          title: '召开地点',
+          align: 'center',
+          dataIndex: 'venue',
+          width: 240,
+          customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
+        },
+        {
+          title: '年份',
+          align: 'center',
+          dataIndex: 'particularYear',
+          width: 120,
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '发布状态',
+          align: 'center',
+          dataIndex: 'isRelease_dictText',
+          scopedSlots: {customRender: 'text'},
+          width: 120,
+        },
+        {
+          title: '创建时间',
+          align: 'center',
+          dataIndex: 'createTime',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '操作',
+          align: 'center',
+          fixed: 'right',
+          width: 180,
+          scopedSlots: {customRender: 'action'}
+        },
+      ],
+      dateKeyObj: {
+        beginKey: 'meetingStartTime',
+        endKey: 'meetingEndTime'
+      },
+      url: {
+        list: '',
+        delete: '',
+        deleteBatch: '',
+        exportXlsUrl: '',
+        importExcelUrl: '',
+        releaseMeeingUrl: ''// 发布会议的接口
+      },
+      disableMixinCreated: true
+    }
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    },
+  },
+  created() {
+    this.filters.meetingType = MeetingTypeEnums.overseas.value
+    this.loadData(1)
+  },
+  methods: {
+    /*
+    *  上传会议文件
+    * */
+    handleUploadFile(record, type) {
+      this.$refs.modalForm.edit(record, type)
+    },
+    /*
+    *  报名信息
+    * */
+    handleSignup() {
+      this.$router.push({
+        path: '/incomePayments/meetManage/SignUpInfoList'
+      })
+    },
+    /*
+    * 修改查询条件
+    * */
+    searchQuery() {
+      // this.queryParam.meetingStartTime = this.queryParam.meetingStartTime ? this.queryParam.meetingStartTime + ' ' + '00:00:00' : undefined
+      // this.queryParam.meetingEndTime = this.queryParam.meetingEndTime ? this.queryParam.meetingEndTime + ' ' + '23:59:59' : undefined
+      // this.queryParam.createTime_begin = this.queryParam.createTime_begin ? this.queryParam.createTime_begin + ' ' + '00:00:00' : undefined
+      // this.queryParam.createTime_end = this.queryParam.createTime_end ? this.queryParam.createTime_end + ' ' + '23:59:59' : undefined
+      this.lastQueryParam = {...this.queryParam}
+      if(this.lastQueryParam.meetingStartTime) this.lastQueryParam.meetingStartTime = this.lastQueryParam.meetingStartTime + ' ' + '00:00:00'
+      if(this.lastQueryParam.meetingEndTime) this.lastQueryParam.meetingEndTime = this.lastQueryParam.meetingEndTime + ' ' + '23:59:59'
+      if(this.lastQueryParam.createTime_begin) this.lastQueryParam.createTime_begin = this.lastQueryParam.createTime_begin + ' ' + '00:00:00'
+      if(this.lastQueryParam.createTime_end) this.lastQueryParam.createTime_end = this.lastQueryParam.createTime_end + ' ' + '23:59:59'
+      this.loadData(1)
+    },
+    /*
+    *  编辑
+    * /incomePayments/meetManage/AddOrDetailMeet
+    * */
+    handleEdit(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query: {
+          id: record.id,
+        }
+      })
+    },
+    /*
+    *  新增
+    * */
+    handleAdd() {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query: {
+          meetingType: MeetingTypeEnums.overseas.value
+        }
+      })
+    },
+    /*
+    * 参会情况
+    * */
+    toAttendance(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AttendanceOverseasMeeting',
+        query: {
+          id: record.id,
+          meetingName: record.meetingName,
+          meetingType: MeetingTypeEnums.overseas.value
+        }
+      })
+    },
+    /*
+    * 创建时间开始禁用
+    * */
+    disabledStartCreateDate(startValue) {
+      const endValue = this.queryParam.createTime_end && moment(this.queryParam.createTime_end, this.rangeDateFormat.end)
+      if (!startValue || !endValue) {
+        return false
+      }
+      return startValue.valueOf() > endValue.valueOf()
+    },
+    /*
+    * 创建时间结束禁用
+    * */
+    disabledEndCreateDate(endValue) {
+      const startValue = this.queryParam.createTime_begin && moment(this.queryParam.createTime_begin, this.rangeDateFormat.begin)
+      if (!endValue || !startValue) {
+        return false
+      }
+      return startValue.valueOf() > endValue.valueOf()
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.primary-color {
+  color: #069f99;
+  cursor: pointer;
+}
+
+</style>
\ No newline at end of file