|
@@ -1,9 +1,9 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form ref="formInline" v-model="formInline" size="mini" :inline="true">
|
|
|
+ <el-form ref="formInline" v-model="formInline" size="mini" :inline="true">
|
|
|
<el-form-item label="会议类别:">
|
|
|
<el-radio-group v-model="formInline.meetingEternal" @input="chooseMeeting()">
|
|
|
- <el-radio-button label="0" value="0" >内部会议</el-radio-button>
|
|
|
+ <el-radio-button label="0" value="0">内部会议</el-radio-button>
|
|
|
<el-radio-button label="1" value="1">外部会议</el-radio-button>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
@@ -11,15 +11,15 @@
|
|
|
<el-input v-model="formInline.meetingName" placeholder="会议主题"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="会议类型:">
|
|
|
- <el-select v-model="formInline.meetingType" placeholder="会议类型" clearable >
|
|
|
- <el-option label="周例会" value="1" key="周例会">周例会</el-option>
|
|
|
+ <el-select v-model="formInline.meetingType" placeholder="会议类型" clearable>
|
|
|
+ <el-option label="周例会" value="1" key="周例会">周例会</el-option>
|
|
|
<el-option label="项目会议" value="2" key="项目会议">项目会议</el-option>
|
|
|
<el-option label="实施会议" value="3" key="实施会议">实施会议</el-option>
|
|
|
<el-option label="其他会议" value="4" key="其他会议">其他会议</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="会议状态:">
|
|
|
- <el-select v-model="formInline.status" placeholder="会议状态" clearable >
|
|
|
+ <el-select v-model="formInline.status" placeholder="会议状态" clearable>
|
|
|
<el-option label="待开始" value="0"></el-option>
|
|
|
<el-option label="进行中" value="1"></el-option>
|
|
|
<el-option label="已结束" value="2"></el-option>
|
|
@@ -27,7 +27,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
|
|
|
- <el-button icon="el-icon-refresh" @click="resetSearch()">重置</el-button>
|
|
|
+ <el-button icon="el-icon-refresh" @click="resetSearch()">重置</el-button>
|
|
|
<el-button type="success" icon="el-icon-plus" @click="createMeeting">创建会议</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
@@ -37,7 +37,7 @@
|
|
|
stripe
|
|
|
size="mini"
|
|
|
style="width: 100%">
|
|
|
- <el-table-column type="index" label="序号" width="60">
|
|
|
+ <el-table-column type="index" label="序号" width="60">
|
|
|
</el-table-column>
|
|
|
<el-table-column label="会议主题" prop="meetingName">
|
|
|
</el-table-column>
|
|
@@ -62,18 +62,18 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="name" label="会议时间" width="300">
|
|
|
<template scope="scope">
|
|
|
- <div>{{scope.row.beginTime}}——{{scope.row.endTime}}</div>
|
|
|
+ <div>{{ scope.row.beginTime }}——{{ scope.row.endTime }}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="address" label="参会人员">
|
|
|
- <template scope="scope">
|
|
|
- <span>{{scope.row.outAttendees}}</span>
|
|
|
- <span v-if="scope.row.outAttendees!=''">、</span>
|
|
|
- <span v-for="(item,index) in JSON.parse(scope.row.innerAttendees) ">
|
|
|
+ <template scope="scope">
|
|
|
+ <span>{{ scope.row.outAttendees }}</span>
|
|
|
+ <span v-if="scope.row.outAttendees!=''">、</span>
|
|
|
+ <span v-for="(item,index) in JSON.parse(scope.row.innerAttendees) ">
|
|
|
<template v-if="index > 0">,</template>
|
|
|
- <span>{{item.name}}</span>
|
|
|
+ <span>{{ item.name }}</span>
|
|
|
</span>
|
|
|
- </template>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="createTime" label="创建时间" width="150">
|
|
|
|
|
@@ -81,10 +81,14 @@
|
|
|
<el-table-column label="操作" prop="op" width="150">
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
- <el-button v-if="scope.row.status===0" size="mini" type="primary" @click="handleEdit(scope.row)">编辑</el-button>
|
|
|
- <el-button v-if="scope.row.status===0" size="mini" type="danger" @click="deleteMeeting( scope.row)">删除</el-button>
|
|
|
- <el-button v-if="scope.row.status===2" type="primary" size="mini" @click="confirmMeeting(scope.row)">结果确认</el-button>
|
|
|
- <el-button v-if="scope.row.status===1" type="primary" size="mini" @click="meetingDetail(scope.row)">会议详情</el-button>
|
|
|
+ <el-button v-if="scope.row.status===0" size="mini" type="primary" @click="handleEdit(scope.row)">编辑
|
|
|
+ </el-button>
|
|
|
+ <el-button v-if="scope.row.status===0" size="mini" type="danger" @click="deleteMeeting( scope.row)">删除
|
|
|
+ </el-button>
|
|
|
+ <el-button v-if="scope.row.status===2" type="primary" size="mini" @click="confirmMeeting(scope.row)">结果确认
|
|
|
+ </el-button>
|
|
|
+ <el-button v-if="scope.row.status===1" type="primary" size="mini" @click="meetingDetail(scope.row)">会议详情
|
|
|
+ </el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -93,7 +97,7 @@
|
|
|
<!--编辑会议窗体-->
|
|
|
<!-- 编辑界面 -->
|
|
|
<el-dialog :title="title" :visible.sync="editFormVisible" width="950px" @click="closeDialog">
|
|
|
- <el-form label-width="120px" ref="form" :model="editForm">
|
|
|
+ <el-form label-width="120px" ref="form" :model="editForm">
|
|
|
<el-form-item label="会议主题:">
|
|
|
<el-input size="small" v-model="editForm.meetingName"></el-input>
|
|
|
</el-form-item>
|
|
@@ -103,14 +107,28 @@
|
|
|
<el-radio :label="0">内部会议</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="会议类型:">
|
|
|
- <el-select v-model="editForm.meetingType" placeholder="会议类型" clearable>
|
|
|
- <el-option label="周例会" value="1" key="周例会">周例会</el-option>
|
|
|
- <el-option label="项目会议" value="2" key="项目会议">项目会议</el-option>
|
|
|
- <el-option label="实施会议" value="3" key="实施会议">实施会议</el-option>
|
|
|
- <el-option label="其他会议" value="4" key="其他会议">其他会议</el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+ <el-row :gutter="10">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="会议类型:">
|
|
|
+ <el-select v-model="editForm.meetingType" placeholder="会议类型" clearable>
|
|
|
+ <el-option label="周例会" :value="1" key="周例会">周例会</el-option>
|
|
|
+ <el-option label="项目会议" :value="2" key="项目会议">项目会议</el-option>
|
|
|
+ <el-option label="实施会议" :value="3" key="实施会议">实施会议</el-option>
|
|
|
+ <el-option label="其他会议" :value="4" key="其他会议">其他会议</el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="关联项目" v-if="editForm.meetingType===2">
|
|
|
+ <el-select
|
|
|
+ v-model="editForm.projectId"
|
|
|
+ clearable
|
|
|
+ style="width: 240px">
|
|
|
+ <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id"/>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
<el-form-item label="会议地点:">
|
|
|
<el-input size="small" v-model="editForm.meetingPlace"></el-input>
|
|
|
</el-form-item>
|
|
@@ -139,18 +157,19 @@
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="记录人:">
|
|
|
- <el-input size="small" v-model="editForm.recorder" :disabled="true" @keyup.enter.native="openUsers1('recorder')">
|
|
|
+ <el-input size="small" v-model="editForm.recorder" :disabled="true"
|
|
|
+ @keyup.enter.native="openUsers1('recorder')">
|
|
|
<el-button @click="openUsers1('recorder')" icon="el-icon-search" slot="append"></el-button>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="会议内容:">
|
|
|
<el-table
|
|
|
style="width: 100%" border stripe :show-header="false" :data="editForm.meetingContents">
|
|
|
- <el-table-column type="index" label="序号" width="40">
|
|
|
+ <el-table-column type="index" label="序号" width="40">
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="工作内容" prop="content" >
|
|
|
+ <el-table-column label="工作内容" prop="content">
|
|
|
<template scope="scope">
|
|
|
- <el-input size="mini" v-model="scope.row.content" ></el-input>
|
|
|
+ <el-input size="mini" v-model="scope.row.content"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" prop="op" width="150">
|
|
@@ -164,7 +183,8 @@
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button size="small" @click="closeDialog">取消</el-button>
|
|
|
- <el-button size="small" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">保存</el-button>
|
|
|
+ <el-button size="small" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">保存
|
|
|
+ </el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
@@ -195,31 +215,31 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" >
|
|
|
+ <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog">
|
|
|
<el-descriptions title="会议记录详情" border :column="2">
|
|
|
<el-descriptions-item label="会议主题">
|
|
|
- {{pro.meetingName}}
|
|
|
+ {{ pro.meetingName }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="会议类别">
|
|
|
- {{pro.external}}
|
|
|
+ {{ pro.external }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="会议类型">
|
|
|
- {{pro.meetingType}}
|
|
|
+ {{ pro.meetingType }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="会议地点">
|
|
|
- {{pro.meetingPlace}}
|
|
|
+ {{ pro.meetingPlace }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="会议时间">
|
|
|
- {{pro.times}}
|
|
|
+ {{ pro.times }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="外部参会人员" v-if="pro.outAttendees!=''">
|
|
|
- {{pro.outAttendees}}
|
|
|
+ {{ pro.outAttendees }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="记录人员" :span="2">
|
|
|
- {{pro.recorder}}
|
|
|
+ {{ pro.recorder }}
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="内部参会人员">
|
|
|
- {{pro.innerAttendees}}
|
|
|
+ {{ pro.innerAttendees }}
|
|
|
</el-descriptions-item>
|
|
|
|
|
|
</el-descriptions>
|
|
@@ -229,7 +249,7 @@
|
|
|
<el-table-column label="会议内容" prop="content"></el-table-column>
|
|
|
<el-table-column label="会议问题" prop="question">
|
|
|
<template scope="scope">
|
|
|
- <el-input size="mini" v-model="scope.row.question"></el-input>
|
|
|
+ <el-input size="mini" v-model="scope.row.question"></el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="会议方案" prop="optionss">
|
|
@@ -240,7 +260,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="执行人" width="180">
|
|
|
<template scope="scope">
|
|
|
- <el-input size="mini" v-model="scope.row.executorName" readonly @keyup.enter.native="openUsers1('executorName',scope.row)">
|
|
|
+ <el-input size="mini" v-model="scope.row.executorName" readonly
|
|
|
+ @keyup.enter.native="openUsers1('executorName',scope.row)">
|
|
|
<el-button @click="openUsers1('executorName',scope.row)" icon="el-icon-search" slot="append"></el-button>
|
|
|
</el-input>
|
|
|
</template>
|
|
@@ -248,13 +269,13 @@
|
|
|
<el-table-column label="周期时间" width="420">
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker size="mini"
|
|
|
- v-model="scope.row.times"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- format="yyyy-MM-dd"
|
|
|
- type="datetimerange"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期">
|
|
|
+ v-model="scope.row.times"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ format="yyyy-MM-dd"
|
|
|
+ type="datetimerange"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期">
|
|
|
</el-date-picker>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -277,12 +298,14 @@ import {
|
|
|
getMeetingDetailsById,
|
|
|
deleteMeetingContentById, saveMeetingOptionss, confirmMeetings
|
|
|
} from '@/api/meeting/meeting'
|
|
|
-import { getDeptUserTree } from '@/api/system/user'
|
|
|
+import {getDeptUserTree} from '@/api/system/user'
|
|
|
+import {getProjectList} from "@/api/task/project";
|
|
|
+
|
|
|
export default {
|
|
|
name: 'Meeting',
|
|
|
data() {
|
|
|
return {
|
|
|
- projectMeetingDetailVisble:false,
|
|
|
+ projectMeetingDetailVisble: false,
|
|
|
tableData: [],
|
|
|
pageparm: {
|
|
|
current: 1,
|
|
@@ -293,59 +316,60 @@ export default {
|
|
|
formInline: {
|
|
|
current: 1,
|
|
|
size: 10,
|
|
|
- meetingEternal:'0',
|
|
|
- meetingName:'',
|
|
|
- meetingType:null,
|
|
|
- status:null
|
|
|
+ meetingEternal: '0',
|
|
|
+ meetingName: '',
|
|
|
+ meetingType: null,
|
|
|
+ status: null
|
|
|
|
|
|
},
|
|
|
editFormVisible: false,
|
|
|
- title : '创建会议',
|
|
|
+ title: '创建会议',
|
|
|
editForm: {
|
|
|
- id:null,
|
|
|
+ id: null,
|
|
|
meetingName: '',
|
|
|
external: 0,
|
|
|
- meetingType : '1',
|
|
|
+ meetingType: '1',
|
|
|
+ projectId: null,
|
|
|
meetingPlace: '',
|
|
|
time: null,
|
|
|
- outAttendees : '',
|
|
|
+ outAttendees: '',
|
|
|
innerAttendees: '',
|
|
|
innerAttendesss: null,
|
|
|
- innerAttendUsers:'',
|
|
|
- emcee : '',
|
|
|
+ innerAttendUsers: '',
|
|
|
+ emcee: '',
|
|
|
recorder: '',
|
|
|
meetingContents: [
|
|
|
- {content: '会议内容','op':''}
|
|
|
+ {content: '会议内容', 'op': ''}
|
|
|
]
|
|
|
},
|
|
|
- usersVisble:false,
|
|
|
- userList:[],
|
|
|
- users1Visble:false,
|
|
|
- users1Flag:'',
|
|
|
- pro:{
|
|
|
- id:'',
|
|
|
- meetingName:'',
|
|
|
- meetingType:'',
|
|
|
- external:null,
|
|
|
- meetingPlace:'',
|
|
|
- times:'',
|
|
|
- outAttendees:'',
|
|
|
- innerAttendees:'',
|
|
|
- emcee:'',
|
|
|
- recorder:'',
|
|
|
- meetingContents:[{
|
|
|
- id:null,
|
|
|
- meetingId:null,
|
|
|
- content:'',
|
|
|
- question:'',
|
|
|
- optionss:'',
|
|
|
- executorName:'',
|
|
|
- executorId:null,
|
|
|
- beginTime:null,
|
|
|
- endTime:null,
|
|
|
- times:[]
|
|
|
+ usersVisble: false,
|
|
|
+ userList: [],
|
|
|
+ users1Visble: false,
|
|
|
+ users1Flag: '',
|
|
|
+ pro: {
|
|
|
+ id: '',
|
|
|
+ meetingName: '',
|
|
|
+ meetingType: '',
|
|
|
+ external: null,
|
|
|
+ meetingPlace: '',
|
|
|
+ times: '',
|
|
|
+ outAttendees: '',
|
|
|
+ innerAttendees: '',
|
|
|
+ emcee: '',
|
|
|
+ recorder: '',
|
|
|
+ meetingContents: [{
|
|
|
+ id: null,
|
|
|
+ meetingId: null,
|
|
|
+ content: '',
|
|
|
+ question: '',
|
|
|
+ optionss: '',
|
|
|
+ executorName: '',
|
|
|
+ executorId: null,
|
|
|
+ beginTime: null,
|
|
|
+ endTime: null,
|
|
|
+ times: []
|
|
|
}],
|
|
|
- row:null,
|
|
|
+ row: null,
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -358,7 +382,7 @@ export default {
|
|
|
this.getDeptUserTrees();
|
|
|
},
|
|
|
methods: {
|
|
|
- getDeptUserTrees(){
|
|
|
+ getDeptUserTrees() {
|
|
|
getDeptUserTree('').then(res => {
|
|
|
this.userList = res.data
|
|
|
});
|
|
@@ -369,26 +393,29 @@ export default {
|
|
|
this.formInline.size = parm.size
|
|
|
this.getData(this.formInline)
|
|
|
},
|
|
|
- getData(data){
|
|
|
- let searchParams=data
|
|
|
- getMeetingsByPage(searchParams).then(response=>{
|
|
|
+ getData(data) {
|
|
|
+ let searchParams = data
|
|
|
+ getMeetingsByPage(searchParams).then(response => {
|
|
|
this.tableData = response.data.records;
|
|
|
this.pageparm.total = response.data.total;
|
|
|
});
|
|
|
},
|
|
|
createMeeting() {
|
|
|
- this.title = '创建会议'
|
|
|
- this.editFormVisible = true
|
|
|
+ getProjectList("").then(res => {
|
|
|
+ this.projectList = res.data;
|
|
|
+ this.title = '创建会议'
|
|
|
+ this.editFormVisible = true
|
|
|
+ })
|
|
|
},
|
|
|
closeDialog() {
|
|
|
this.editFormVisible = false
|
|
|
},
|
|
|
- addRow(){
|
|
|
- let row={content: '','op':''}
|
|
|
+ addRow() {
|
|
|
+ let row = {content: '', 'op': ''}
|
|
|
this.editForm.meetingContents.push(row)
|
|
|
},
|
|
|
- deleteRow(index,row){
|
|
|
- if(index==0){
|
|
|
+ deleteRow(index, row) {
|
|
|
+ if (index == 0) {
|
|
|
this.$message({
|
|
|
message: '不能删除会议内容',
|
|
|
type: 'warning'
|
|
@@ -396,12 +423,12 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
this.editForm.meetingContents.splice(index, 1)
|
|
|
- deleteMeetingContentById(row.id).then(res =>{
|
|
|
+ deleteMeetingContentById(row.id).then(res => {
|
|
|
});
|
|
|
},
|
|
|
- submitForm(){
|
|
|
- let data=this.editForm;
|
|
|
- addMeeting(data).then(response => {
|
|
|
+ submitForm() {
|
|
|
+ let data = this.editForm;
|
|
|
+ addMeeting(data).then(response => {
|
|
|
this.$message({
|
|
|
message: '操作成功!',
|
|
|
type: 'success'
|
|
@@ -410,25 +437,25 @@ export default {
|
|
|
this.getData(this.formInline);
|
|
|
});
|
|
|
},
|
|
|
- resetSearch(){
|
|
|
- this.formInline={
|
|
|
+ resetSearch() {
|
|
|
+ this.formInline = {
|
|
|
current: 1,
|
|
|
size: 10,
|
|
|
- meetingEternal:0,
|
|
|
- meetingName:'',
|
|
|
- meetingType:null,
|
|
|
- status:null
|
|
|
+ meetingEternal: 0,
|
|
|
+ meetingName: '',
|
|
|
+ meetingType: null,
|
|
|
+ status: null
|
|
|
}
|
|
|
this.getData(this.formInline);
|
|
|
},
|
|
|
- search(){
|
|
|
- let searchParams=this.formInline
|
|
|
+ search() {
|
|
|
+ let searchParams = this.formInline
|
|
|
this.getData(searchParams);
|
|
|
},
|
|
|
- deleteMeeting(row){
|
|
|
+ deleteMeeting(row) {
|
|
|
//删除会议
|
|
|
- let id=row.id;
|
|
|
- deleteMeeting(id).then(()=>{
|
|
|
+ let id = row.id;
|
|
|
+ deleteMeeting(id).then(() => {
|
|
|
this.$message({
|
|
|
message: '操作成功!',
|
|
|
type: 'success'
|
|
@@ -436,9 +463,9 @@ export default {
|
|
|
this.getData(this.formInline);
|
|
|
})
|
|
|
},
|
|
|
- confirmMeeting(row){
|
|
|
- let id=row.id;
|
|
|
- confirmMeetings(id).then(res=>{
|
|
|
+ confirmMeeting(row) {
|
|
|
+ let id = row.id;
|
|
|
+ confirmMeetings(id).then(res => {
|
|
|
this.$message({
|
|
|
message: '操作成功!',
|
|
|
type: 'success'
|
|
@@ -447,61 +474,61 @@ export default {
|
|
|
});
|
|
|
|
|
|
},
|
|
|
- meetingDetail(row){
|
|
|
- let meetingType=row.meetingType
|
|
|
- if(meetingType===2){
|
|
|
- this.projectMeetingDetailVisble=true
|
|
|
- this.pro.meetingName=row.meetingName
|
|
|
- this.pro.outAttendees=row.outAttendees
|
|
|
- this.pro.innerAttendees=row.innerAttendees
|
|
|
- this.pro.recorder=row.recorder
|
|
|
- this.pro.times=row.beginTime+'至'+row.endTime
|
|
|
- this.pro.meetingPlace=row.meetingPlace
|
|
|
- let meetingType=row.meetingType
|
|
|
+ meetingDetail(row) {
|
|
|
+ let meetingType = row.meetingType
|
|
|
+ if (meetingType === 2) {
|
|
|
+ this.projectMeetingDetailVisble = true
|
|
|
+ this.pro.meetingName = row.meetingName
|
|
|
+ this.pro.outAttendees = row.outAttendees
|
|
|
+ this.pro.innerAttendees = row.innerAttendees
|
|
|
+ this.pro.recorder = row.recorder
|
|
|
+ this.pro.times = row.beginTime + '至' + row.endTime
|
|
|
+ this.pro.meetingPlace = row.meetingPlace
|
|
|
+ let meetingType = row.meetingType
|
|
|
//1-周例会,2-项目会议,3-实施会议,4-其他会议
|
|
|
- let meetingTypeNames='';
|
|
|
- if(meetingType===1){
|
|
|
- meetingTypeNames='周例会'
|
|
|
- }else if(meetingType===2){
|
|
|
- meetingTypeNames='项目会议'
|
|
|
- }else if(meetingType===3){
|
|
|
- meetingTypeNames='实施会议'
|
|
|
- }else{
|
|
|
- meetingTypeNames='其他会议'
|
|
|
+ let meetingTypeNames = '';
|
|
|
+ if (meetingType === 1) {
|
|
|
+ meetingTypeNames = '周例会'
|
|
|
+ } else if (meetingType === 2) {
|
|
|
+ meetingTypeNames = '项目会议'
|
|
|
+ } else if (meetingType === 3) {
|
|
|
+ meetingTypeNames = '实施会议'
|
|
|
+ } else {
|
|
|
+ meetingTypeNames = '其他会议'
|
|
|
}
|
|
|
- this.pro.meetingType=meetingTypeNames
|
|
|
- let external=row.external
|
|
|
- if(external===0){
|
|
|
- this.pro.external='内部会议'
|
|
|
- }else{
|
|
|
- this.pro.external='外部会议'
|
|
|
+ this.pro.meetingType = meetingTypeNames
|
|
|
+ let external = row.external
|
|
|
+ if (external === 0) {
|
|
|
+ this.pro.external = '内部会议'
|
|
|
+ } else {
|
|
|
+ this.pro.external = '外部会议'
|
|
|
}
|
|
|
- let innerAttendees=JSON.parse(row.innerAttendees);
|
|
|
- let innerPeople='';
|
|
|
- for(let i=0;i<innerAttendees.length;i++){
|
|
|
- innerPeople+=innerAttendees[i].name+'、'
|
|
|
+ let innerAttendees = JSON.parse(row.innerAttendees);
|
|
|
+ let innerPeople = '';
|
|
|
+ for (let i = 0; i < innerAttendees.length; i++) {
|
|
|
+ innerPeople += innerAttendees[i].name + '、'
|
|
|
}
|
|
|
- innerPeople=innerPeople.substring(0,innerPeople.length-1);
|
|
|
- this.pro.innerAttendees=innerPeople
|
|
|
- let meetingId=row.id
|
|
|
+ innerPeople = innerPeople.substring(0, innerPeople.length - 1);
|
|
|
+ this.pro.innerAttendees = innerPeople
|
|
|
+ let meetingId = row.id
|
|
|
getMeetingDetailsById(meetingId).then(res => {
|
|
|
- let data=res.data.meetingContents
|
|
|
- this.pro.meetingContents=data
|
|
|
+ let data = res.data.meetingContents
|
|
|
+ this.pro.meetingContents = data
|
|
|
});
|
|
|
|
|
|
}
|
|
|
},
|
|
|
- openUsers(){
|
|
|
- this.usersVisble=true
|
|
|
+ openUsers() {
|
|
|
+ this.usersVisble = true
|
|
|
},
|
|
|
- closeUserDialog(){
|
|
|
- this.usersVisble=false
|
|
|
+ closeUserDialog() {
|
|
|
+ this.usersVisble = false
|
|
|
},
|
|
|
- submitUserForm(){
|
|
|
+ submitUserForm() {
|
|
|
//获取选中的节点
|
|
|
- let node=this.$refs.dept.getCheckedNodes();
|
|
|
+ let node = this.$refs.dept.getCheckedNodes();
|
|
|
|
|
|
- if(node==undefined || node==null ||node.length===0){
|
|
|
+ if (node == undefined || node == null || node.length === 0) {
|
|
|
this.$message({
|
|
|
message: '请选择人员数据!',
|
|
|
type: 'warning'
|
|
@@ -509,20 +536,20 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
let userList = []
|
|
|
- let userName=''
|
|
|
- let saveUsers=[]
|
|
|
- node.forEach(item=>{
|
|
|
- if(item.type==='u'){
|
|
|
+ let userName = ''
|
|
|
+ let saveUsers = []
|
|
|
+ node.forEach(item => {
|
|
|
+ if (item.type === 'u') {
|
|
|
userList.push(item);
|
|
|
- userName+=item.name+'、';
|
|
|
+ userName += item.name + '、';
|
|
|
saveUsers.push({
|
|
|
id: item.id,
|
|
|
name: item.name
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
- userName=userName.substring(0,userName.length-1);
|
|
|
- if(userList.length===0){
|
|
|
+ userName = userName.substring(0, userName.length - 1);
|
|
|
+ if (userList.length === 0) {
|
|
|
this.$message({
|
|
|
message: '请选择人员!',
|
|
|
type: 'warning'
|
|
@@ -530,84 +557,86 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
this.closeUserDialog()
|
|
|
- this.editForm.innerAttendUsers=userName
|
|
|
- this.editForm.innerAttendesss=saveUsers
|
|
|
+ this.editForm.innerAttendUsers = userName
|
|
|
+ this.editForm.innerAttendesss = saveUsers
|
|
|
},
|
|
|
- closeUser1Dialog(){
|
|
|
- this.users1Visble=false
|
|
|
+ closeUser1Dialog() {
|
|
|
+ this.users1Visble = false
|
|
|
},
|
|
|
- openUsers1(data,row){
|
|
|
- this.users1Visble=true
|
|
|
- this.users1Flag=data
|
|
|
- this.pro.row=row
|
|
|
+ openUsers1(data, row) {
|
|
|
+ this.users1Visble = true
|
|
|
+ this.users1Flag = data
|
|
|
+ this.pro.row = row
|
|
|
|
|
|
},
|
|
|
- submitUser1Form(){
|
|
|
- let node=this.$refs.dept1.getCurrentNode();
|
|
|
- if(node==undefined || node==null){
|
|
|
+ submitUser1Form() {
|
|
|
+ let node = this.$refs.dept1.getCurrentNode();
|
|
|
+ if (node == undefined || node == null) {
|
|
|
this.$message({
|
|
|
message: '请选择数据!',
|
|
|
type: 'warning'
|
|
|
});
|
|
|
return;
|
|
|
}
|
|
|
- if(node.type!=='u') {
|
|
|
+ if (node.type !== 'u') {
|
|
|
this.$message({
|
|
|
message: '请选择人员!',
|
|
|
type: 'warning'
|
|
|
});
|
|
|
return;
|
|
|
}
|
|
|
- let user1Flag=this.users1Flag;
|
|
|
- if(user1Flag==='emcee'){
|
|
|
- this.editForm.emcee=node.name
|
|
|
- }else if(user1Flag==='executorName'){
|
|
|
- let row=this.pro.row
|
|
|
- row.executorName=node.name
|
|
|
- row.executorId=node.id
|
|
|
- this.pro.meetingContents.executorName=node.name
|
|
|
- this.pro.meetingContents.executorId=node.id
|
|
|
+ let user1Flag = this.users1Flag;
|
|
|
+ if (user1Flag === 'emcee') {
|
|
|
+ this.editForm.emcee = node.name
|
|
|
+ } else if (user1Flag === 'executorName') {
|
|
|
+ let row = this.pro.row
|
|
|
+ row.executorName = node.name
|
|
|
+ row.executorId = node.id
|
|
|
+ this.pro.meetingContents.executorName = node.name
|
|
|
+ this.pro.meetingContents.executorId = node.id
|
|
|
|
|
|
- }
|
|
|
- else{
|
|
|
- this.editForm.recorder=node.name
|
|
|
+ } else {
|
|
|
+ this.editForm.recorder = node.name
|
|
|
}
|
|
|
|
|
|
this.closeUser1Dialog()
|
|
|
},
|
|
|
- handleEdit(row){
|
|
|
+ handleEdit(row) {
|
|
|
+ getProjectList("").then(res => {
|
|
|
+ this.projectList = res.data;
|
|
|
+ })
|
|
|
getMeetingDetailsById(row.id).then(res => {
|
|
|
- let data=res.data
|
|
|
- this.editForm=data
|
|
|
- let users=JSON.parse(data.innerAttendees)
|
|
|
- this.editForm.innerAttendees=''
|
|
|
- for(let i=0;i<users.length;i++){
|
|
|
- this.editForm.innerAttendees+=users[i].name+','
|
|
|
+ let data = res.data
|
|
|
+ this.editForm = data
|
|
|
+ let users = JSON.parse(data.innerAttendees)
|
|
|
+ this.editForm.innerAttendees = ''
|
|
|
+ for (let i = 0; i < users.length; i++) {
|
|
|
+ this.editForm.innerAttendees += users[i].name + ','
|
|
|
}
|
|
|
- this.editForm.innerAttendees= this.editForm.innerAttendees.substring(0,this.editForm.innerAttendees.length-1)
|
|
|
- this.editForm.innerAttendesss=users;
|
|
|
- this.editForm.innerAttendUsers=this.editForm.innerAttendees
|
|
|
- this.editForm.meetingType=data.meetingType
|
|
|
- let time=[];
|
|
|
+ this.editForm.innerAttendees = this.editForm.innerAttendees.substring(0, this.editForm.innerAttendees.length - 1)
|
|
|
+ this.editForm.innerAttendesss = users;
|
|
|
+ this.editForm.innerAttendUsers = this.editForm.innerAttendees
|
|
|
+ this.editForm.meetingType = data.meetingType
|
|
|
+ let time = [];
|
|
|
time.push(data.beginTime);
|
|
|
time.push(data.endTime);
|
|
|
- this.editForm.time=time;
|
|
|
+ this.editForm.time = time;
|
|
|
this.title = '修改会议'
|
|
|
this.editFormVisible = true
|
|
|
});
|
|
|
},
|
|
|
- chooseMeeting(){
|
|
|
- let val=this.formInline.meetingEternal;
|
|
|
- let search=this.formInline
|
|
|
- search.meetingEternal=val;
|
|
|
+ chooseMeeting() {
|
|
|
+ let val = this.formInline.meetingEternal;
|
|
|
+ let search = this.formInline
|
|
|
+ search.meetingEternal = val;
|
|
|
this.getData(search)
|
|
|
},
|
|
|
- closeProjectMeetingDailog(){
|
|
|
- this.projectMeetingDetailVisble=false;
|
|
|
+ closeProjectMeetingDailog() {
|
|
|
+ this.projectMeetingDetailVisble = false;
|
|
|
},
|
|
|
- submitMeetingOptionsForm(){
|
|
|
- let data=this.pro.meetingContents;
|
|
|
- saveMeetingOptionss(data).then(res =>{
|
|
|
+ submitMeetingOptionsForm() {
|
|
|
+ let data = this.pro.meetingContents;
|
|
|
+ saveMeetingOptionss(data).then(res => {
|
|
|
this.$message({
|
|
|
message: '操作成功!',
|
|
|
type: 'info'
|