日历页面显示调整、手机端页面调整、未符合项流程带入数据显示调整、未符合项审批历史显示

src/pages/localTool/standCalendar/index.vue

@@ -32,9 +32,11 @@
                       <el-tag style="background-color: unset;border-color: unset;border-width: 0"/>
                     </span>
                     <!-- 获取当前登录人的会议并表示出来-->
-                    <span v-for="item in dealMyDate(data.day)" :value="item.fillPeopleId">
+                    <span v-for="(item,index) in dealMyDate(data.day)" :value="index">
                       <el-tag v-if="userId === item.fillPeopleId" class="tagTwo"/>
-                      <el-tag v-else class="tagOne"/>
+                    </span>
+                    <span v-if="dealMyDate(data.day).length > 0">
+                      <el-tag class="tagOne"/>
                     </span>
                   </span>
                 </div>
@@ -59,7 +61,9 @@
           <el-card class="card_info" v-else v-for="(item, index) in todayData" :value="item" :key="index">
             <span v-for="res in item.attend" :key="res.fillPeopleId">
               <el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
-              <el-tag v-else type="warning" size="mini">会议</el-tag>
+            </span>
+            <span>
+              <el-tag type="warning" size="mini">会议</el-tag>
             </span>
             <span style="float: right;padding-right: 5px">
               <el-button type="primary" size="mini" plain @click="edit_meeting(item)">编辑会议内容</el-button>
@@ -69,7 +73,7 @@
               <div class="content_text">
                 <span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm:ss') }} </span>
               </div>
-              <div class="content_text">
+              <div class="content_text2">
                 <span>参与人 : {{ item.partPeople.join('、') }} </span>
               </div>
               <div class="content_text2">
@@ -101,6 +105,7 @@
     <el-drawer
       title="编辑人员信息"
       :visible.sync="meetFlag"
+      :before-close="falseDrawer"
       size="600px"
     >
       <div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
@@ -128,7 +133,6 @@
               border
               ref="entryTable"
               @selection-change="selectedDelete"
-              height="49%"
               style="width: 100%"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
@@ -334,7 +338,7 @@ export default {
       },
       // 议题选中时储存数组
       deleteTable: [],
-      loading: false
+      loading: false,
     }
   },
   mounted() {
@@ -446,14 +450,25 @@ export default {
      * 并在日历上显示出标记*/
     dealMyDate(v) {
       let len = this.resDate.length
-      let res = ''
+      let res = []
       for (let i = 0; i < len; i++) {
         if (this.resDate[i].date.slice(0, 10) === v) {
-          res = this.resDate[i].attend
-          break
+          res = res.concat(this.resDate[i].attend)
         }
       }
-      return res
+
+      // 去除当天重复的人员
+      let map = new Map();
+      let array = new Array();  // 数组用于返回结果
+      for (let i = 0; i < res.length; i++) {
+        if(map.has(res[i].fillPeopleId)) {  // 如果有该key值
+          map.set(res[i].fillPeopleId, true);
+        } else {
+          map.set(res[i].fillPeopleId, false);   // 如果没有该key值
+          array.push(res[i]);
+        }
+      }
+      return array
     },
     // 头部时间改变事件
     handleDate() {
@@ -502,13 +517,11 @@ export default {
 
     /** 每个会议对应的编辑按钮 */
     edit_meeting(item) {
-      this.editMeetForm.contents = []
-      console.log(item)
       localStorage.setItem('objs', JSON.stringify(item))
       this.fileListData = item
       this.reData = item.files
+      console.log(item)
       this.editMeetForm = item
-      this.editMeetForm.contents
       this.editMeetForm.contents = []
       if (this.editMeetForm.content !== '') {
         this.editMeetForm.content.split(';').forEach(item => {
@@ -863,8 +876,6 @@ export default {
         overflow: hidden;
         text-overflow: ellipsis;
         display: -webkit-box;
-        -webkit-line-clamp: 4;
-        line-clamp: 4;
         -webkit-box-orient: vertical;
         line-height: normal;
         margin-top: 10px;