Merge remote-tracking branch 'origin/master' into master

src/api/meeting/meeting.js

@@ -271,3 +271,14 @@ export function getMeetingContentsByMeetingId(id){
   })
 }
 
+/**
+ * 根据id导出会议通知
+ * @param id
+ */
+export function exportOutMeetingNotice(id){
+  return download({
+    url: '/meeting/exportOutMeetingNotice?meetingId='+id,
+    method: 'get',
+    responseType: 'blob',
+  })
+}

src/views/meeting/meeting.vue

@@ -2,17 +2,24 @@
   <div class="app-container">
     <div class="query-container">
       <el-form ref="formInline" v-model="formInline" size="mini" :inline="true">
-        <el-form-item>
+<!--        <el-form-item>
           <el-radio-group v-model="formInline.meetingEternal" @input="chooseMeeting()">
             <el-radio-button label="0" value="0">内部会议</el-radio-button>
             <el-radio-button label="1" value="1">外部会议</el-radio-button>
           </el-radio-group>
+        </el-form-item>-->
+        <el-form-item>
+          <el-radio-group v-model="formInline.chooseType" @input="chooseMeeting()">
+            <el-radio-button label="0" value="0">全部</el-radio-button>
+            <el-radio-button label="1" value="1">我参与的会议</el-radio-button>
+            <el-radio-button label="2" value="2">项目会议</el-radio-button>
+          </el-radio-group>
         </el-form-item>
         <el-form-item>
           <el-input v-model="formInline.meetingName" placeholder="会议主题"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="formInline.meetingType" placeholder="会议类型" clearable>
+          <el-select style="width: 150px"  v-model="formInline.meetingType" placeholder="会议类型" clearable>
             <el-option label="周例会" value="1" key="周例会">周例会</el-option>
             <el-option label="项目会议" value="2" key="项目会议">项目会议</el-option>
             <el-option label="实施会议" value="3" key="实施会议">实施会议</el-option>
@@ -20,7 +27,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="formInline.status" placeholder="会议状态" clearable>
+          <el-select style="width: 150px" v-model="formInline.status" placeholder="会议状态" clearable>
             <el-option label="待开始" value="0"></el-option>
             <el-option label="进行中" value="1"></el-option>
             <el-option label="已结束" value="2"></el-option>
@@ -47,6 +54,9 @@
       <el-table-column type="index" label="序号" width="60" fixed>
       </el-table-column>
       <el-table-column label="会议主题" prop="meetingName">
+        <template slot-scope="scope">
+          {{scope.row.meetingName}}(<span style="color: blue;cursor:pointer" slot="reference" @click="exportOutMeetingNotices(scope.row)">会议通知</span>)
+        </template>
       </el-table-column>
       <el-table-column label="会议地点" prop="meetingPlace" width="150" :show-overflow-tooltip="true">
       </el-table-column>
@@ -61,7 +71,7 @@
               <el-table-column width="60" type="index" label="序号"></el-table-column>
               <el-table-column min-width="300" property="content" label="内容"></el-table-column>
             </el-table>
-            <span style="color: blue" slot="reference" @click="searchMeetingContent(scope.row)">会议内容</span>
+            <span style="color: blue;cursor:pointer" slot="reference" @click="searchMeetingContent(scope.row)">会议内容</span>
           </el-popover>
         </scope>
       </el-table-column>
@@ -75,13 +85,17 @@
            </span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="会议时间" width="240">
+      <el-table-column prop="name" label="会议时间" width="180">
         <template slot-scope="scope">
-          <div>{{ parseTime(scope.row.beginTime) }}——{{ parseTime(scope.row.endTime) }}</div>
+          <div v-if="false">{{ parseTime(scope.row.beginTime) }}——{{ parseTime(scope.row.endTime) }}</div>
+          <div>{{ parseTime(scope.row.beginTime) }}&nbsp;&nbsp;({{scope.row.duration}}分钟)</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="emcee" label="主持人/记录人" width="150">
+        <template slot-scope="scope">
+          {{scope.row.emcee}}/{{scope.row.recorder}}
         </template>
       </el-table-column>
-      <el-table-column prop="emcee" label="主持人" width="100"></el-table-column>
-      <el-table-column prop="recorder" label="记录人" width="100"></el-table-column>
       <el-table-column label="会议类型" prop="meetingType" width="80">
         <template slot-scope="scope">
           <!--会议类型（1-周例会，2-项目会议，3-实施会议，4-其他会议）-->
@@ -94,17 +108,17 @@
       <el-table-column prop="status" label="会议状态" width="80">
         <template slot-scope="scope">
           <!--会议状态，0待开始，1进行中，2已结束-->
-          <div v-if="scope.row.status===0" style="color: green">待开始</div>
+          <div v-if="scope.row.status===0" style="color: red">待开始</div>
           <div v-else-if="scope.row.status===1" style="color: #3A71A8">进行中</div>
-          <div v-else>已结束</div>
+          <div v-else style="color: green">已结束</div>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="确认状态" width="80">
         <template slot-scope="scope">
-          <div v-if="scope.row.meetingConfirmStatus===0 && (scope.row.meetingType===1 || scope.row.meetingType===2)">
+          <div style="color: red" v-if="scope.row.meetingConfirmStatus===0 && (scope.row.meetingType===1 || scope.row.meetingType===2)">
             未确认
           </div>
-          <div
+          <div style="color: green"
             v-else-if="scope.row.meetingConfirmStatus===1 && (scope.row.meetingType===1 || scope.row.meetingType===2)">
             已确认
           </div>
@@ -450,7 +464,7 @@ import {
   startMeetingById,
   meetingAuthById,
   meetingDeleteAuth,
-  endMeeting, editMeetingContent, getMeetingContentsByMeetingId
+  endMeeting, editMeetingContent, getMeetingContentsByMeetingId, exportOutMeetingNotice
 } from '@/api/meeting/meeting'
 import {getDeptUserTree} from '@/api/system/user'
 import {getProjectList} from "@/api/task/project";
@@ -483,11 +497,12 @@ export default {
       formInline: {
         current: 1,
         size: 10,
-        meetingEternal: '0',
+        meetingEternal: null,
         meetingName: '',
         meetingType: null,
         status: null,
         searchAuthFlag: false,
+        chooseType:'0'
 
       },
       editFormVisible: false,
@@ -705,7 +720,8 @@ export default {
         meetingName: '',
         meetingType: null,
         status: null,
-        searchAuthFlag:false
+        searchAuthFlag:false,
+        chooseType: '0'
       }
       this.getData(this.formInline);
     },
@@ -1002,9 +1018,9 @@ export default {
 
     },
     chooseMeeting() {
-      let val = this.formInline.meetingEternal;
+      let val = this.formInline.chooseType;
       let search = this.formInline
-      search.meetingEternal = val;
+      search.chooseType = val;
       this.getData(search)
     },
     closeProjectMeetingDailog() {
@@ -1142,6 +1158,10 @@ export default {
         let contents=res.data
         this.meetingContents=contents
       })
+    },
+    exportOutMeetingNotices(row){
+      let id=row.id
+      exportOutMeetingNotice(id);
     }
   }
 

src/views/meeting/weekly.vue

@@ -19,13 +19,15 @@
           size="mini"
           style="width: 100%" v-model="workContents" :data="workContents"
           @row-click="rowClick" :span-method="objectSpanMethod" :highlight-current-row="true">
-          <el-table-column label="分类" prop="classifyName" width="120">
+          <el-table-column type="index" label="序号" width="50">
           </el-table-column>
-          <el-table-column label="项目" prop="projectName" width="160">
+<!--          <el-table-column label="分类" prop="classifyName" width="120" v-show="false">
+          </el-table-column>-->
+          <el-table-column label="项目" prop="projectName" width="180">
           </el-table-column>
-          <el-table-column label="模块" prop="moduleName" width="120">
-          </el-table-column>
-          <el-table-column label="任务名称" prop="taskName" width="250">
+<!--          <el-table-column label="模块" prop="moduleName" width="120"  v-show="false">
+          </el-table-column>-->
+          <el-table-column label="任务名称" prop="taskName" width="400">
           </el-table-column>
           <el-table-column label="工作反馈" prop="description" :show-overflow-tooltip="true">
             <template slot-scope="scope">

src/views/meeting/weeklyRecords.vue

@@ -80,12 +80,12 @@
       <el-table-column label="本周工作总结" min-width="450">
         <el-table-column label="工作内容" prop="taskName">
         </el-table-column>
-        <el-table-column label="是否上周遗留" width="100" prop="lastWeekFlag">
+<!--        <el-table-column label="是否上周遗留" width="100" prop="lastWeekFlag" v-show="false">
           <template slot-scope="scope">
             <div v-if="scope.row.lastWeekFlag==='0'" style="color: darkred">是</div>
             <div v-else="scope.row.lastWeekFlag==='1'">否</div>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column label="完成情况说明" prop="progressValue" width="100">
           <template slot-scope="scope">
             <div style="color: darkgreen" @click="getTaskScheduleRemarks(scope.row)">{{ scope.row.progressValue }}%