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

src/views/meeting/meeting.vue

@@ -426,37 +426,43 @@
 
     <el-dialog :visible.sync="otherMeetingDetailVisble" width="95%" @click="closeotherMeetingDailog" fullscreen
                :close-on-click-modal="false">
-      <el-descriptions title="会议记录详情" border :column="2">
+      <el-descriptions title="会议记录详情" border :column="3">
         <el-descriptions-item label="会议主题">
           {{ pro.meetingName }}
         </el-descriptions-item>
-        <el-descriptions-item label="会议类别">
+        <el-descriptions-item label="会议类别" v-if="false">
           {{ pro.external }}
         </el-descriptions-item>
-        <el-descriptions-item label="会议类型">
-          {{ pro.meetingType }}
+        <el-descriptions-item label="会议时间">
+          {{ pro.times }}
         </el-descriptions-item>
         <el-descriptions-item label="会议地点">
           {{ pro.meetingPlace }}
         </el-descriptions-item>
-        <el-descriptions-item label="会议时间">
-          {{ pro.times }}
+        <el-descriptions-item label="会议类型">
+          {{ pro.meetingType }}
+        </el-descriptions-item>
+        <el-descriptions-item label="内部参会人员">
+          <span v-if="pro.innerAttendeesNew!==''" v-for="(item,index) in pro.innerAttendeesNew">
+            &nbsp;&nbsp;&nbsp; {{ item.name }}
+          </span>
         </el-descriptions-item>
         <el-descriptions-item label="外部参会人员" v-if="pro.outAttendees!=''">
           {{ pro.outAttendees }}
         </el-descriptions-item>
-        <el-descriptions-item label="记录人员" :span="2">
-          {{ pro.recorder }}
-        </el-descriptions-item>
-        <el-descriptions-item label="内部参会人员">
-          {{ pro.innerAttendees }}
+        <el-descriptions-item label="主持人" >
+          {{ pro.emcee }}
         </el-descriptions-item>
-        <el-descriptions-item label="参会情况">
-          {{ pro.remark }}
+        <el-descriptions-item label="记录人员" >
+          {{ pro.recorder }}
         </el-descriptions-item>
-        <el-descriptions-item label="会议备注">
+        <el-descriptions-item label="会议备注" :span="3">
           <div v-html="pro.remarks"></div>
         </el-descriptions-item>
+        <el-descriptions-item label="参会情况" :span="3">
+          <el-input size="mini" v-model="pro.remark" type="textarea"
+                    :autosize="{ minRows: 4, maxRows: 10}" @input="editMeetings(pro)"></el-input>
+        </el-descriptions-item>
       </el-descriptions>
 
       <el-table style="width: 100%;margin: 0" border stripe :data="pro.meetingContents">

src/views/meeting/weekly.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form size="mini" :inline="true">
       <el-form-item label="关联会议">
-        <el-select size="small" style="width: 350px" placeholder="关联会议" clearable filterable v-model="meetingWeek" @change="changeWeekData()">
+        <el-select size="small" style="width: 350px" placeholder="请选择会议" clearable filterable v-model="meetingWeek" @change="changeWeekData()">
           <el-option v-for="(item,index) in meetingData" :label="item.meetingName" :key="item.id" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
@@ -219,7 +219,14 @@ export default {
         // 获取当前第几周
         let week = this.getYearWeek(date.getFullYear(), Number(date.getMonth()) + 1, date.getDate());
         let currentWeek = week ;
-        this.meetingWeek = currentWeek
+        //this.meetingWeek = currentWeek
+        //默认选择当前周的周会议
+        for(let i=0;i<this.meetingData.length;i++){
+          if(this.meetingData[i].week===week){
+            this.meetingWeek=this.meetingData[i].id
+            break;
+          }
+        }
         this.getMeetingsAndWorkPlansByWeeksData(currentWeek)
       })
       getProjects().then(res=>{
@@ -256,16 +263,18 @@ export default {
         }
         let obj = {};
         obj = this.meetingData.find(item => {
-          return item.weeks === currentWeek;
+          return item.id === response.data.meetingId;
         });
+
         this.meetingId =obj.id
+        this.meetingWeek=this.meetingId
       })
     },
     getYearWeek(a, b, c) {
-      let date1 = new Date(a, parseInt(b) - 1, c),
+        let date1 = new Date(a, parseInt(b) - 1, c),
         date2 = new Date(a, 0, 1),
         d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000);
-      return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
+        return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
     },
     getWorkData() {
 
@@ -414,7 +423,6 @@ export default {
     },
     changeWeekData() {
       this.getMeetingsAndWorkPlansByWeeksData(this.meetingWeek)
-
     },
     /** 查看任务详情*/
     rowClick(row, column, event) {