|
@@ -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">
|
|
|
+ {{ 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">
|