Skip to content

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

会议意向

parent 1211f3de
Hide whitespace changes
Inline Side-by-side
Showing with 331 additions and 243 deletions
src/api/api.js
View file @ 0228dad9
...@@ -45,6 +45,20 @@ export const updateIntention = params =>req('post','/intention/updateIntention' ...@@ -45,6 +45,20 @@ export const updateIntention = params =>req('post','/intention/updateIntention'
//根据ID获取意向 //根据ID获取意向
export const getIntentionById = params =>req('get','/intention/getIntentionById',params); export const getIntentionById = params =>req('get','/intention/getIntentionById',params);
//会议分页列表
export const getMeetingPage = params =>req('get','/meeting/getMeetingPage',params);
//添加会议
export const addMeeting = params =>req('post','/meeting/addMeeting',params);
//编辑会议
export const updateMeeting = params =>req('post','/meeting/updateMeeting',params);
//根据ID删除会议
export const removeMeetingById = params =>req('get','/meeting/removeMeetingById',params);
//根据ID获取会议
export const getMeetingById = params =>req('get','/meeting/getMeetingById',params);
......
src/components/intentionDialog.vue
View file @ 0228dad9
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
console.log('close') console.log('close')
this.$refs.form.resetFields() this.$refs.form.resetFields()
this.dialogFormVisible = false this.dialogFormVisible = false
this.fileList = []
}, },
handleUpload(file,fileList){ handleUpload(file,fileList){
const formData = new FormData() const formData = new FormData()
......
src/views/intention.vue
View file @ 0228dad9
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
this.$refs.intentionDialog.showDialog() this.$refs.intentionDialog.showDialog()
}, },
handleEdit(row){ handleEdit(row){
this.$refs.intentionDialog.editDialog('6414075e02444a27a4eec0d6d22bbfd7') this.$refs.intentionDialog.editDialog('03f273003a794249b0001f0622631a17')
}, },
handleDelete(){ handleDelete(){
......
src/views/meetList.vue
View file @ 0228dad9
<!--会议列表--> <!--会议列表-->
<template> <template>
<div class="meetList"> <div class="meetList">
<p class="margin-20-0">当前位置：部务会议程管理 - 部务会会议列表</p> <p class="margin-20-0">当前位置：部务会议程管理 - 部务会会议列表</p>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<span>会议名称：</span> <span>会议名称：</span>
<el-input style="width: 180px;" size="small" <el-input style="width: 180px;" size="small"
placeholder="会议名称" placeholder="会议名称"
v-model="input1"> v-model="form.title">
</el-input> </el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<span>会议日期：</span> <span>会议日期：</span>
<el-date-picker size="small" v-model="input1" type="date" placeholder="选择日期"> <el-date-picker size="small" v-model="form.meetingDate" type="date" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-col> </el-col>
<el-col class="text-right" :span="8"> <el-col class="text-right" :span="8">
<el-button size="small" plain> 查 询 </el-button> <el-button size="small" @click="search" plain> 查 询</el-button>
<el-button size="small" plain>新增会议</el-button> <el-button size="small" @click="handleAdd" plain>新增会议</el-button>
</el-col> </el-col>
</el-row> </el-row>
<div class="margin-20-0"> <div class="margin-20-0">
...@@ -29,16 +28,16 @@ ...@@ -29,16 +28,16 @@
width="90"> width="90">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="title"
label="会议名称" label="会议名称"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="meetingTime"
label="会议日期"> label="会议日期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="remark"
cell-class-name="text-center" cell-class-name="text-center"
label="备注"> label="备注">
</el-table-column> </el-table-column>
...@@ -46,15 +45,14 @@ ...@@ -46,15 +45,14 @@
prop="address" prop="address"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="font-size-20"> <span class="font-size-20 pointer">
<i @click="handleEdit(scope.row)" class="el-icon-edit-outline margin-right-10"></i> <i @click="handleEdit(scope.row)" class="el-icon-edit-outline margin-right-10"></i>
<i class="el-icon-view margin-right-10"></i>
<i @click="handleDelete(scope.row)" class="el-icon-delete"></i> <i @click="handleDelete(scope.row)" class="el-icon-delete"></i>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="margin-20-0 text-center"> <div class="margin-20-0 text-center">
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -70,67 +68,73 @@ ...@@ -70,67 +68,73 @@
</template> </template>
<script> <script>
import {getMeetingPage,removeMeetingById} from '../api/api'
export default { export default {
name: "meet-list", name: "meet-list",
data(){ data() {
return { return {
currentPage:1, currentPage: 1,
input1:"", input1: "",
tableData: [ form: {
{ pageNo: '1',
date: '2016-05-02', pageSize: '10',
name: '王小虎', title: null,
province: '上海', meetingDate: null
city: '普陀区', },
address: '上海市普陀区金沙江路 1518 弄', tableData: [],
zip: 200333,
tag: '家'
}, {
date: '2016-05-04',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1517 弄',
zip: 200333,
tag: '公司'
}, {
date: '2016-05-01',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1519 弄',
zip: 200333,
tag: '家'
}, {
date: '2016-05-03',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333,
tag: '公司'
}],
} }
}, },
methods:{ mounted() {
this.getList()
},
methods: {
getList() {
getMeetingPage(this.form).then(
(res) => {
this.tableData = res.data.data
}
)
},
search() {
this.form.pageNo = '1'
this.getList()
},
//更改每页条数 //更改每页条数
handleSizeChange(){ handleSizeChange() {
}, },
handleCurrentChange(){}, //翻页
handleCurrentChange() {
},
//新增会议
handleAdd(){
this.$router.push({
path: '/meetManage',
})
},
//去编辑页面 //去编辑页面
handleEdit(row){ handleEdit(row) {
this.$router.push({ this.$router.push({
path:'/meetManage', path: '/meetManage',
query:{ query: {item: row}
item:row
}
}) })
}, },
//删除 //删除
handleDelete(row){ handleDelete(row) {
this.$confirm('确定删除该会议?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
removeMeetingById({id:row.id}).then(
(res)=>{
this.getList()
this.$message.success("删除成功")
}
)
})
} }
} }
} }
......
src/views/meetManage.vue
View file @ 0228dad9
<template> <template>
<div class="meet-manage"> <div class="meet-manage">
<div> <div>
<div class="info"> <div class="info">
<div class="border padding-10-20 margin-top-15"> <div class="border padding-10-20 margin-top-15">
<p>会议信息</p> <p>会议信息</p>
<el-row class="margin-top-15"> <el-row class="margin-top-15">
<el-col :span="16"> <el-col :span="16">
<span>会议名称：</span> <span>会议名称：</span>
<el-input style="width:70%" size="small" <el-input style="width:70%" size="small"
placeholder="会议名称" placeholder="会议名称"
v-model="input1"> v-model="form.title">
</el-input> </el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<span>&nbsp;次&nbsp;序&nbsp;数：</span> <span>&nbsp;次&nbsp;序&nbsp;数：</span>
<el-input style="width: 220px;" size="small" <el-input style="width: 220px;" size="small"
placeholder="次序数" placeholder="次序数"
v-model="input1"> v-model="form.meetingSort">
</el-input> </el-input>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="margin-top-15"> <el-row class="margin-top-15">
<el-col :span="8"> <el-col :span="8">
<span>&nbsp;发&nbsp;起&nbsp;人：</span> <span>&nbsp;发&nbsp;起&nbsp;人：</span>
<el-input style="width: 220px;" size="small" <el-input style="width: 220px;" size="small"
placeholder="发起人" placeholder="发起人"
v-model="input1"> v-model="form.initiator">
</el-input> </el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<span>发起处室：</span> <span>发起处室：</span>
<el-input style="width: 220px;" size="small" <el-input style="width: 220px;" size="small"
placeholder="发起处室" placeholder="发起处室"
v-model="input1"> v-model="form.initDepartment">
</el-input> </el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<span>会议时间：</span> <span>会议时间：</span>
<el-date-picker <el-date-picker
v-model="input1" v-model="form.meetingTime"
type="datetime" type="datetime"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-col> </el-col>
</el-row> </el-row>
<el-row class="margin-top-15"> <el-row class="margin-top-15">
<el-col :span="8"> <el-col :span="8">
<span>会议地点：</span> <span>会议地点：</span>
<el-input style="width: 220px;" size="small" <el-input style="width: 220px;" size="small"
placeholder="会议地点" placeholder="会议地点"
v-model="input1"> v-model="form.meetingAddress">
</el-input> </el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<span>&nbsp;&nbsp;备&nbsp;&nbsp;注&nbsp;&nbsp;：</span> <span>&nbsp;&nbsp;备&nbsp;&nbsp;注&nbsp;&nbsp;：</span>
<el-input style="width: 220px;" size="small" <el-input style="width: 220px;" size="small"
placeholder="备注" placeholder="备注"
v-model="input1"> v-model="form.remark">
</el-input> </el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<span>&nbsp;&nbsp;密&nbsp;&nbsp;级&nbsp;&nbsp;：</span> <span>&nbsp;&nbsp;密&nbsp;&nbsp;级&nbsp;&nbsp;：</span>
<el-select style="width: 220px;" v-model="input1" placeholder="请选择" size="small"> <el-select style="width: 220px;" v-model="form.secretLevel" placeholder="请选择" size="small">
<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-row> </el-row>
</div> </div>
<div class="text-center margin-20-0"> <div class="text-center margin-20-0">
<el-button size="small" plain>&nbsp;&nbsp;保&nbsp;&nbsp;&nbsp;&nbsp;存&nbsp;&nbsp;</el-button> <el-button size="small" @click="save" plain>&nbsp;&nbsp;保&nbsp;&nbsp;&nbsp;&nbsp;存&nbsp;&nbsp;</el-button>
</div> </div>
</div> </div>
<div> <div>
<div class="border padding-20-20"> <div class="border padding-20-20">
<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 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>
<div class="table margin-top-20"> <div class="table margin-top-20">
<el-table :data="tableData" border style="width: 100%"> <el-table :data="tableData" border style="width: 100%">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
width="90"> width="90">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
label="意向/议程主题" label="意向/议程主题"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="address"
label="附件名称"> label="附件名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="address"
cell-class-name="text-center" cell-class-name="text-center"
label="汇报处室"> label="汇报处室">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="address"
cell-class-name="text-center" cell-class-name="text-center"
label="列席人员"> label="列席人员">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="address"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="font-size-20"> <span class="font-size-20">
<router-link to="/meetManage"> <router-link to="/meetManage">
<i class="el-icon-edit-outline margin-right-10"></i> <i class="el-icon-edit-outline margin-right-10"></i>
</router-link> </router-link>
<i class="el-icon-delete"></i> <i class="el-icon-delete"></i>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="text-center margin-top-20"> <div class="text-center margin-top-20">
<el-button 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="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 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"></select-intention-dialog>
<index-dialog ref="indexDialog"></index-dialog> <index-dialog ref="indexDialog"></index-dialog>
</div> </div>
...@@ -144,69 +144,78 @@ ...@@ -144,69 +144,78 @@
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"
export default { export default {
components: { components: {
IndexDialog, IndexDialog,
SelectIntentionDialog, SelectIntentionDialog,
ElRow}, ElRow
},
name: "meet-manage", name: "meet-manage",
data(){ data() {
return { return {
input1:"", form: {
item:"", title: null,
options:[ initiator: null,
{label:"绝密",value:"1"}, meetingSort:null,
{label:"机密",value:"2"}, initDepartment: '',
{label:"秘密",value:"3"}, meetingTime: "",
{label:"普通",value:"4"}, meetingAddress: '',
remark: "",
secretLevel: "",
agendaList: [],
intentionList: []
},
options: [
{label: "绝密", value: "3"},
{label: "机密", value: "2"},
{label: "秘密", value: "1"},
{label: "普通", value: "0"},
], ],
tableData: [ tableData: [],
{
date: '2016-05-02',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1518 弄',
zip: 200333,
tag: '家'
}, {
date: '2016-05-04',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1517 弄',
zip: 200333,
tag: '公司'
}, {
date: '2016-05-01',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1519 弄',
zip: 200333,
tag: '家'
}, {
date: '2016-05-03',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普陀区金沙江路 1516 弄',
zip: 200333,
tag: '公司'
}],
} }
}, },
created(){ created() {
this.item = this.$route.query.item this.item = this.$route.query.item
if(this.item){
getMeetingById({id:this.item.id}).then(
(res)=>{
for(const i in this.form){
this.form[i] = res.data[i]
}
console.log(this.form)
}
)
}
console.log(this.item) console.log(this.item)
}, },
methods:{ methods: {
showDialog(){ showDialog() {
this.$refs.selectIntentionDialog.showDialog() this.$refs.selectIntentionDialog.showDialog()
}, },
showIndexDialog(){ showIndexDialog() {
this.$refs.indexDialog.showDialog("议程排序") this.$refs.indexDialog.showDialog("议程排序")
},
save(){
if(this.item){
this.update()
}else{
this.create()
}
},
create(){
addMeeting(this.form).then(
(res)=>{
}
)
},
update(){
updateMeeting(this.form).then(
(res)=>{
}
)
} }
} }
} }
......
src/views/viewFile.vue
View file @ 0228dad9
<template> <template>
<div> <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-col class="left" :span="12">
<div class="text-center">
<p class="margin-10-0">2019年部位会会议议程</p>
<p class="margin-10-0">时间：XXXXX</p>
<p class="margin-10-0">地点：XXXXX</p>
</div>
<p>一、会议主题</p>
<div class="padding-0-20">
<p class="padding-10-0">列席</p>
<p class="padding-10-0">汇报</p>
</div>
<p>二、信息中心意向</p>
<div class="padding-0-20">
<p class="padding-10-0">汇报</p>
</div>
<p>二、意向主题</p>
<div class="padding-0-20">
<p class="padding-10-0">汇报</p>
</div>
<p>四、附件</p>
<p>五、信息处意向1</p>
<div class="padding-0-20">
<p class="padding-10-0">汇报</p>
</div>
</el-col>
<el-col :span="12">
<el-row>
<el-col :span="6">
<el-select size="small" v-model="value" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-col>
<el-col class="text-center" :span="18">
议程主题
</el-col>
<el-col :span="6">
附件名称
</el-col>
<el-col :span="18">
<canvas v-for="page in pages" :id="'the-canvas'+page" :key="page"></canvas>
</el-col>
</el-row>
</el-col>
</el-row>
</div> </div>
</template> </template>
<script> <script>
import PDFJS from 'pdfjs-dist' import PDFJS from 'pdfjs-dist'
let Base64 = require('js-base64').Base64 let Base64 = require('js-base64').Base64
export default { export default {
data () { data () {
return { return {
...@@ -60,12 +108,24 @@ ...@@ -60,12 +108,24 @@
}, },
mounted () { mounted () {
let url = 'http://storage.xuetangx.com/public_assets/xuetangx/PDF/1.xls' let url = 'http://storage.xuetangx.com/public_assets/xuetangx/PDF/1.xls'
this.loadFile(url) // this.loadFile(url)
} }
} }
</script> </script>
<style scoped> <style lang="scss">
.left{
background-color: #b5cdde;
padding: 10px 20px;
}
.left > p{
background-color: #3757e2ad;
color: #f8f8f8;
padding: 15px 10px;
}
.left > div >p{
color: #333333;
}
canvas { canvas {
display: block; display: block;
border-bottom: 1px solid black; border-bottom: 1px solid black;
......
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