fix

virgo.wzfrontend/console/src/components/work/operation/meeting/detail.vue

@@ -10,18 +10,26 @@
 				<div class="hui-detail-label">会议日期</div>
 				<div class="hui-detail-value">{{detail.date}}</div>
 			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">会议类型</div>
+				<div class="hui-detail-value">{{detail.typeName}}</div>
+			</div>
 			<div class="hui-detail-item">
 				<div class="hui-detail-label">会议时长</div>
 				<div class="hui-detail-value">{{detail.duration}}</div>
 			</div>
 			<div class="hui-detail-item">
-				<div class="hui-detail-label">会议类型</div>
-				<div class="hui-detail-value">{{detail.typeName}}</div>
+				<div class="hui-detail-label">发起人</div>
+				<div class="hui-detail-value">{{detail.userName}}</div>
 			</div>
 			<div class="hui-detail-item">
-				<div class="hui-detail-label">会议场所</div>
+				<div class="hui-detail-label">会议地点</div>
 				<div class="hui-detail-value">{{detail.placeName}}</div>
 			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">会议纪要</div>
+				<div class="hui-detail-value">{{detail.meetingMinutes}}</div>
+			</div>
 		</div>
 		<div v-if="detail.joinUserList.length > 0">
 			<div class="hui-detail-title">参与人员</div>
@@ -60,6 +68,7 @@
 					duration: '',
 					placeId: '',
 					typeId: '',
+					joinUserList: []
 				}
 			}
 		},

virgo.wzfrontend/console/src/components/work/operation/meeting/edit.vue

@@ -5,7 +5,6 @@
 				<el-form-item label="会议名称" prop="name" :rules="[{required: true, message: '请输入会议名称'}]">
 					<el-input type="text" v-model="form.name" placeholder="请输入会议名称"></el-input>
 				</el-form-item>
-
 				<el-form-item label="会议日期" prop="date" :rules="[{required: true, message: '请选择会议日期'}]">
 					<el-date-picker v-model="form.date" value-format="yyyy-MM-dd" type="date" placeholder="请选择会议日期">
 					</el-date-picker>
@@ -32,6 +31,10 @@
 				<el-form-item label="会议内容" class="hui-textarea">
 					<meeting-content ref="content" :list="contentList"></meeting-content>
 				</el-form-item>
+				<el-form-item label="会议纪要" class="hui-textarea">
+					<el-input type="textarea" v-model="form.meetingMinutes" placeholder="请输入会议纪要" resize="none">
+					</el-input>
+				</el-form-item>
 				<el-form-item label="上传附件" class="hui-textarea">
 					<upload ref="upload" :list="responsibility" type="insert" text="上传附件" accept="*"></upload>
 				</el-form-item>
@@ -64,6 +67,7 @@
 					duration: '',
 					placeId: '',
 					typeId: '',
+					meetingMinutes: ''
 				},
 				responsibility: [],
 				meetingPlace: [],
@@ -79,6 +83,7 @@
 				this.form['organizationId'] = this.$store.getters.organization.id;
 				this.form['projectId'] = this.$store.getters.project.id;
 				this.form['type'] = this.type;
+				this.form['userId'] = this.$store.getters.user.userId;
 			} else {
 				getMeetingDetailById(this.detailId).then(res => {
 					if (res.state) {
@@ -104,7 +109,7 @@
 				getMeetingPlaceListByQuery(data).then(res => successFunc(res, 'meetingPlace'));
 				getMeetingTypeListByQuery(data).then(res => successFunc(res, 'meetingType'));
 			},
-			submit() {
+			submit() {
 				this.loading = true;
 				this.$refs.form.validate((valid) => {
 					if (valid) {
@@ -118,13 +123,13 @@
 						} else {
 							insertMeeting(postData).then(this.successFunc);
 						}
-					} else {
+					} else {
 						this.loading = false;
 						return false;
 					}
 				});
 			},
-			successFunc(res) {
+			successFunc(res) {
 				this.loading = false;
 				if (res.state) {
 					this.$message.success('操作成功');

virgo.wzfrontend/console/src/components/work/organization/user/role.vue

@@ -3,8 +3,7 @@
 		<div class="hui-flex-box hui-dialog-content">
 			<el-tree :data="roleData" :props="defaultProps" show-checkbox node-key="id"
 				:default-checked-keys="checkedKeys" ref="tree" :render-after-expand="false">
-				<div :class="(node.childNodes.length == 0 && node.level == 4)? 'tree-node especially' : 'tree-node'"
-					slot-scope="{ node, data }">
+				<div :class="classNode(node)? 'tree-node especially' : 'tree-node'" slot-scope="{ node, data }">
 					<div class="tree-node-label">
 						<span>{{ node.label }}</span>
 					</div>
@@ -44,6 +43,9 @@
 			}
 		},
 		methods: {
+			classNode(node) {
+				return node.data.isMenu === '2';
+			},
 			cssTree() {
 				let classDomList = document.getElementsByClassName('especially')
 				// 改变这几个样式
@@ -117,7 +119,27 @@
 			.el-tree-node__content>.el-tree-node__expand-icon {
 				padding: 6px;
 			}
-		}
 
+			.tree-children-list {
+				display: flex !important;
+
+				.el-tree-node__content {
+					padding: 0 !important;
+				}
+
+				.el-tree-node__expand-icon.el-icon-caret-right {
+					display: none !important;
+				}
+
+				.especially {
+					padding-right: 15px;
+				}
+
+				.el-tree-node__content:hover,
+				.el-tree .el-tree-node:focus>.el-tree-node__content {
+					background: transparent !important;
+				}
+			}
+		}
 	}
 </style>

virgo.wzfrontend/console/src/main.js

@@ -41,9 +41,11 @@ Vue.prototype.$confirm = (title, callback) => {
 		cancelButtonText: '取 消',
 		type: 'warning'
 	}).then(callback).catch(() => {});
-};
-//router拦截器
+};
+//权限控制
 import './uitls/permission'
+//router拦截器
+import './uitls/routerPermission'
 new Vue({
 	router,
 	store,

virgo.wzfrontend/console/src/uitls/permission.js

@@ -1,71 +1,15 @@
-import router from '../router'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
+import Vue from 'vue'
 import {
-	getToken,
-	getComment,
-	removeToken
+	auth
 } from '@/uitls/auth'
-import store from '../store';
-import {
-	Message
-} from 'element-ui'
-NProgress.configure({
-	showSpinner: false
-})
-const baseUrl = ['/', '/401', '/404', '/loginRegister/login', '/work', '/message', '/work/space/project',
-	'/iot/device/detail', '/work/staging/project', '/work/operation/week/detail'
-];
-
-const testBaseUrl = (path) => { //判断公共路由
-	let nowBaseUrl = ['/loginRegister/login'].filter((item) => {
-		return (item == path && item != '/')
-	})
-	return nowBaseUrl.length == 0;
-}
-/* 消息提示 */
-const tip = (msg, type) => {
-	let types = type || 'warning';
-	Message({
-		message: msg,
-		type: types,
-		duration: 2000
-	});
-}
-const testComment = (path) => { //判断权限路由
-	let comment = getComment() ? JSON.parse(getComment()) : [];
-	let nowComment = comment.concat(baseUrl).filter((item) => {
-		return item == path
-	})
-	return nowComment.length == 0;
-}
-
-
-router.beforeEach((to, from, next) => {
-	if (getToken() && !(store.getters && store.getters.user && store.getters.user.userId) && !sessionStorage
-		.getItem('store')) removeToken();
-	if (to.path.indexOf('website') === -1) {
-		/* 判断是否登录 */
-		if (!getToken() && testBaseUrl(to.path)) return next('/loginRegister/login');
-		/* 判断路由是否存在 */
-		if (to.matched.length === 0) return next('/404');
-		/* 判断是否有权限 */
-		if (testComment(to.path)) return next('/401');
-		/* 无项目时跳转项目列表页面 */
-		if (getToken() && localStorage.getItem('projectId') == 0 && to.path !== '/work/space/project') {
-			tip('暂无项目，请先添加项目');
-			return next('/work/space/project');
-		}
+// 注册一个全局自定义指令 `v-permission`
+Vue.directive('permission', {
+	// 当绑定元素挂载到 DOM 上时
+	inserted: function(el, binding, vnode) {
+		// 获取绑定的权限值
+		const permissionValue = binding.value;
+		// 检查用户权限
+		if (auth(permissionValue)) return;
+		el.style.display = 'none';
 	}
-	NProgress.start();
-	next();
-});
-
-router.afterEach(() => {
-	NProgress.done();
-});
-
-router.onError((error) => {
-	NProgress.done();
-	location.reload();
 });

virgo.wzfrontend/console/src/uitls/routerPermission.js

@@ -0,0 +1,70 @@
+import router from '../router'
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import {
+	getToken,
+	getComment,
+	removeToken
+} from '@/uitls/auth'
+import store from '../store';
+import {
+	Message
+} from 'element-ui'
+NProgress.configure({
+	showSpinner: false
+})
+const baseUrl = ['/', '/401', '/404', '/loginRegister/login', '/work', '/message', '/work/space/project',
+	'/iot/device/detail', '/work/staging/project', '/work/operation/week/detail'
+];
+
+const testBaseUrl = (path) => { //判断公共路由
+	let nowBaseUrl = ['/loginRegister/login'].filter((item) => {
+		return (item == path && item != '/')
+	})
+	return nowBaseUrl.length == 0;
+}
+/* 消息提示 */
+const tip = (msg, type) => {
+	let types = type || 'warning';
+	Message({
+		message: msg,
+		type: types,
+		duration: 2000
+	});
+}
+const testComment = (path) => { //判断权限路由
+	let comment = getComment() ? JSON.parse(getComment()) : [];
+	let nowComment = comment.concat(baseUrl).filter((item) => {
+		return item == path
+	})
+	return nowComment.length == 0;
+}
+
+router.beforeEach((to, from, next) => {
+	if (getToken() && !(store.getters && store.getters.user && store.getters.user.userId) && !sessionStorage
+		.getItem('store')) removeToken();
+	if (to.path.indexOf('website') === -1) {
+		/* 判断是否登录 */
+		if (!getToken() && testBaseUrl(to.path)) return next('/loginRegister/login');
+		/* 判断路由是否存在 */
+		if (to.matched.length === 0) return next('/404');
+		/* 判断是否有权限 */
+		if (testComment(to.path)) return next('/401');
+		/* 无项目时跳转项目列表页面 */
+		if (getToken() && localStorage.getItem('projectId') == 0 && to.path !== '/work/space/project') {
+			tip('暂无项目，请先添加项目');
+			return next('/work/space/project');
+		}
+	}
+	NProgress.start();
+	next();
+});
+
+router.afterEach(() => {
+	NProgress.done();
+});
+
+router.onError((error) => {
+	NProgress.done();
+	location.reload();
+});

virgo.wzfrontend/console/src/views/system/main.vue

@@ -1,161 +1,163 @@
-<template>
-	<div class="hui-flex">
-		<div class="hui-flex-box hui-flex hui-table">
-			<div class="hui-content-insert">
-				<el-button type="primary" size="medium" @click="insert(-1)">新增主菜单</el-button>
-			</div>
-			<div class="hui-flex-box">
-				<el-table :data="tableData" row-key="id" border height="100%">
-					<el-table-column prop="title" label="菜单名称" width="180">
-					</el-table-column>
-					<el-table-column prop="iconClass" label="菜单图标" width="180">
-					</el-table-column>
-					<el-table-column prop="index" label="菜单URL">
-					</el-table-column>
-					<el-table-column label="操作" width="180">
-						<template slot-scope="scope">
-							<div class="hui-table-operation">
-								<span class="table-operation" @click="insert(scope.row.id)">新增</span>
-								<span class="table-operation" @click="update(scope.row)">编辑</span>
-								<span class="table-operation" @click="deleteItem(scope.row.id)">删除</span>
-							</div>
-						</template>
-					</el-table-column>
-					<template slot="empty">
-						<empty description="暂无数据"></empty>
-					</template>
-				</el-table>
-			</div>
-		</div>
-		<el-dialog :close-on-click-modal="false" title="菜单" :visible.sync="dialogVisible" width="900px" :append-to-body="true">
-			<edit v-if="dialogVisible" :updateData="updateData" ref="mainForm" @callback="dialogVisible = false"
-				@sure="sure">
-			</edit>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-	import {
-		getMenuList,
-		insertMenu,
-		updateMenu
-	} from '@/httpApi/system'
-	import edit from '@/components/system/main/edit'
-	import {
-		setComment
-	} from '@/uitls/auth';
-	export default {
-		data() {
-			return {
-				tableData: [],
-				comment: [],
-				dialogVisible: false,
-				tableId: 1,
-				nowDataId: -1,
-				updateData: {},
-				menuData: {},
-				type: ''
-			}
-		},
-		created() {
-			this.init()
-		},
-		methods: {
-			init(type) {
-				getMenuList().then(res => {
-					if (res.state) {
-						if (!res.data || res.data.length === 0) return;
-						this.menuData = res.data[0];
-						this.tableData = JSON.parse(this.menuData.data);
-						this.comment = [];
-						this.testIndex(this.tableData);
-						this.testComment(this.tableData);
-						if (type === 'reload') {
-							this.$store.dispatch('app/changeMenuData', this.tableData);
-							setComment(JSON.stringify(this.comment));
-						}
-					}
-				})
-			},
-			testIndex(tableData) {
-				for (let i = 0; i < tableData.length; i++) {
-					if (tableData[i].id + 1 > this.tableId) this.tableId = tableData[i].id + 1;
-					if (tableData[i].children) this.testIndex(tableData[i].children);
-				}
-			},
-			testComment(item, id, form) {
-				if (id == -1) return item.push(form);
-				if (this.type == 'delete') {
-					let index = item.findIndex(node => node.id == id);
-					if (index > -1) item.splice(index, 1);
-				}
-				for (let i = 0; i < item.length; i++) {
-					if (item[i].id == id) {
-						if (this.type == 'insert') {
-							if (!item[i].children) item[i].children = [];
-							item[i].children.push(form);
-						} else if (this.type == 'update') {
-							item[i] = form;
-						}
-					}
-					if (item[i].index && this.comment.filter(node => node == item[i].index).length == 0) this.comment.push(
-						item[i].index);
-					if (item[i].children) this.testComment(item[i].children, id, form);
-				}
-			},
-			insert(id) {
-				this.type = 'insert';
-				this.nowDataId = id;
-				this.updateData = {};
-				this.dialogVisible = true;
-			},
-			update(item) {
-				this.type = 'update';
-				this.nowDataId = item.id;
-				this.updateData = JSON.parse(JSON.stringify(item));
-				this.dialogVisible = true;
-			},
-			deleteItem(id) {
-				this.type = 'delete';
-				this.nowDataId = id;
-				this.updateData = {};
-				this.sure();
-			},
-			sure() {
-				let obj = JSON.parse(JSON.stringify(this.tableData));
-				this.comment = [];
-				this.testComment(obj, this.nowDataId, this.returnForm());
-				this.menuData.id ? updateMenu({
-					id: this.menuData.id,
-					data: JSON.stringify(obj),
-					comment: JSON.stringify(this.comment)
-				}).then(this.successFunc) : insertMenu({
-					data: JSON.stringify(obj),
-					comment: JSON.stringify(this.comment)
-				}).then(this.successFunc);
-			},
-			returnForm() {
-				if (this.type == 'delete') return {};
-				let form = this.$refs.mainForm.sureIncrease();
-				if (this.type == 'insert') form['id'] = this.tableId;
-				return form;
-			},
-			successFunc(res) {
-				if (res.state) {
-					this.$message({
-						type: 'success',
-						message: '操作成功'
-					})
-					this.init('reload');
-					this.dialogVisible = false;
-				}
-			}
-		},
-		components: {
-			edit
-		},
-	}
-</script>
-
+<template>
+	<div class="hui-flex">
+		<div class="hui-flex-box hui-flex hui-table">
+			<div class="hui-content-insert">
+				<el-button type="primary" size="medium" @click="insert(-1)">新增主菜单</el-button>
+			</div>
+			<div class="hui-flex-box">
+				<el-table :data="tableData" row-key="id" border height="100%">
+					<el-table-column prop="title" label="菜单名称" width="180">
+					</el-table-column>
+					<el-table-column prop="iconClass" label="菜单图标" width="180">
+					</el-table-column>
+					<el-table-column prop="index" label="菜单URL">
+					</el-table-column>
+					<el-table-column label="操作" width="180">
+						<template slot-scope="scope">
+							<div class="hui-table-operation">
+								<span class="table-operation" v-if="scope.row.isMenu === '1'"
+									@click="insert(scope.row.id)">新增</span>
+								<span class="table-operation" @click="update(scope.row)">编辑</span>
+								<span class="table-operation" @click="deleteItem(scope.row.id)">删除</span>
+							</div>
+						</template>
+					</el-table-column>
+					<template slot="empty">
+						<empty description="暂无数据"></empty>
+					</template>
+				</el-table>
+			</div>
+		</div>
+		<el-dialog :close-on-click-modal="false" title="菜单" :visible.sync="dialogVisible" width="900px"
+			:append-to-body="true">
+			<edit v-if="dialogVisible" :updateData="updateData" ref="mainForm" @callback="dialogVisible = false"
+				@sure="sure">
+			</edit>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		getMenuList,
+		insertMenu,
+		updateMenu
+	} from '@/httpApi/system'
+	import edit from '@/components/system/main/edit'
+	import {
+		setComment
+	} from '@/uitls/auth';
+	export default {
+		data() {
+			return {
+				tableData: [],
+				comment: [],
+				dialogVisible: false,
+				tableId: 1,
+				nowDataId: -1,
+				updateData: {},
+				menuData: {},
+				type: ''
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			init(type) {
+				getMenuList().then(res => {
+					if (res.state) {
+						if (!res.data || res.data.length === 0) return;
+						this.menuData = res.data[0];
+						this.tableData = JSON.parse(this.menuData.data);
+						this.comment = [];
+						this.testIndex(this.tableData);
+						this.testComment(this.tableData);
+						if (type === 'reload') {
+							this.$store.dispatch('app/changeMenuData', this.tableData);
+							setComment(JSON.stringify(this.comment));
+						}
+					}
+				})
+			},
+			testIndex(tableData) {
+				for (let i = 0; i < tableData.length; i++) {
+					if (tableData[i].id + 1 > this.tableId) this.tableId = tableData[i].id + 1;
+					if (tableData[i].children) this.testIndex(tableData[i].children);
+				}
+			},
+			testComment(item, id, form) {
+				if (id == -1) return item.push(form);
+				if (this.type == 'delete') {
+					let index = item.findIndex(node => node.id == id);
+					if (index > -1) item.splice(index, 1);
+				}
+				for (let i = 0; i < item.length; i++) {
+					if (item[i].id == id) {
+						if (this.type == 'insert') {
+							if (!item[i].children) item[i].children = [];
+							item[i].children.push(form);
+						} else if (this.type == 'update') {
+							item[i] = form;
+						}
+					}
+					if (item[i].index && this.comment.filter(node => node == item[i].index).length == 0) this.comment.push(
+						item[i].index);
+					if (item[i].children) this.testComment(item[i].children, id, form);
+				}
+			},
+			insert(id) {
+				this.type = 'insert';
+				this.nowDataId = id;
+				this.updateData = {};
+				this.dialogVisible = true;
+			},
+			update(item) {
+				this.type = 'update';
+				this.nowDataId = item.id;
+				this.updateData = JSON.parse(JSON.stringify(item));
+				this.dialogVisible = true;
+			},
+			deleteItem(id) {
+				this.type = 'delete';
+				this.nowDataId = id;
+				this.updateData = {};
+				this.sure();
+			},
+			sure() {
+				let obj = JSON.parse(JSON.stringify(this.tableData));
+				this.comment = [];
+				this.testComment(obj, this.nowDataId, this.returnForm());
+				this.menuData.id ? updateMenu({
+					id: this.menuData.id,
+					data: JSON.stringify(obj),
+					comment: JSON.stringify(this.comment)
+				}).then(this.successFunc) : insertMenu({
+					data: JSON.stringify(obj),
+					comment: JSON.stringify(this.comment)
+				}).then(this.successFunc);
+			},
+			returnForm() {
+				if (this.type == 'delete') return {};
+				let form = this.$refs.mainForm.sureIncrease();
+				if (this.type == 'insert') form['id'] = this.tableId;
+				return form;
+			},
+			successFunc(res) {
+				if (res.state) {
+					this.$message({
+						type: 'success',
+						message: '操作成功'
+					})
+					this.init('reload');
+					this.dialogVisible = false;
+				}
+			}
+		},
+		components: {
+			edit
+		},
+	}
+</script>
+
 <style lang="scss"></style>

virgo.wzfrontend/console/src/views/work/operation/meeting/organization.vue

@@ -15,11 +15,13 @@
 								<div style="text-align: center;">{{scope.$index + 1}}</div>
 							</template>
 						</el-table-column>
-						<el-table-column label="会议日期" prop="date"></el-table-column>
 						<el-table-column label="会议名称" prop="name"></el-table-column>
-						<el-table-column label="会议时长" prop="duration"></el-table-column>
+						<el-table-column label="会议时间" prop="date"></el-table-column>
 						<el-table-column label="会议类型" prop="typeName"></el-table-column>
-						<el-table-column label="会议场所" prop="placeName"></el-table-column>
+						<el-table-column label="会议时长" prop="duration"></el-table-column>
+						<el-table-column label="发起人" prop="userName"></el-table-column>
+						<el-table-column label="会议地点" prop="placeName"></el-table-column>
+						<el-table-column label="会议纪要" prop="meetingMinutes"></el-table-column>
 						<el-table-column label="操作" width="150">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">

virgo.wzfrontend/console/src/views/work/operation/meeting/project.vue

@@ -1,150 +1,153 @@
-<template>
-	<div class="hui-flex hui-content">
-		<div class="hui-flex">
-			<div class="hui-content-title">
-				<div class="hui-title-item active">项目会议</div>
-			</div>
-			<div class="hui-flex-box hui-flex hui-table">
-				<div class="hui-content-insert">
-					<el-button type="primary" size="medium" @click="insert">新增会议</el-button>
-				</div>
-				<div class="hui-flex-box">
-					<el-table :data="tableData" row-key="id" border height="100%">
-						<el-table-column label="序号" width="50">
-							<template slot-scope="scope">
-								<div style="text-align: center;">{{scope.$index + 1}}</div>
-							</template>
-						</el-table-column>
-						<el-table-column label="会议名称" prop="name"></el-table-column>
-						<el-table-column label="会议时间" prop="date"></el-table-column>
-						<el-table-column label="会议类型" prop="typeName"></el-table-column>
-						<el-table-column label="会议时长" prop="duration"></el-table-column>
-						<el-table-column label="会议地点" prop="placeName"></el-table-column>
-						<el-table-column label="操作" width="150">
-							<template slot-scope="scope">
-								<div class="hui-table-operation">
-									<span class="table-operation" @click="detailItem(scope.row)">
-										详情
-									</span>
-									<span class="table-operation" @click="updateItem(scope.row)">
-										编辑
-									</span>
-									<span class="table-operation" @click="deleteItem(scope.row)">
-										删除
-									</span>
-								</div>
-							</template>
-						</el-table-column>
-						<template slot="empty">
-							<empty description="暂无数据"></empty>
-						</template>
-					</el-table>
-				</div>
-				<div class="hui-content-pagination">
-					<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
-						@current-change="currentChange">
-					</el-pagination>
-				</div>
-			</div>
-		</div>
-		<el-dialog :close-on-click-modal="false" :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px" :append-to-body="true">
-			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId" :type="type"></edit>
-		</el-dialog>
-		<el-drawer title="会议详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId" @callback="callback"></detail>
-		</el-drawer>
-	</div>
-</template>
-
-<script>
-	import {
-		getMeetingListByQuery,
-		deleteMeetingById
-	} from '@/httpApi/operation'
-	import edit from '@/components/work/operation/meeting/edit'
-	import detail from '@/components/work/operation/meeting/detail'
-	export default {
-		data() {
-			return {
-				tableData: [],
-				currPage: 1,
-				pageSize: 10,
-				totalCount: 0,
-				filterOption: {},
-				type: 1,
-				isUpdate: false,
-				visible: false,
-				detailId: '',
-				drawer: false
-			}
-		},
-		created() {
-			this.init();
-		},
-		methods: {
-			init() {
-				let postData = {
-					currPage: this.currPage,
-					pageSize: this.pageSize,
-					organizationId: this.$store.getters.organization.id,
-					projectId: this.$store.getters.project.id,
-					type: this.type
-				}
-				postData = Object.assign(postData, this.filterOption);
-				getMeetingListByQuery(postData).then(res => {
-					if (res.state) {
-						this.tableData = res.data.dataList;
-						this.totalCount = res.data.totalCount;
-					}
-				})
-			},
-			filterInit(option) {
-				this.filterOption = option;
-				this.currPage = 1;
-				this.init();
-			},
-			insert() {
-				this.detailId = '';
-				this.isUpdate = false;
-				this.visible = true;
-			},
-			updateItem(item) {
-				this.detailId = item.id;
-				this.isUpdate = true;
-				this.visible = true;
-			},
-			detailItem(item) {
-				this.detailId = item.id;
-				this.drawer = true;
-			},
-			currentChange(currPage) {
-				this.currPage = currPage;
-				this.init();
-			},
-			deleteItem(item) {
-				this.$confirm('确定要删除该会议记录?', () => {
-					deleteMeetingById(item.id).then(res => {
-						if (res.state) {
-							this.$message({
-								type: 'success',
-								message: '操作成功'
-							})
-							this.init();
-						}
-					})
-				});
-			},
-			callback(type) {
-				if (type === 'init') this.init();
-				this.visible = false;
-			}
-		},
-		components: {
-			edit,
-			detail
-		},
-	}
-</script>
-
-<style>
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-flex">
+			<div class="hui-content-title">
+				<div class="hui-title-item active">项目会议</div>
+			</div>
+			<div class="hui-flex-box hui-flex hui-table">
+				<div class="hui-content-insert">
+					<el-button type="primary" size="medium" @click="insert">新增会议</el-button>
+				</div>
+				<div class="hui-flex-box">
+					<el-table :data="tableData" row-key="id" border height="100%">
+						<el-table-column label="序号" width="50">
+							<template slot-scope="scope">
+								<div style="text-align: center;">{{scope.$index + 1}}</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="会议名称" prop="name"></el-table-column>
+						<el-table-column label="会议时间" prop="date"></el-table-column>
+						<el-table-column label="会议类型" prop="typeName"></el-table-column>
+						<el-table-column label="会议时长" prop="duration"></el-table-column>
+						<el-table-column label="发起人" prop="userName"></el-table-column>
+						<el-table-column label="会议地点" prop="placeName"></el-table-column>
+						<el-table-column label="会议纪要" prop="meetingMinutes"></el-table-column>
+						<el-table-column label="操作" width="150">
+							<template slot-scope="scope">
+								<div class="hui-table-operation">
+									<span class="table-operation" @click="detailItem(scope.row)">
+										详情
+									</span>
+									<span class="table-operation" @click="updateItem(scope.row)">
+										编辑
+									</span>
+									<span class="table-operation" @click="deleteItem(scope.row)">
+										删除
+									</span>
+								</div>
+							</template>
+						</el-table-column>
+						<template slot="empty">
+							<empty description="暂无数据"></empty>
+						</template>
+					</el-table>
+				</div>
+				<div class="hui-content-pagination">
+					<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
+						@current-change="currentChange">
+					</el-pagination>
+				</div>
+			</div>
+		</div>
+		<el-dialog :close-on-click-modal="false" :title="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px"
+			:append-to-body="true">
+			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId" :type="type"></edit>
+		</el-dialog>
+		<el-drawer title="会议详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+			<detail v-if="drawer" :detailId="detailId" @callback="callback"></detail>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		getMeetingListByQuery,
+		deleteMeetingById
+	} from '@/httpApi/operation'
+	import edit from '@/components/work/operation/meeting/edit'
+	import detail from '@/components/work/operation/meeting/detail'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+				filterOption: {},
+				type: 1,
+				isUpdate: false,
+				visible: false,
+				detailId: '',
+				drawer: false
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				let postData = {
+					currPage: this.currPage,
+					pageSize: this.pageSize,
+					organizationId: this.$store.getters.organization.id,
+					projectId: this.$store.getters.project.id,
+					type: this.type
+				}
+				postData = Object.assign(postData, this.filterOption);
+				getMeetingListByQuery(postData).then(res => {
+					if (res.state) {
+						this.tableData = res.data.dataList;
+						this.totalCount = res.data.totalCount;
+					}
+				})
+			},
+			filterInit(option) {
+				this.filterOption = option;
+				this.currPage = 1;
+				this.init();
+			},
+			insert() {
+				this.detailId = '';
+				this.isUpdate = false;
+				this.visible = true;
+			},
+			updateItem(item) {
+				this.detailId = item.id;
+				this.isUpdate = true;
+				this.visible = true;
+			},
+			detailItem(item) {
+				this.detailId = item.id;
+				this.drawer = true;
+			},
+			currentChange(currPage) {
+				this.currPage = currPage;
+				this.init();
+			},
+			deleteItem(item) {
+				this.$confirm('确定要删除该会议记录?', () => {
+					deleteMeetingById(item.id).then(res => {
+						if (res.state) {
+							this.$message({
+								type: 'success',
+								message: '操作成功'
+							})
+							this.init();
+						}
+					})
+				});
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.visible = false;
+			}
+		},
+		components: {
+			edit,
+			detail
+		},
+	}
+</script>
+
+<style>
 </style>

virgo.wzfrontend/console/src/views/work/property/register.vue

@@ -37,7 +37,7 @@
 					</div>
 					<div class="hui-flex-box hui-flex hui-table">
 						<div class="hui-content-insert">
-							<el-button type="primary" size="medium" @click="insert">新增登记</el-button>
+							<el-button v-permission="'/work/property/register/add'" type="primary" size="medium" @click="insert">新增登记</el-button>
 						</div>
 						<div class="hui-flex-box">
 							<el-table :data="tableData" row-key="id" border height="100%">