Skip to content

M
meet
Commit b34972b9 authored by wangqinghua's avatar wangqinghua
Browse files
Options

会议意向

parent 0228dad9
Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 61 deletions
src/api/api.js
View file @ b34972b9
...@@ -60,6 +60,13 @@ export const removeMeetingById = params =>req('get','/meeting/removeMeetingById ...@@ -60,6 +60,13 @@ export const removeMeetingById = params =>req('get','/meeting/removeMeetingById
//根据ID获取会议 //根据ID获取会议
export const getMeetingById = params =>req('get','/meeting/getMeetingById',params); export const getMeetingById = params =>req('get','/meeting/getMeetingById',params);
//根据ID结束会议
export const meetEnd = params =>req('get','/meeting/end',params);
//获取所有未上会的意向数据
export const getIntentionOfUnUse = params =>req('get','/intention/getIntentionOfUnUse',params);
......
src/components/addCode.vue
View file @ b34972b9
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
ips: "", ips: "",
} }
this.attendPerson = "" this.attendPerson = ""
this.dialogFormVisible = false
}, },
//选择列席人员 //选择列席人员
selectPerson(){ selectPerson(){
......
src/components/attendList.vue
View file @ b34972b9
<!--选择添加议程--> <!--选择意向-->
<template> <template>
<div class="select-intention"> <div class="select-intention">
<el-dialog title="选择意向" :visible.sync="dialogFormVisible"> <el-dialog title="选择意向" :visible.sync="dialogFormVisible">
......
src/components/selectIntentionDialog.vue
View file @ b34972b9
<!--选择添加议程--> <!--选择意向-->
<template> <template>
<div class="select-intention"> <div class="select-intention">
<el-dialog title="选择意向" :visible.sync="dialogFormVisible"> <el-dialog title="选择意向" :visible.sync="dialogFormVisible">
<el-table <el-table
:data="tableData3" :data="tableData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
...@@ -17,28 +17,25 @@ ...@@ -17,28 +17,25 @@
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="title"
label="意向主题" label="意向主题"
width="120"> show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.date }}</template>
</el-table-column>
<el-table-column
prop="name"
label="汇报处室"
width="120">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address"
label="附件名称" label="附件名称"
show-overflow-tooltip> width="300">
<template slot-scope="scope">
<p v-for="item of scope.row.accessories">{{ item.name }}</p>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="remark"
label="备注" label="备注"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div slot="footer" class="dialog-footer text-center"> <div slot="footer" class="dialog-footer text-center">
<el-button size="small" @click="dialogFormVisible = false">添加</el-button> <el-button size="small" @click="done">添加</el-button>
<el-button size="small" @click="dialogFormVisible = false">关闭</el-button> <el-button size="small" @click="dialogFormVisible = false">关闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -46,49 +43,31 @@ ...@@ -46,49 +43,31 @@
</template> </template>
<script> <script>
import {getIntentionOfUnUse} from '../api/api'
export default { export default {
name: "select-intention-dialog", name: "select-intention-dialog",
data() { data() {
return { return {
dialogFormVisible:false, dialogFormVisible:false,
tableData3: [{ tableData: [],
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-08',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-06',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-07',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}],
multipleSelection: [] multipleSelection: []
} }
}, },
methods:{ methods:{
handleSelectionChange(val) { handleSelectionChange(val) {
console.log(val) console.log(val)
this.multipleSelection = val
}, },
showDialog(){ showDialog(){
this.dialogFormVisible = true; this.dialogFormVisible = true;
getIntentionOfUnUse().then(
(res)=>{
this.tableData = res.data
}
)
},
done(){
this.$emit('update',this.multipleSelection)
} }
} }
} }
......
src/components/selectSpecialAgenda.vue 0 → 100644
View file @ b34972b9
<!--选择意向-->
<template>
<div class="select-intention">
<el-dialog title="选择意向" :visible.sync="dialogFormVisible">
<el-table
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
label="序号"
type="index"
width="55">
</el-table-column>
<el-table-column
prop="title"
label="代码名称"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="URL"
width="300">
<template slot-scope="scope">
<p v-for="item of scope.row.accessories">{{ item.name }}</p>
</template>
</el-table-column>
<el-table-column
prop="remark"
label="备注"
show-overflow-tooltip>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer text-center">
<el-button size="small" @click="done">添加</el-button>
<el-button size="small" @click="dialogFormVisible = false">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {getSpecialAgendaList} from '../api/api'
export default {
name: "select-special-agenda",
data() {
return {
dialogFormVisible:false,
tableData: [],
multipleSelection: []
}
},
methods:{
handleSelectionChange(val) {
this.multipleSelection = val
},
showDialog(){
this.dialogFormVisible = true;
getSpecialAgendaList().then(
(res)=>{
this.tableData = res.data
}
)
},
done(){
this.dialogFormVisible = false
this.$emit('update',this.multipleSelection[0])
}
}
}
</script>
<style scoped>
</style>
src/components/specialDialog.vue 0 → 100644
View file @ b34972b9
<!--特殊议程-->
<template>
<div class="code">
<el-dialog :title="title" :visible.sync="dialogFormVisible" :before-close="initForm">
<el-checkbox @change="changeCheck" v-model="checked">特殊议程</el-checkbox>
<el-form :model="form" :rules="rules" ref="form" label-width="100px">
<el-form-item label="议程主题" prop="title" :label-width="formLabelWidth">
<el-input v-model="form.title" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="汇报处室" prop="url" :label-width="formLabelWidth">
<el-input v-model="form.url" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="备注" prop="reportDep" :label-width="formLabelWidth">
<el-input v-model="form.reportDep" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="列席人员" :label-width="formLabelWidth">
<el-input :disabled="true" v-model="attendPerson" autocomplete="off">
<el-button @click="selectPerson" slot="append">选择</el-button>
</el-input>
</el-form-item>
<el-form-item label="相关附件" :label-width="formLabelWidth">
<el-upload
class="upload-demo"
ref="upload"
action=""
:on-change="handleUpload"
:file-list="fileList"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
</el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="initForm">取 消</el-button>
<el-button size="small" type="primary" @click="submitForm('form')">确 定</el-button>
</div>
</el-dialog>
<attend-list ref="attendList" @select="getPerson"></attend-list>
<select-special-agenda ref="selectSpecialAgenda" @update="getInfo"></select-special-agenda>
</div>
</template>
<script>
import {updateSpecialAgenda, addSpecialAgenda,getSpecialAgendaById} from "../api/api"
import AttendList from "./attendList";
import SelectSpecialAgenda from "./selectSpecialAgenda";
export default {
components: {
SelectSpecialAgenda,
AttendList},
name: "special-dialog",
data() {
return {
checked:"",
fileList:[],
title: "",
id:"",
attendPerson:"",
linkSpecial:"",
form: {
title: "",
reportDep: "",
linkAttends: null,
remark:"",
},
rules:{
title:[{required:true,message:"请输入议程名称",trigger:'blur'},{min:1,max:20,message:'长度在1到20个字符之间',trigger:'blur'}]
},
dialogFormVisible: false,
formLabelWidth: "100px"
}
},
methods: {
showAddDialog(title) {
this.title = title
this.dialogFormVisible = true
},
showEditDialog(title, item) {
this.title = title
this.id = item.id
this.attendPerson = item.attendPerson
this.dialogFormVisible = true
getSpecialAgendaById({id:item.id}).then(
(res)=>{
this.form.title = res.data.title;
this.form.url = res.data.url;
this.form.reportDep = res.data.reportDep;
this.form.linkAttends = res.data.linkAttends;
this.form.ips = res.data.ips;
}
)
},
initForm() {
this.$refs['form'].resetFields();
this.form = {
title: "",
url: "",
reportDep: "",
attendPerson: "",
ips: "",
}
this.attendPerson = ""
this.dialogFormVisible = false
},
//选择列席人员
selectPerson(){
this.$refs.attendList.showDialog()
},
handleUpload(){
},
//选择特殊议程
changeCheck(){
console.log('chenge')
if(this.checked){
this.$refs.selectSpecialAgenda.showDialog()
}else{
this.form.title = ""
this.form.remark = ""
this.form.linkAttends = ""
}
},
//获取特殊议程
getInfo(data){
this.form.title = data.title
this.form.remark = data.remark
this.form.linkAttends = data.linkAttends
this.linkSpecial = data.id
},
getPerson(data){
this.attendPerson = ""
this.form.linkAttends = data.map(e=>{
this.attendPerson += e.name +","
const d = {
attendId:e.id
}
return d
});
this.attendPerson = this.attendPerson.substr(0,this.attendPerson.length -1)
},
//提交
submitForm(formName) {
this.$refs[formName].validate((valid)=>{
console.log(valid)
console.log(this.form)
if(valid){
if (this.title == "添加议程") {
addSpecialAgenda(this.form).then(
(res) => {
this.dialogFormVisible = false;
this.$message.success('添加成功')
this.$emit('update', res.data)
this.form.name = ""
this.initForm()
}
)
} else {
this.form.id = this.id
updateSpecialAgenda(this.form).then(
(res) => {
this.dialogFormVisible = false;
this.$emit('update', res.data)
this.$message.success('编辑成功')
this.form.name = ""
this.initForm()
}
)
}
}else{
return false
}
})
}
}
}
</script>
<style scoped>
</style>
src/http.js/http.js
View file @ b34972b9
...@@ -6,8 +6,8 @@ import {Message} from 'element-ui'; ...@@ -6,8 +6,8 @@ import {Message} from 'element-ui';
//axios配置 //axios配置
let instance = axios.create({ let instance = axios.create({
baseURL: '/api/', baseURL:'/api/',
timeout: 20000, timeout:20000,
}); });
//http request 拦截器 //http request 拦截器
......
src/views/meetManage.vue
View file @ b34972b9
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<p>意向/议程信息</p> <p>意向/议程信息</p>
<el-row> <el-row>
<el-col class="text-right" :offset="16" :span="8"> <el-col class="text-right" :offset="16" :span="8">
<el-button size="small" plain>添加议程</el-button> <el-button @click="showAgendaDialog" size="small" plain>添加议程</el-button>
<el-button @click="showDialog" size="small" plain>添加意向</el-button> <el-button @click="showDialog" size="small" plain>添加意向</el-button>
</el-col> </el-col>
</el-row> </el-row>
...@@ -130,13 +130,14 @@ ...@@ -130,13 +130,14 @@
<el-button size="small" plain>导出</el-button> <el-button size="small" plain>导出</el-button>
<el-button @click="showIndexDialog" size="small" plain>议程排序</el-button> <el-button @click="showIndexDialog" size="small" plain>议程排序</el-button>
<el-button size="small" plain>办结</el-button> <el-button size="small" plain>办结</el-button>
<el-button size="small" plain>结束</el-button> <el-button @click="doEnd" size="small" plain>结束</el-button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<select-intention-dialog ref="selectIntentionDialog"></select-intention-dialog> <select-intention-dialog ref="selectIntentionDialog" @update="selectIntention"></select-intention-dialog>
<index-dialog ref="indexDialog"></index-dialog> <index-dialog ref="indexDialog"></index-dialog>
<special-dialog ref="specialDialog" @update="getAgenda"></special-dialog>
</div> </div>
</template> </template>
...@@ -144,9 +145,11 @@ ...@@ -144,9 +145,11 @@
import ElRow from "element-ui/packages/row/src/row"; import ElRow from "element-ui/packages/row/src/row";
import SelectIntentionDialog from "../components/selectIntentionDialog"; import SelectIntentionDialog from "../components/selectIntentionDialog";
import IndexDialog from "../components/indexDialog"; import IndexDialog from "../components/indexDialog";
import {addMeeting,updateMeeting,getMeetingById} from "../api/api" import {addMeeting,updateMeeting,getMeetingById,meetEnd} from "../api/api"
import SpecialDialog from "../components/specialDialog";
export default { export default {
components: { components: {
SpecialDialog,
IndexDialog, IndexDialog,
SelectIntentionDialog, SelectIntentionDialog,
ElRow ElRow
...@@ -196,6 +199,19 @@ ...@@ -196,6 +199,19 @@
showIndexDialog() { showIndexDialog() {
this.$refs.indexDialog.showDialog("议程排序") this.$refs.indexDialog.showDialog("议程排序")
}, },
//选择议程窗口
showAgendaDialog(){
this.$refs.specialDialog.showAddDialog()
},
//选择意向
selectIntention(data){
this.tableData = data
},
//选择议程
getAgenda(data){
this.form.agendaList = data
},
//保存
save(){ save(){
if(this.item){ if(this.item){
this.update() this.update()
...@@ -203,6 +219,7 @@ ...@@ -203,6 +219,7 @@
this.create() this.create()
} }
}, },
//创建
create(){ create(){
addMeeting(this.form).then( addMeeting(this.form).then(
(res)=>{ (res)=>{
...@@ -210,12 +227,21 @@ ...@@ -210,12 +227,21 @@
} }
) )
}, },
//修改
update(){ update(){
updateMeeting(this.form).then( updateMeeting(this.form).then(
(res)=>{ (res)=>{
} }
) )
},
//结束会议
doEnd(){
meetEnd({id:this.item.id}).then(
(res)=>{
}
)
} }
} }
} }
......
src/views/sidebar.vue
View file @ b34972b9
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</template> </template>
<el-menu-item-group> <el-menu-item-group>
<el-menu-item index="3-1"> <el-menu-item index="3-1">
<router-link to="/agenda">特殊会议</router-link> <router-link to="/agenda">特殊议程</router-link>
</el-menu-item> </el-menu-item>
<el-menu-item index="3-2"> <el-menu-item index="3-2">
<router-link to="/attend">列席信息</router-link> <router-link to="/attend">列席信息</router-link>
......
src/views/viewFile.vue
View file @ b34972b9
<template> <template>
<div class="view-file"> <div class="view-file">
<!--<canvas v-for="page in pages" :id="'the-canvas'+page" :key="page"></canvas>--> <canvas v-for="page in pages" :id="'the-canvas'+page" :key="page"></canvas>
<el-row class="margin-20-0"> <el-row class="margin-20-0">
<el-col class="left" :span="12"> <el-col class="left" :span="12">
<div class="text-center"> <div class="text-center">
...@@ -30,14 +30,14 @@ ...@@ -30,14 +30,14 @@
<el-col :span="12"> <el-col :span="12">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-select size="small" v-model="value" placeholder="请选择"> <!--<el-select size="small" placeholder="请选择">-->
<el-option <!--<el-option-->
v-for="item in options" <!--v-for="item in options"-->
:key="item.value" <!--:key="item.value"-->
:label="item.label" <!--:label="item.label"-->
:value="item.value"> <!--:value="item.value">-->
</el-option> <!--</el-option>-->
</el-select> <!--</el-select>-->
</el-col> </el-col>
<el-col class="text-center" :span="18"> <el-col class="text-center" :span="18">
议程主题 议程主题
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
}) })
}, },
loadFile (url) { loadFile (url) {
console.log(url)
let _this = this let _this = this
PDFJS.getDocument(url).then(function (pdf) { PDFJS.getDocument(url).then(function (pdf) {
_this.pdfDoc = pdf _this.pdfDoc = pdf
...@@ -107,8 +108,8 @@ ...@@ -107,8 +108,8 @@
} }
}, },
mounted () { mounted () {
let url = 'http://storage.xuetangx.com/public_assets/xuetangx/PDF/1.xls' let url = '/api/common/file/download?fileName=invoice.pdf'
// this.loadFile(url) this.loadFile(url)
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment