fix

virgo.wzfrontend/console/src/assets/scss/index.scss

@@ -1519,6 +1519,7 @@
 		flex: 1;
 		width: 0;
 		overflow: hidden;
+		font-size: 12px;
 	}
 	
 	.iconfont{
@@ -1529,6 +1530,10 @@
 		font-size: 16px;
 	}
 	
+	.el-icon-more{
+		color: $--color-common;
+	}
+	
 	.active{
 		color: $--color-primary;
 	}

virgo.wzfrontend/console/src/components/work/contract/common/tagTree.vue

@@ -1,14 +1,40 @@
 <template>
 	<div class="tag-tree">
-		<el-tree :data="treeData" :props="defaultProps" :expand-on-click-node="false" @node-click="nodeClick">
+		<el-tree :data="treeData" :expand-on-click-node="false" node-key="id" :default-expanded-keys="expandedKeys"
+			:props="defaultProps" @node-expand="nodeExpand" @node-collapse="nodeCollapse">
+			<div class="custom-tree-node" slot-scope="{ node, data }">
+				<div class="label" @click.stop="nodeClick(data)">{{node.label}}</div>
+				<div class="custom-tree-icon">
+					<el-dropdown @command="type=>command(type,data)" trigger="click">
+						<i class="el-icon-more"></i>
+						<el-dropdown-menu slot="dropdown">
+							<el-dropdown-item command="look">详情</el-dropdown-item>
+							<el-dropdown-item command="insert">新增</el-dropdown-item>
+							<el-dropdown-item command="update">编辑</el-dropdown-item>
+							<el-dropdown-item command="delete">删除</el-dropdown-item>
+						</el-dropdown-menu>
+					</el-dropdown>
+				</div>
+			</div>
 		</el-tree>
+		<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" :part="part">
+			</edit>
+		</el-dialog>
+		<el-drawer title="分类详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+			<detail v-if="drawer" :detail="part"></detail>
+		</el-drawer>
 	</div>
 </template>
 
 <script>
 	import {
-		getTagList
+		getTagList,
+		deleteTag
 	} from '@/httpApi/contract'
+	import edit from '@/components/work/contract/tag/edit'
+	import detail from '@/components/work/contract/tag/detail'
 	export default {
 		data() {
 			return {
@@ -17,11 +43,20 @@
 					children: 'children',
 					label: 'name'
 				},
+				visible: false,
+				isUpdate: false,
+				part: {},
+				drawer: false,
+				expandedKeys: []
 			}
 		},
 		created() {
 			this.init();
 		},
+		components: {
+			edit,
+			detail
+		},
 		methods: {
 			init() {
 				getTagList(this.$store.getters.organization.id, this.$store.getters.project.id).then(res => {
@@ -30,6 +65,59 @@
 					}
 				})
 			},
+			nodeExpand(data) {
+				this.expandedKeys.push(data.id);
+			},
+			nodeCollapse(data) {
+				let index = this.expandedKeys.findIndex(node => node === data.id);
+				this.expandedKeys.splice(index, 1);
+			},
+			command(type, data) {
+				switch (type) {
+					case 'look':
+						this.lookTag(data);
+						break;
+					case 'insert':
+						this.insertTag(data);
+						break;
+					case 'update':
+						this.updateTag(data);
+						break;
+					case 'delete':
+						this.deleteTag(data);
+						break;
+					default:
+						break;
+				}
+			},
+			insertTag(val) {
+				this.part = JSON.parse(JSON.stringify(val));
+				this.visible = true;
+				this.isUpdate = false;
+			},
+			lookTag(val) {
+				this.part = JSON.parse(JSON.stringify(val));
+				this.drawer = true;
+			},
+			updateTag(val) {
+				this.part = JSON.parse(JSON.stringify(val));
+				this.isUpdate = true;
+				this.visible = true;
+			},
+			deleteTag(val) {
+				this.$confirm('确定要删除该分类?', () => {
+					deleteTag(val.id).then(res => {
+						if (res.state) {
+							this.$message.success('操作成功');
+							this.init();
+						}
+					})
+				});
+			},
+			callback(type) {
+				this.visible = false;
+				if (type === 'init') this.init();
+			},
 			nodeClick(item) {
 				this.$emit('treeclick', item);
 			}

virgo.wzfrontend/console/src/components/work/organization/manager/edit.vue

@@ -24,6 +24,11 @@
 					<upload ref="uploadLogo" :list="informationForm.logo" :maxLen="1" type="insert" text="上传LOGO">
 					</upload>
 				</el-form-item>
+				<el-form-item label="公司简介" class="hui-textarea">
+					<el-input type="textarea" v-model="informationForm.introduction" placeholder="请输入公司简介"
+						resize="none">
+					</el-input>
+				</el-form-item>
 				<el-form-item label="附件" class="hui-textarea">
 					<upload ref="upload" :list="informationForm.businessLicense" type="insert">
 					</upload>
@@ -54,7 +59,8 @@
 					address: [],
 					businessLicense: [],
 					logo: [],
-					detailAddress: ''
+					detailAddress: '',
+					introduction: ''
 				},
 				isUpdate: true
 			}

virgo.wzfrontend/console/src/components/work/organization/seal/edit.vue

@@ -2,9 +2,16 @@
 	<div class="hui-flex hui-dialog">
 		<div class="hui-flex-box hui-dialog-content">
 			<el-form ref="sealForm" :model="sealForm" label-position="top">
-				<el-form-item label="印章名称" class="hui-textarea">
+				<el-form-item label="印章名称">
 					<el-input type="text" v-model="sealForm.name" placeholder="请输入印章名称"></el-input>
 				</el-form-item>
+				<el-form-item label="印章类型" prop="type" :rules="[{required: true, message: '请选择印章类型'}]">
+					<el-select v-model="sealForm.type" placeholder="请选择印章类型">
+						<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.sealType"
+							:key="item.id">
+						</el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="印章描述" class="hui-textarea">
 					<el-input type="textarea" v-model="sealForm.comment" placeholder="请输入印章描述" resize="none">
 					</el-input>
@@ -34,10 +41,11 @@
 			return {
 				sealForm: {
 					name: '',
+					type: 1,
 					comment: ''
 				},
-				responsibility: [],
-				loading:false
+				responsibility: [],
+				loading: false
 			}
 		},
 		created() {
@@ -47,7 +55,8 @@
 						let data = res.data;
 						this.sealForm['id'] = data.id;
 						this.sealForm['name'] = data.name;
-						this.sealForm['comment'] = data.comment;
+						this.sealForm['comment'] = data.comment;
+						this.sealForm['type'] = data.type;
 						let fileNode = data.fileNode;
 						let typeList = fileNode.name.split('.');
 						this.responsibility = [{
@@ -63,12 +72,12 @@
 			}
 		},
 		methods: {
-			submit() {
+			submit() {
 				this.loading = true;
 				let fileList = this.$refs.upload.fileList;
-				if (fileList.length < 1) {
-					this.loading = false;
-					this.$message.warning('请上传印章');
+				if (fileList.length < 1) {
+					this.loading = false;
+					this.$message.warning('请上传印章');
 				}
 				this.sealForm['fileNodeId'] = fileList[0].id;
 				if (this.isUpdate) {
@@ -77,7 +86,7 @@
 					insertSeal(this.sealForm).then(this.successFunc)
 				}
 			},
-			successFunc(res) {
+			successFunc(res) {
 				this.loading = false;
 				if (res.state) {
 					this.$message.success('操作成功');

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

@@ -26,12 +26,46 @@
 				<div class="hui-detail-label">部门</div>
 				<div class="hui-detail-value">{{user.partName}}</div>
 			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">岗位</div>
+				<div class="hui-detail-value">{{operateUserInfo.employeePosition || '-'}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">职务</div>
+				<div class="hui-detail-value">{{operateUserInfo.position || '-'}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">入职时间</div>
+				<div class="hui-detail-value">{{operateUserInfo.entryDate || '-'}}</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">工作状态</div>
+				<div class="hui-detail-value">
+					<div class="hui-tag" v-if="operateUserInfo.state === 1">在职</div>
+					<div class="hui-tag hui-tag-warning" v-else-if="operateUserInfo.state === 2">请假</div>
+					<div class="hui-tag hui-tag-error" v-else-if="operateUserInfo.state === 3">离职</div>
+					<span v-else>-</span>
+				</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">空间位置</div>
+				<div class="hui-detail-value">
+					{{operateUserInfo.projectItemTargetRoomName || operateUserInfo.projectItemTargetName || operateUserInfo.projectItemName || '-'}}
+				</div>
+			</div>
+			<div class="hui-detail-item">
+				<div class="hui-detail-label">工作业务</div>
+				<div class="hui-detail-value">{{operateUserInfo.workBusiness || '-'}}</div>
+			</div>
 		</div>
 	</div>
 </template>
 
 <script>
 	import avatar from '@/components/common/avatar'
+	import {
+		getOperationUserInfo
+	} from '@/httpApi/loginRegister'
 	export default {
 		props: ['user'],
 		data() {
@@ -44,7 +78,17 @@
 			if (this.user.id) this.init();
 		},
 		methods: {
-			init() {}
+			init() {
+				getOperationUserInfo({
+					projectId: this.$store.getters.project.id,
+					operateOrganizationId: this.$store.getters.organization.id,
+					userId: this.user.id
+				}).then(res => {
+					if (res.state) {
+						this.operateUserInfo = res.data || {}
+					}
+				})
+			}
 		},
 		components: {
 			avatar

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

@@ -0,0 +1,106 @@
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<project-item ref="projectItem" :form="userForm"></project-item>
+			<el-form :model="userForm" ref="userForm" label-position="top">
+				<el-form-item label="入职时间">
+					<el-date-picker v-model="userForm.entryDate" value-format="yyyy-MM-dd" type="date"
+						placeholder="选择入职时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="工作状态">
+					<el-select v-model="userForm.state" placeholder="请选择工作状态">
+						<el-option :value="1" label="在职"></el-option>
+						<el-option :value="2" label="请假"></el-option>
+						<el-option :value="3" label="离职"></el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="岗位" prop="employeePosition">
+					<el-input v-model="userForm.employeePosition" placeholder="请输入岗位"></el-input>
+				</el-form-item>
+				<el-form-item label="职务" prop="position">
+					<el-input v-model="userForm.position" placeholder="请输入职务"></el-input>
+				</el-form-item>
+				<el-form-item label="工作业务" class="hui-textarea">
+					<el-input type="textarea" v-model="userForm.workBusiness" placeholder="请输入工作业务" resize="none">
+					</el-input>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="submit">保 存</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		insertOperationUserInfo,
+		updateOperationUserInfo,
+		getOperationUserInfo
+	} from '@/httpApi/loginRegister'
+	import projectItem from '@/components/common/projectItem'
+	export default {
+		props: ['user'],
+		data() {
+			return {
+				operateUserInfo: {},
+				userForm: {
+					userId: '',
+					projectId: '',
+					projectItemId: '',
+					projectItemTargetId: '',
+					organizationId: '',
+					entryDate: '',
+					state: 1,
+					employeePosition: '',
+					position: '',
+					workBusiness: ''
+				}
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getOperationUserInfo({
+					projectId: this.$store.getters.project.id,
+					organizationId: this.$store.getters.organization.id,
+					userId: this.user.id
+				}).then(res => {
+					if (res.state) {
+						this.operateUserInfo = res.data || {};
+						if (this.operateUserInfo.id) {
+							this.userForm = JSON.parse(JSON.stringify(this.operateUserInfo));
+						} else {
+							this.userForm['userId'] = this.user.id;
+							this.userForm['projectId'] = this.$store.getters.project.id;
+							this.userForm['organizationId'] = this.$store.getters.organization.id;
+						}
+					}
+				})
+			},
+			submit() {
+				let data = this.$refs.projectItem.returnItem();
+				this.userForm['projectItemId'] = data.projectItem.id;
+				this.userForm['projectItemTargetId'] = data.projectItemTarget.id;
+				this.userForm.id ? updateOperationUserInfo(this.userForm).then(this.successFunc) : insertOperationUserInfo(
+					this.userForm).then(this.successFunc);
+			},
+			successFunc(res) {
+				if (res.state) {
+					this.$message.success('操作成功');
+					this.$emit('callback', 'init');
+				}
+			},
+			close() {
+				this.$emit('callback', 'cancel')
+			}
+		},
+		components: {
+			projectItem
+		},
+	}
+</script>

virgo.wzfrontend/console/src/components/work/space/project/edit.vue

@@ -143,7 +143,6 @@
 				postData['coordinates'] = this.$refs.map.address;
 				postData['supportingFacilities'] = this.supportingFacilities.join(',');
 				postData['addressCode'] = this.$refs.city.addressCode();
-				console.log(postData);
 				return postData;
 			},
 			submit() {

virgo.wzfrontend/console/src/config/field.js

@@ -253,6 +253,25 @@ const modelType = [{
 	name: 'FBX',
 	accept: '.fbx, .FBX'
 }]
+const sealType = [{
+	id: 1,
+	name: '公章'
+}, {
+	id: 2,
+	name: '财务章'
+}, {
+	id: 3,
+	name: '法人章'
+}, {
+	id: 4,
+	name: '项目章'
+}, {
+	id: 5,
+	name: '合同章'
+}, {
+	id: 6,
+	name: '资料章'
+}]
 
 const findItem = (type, id) => {
 	return eval(type).find(node => node.id == id) || {
@@ -283,7 +302,8 @@ export default {
 		serviceWorkWay,
 		clearWorkWay,
 		supportingFacilities,
-		modelType
+		modelType,
+		sealType
 	},
 	findTypeName(type, id) {
 		return findItem(type, id).name;

virgo.wzfrontend/console/src/httpApi/loginRegister.js

@@ -118,4 +118,37 @@ export function refresh() {
 		url: `/manager/userContext/refresh`,
 		method: 'get',
 	})
+}
+/* 
+ * 获取项目组织下个人信息
+ * 
+ */
+export function getOperationUserInfo(data) {
+	return request({
+		url: `/api/info/get`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 新增项目组织下个人信息
+ * 
+ */
+export function insertOperationUserInfo(data) {
+	return request({
+		url: `/api/info`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 修改项目组织下个人信息
+ * 
+ */
+export function updateOperationUserInfo(data) {
+	return request({
+		url: `/api/info`,
+		method: 'put',
+		data: data
+	})
 }

virgo.wzfrontend/console/src/views/work/contract/template.vue

@@ -5,9 +5,10 @@
 				<div class="hui-left-tree-title">
 					<svg-icon name="zhuangshi" width="16" height="20"></svg-icon>
 					<span class="hui-left-tree-sub">合同分类</span>
+					<i class="el-icon-plus" style="cursor: pointer;" @click="$refs.tagTree.insertTag({})"></i>
 				</div>
 				<div class="hui-left-tree-content">
-					<tag-tree @treeclick="treeclick"></tag-tree>
+					<tag-tree ref="tagTree" @treeclick="treeclick"></tag-tree>
 				</div>
 			</div>
 			<div class="hui-tree-content">
@@ -69,12 +70,13 @@
 				</div>
 			</div>
 		</div>
-		<el-dialog :close-on-click-modal="false" title="预览" :visible.sync="detailsDialogVisible" width="80%" class="document-dialog"
-			:append-to-body="true">
+		<el-dialog :close-on-click-modal="false" title="预览" :visible.sync="detailsDialogVisible" width="80%"
+			class="document-dialog" :append-to-body="true">
 			<preview v-if="detailsDialogVisible" :templateId="templateId" @close="detailsDialogVisible = false">
 			</preview>
 		</el-dialog>
-		<el-dialog :close-on-click-modal="false" title="字段设置" :visible.sync="visible" width="900px" :append-to-body="true">
+		<el-dialog :close-on-click-modal="false" title="字段设置" :visible.sync="visible" width="900px"
+			:append-to-body="true">
 			<field v-if="visible" :templateId="templateId"></field>
 		</el-dialog>
 	</div>

virgo.wzfrontend/console/src/views/work/organization/depart.vue

@@ -1,133 +1,141 @@
-<template>
-	<div class="hui-flex hui-content">
-		<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="insertDepartment({})">新建部门</el-button>
-			</div>
-			<div class="hui-flex-box">
+<template>
+	<div class="hui-flex hui-content">
+		<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="insertDepartment({})">新建部门</el-button>
+			</div>
+			<div class="hui-flex-box">
 				<el-table :data="treeData" row-key="id" border height="100%">
-					<el-table-column label="部门名称" prop="name"></el-table-column>
-					<el-table-column label="部门人数">
-						<template slot-scope="scope">
-							<span>{{!scope.row.users ?0: scope.row.users.length}}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="部门责任人">
-						<template slot-scope="scope">
-							<div class="hui-table-user" v-if="scope.row.responsible && scope.row.responsible!='[]'">
-								<div class="hui-table-avatar">
-									<avatar :user="JSON.parse(scope.row.responsible)[0]"></avatar>
-								</div>
-								<div>{{JSON.parse(scope.row.responsible)[0].name}}</div>
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="操作" width="240">
-						<template slot-scope="scope">
-							<div class="hui-table-operation">
-								<span class="table-operation" @click="lookFlow(scope.row)">
-									详情
-								</span>
-								<span class="table-operation" @click="insertDepartment(scope.row)">
-									添加子部门
-								</span>
-								<span class="table-operation" @click="updateDepartment(scope.row)">
-									编辑
-								</span>
-								<span class="table-operation" @click="deleteDepartment(scope.row)">
-									删除
-								</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="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px" :append-to-body="true">
-			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :part="part">
-			</edit>
-		</el-dialog>
-		<el-drawer title="部门详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detail="part"></detail>
-		</el-drawer>
-	</div>
-</template>
-
-<script>
-	import {
-		getPartList,
-		deleteDepartment
-	} from '@/httpApi/organization'
-	import edit from '@/components/work/organization/depart/edit'
-	import detail from '@/components/work/organization/depart/detail'
-	import avatar from '@/components/common/avatar'
-	export default {
-		data() {
-			return {
-				treeData: [],
-				visible: false,
-				isUpdate: false,
-				part: {},
-				drawer: false
-			}
-		},
-		created() {
-			this.init();
-		},
-		methods: {
-			init() {
-				getPartList(this.$store.getters.organization.id, this.$store.getters.project.id).then(res => {
-					if (res.state) {
-						this.treeData = res.data;
-					}
-				})
-			},
-			currentChange(currPage) {
-				this.currPage = currPage;
-				this.init();
-			},
-			insertDepartment(val) {
-				this.part = JSON.parse(JSON.stringify(val));
-				this.visible = true;
-				this.isUpdate = false;
-			},
-			lookFlow(val) {
-				this.part = JSON.parse(JSON.stringify(val));
-				this.drawer = true;
-			},
-			updateDepartment(val) {
-				this.part = JSON.parse(JSON.stringify(val));
-				this.isUpdate = true;
-				this.visible = true;
-			},
-			deleteDepartment(val) {
-				this.$confirm('确定要删除该部门?', () => {
-					deleteDepartment(val.id).then(res => {
-						if (res.state) {
-							this.$message.success('操作成功');
-							this.init();
-						}
-					})
-				});
-			},
-			callback(type) {
-				this.visible = false;
-				if (type === 'init') this.init();
-			}
-		},
-		components: {
-			edit,
-			avatar,
-			detail
-		},
-	}
-</script>
-
-<style lang="scss">
+					<el-table-column width="50"></el-table-column>
+					<el-table-column label="序号">
+						<template slot-scope="scope">
+							<span>{{scope.$index + 1}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="部门名称" prop="name"></el-table-column>
+					<el-table-column label="部门人数">
+						<template slot-scope="scope">
+							<span>{{!scope.row.users ?0: scope.row.users.length}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="部门责任人">
+						<template slot-scope="scope">
+							<div class="hui-table-user" v-if="scope.row.responsible && scope.row.responsible!='[]'">
+								<div class="hui-table-avatar">
+									<avatar :user="JSON.parse(scope.row.responsible)[0]"></avatar>
+								</div>
+								<div>{{JSON.parse(scope.row.responsible)[0].name}}</div>
+							</div>
+							<div v-else>无</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" width="240">
+						<template slot-scope="scope">
+							<div class="hui-table-operation">
+								<span class="table-operation" @click="lookFlow(scope.row)">
+									详情
+								</span>
+								<span class="table-operation" @click="insertDepartment(scope.row)">
+									添加子部门
+								</span>
+								<span class="table-operation" @click="updateDepartment(scope.row)">
+									编辑
+								</span>
+								<span class="table-operation" @click="deleteDepartment(scope.row)">
+									删除
+								</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="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px"
+			:append-to-body="true">
+			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :part="part">
+			</edit>
+		</el-dialog>
+		<el-drawer title="部门详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+			<detail v-if="drawer" :detail="part"></detail>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		getPartList,
+		deleteDepartment
+	} from '@/httpApi/organization'
+	import edit from '@/components/work/organization/depart/edit'
+	import detail from '@/components/work/organization/depart/detail'
+	import avatar from '@/components/common/avatar'
+	export default {
+		data() {
+			return {
+				treeData: [],
+				visible: false,
+				isUpdate: false,
+				part: {},
+				drawer: false
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getPartList(this.$store.getters.organization.id, this.$store.getters.project.id).then(res => {
+					if (res.state) {
+						this.treeData = res.data;
+					}
+				})
+			},
+			currentChange(currPage) {
+				this.currPage = currPage;
+				this.init();
+			},
+			insertDepartment(val) {
+				this.part = JSON.parse(JSON.stringify(val));
+				this.visible = true;
+				this.isUpdate = false;
+			},
+			lookFlow(val) {
+				this.part = JSON.parse(JSON.stringify(val));
+				this.drawer = true;
+			},
+			updateDepartment(val) {
+				this.part = JSON.parse(JSON.stringify(val));
+				this.isUpdate = true;
+				this.visible = true;
+			},
+			deleteDepartment(val) {
+				this.$confirm('确定要删除该部门?', () => {
+					deleteDepartment(val.id).then(res => {
+						if (res.state) {
+							this.$message.success('操作成功');
+							this.init();
+						}
+					})
+				});
+			},
+			callback(type) {
+				this.visible = false;
+				if (type === 'init') this.init();
+			}
+		},
+		components: {
+			edit,
+			avatar,
+			detail
+		},
+	}
+</script>
+
+<style lang="scss">
 </style>

virgo.wzfrontend/console/src/views/work/organization/manager.vue

@@ -39,6 +39,10 @@
 							<div class="manager-item">
 								<div class="manager-label">联系方式</div>
 								<div class="manager-value">{{organization.contactTel}}</div>
+							</div>
+							<div class="manager-item" style="width: 100%;">
+								<div class="manager-label">公司简介</div>
+								<div class="manager-value">{{organization.introduction}}</div>
 							</div>
 							<div class="manager-item" style="width: 100%;">
 								<div class="manager-label">附件</div>

virgo.wzfrontend/console/src/views/work/organization/seal.vue

@@ -1,123 +1,130 @@
-<template>
-	<div class="hui-flex hui-content">
-		<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="insertSeal">新增印章</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="comment"></el-table-column>
-					<el-table-column label="申请印章" width="150">
-						<template slot-scope="scope">
-							<div class="hui-table-operation">
-								<span class="table-operation" @click="requestSeal(scope.row)">查看</span>
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="操作" width="150">
-						<template slot-scope="scope">
-							<div class="hui-table-operation">
-								<span class="table-operation" @click="lookSeal(scope.row)">详情</span>
-								<span class="table-operation" @click="updateSeal(scope.row)">编辑</span>
-								<span class="table-operation" @click="deleteSeal(scope.row)">删除</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="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px" :append-to-body="true">
-			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId"></edit>
-		</el-dialog>
-		<el-dialog :close-on-click-modal="false" title="印章申请列表" :visible.sync="requestVisible" width="1000px" :append-to-body="true">
-			<request v-if="requestVisible" :detailId="detailId"></request>
-		</el-dialog>
-		<el-drawer title="项目详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<detail v-if="drawer" :detailId="detailId"></detail>
-		</el-drawer>
-	</div>
-</template>
-
-<script>
-	import {
-		getSealList,
-		deleteSeal
-	} from '@/httpApi/organization'
-	import edit from '@/components/work/organization/seal/edit'
-	import detail from '@/components/work/organization/seal/detail'
-	import request from '@/components/work/organization/seal/request'
-	export default {
-		data() {
-			return {
-				tableData: [],
-				visible: false,
-				detailId: '',
-				isUpdate: false,
-				drawer: false,
-				requestVisible: false
-			}
-		},
-		created() {
-			this.init();
-		},
-		methods: {
-			init() {
-				getSealList(this.$store.getters.organization.id).then(res => {
-					if (res.state) {
-						this.tableData = res.data;
-					}
-				})
-			},
-			insertSeal() {
-				this.isUpdate = false;
-				this.visible = true;
-			},
-			requestSeal(item) {
-				this.detailId = item.id;
-				this.requestVisible = true;
-			},
-			updateSeal(item) {
-				this.detailId = item.id;
-				this.isUpdate = true;
-				this.visible = true;
-			},
-			lookSeal(item) {
-				this.detailId = item.id;
-				this.drawer = true;
-			},
-			deleteSeal(item) {
-				this.$confirm('确定要删除该印章?', () => {
-					deleteSeal(item.id).then(res => {
-						if (res.state) {
-							this.init();
-							this.$message.success('操作成功');
-						}
-					})
-				});
-			},
-			callback(type) {
-				if (type === 'init') this.init();
-				this.visible = false;
-			}
-		},
-		components: {
-			edit,
-			detail,
-			request
-		},
-	}
-</script>
-
+<template>
+	<div class="hui-flex hui-content">
+		<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="insertSeal">新增印章</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="name">
+						<template slot-scope="scope">
+							<span>{{$field.findTypeName('sealType',scope.row.type)}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="印章描述" prop="comment"></el-table-column>
+					<el-table-column label="申请印章" width="150">
+						<template slot-scope="scope">
+							<div class="hui-table-operation">
+								<span class="table-operation" @click="requestSeal(scope.row)">查看</span>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" width="150">
+						<template slot-scope="scope">
+							<div class="hui-table-operation">
+								<span class="table-operation" @click="lookSeal(scope.row)">详情</span>
+								<span class="table-operation" @click="updateSeal(scope.row)">编辑</span>
+								<span class="table-operation" @click="deleteSeal(scope.row)">删除</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="isUpdate?'编辑':'新增'" :visible.sync="visible" width="900px"
+			:append-to-body="true">
+			<edit v-if="visible" @callback="callback" :isUpdate="isUpdate" :detailId="detailId"></edit>
+		</el-dialog>
+		<el-dialog :close-on-click-modal="false" title="印章申请列表" :visible.sync="requestVisible" width="1000px"
+			:append-to-body="true">
+			<request v-if="requestVisible" :detailId="detailId"></request>
+		</el-dialog>
+		<el-drawer title="项目详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+			<detail v-if="drawer" :detailId="detailId"></detail>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		getSealList,
+		deleteSeal
+	} from '@/httpApi/organization'
+	import edit from '@/components/work/organization/seal/edit'
+	import detail from '@/components/work/organization/seal/detail'
+	import request from '@/components/work/organization/seal/request'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				visible: false,
+				detailId: '',
+				isUpdate: false,
+				drawer: false,
+				requestVisible: false
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getSealList(this.$store.getters.organization.id).then(res => {
+					if (res.state) {
+						this.tableData = res.data;
+					}
+				})
+			},
+			insertSeal() {
+				this.isUpdate = false;
+				this.visible = true;
+			},
+			requestSeal(item) {
+				this.detailId = item.id;
+				this.requestVisible = true;
+			},
+			updateSeal(item) {
+				this.detailId = item.id;
+				this.isUpdate = true;
+				this.visible = true;
+			},
+			lookSeal(item) {
+				this.detailId = item.id;
+				this.drawer = true;
+			},
+			deleteSeal(item) {
+				this.$confirm('确定要删除该印章?', () => {
+					deleteSeal(item.id).then(res => {
+						if (res.state) {
+							this.init();
+							this.$message.success('操作成功');
+						}
+					})
+				});
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.visible = false;
+			}
+		},
+		components: {
+			edit,
+			detail,
+			request
+		},
+	}
+</script>
+
 <style lang="scss"></style>

virgo.wzfrontend/console/src/views/work/organization/user.vue

@@ -75,6 +75,10 @@
 										<span class="table-operation" @click="lookUser(scope.row)">
 											详情
 										</span>
+										<span class="table-operation" v-if="!scope.row.projectFlowId"
+											@click="updateUser(scope.row,3,'修改用户')">
+											编辑
+										</span>
 										<span class="table-operation" v-if="!scope.row.projectFlowId"
 											@click="deleteUser(scope.row)">
 											删除
@@ -93,6 +97,7 @@
 		<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="visible" width="900px" :append-to-body="true">
 			<edit v-if="visible && type === 1" :part="part" @callback="callback"></edit>
 			<role v-if="visible && type === 2" :user="user" @callback="callback"></role>
+			<info-form v-if="visible && type === 3" :user="user" @callback="callback"></info-form>
 		</el-dialog>
 		<el-drawer title="用户详情" :visible.sync="drawer" :size="400" :append-to-body="true">
 			<detail v-if="drawer" :user="user"></detail>
@@ -110,6 +115,7 @@
 	import role from '@/components/work/organization/user/role'
 	import detail from '@/components/work/organization/user/detail'
 	import edit from '@/components/work/organization/user/edit'
+	import infoForm from '@/components/work/organization/user/infoForm'
 	export default {
 		data() {
 			return {
@@ -198,7 +204,8 @@
 			avatar,
 			edit,
 			role,
-			detail
+			detail,
+			infoForm
 		}
 	}
 </script>