|
|
@@ -306,44 +306,51 @@
|
|
|
|
|
|
<el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" 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>
|
|
|
- <el-descriptions-item label="外部参会人员" v-if="pro.outAttendees!=''">
|
|
|
- {{ pro.outAttendees }}
|
|
|
+ <el-descriptions-item label="会议类型">
|
|
|
+ {{ pro.meetingType }}
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item label="记录人员" :span="2">
|
|
|
- {{ pro.recorder }}
|
|
|
+ <el-descriptions-item label="项目名称" :span="2">
|
|
|
+ {{ pro.meetingType }}
|
|
|
</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="pro.meetingConfirmStatus===1">
|
|
|
+ <el-badge is-dot type="success" v-if="pro.meetingConfirmStatus===1">
|
|
|
{{ item.name }}
|
|
|
</el-badge>
|
|
|
- <el-badge is-dot v-else type="info">
|
|
|
+ <el-badge is-dot v-else type="danger">
|
|
|
{{ item.name }}
|
|
|
</el-badge>
|
|
|
</span>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item label="参会情况">
|
|
|
- {{ pro.remark }}
|
|
|
+ <el-descriptions-item label="外部参会人员" v-if="pro.outAttendees!=''">
|
|
|
+ {{ pro.outAttendees }}
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item label="会议备注">
|
|
|
+ <el-descriptions-item label="主持人" >
|
|
|
+ {{ pro.emcee }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="记录人员" >
|
|
|
+ {{ pro.recorder }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <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=""></el-input>
|
|
|
+ </el-descriptions-item>
|
|
|
</el-descriptions>
|
|
|
|
|
|
<el-table style="width: 100%;margin: 0" border stripe :data="pro.meetingContents">
|
|
|
@@ -406,10 +413,10 @@
|
|
|
|
|
|
</el-table>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button v-if="pro.status!==0 && pro.meetingConfirmStatus===0" type="success" size="mini"
|
|
|
+ <el-button v-if="pro.status===2 && pro.meetingConfirmStatus===0" type="success" size="mini"
|
|
|
@click="confirmMeeting(pro)">会议结果确认
|
|
|
</el-button>
|
|
|
- <el-button size="mini" @click="closeProjectMeetingDailog">取消</el-button>
|
|
|
+ <el-button size="mini" @click="closeProjectMeetingDailog" v-show="false">取消</el-button>
|
|
|
<el-button size="mini" v-if="pro.meetingConfirmStatus===0" type="primary" class="title"
|
|
|
@click="submitMeetingOptionsForm(pro,'editForm')">保存
|
|
|
</el-button>
|