Browse Source

调整样式

humingbo 1 year ago
parent
commit
b279b7e6ea
2 changed files with 10 additions and 4 deletions
  1. 2 2
      src/views/meeting/weekly.vue
  2. 8 2
      src/views/meeting/weeklyRecords.vue

+ 2 - 2
src/views/meeting/weekly.vue

@@ -53,7 +53,7 @@
           </el-table-column>
           <el-table-column label="工作计划" prop="workPlan">
             <template slot-scope="scope">
-              <el-input size="mini" type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="scope.row.planContent" ></el-input>
+              <el-input size="mini" type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="scope.row.planContent" placeholder="请填写工作计划信息"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="预计完成时间" prop="completionTimes">
@@ -170,7 +170,7 @@ export default {
           this.workPlans = response.data.workPlan
         }else{
           this.workPlans=[{
-            planContent: '请填写工作计划信息',
+            planContent: '',
             id: null,
             meetingId: null,
             completionTimes: null,

+ 8 - 2
src/views/meeting/weeklyRecords.vue

@@ -43,7 +43,12 @@
           参会人员
         </template>
         <span v-if="m.innerAttendees!=''" v-for="(item,index) in JSON.parse(m.innerAttendees)">
-          {{ item.name }}
+          <el-badge is-dot v-if="item.flag==='1'">
+          &nbsp;&nbsp;&nbsp; {{ item.name }}
+          </el-badge>
+           <el-badge is-dot v-else type="info">
+          &nbsp;&nbsp;&nbsp; {{ item.name }}
+          </el-badge>
         </span>
       </el-descriptions-item>
       <el-descriptions-item >
@@ -238,6 +243,7 @@ export default {
       projects:[],
       row:null,
       workScoreVisible:false,
+      meetingConfirms:[]
     }
   },
   created() {
@@ -267,6 +273,7 @@ export default {
           this.tableData = res.data.workContent
           this.getSpanArr(this.tableData);
           this.m = res.data.meeting
+
         })
       } else {
         //获取当前周会会议id与所属周数
@@ -291,7 +298,6 @@ export default {
       }
 
     },
-
     objectSpanMethod({row, column, rowIndex, columnIndex}) {
       if (this.mergeArr.indexOf(column.property) !== -1) {
         // 判断其值是不是为0