|
@@ -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'">
|
|
|
+ {{ item.name }}
|
|
|
+ </el-badge>
|
|
|
+ <el-badge is-dot v-else type="info">
|
|
|
+ {{ 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
|