调整样式

src/views/meeting/meeting.vue

@@ -250,7 +250,7 @@
         :data="userList"
         node-key="id"
         show-checkbox
-        :props="{label:'name'}" :default-expand-all="true">
+        :props="{label:'name'}" :default-expand-all="false">
       </el-tree>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeUserDialog">取消</el-button>
@@ -264,7 +264,7 @@
         ref="dept1"
         :data="userList"
         node-key="id"
-        :props="{label:'name'}" :default-expand-all="true">
+        :props="{label:'name'}" :default-expand-all="false">
       </el-tree>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeUser1Dialog">取消</el-button>
@@ -298,7 +298,7 @@
         </el-descriptions-item>
         <el-descriptions-item label="内部参会人员">
           <span v-if="pro.innerAttendeesNew!==''" v-for="(item,index) in pro.innerAttendeesNew">
-            <el-badge is-dot v-if="item.confirmFlag==='1'">
+            <el-badge is-dot v-if="pro.meetingConfirmStatus===1">
           &nbsp;&nbsp;&nbsp; {{ item.name }}
             </el-badge>
              <el-badge is-dot v-else type="info">

src/views/meeting/weeklyRecords.vue

@@ -487,7 +487,17 @@ export default {
                 let userId=row.executor
                 this.workPlanTitle=row.userName+'下周工作计划'
                 getWorkPlanByWeeks(weeks,userId).then(res=>{
-                  this.workPlanDatas=res.data
+                  let datas=[]
+                  let data=res.data
+                  if(data.length>0){
+                    for(let i=0;i<data.length;i++){
+                      if(data[i].taskId!==undefined && data[i].taskId!==null){
+                        continue
+                      }
+                      datas.push(data[i])
+                    }
+                  }
+                  this.workPlanDatas=datas;
                 })
                 this.row=row
                 this.workPlanVisible=true