【修改】其他类型 会议发布 会议通知 酒店联系人非必填

src/mixins/JeroListMixin.js

@@ -356,6 +356,29 @@ export const JeroListMixin = {
         }
       }
     },
+    /**
+     * @description: 会议的发布 会议需要发布对应的企业人员才能在企业端看见该会议
+     * @param:record  表格行数据
+     * @Date 2021-12-29
+     * @author fac
+     * */
+    releaseMeeing(record){
+      if(this.url.releaseMeeingUrl){
+        const param = {
+          id:record.id
+        }
+        getAction(this.url.releaseMeeingUrl,param).then(res => {
+          if(res.success){
+            this.$message.success(res.message)
+            this.loadData()
+          }else {
+            this.$message.warn(res.message)
+          }
+        })
+      }else {
+        this.$message.warn('请设置url.releaseMeeingUrl')
+      }
+    },
     /*
     * 打开项目详情模态框
     * */

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -326,7 +326,7 @@
 
         </a-form>
         <div class="footer">
-          <a-button type="primary" @click="handleOk" class="submit" v-preventclick>发布</a-button>
+          <a-button type="primary" @click="handleOk" class="submit" v-preventclick>保存</a-button>
           <a-button @click="handleCancel">取消</a-button>
         </div>
       </a-spin>

src/views/incomePayments/meetManage/meetingValidate.js

@@ -13,7 +13,7 @@ export default {
   },
   meetingFiles:{
     rules: [
-      { required: true, message: '请上传会议通知' },
+      { required: false, message: '请上传会议通知' },
     ],
     validateTrigger:['change']
   },
@@ -73,19 +73,19 @@ export default {
   },
   hotelName:{
     rules: [
-      { required: true, message: '请输入酒店名称' },
+      { required: false, message: '请输入酒店名称' },
     ],
         validateTrigger:['blur']
   },
   hotelAddress:{
     rules: [
-      { required: true, message: '请输入酒店地址' },
+      { required: false, message: '请输入酒店地址' },
     ],
         validateTrigger:['blur']
   },
   contactPerson:{
     rules: [
-      { required: true, message: '请输入酒店联系人' },
+      { required: false, message: '请输入酒店联系人' },
     ],
         validateTrigger:['blur']
   }

src/views/projectManagement/CommitteeMeeting.vue

@@ -28,8 +28,8 @@
                 </j-date>
               </a-form-item>
             </a-col>
-<!--            标协会议类型 -->
-            <a-col :xl="7" :lg="8" :md="8" :sm="24" v-if="$route.query.meetingType === '2' ">
+            <!--            标协会议类型 -->
+            <a-col :xl="6" :lg="7" :md="8" :sm="24" v-if="$route.query.meetingType === '2' ">
               <a-form-item label="会议类型">
                 <j-dict-select-tag style="width: 100%"
                                    dict-code="standard_meeting_type"
@@ -69,6 +69,13 @@
                                    placeholder="请选择提醒类型"></j-dict-select-tag>
               </a-form-item>
             </a-col>
+            <!--标协会议显示发布 -->
+            <a-col :xl="6" :lg="7" :md="8" :sm="24" v-if="$route.query.meetingType === '2' ">
+              <a-form-item label="发布状态">
+                <j-dict-select-tag placeholder="请选择发布状态" dict-code="release" style="width: 100%"
+                                   v-model="queryParam.isRelease"></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"
@@ -126,6 +133,8 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
+                        <!--会议需要发布才能让企业人员看见 已发布状态禁用按钮  标协会议显示 -->
+            <a @click="releaseMeeing(record)" :disabled="record.release === 1 " v-if="$route.query.meetingType === '2' ">发布</a>
           <a @click="uploadFile(record,'1')" v-has:[authorCode.uploadCouncil]="'committeeMeeting:upload'">会议纪要</a>
           <a @click="uploadFile(record,'2')" v-has:[authorCode.upload]="'committeeMeeting:upload'">上传文件</a>
             <!--          <a @click="applyMsg">报名信息</a>-->
@@ -233,6 +242,13 @@ export default {
           width: 120,
           scopedSlots: {customRender: 'text'}
         },
+        {
+          title: '发布状态',
+          align: 'center',
+          dataIndex: 'release_dictText',
+          scopedSlots: {customRender: 'text'},
+          width: 100,
+        },
         {
           title: '已提醒',
           align: 'center',
@@ -267,7 +283,7 @@ export default {
         upload: 'committeeMeeting:upload',
         edit: 'committeeMeeting:edit',
         delete: 'committeeMeeting:delete',
-        uploadCouncil:'committeeMeeting:uploadCouncil'
+        uploadCouncil: 'committeeMeeting:uploadCouncil'
       },
       // 标协会议的权限编码
       standardsMeetingAuthorCode: {
@@ -278,7 +294,8 @@ export default {
         upload: 'standardsMeeting:upload',
         edit: 'standardsMeeting:edit',
         delete: 'standardsMeeting:delete',
-        uploadCouncil:'standardsMeeting:uploadCouncil'
+        uploadCouncil: 'standardsMeeting:uploadCouncil',
+        releaseMeeing:'', // 发布会议的按钮权限
       }
     }
   },
@@ -300,11 +317,14 @@ export default {
       // 找出提醒字段的索引
       this.newColumns = this.newColumns.filter(item => item.dataIndex !== 'remind_dictText')
     } else {
+      // 分标委会议 列表表头 去掉可发布列
+
       this.newColumns = [...this.columns]
+      this.newColumns = this.newColumns.filter(item => item.dataIndex !== 'release_dictText')
     }
   },
   mounted() {
-    if(this.disableMixinCreated){
+    if (this.disableMixinCreated) {
       this.loadData(1)
     }
   },
@@ -330,6 +350,7 @@ export default {
           delete: '/meeting/standardsMeeting/delete',
           deleteBatch: '/meeting/standardsMeeting/deleteBatch',
           exportXlsUrl: '/meeting/standardsMeeting/exportXls',
+          releaseMeeingUrl:'', // 发布会议的接口
         }
       } else if (meetingType === '5') {
         // 分标委会议
@@ -411,7 +432,7 @@ export default {
         return
       } else {
         // 传入选中的会议id
-        this.$refs.publishRemindModal.open(this.selectedRowKeys,true)
+        this.$refs.publishRemindModal.open(this.selectedRowKeys, true)
         this.$refs.publishRemindModal.title = '发布'
       }
 
@@ -419,8 +440,8 @@ export default {
     /*
     * 上传文件
     * */
-    uploadFile(record,type) {
-      this.$refs.modalForm.edit(record,type)
+    uploadFile(record, type) {
+      this.$refs.modalForm.edit(record, type)
     },
     /*
     * 报名信息

src/views/projectManagement/InternationalSeminar.vue

@@ -33,6 +33,11 @@
               <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.release"></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
@@ -96,6 +101,8 @@
         </template>
 
         <span slot="action" slot-scope="text, record" class="action-span-cell">
+            <!--会议需要发布才能让企业人员看见 已发布状态禁用按钮 -->
+          <a @click="releaseMeeing(record)" :disabled="record.release === 1 ">发布</a>
           <a @click="handleUploadFile(record,'1')" v-has=" 'internalMeeting:uploadCouncil' ">会议纪要</a>
           <a @click="handleUploadFile(record,'2')" v-has="'internalMeeting:upload'">上传文件</a>
 <!--          <a @click="handleSignup(record)">报名信息</a>-->
@@ -120,6 +127,7 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_international_meeting.png'
 import '@/assets/less/TableExpand.less'
 import JDate from '@comp/tools/JDate'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import moment from 'moment'
 
 export default {
@@ -129,6 +137,7 @@ export default {
     JYearDate,
     UploadMeetFileModal,
     PageHeaderTitle,
+    JDictSelectTag,
     JDate
   },
   data() {
@@ -188,6 +197,13 @@ export default {
           scopedSlots: {customRender: 'text'},
           width: 120,
         },
+        {
+          title: '发布状态',
+          align: 'center',
+          dataIndex: 'release_dictText',
+          scopedSlots: {customRender: 'text'},
+          width: 120,
+        },
         {
           title: '创建时间',
           align: 'center',
@@ -212,6 +228,7 @@ export default {
         deleteBatch: '/meeting/internalMeeting/deleteBatch',
         exportXlsUrl: '/meeting/internalMeeting/exportXls',
         importExcelUrl: '/meeting/internalMeeting/importExcel',
+        releaseMeeingUrl:'', // 发布会议的接口
       },
       disableMixinCreated:true
     }

src/views/projectManagement/OtherMeeting.vue

@@ -33,6 +33,12 @@
                 <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
@@ -95,11 +101,13 @@
             <span v-else></span>
           </template>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
-                 <a @click="handleUploadFile(record,'1')" v-has="'otherMeeting:uploadCouncil'">会议纪要</a>
-          <a @click="handleUploadFile(record,'2')" v-has="'otherMeeting:upload'">上传文件</a>
+            <!--会议需要发布才能让企业人员看见 已发布状态禁用按钮 -->
+            <a @click="releaseMeeing(record)" :disabled="record.release === 1 ">发布</a>
+            <a @click="handleUploadFile(record,'1')" v-has="'otherMeeting:uploadCouncil'">会议纪要</a>
+            <a @click="handleUploadFile(record,'2')" v-has="'otherMeeting:upload'">上传文件</a>
 <!--          <a @click="handleSignup(record)">报名信息</a>-->
-          <a @click="handleEdit(record)" v-has="'otherMeeting:edit'">编辑</a>
-          <a @click="handleDelete(record.id)" v-has="'otherMeeting:delete'">删除</a>
+            <a @click="handleEdit(record)" v-has="'otherMeeting:edit'">编辑</a>
+            <a @click="handleDelete(record.id)" v-has="'otherMeeting:delete'">删除</a>
         </span>
         </a-table>
       </div>
@@ -119,6 +127,7 @@ 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'
 export default {
 name: 'OtherMeeting',
@@ -127,7 +136,8 @@ name: 'OtherMeeting',
     JYearDate,
     UploadMeetFileModal,
     PageHeaderTitle,
-    JDate
+    JDate,
+    JDictSelectTag
   },
   data() {
     return {
@@ -186,6 +196,13 @@ name: 'OtherMeeting',
           width: 120,
           scopedSlots: {customRender: 'text'}
         },
+        {
+          title: '发布状态',
+          align: 'center',
+          dataIndex: 'release_dictText',
+          scopedSlots: {customRender: 'text'},
+          width: 120,
+        },
         {
           title: '创建时间',
           align: 'center',
@@ -210,6 +227,7 @@ name: 'OtherMeeting',
         deleteBatch: '/meeting/otherMeeting/deleteBatch',
         exportXlsUrl: '/meeting/otherMeeting/exportXls',
         importExcelUrl: '/meeting/otherMeeting/importExcel',
+        releaseMeeingUrl:''// 发布会议的接口
       },
       disableMixinCreated:true
     }