【开发】 理事会会议

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -464,6 +464,14 @@ export default {
       } else {
         return false
       }
+    },
+    // 是否从理事会会议维护来的
+    isCouncilIdId() {
+      if (this.$route.query.councilId) {
+        return true
+      } else {
+        return false
+      }
     }
   },
   mounted() {
@@ -593,6 +601,11 @@ export default {
             formData.meetingType = '5'
             formData.caseCommitteeId = this.$route.query.caseCommitteeId
           }
+          // 如果是理事会会议需要加上理事会id与会议类型
+          if (this.isCouncilIdId) {
+            formData.meetingType = '6'
+            formData.caseCommitteeId = this.$route.query.councilIdId
+          }
           // 转换召开时间
           formData.startTime = this.newConvokeTime[0]
           formData.endTime = this.newConvokeTime[1]
@@ -763,6 +776,12 @@ export default {
             add: '/meeting/committeeMeeting/add',
             edit: '/meeting/committeeMeeting/edit'
           }
+        // 理事会会议
+        case '6':
+          return {
+            add: '/meeting/councilMeeting/add',
+            edit: '/meeting/councilMeeting/edit'
+          }
       }
     },
     /*

src/views/incomePayments/memberManage/CouncilMeetingManage.vue

@@ -0,0 +1,393 @@
+<template>
+  <div>
+    <page-header-title :is-level-one="false" :level-two-title="councilName"></page-header-title>
+    <a-card :bordered="false">
+      <!--    查询区域-->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="12" :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="年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-year-date style="width:100%" placeholder="请选择年份"
+                             v-model="queryParam.particularYear"></j-year-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="12" :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">
+              <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>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" icon="search" @click="searchQuery"
+                        v-has="'councilMeeting:search'">查询</a-button>
+              <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!--    /查询区域-->
+
+      <!--    操作按钮区域-->
+      <div class="table-operator">
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'councilMeeting:add'">新增
+        </a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('理事会会议')"
+                  v-has="'councilMeeting:export'">导出
+        </a-button>
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'councilMeeting:batchDel'">
+          批量删除
+        </a-button>
+        <a-button type="primary" @click="publishRemind" v-has="'councilMeeting:publish'">发布
+        </a-button>
+      </div>
+      <!--    /操作按钮区域-end-->
+
+      <!--    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">
+
+          <!-- 会议名称 点击去参会情况-->
+          <template slot="htmlSlot" slot-scope="text, record">
+            <j-ellipsis v-if="!!text" class="primary-color" :value="text" :length="20"
+                        @click="toAttendance(record)"></j-ellipsis>
+          </template>
+
+          <template slot="text" slot-scope="text">
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+          </template>
+
+          <span slot="action" class="action-span-cell" slot-scope="text, record">
+               <a @click="uploadFile(record,'1')" v-has="'councilMeeting:uploadCouncil'">会议纪要</a>
+          <a @click="uploadFile(record,'2')" v-has="'councilMeeting:upload'">上传文件</a>
+            <!--          <a @click="applyMsg">报名信息</a>-->
+          <a @click="handleEdit(record)" v-has="'councilMeeting:edit'">编辑</a>
+          <a @click="handleDelete(record.id)" v-has="'councilMeeting:delete'">删除</a>
+        </span>
+        </a-table>
+      </div>
+      <publish-remind-modal ref="publishRemindModal" @ok="modalFormOk"></publish-remind-modal>
+      <upload-meet-file-modal ref="modalForm" @ok="modalFormOk"></upload-meet-file-modal>
+    </a-card>
+  </div>
+</template>
+
+<script>
+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'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+
+export default {
+  name: 'ConferenceMaintenance',
+  components: {
+    JYearDate,
+    JDate,
+    JDictSelectTag,
+    PublishRemindModal,
+    UploadMeetFileModal,
+    PageHeaderTitle
+  },
+  mixins: [JeroListMixin, RangeDateMixin],
+  data() {
+    return {
+      councilName: '',
+      councilId: '',
+      disableMixinCreated: true,
+      list: [],
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5}
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 10}
+      },
+      dateKeyObj: {
+        beginKey: 'meetingStartTime',
+        endKey: 'meetingEndtTime'
+      },
+      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: 160
+
+        },
+        {
+          title: '会议类型',
+          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: 200,
+          customRender: (text, record) => (
+            <j-ellipsis value={record.startTime + '~' + record.endTime} length={20}></j-ellipsis>)
+        },
+        {
+          title: '召开地点',
+          align: 'center',
+          dataIndex: 'venue',
+          width: 200,
+          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: 'remind_dictText',
+          width: 100,
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '创建时间',
+          align: 'center',
+          dataIndex: 'createTime',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '操作',
+          align: 'center',
+          fixed: 'right',
+          width: 160,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: '/meeting/councilMeeting/page',
+        delete: '/meeting/councilMeeting/delete',
+        deleteBatch: '/meeting/councilMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/councilMeeting/exportXls'
+      },
+      canOperate: true // 是否可操作（负责人B不可操作）
+    }
+  },
+  created() {
+    this.councilName = this.$route.query.councilName
+    this.councilId = this.$route.query.councilId
+    this.filters.councilId = this.councilId
+    this.filters.councilName = this.councilName
+    this.loadData(1)
+  },
+  methods: {
+    /**
+     * 返回工作组项目列表
+     */
+    backWorkingGroupProject() {
+      this.$router.go(-1)
+    },
+    /*
+    * 新增
+    * */
+    handleAdd() {
+      // 记录当前的理事会id
+      let currentId = this.$route.query.councilId
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query: {
+          councilId: currentId,
+          meetingType: '6'
+        }
+      })
+    },
+    /*
+    * 编辑
+    * */
+    handleEdit(record) {
+      // 记录当前的理事会id
+      let currentId = this.$route.query.councilId
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query: {
+          councilId: currentId,
+          id: record.id
+        }
+      })
+    },
+    /*
+    * 发布
+    * */
+    publishRemind() {
+      if (this.selectionRows.length === 0) {
+        this.$message.warn('请选择一个会议')
+        return
+      } else {
+        // 传入选中的会议id
+        this.$refs.publishRemindModal.open(this.selectedRowKeys)
+        this.$refs.publishRemindModal.title = '发布'
+      }
+
+    },
+    /*
+    * 上传文件
+    * */
+    uploadFile(record, type) {
+      this.$refs.modalForm.edit(record, type)
+    },
+    /*
+    * 报名信息
+    * */
+    applyMsg() {
+      this.$router.push({
+        path: '/incomePayments/meetManage/SignUpInfoList'
+      })
+    },
+    /*
+     * 参会情况
+     * */
+    toAttendance(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AttendanceWorkGroupMeeting',
+        query: {
+          id: record.id,
+          meetingName: record.meetingName,
+          meetingType: '6'
+        }
+      })
+    },
+    /*
+    * 创建时间开始禁用
+    * */
+    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()
+    },
+    /*
+     * 修改查询条件
+     * */
+    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}
+      this.loadData(1)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.title {
+
+  &-text {
+    padding-left: 1rem;
+    font-size: 18px;
+    line-height: 22px;
+  }
+}
+
+.divider {
+  height: 1px;
+  background-color: #cccccc;
+  margin: 15px -24px;
+}
+</style>

src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue

@@ -32,7 +32,7 @@
         </a-form>
       </div>
       <!--    查询区域-end-->
-      
+
       <!--    操作按钮区域-->
       <div class="table-operator">
         <a-button type="primary" icon="plus" @click="handleAdd" v-has="'council:add'">新增理事会</a-button>
@@ -41,7 +41,7 @@
         <a-button type="danger" icon="delete" @click="batchDel" v-has="'council:batchDel'">批量删除</a-button>
       </div>
       <!--    操作按钮区域-end-->
-      
+
       <!--    table表格区域-->
       <div>
         <a-table rowKey="id"
@@ -58,7 +58,7 @@
           <template slot="text" slot-scope="text">
             <j-ellipsis :value="text" :length="20"></j-ellipsis>
           </template>
-          
+
           <span slot="operation" class="action-span-cell" slot-scope="text, record">
             <a @click="handleMaintainData(record)" v-has="'council:fileMaintenance'">其他分发资料</a>
             <a @click="handleMaintainMeeting(record)" v-has="'council:meetingMaintenance'">理事会会议</a>
@@ -66,7 +66,7 @@
             <a @click="handleEdit(record)" v-has="'council:edit'">基本信息维护</a>
             <a @click="handleDelete(record.id)" v-has="'council:delete'">删除</a>
           </span>
-          
+
           <a-table
             rowKey="id"
             slot="expandedRowRender"
@@ -79,12 +79,12 @@
             <template slot="textRow" slot-scope="text">
               <j-ellipsis :value="text" :length="12"></j-ellipsis>
             </template>
-            
+
             <span slot="action" class="action-span-cell" slot-scope="text, itemRecord">
               <a @click="handleDeleteMember(itemRecord.id)" v-has="'council:member:delete'">删除</a>
             </span>
           </a-table>
-        
+
         </a-table>
       </div>
       <!--    /table表格区域-->
@@ -235,6 +235,16 @@ export default {
         this.loading = false
       })
     },
+    // 理事会会议
+    handleMaintainMeeting(record){
+      this.$router.push({
+        path:'/incomePayments/memberManage/councilMeetingManage',
+        query:{
+          councilId:record.id,
+          councilName:record.name
+        }
+      })
+    },
     // 下拉框的搜索
     filterOption(input, option) {
       return (