fix

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

@@ -1286,3 +1286,62 @@
 		}
 	}
 }
+
+.el-alert.is-light {
+	background-color: #141C27 !important;
+	border: none !important;
+	border-radius: 2px;
+
+	.el-alert__icon {
+		margin-right: 8px;
+		font-family: "iconfont" !important;
+		font-size: 16px;
+	}
+
+	.el-alert__content {
+		color: $--color-common !important;
+		line-height: 22px;
+	}
+}
+
+.el-alert--success {
+	.el-icon-success {
+		color: $--color-green;
+	}
+
+	.el-icon-success::before {
+		content: '\e73c';
+	}
+}
+
+.el-alert--success {
+	.el-icon-success {
+		color: $--color-green;
+	}
+
+	.el-icon-success::before {
+		content: '\e73c';
+	}
+}
+
+.el-alert--error {
+	.el-icon-error {
+		color: $--color-red;
+		margin-top: 2px;
+	}
+
+	.el-icon-error::before {
+		content: '\e73a';
+	}
+}
+
+.el-alert--warning {
+	.el-icon-warning {
+		color: $--color-orange;
+		margin-top: 1px;
+	}
+
+	.el-icon-warning::before {
+		content: '\e73b';
+	}
+}

virgo.wzfrontend/console/src/components/system/role/edit.vue

@@ -0,0 +1,68 @@
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form ref="form" :model="form" label-position="top">
+				<el-form-item label="角色名称">
+					<el-input v-model="form.name"></el-input>
+				</el-form-item>
+				<el-form-item label="角色备注">
+					<el-input v-model="form.remark"></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 {
+		insertIdentity,
+		updateIdentity
+	} from '@/httpApi/system'
+	export default {
+		props: ['isUpdate', 'detail'],
+		data() {
+			return {
+				form: {
+					name: '',
+					remark: ''
+				}
+			}
+		},
+		created() {
+			if (this.isUpdate) {
+				this.form = JSON.parse(JSON.stringify(this.detail));
+			}
+		},
+		methods: {
+			submit() {
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						let postData = JSON.parse(JSON.stringify(this.form));
+						console.log(postData);
+						if (this.isUpdate) {
+							updateIdentity(postData).then(this.successFunc);
+						} else {
+							insertIdentity(postData).then(this.successFunc);
+						}
+					} else {
+						return false;
+					}
+				});
+			},
+			successFunc(res) {
+				if (res.state) {
+					this.$message.success('操作成功');
+					this.$emit('callback', 'init');
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

virgo.wzfrontend/console/src/components/system/role/role.vue

@@ -0,0 +1,144 @@
+<template>
+	<div class="hui-flex hui-dialog role-box">
+		<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="tree-node-label">
+						<span>{{ node.label }}</span>
+					</div>
+				</div>
+			</el-tree>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="updateMenu">保 存</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		getIdentityResource,
+		insertIdentityResource,
+		updateIdentityResource
+	} from '@/httpApi/system'
+	export default {
+		props: ['identityId', 'projectType'],
+		data() {
+			return {
+				roleData: [],
+				defaultProps: {
+					label: 'title'
+				},
+				checkedKeys: [],
+				resourceData: {}
+			}
+		},
+		created() {
+			this.roleData = JSON.parse(JSON.stringify(this.$store.getters.menuData));
+			this.$nextTick(() => {
+				this.cssTree();
+			})
+			this.init();
+		},
+		methods: {
+			init() {
+				getIdentityResource({
+					identityId: this.identityId,
+					type: this.projectType
+				}).then(res => {
+					if (res.state) {
+						if (res.data.length > 0) {
+							this.resourceData = res.data[0];
+							this.checkedKeys = [];
+							this.testCheck(this.resourceData.resource ? JSON.parse(this.resourceData.resource) :
+							[]);
+						}
+					}
+				})
+			},
+			cssTree() {
+				let classDomList = document.getElementsByClassName('especially')
+				// 改变这几个样式
+				if (classDomList.length == 0) return;
+				let paddingleft = parseInt(classDomList[0].parentNode.style.paddingLeft);
+				for (let i = 0; i < classDomList.length; i++) {
+					let node = classDomList[i].parentNode.parentNode;
+					node.parentNode.style.paddingLeft = (paddingleft + 24) + 'px';
+					node.parentNode.classList.add('tree-children-list')
+				}
+			},
+			filterArr(opArr, partId) {
+				function circle(opArr) {
+					for (let i = 0; i < opArr.length; i++) {
+						const isAccord = partId.find(r => r === opArr[i].id)
+						if (!isAccord) {
+							opArr.splice(i, 1)
+							i--
+						} else if (opArr[i].children && opArr[i].children.length) {
+							circle(opArr[i].children)
+						}
+					}
+				}
+				circle(opArr)
+				return opArr
+			},
+			testCheck(data) {
+				for (var i = 0; i < data.length; i++) {
+					if (data[i].children && data[i].children.length > 0) {
+						this.testCheck(data[i].children);
+					} else {
+						this.checkedKeys.push(data[i].id);
+					}
+				}
+			},
+			updateMenu() {
+				let resultData = JSON.parse(JSON.stringify(this.$store.getters.menuData));
+				let data = this.$refs.tree.getCheckedNodes(false, true);
+				let partId = data.map(node => node.id);
+				let obj = {
+					identityId: this.identityId,
+					type: this.projectType,
+					resource: JSON.stringify(this.filterArr(resultData, partId)),
+					menus: JSON.stringify(data.filter(item => !!item.index).map(item => item.index))
+				}
+				if (this.resourceData.id) {
+					obj['id'] = this.resourceData.id;
+					updateIdentityResource(obj).then(res => {
+						if (res.state) {
+							this.$emit('callback', 'init');
+							this.$message.success('操作成功')
+						}
+					})
+				} else {
+					insertIdentityResource(obj).then(res => {
+						if (res.state) {
+							this.$emit('callback', 'init');
+							this.$message.success('操作成功')
+						}
+					})
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.role-box {
+		width: 100%;
+		height: 100%;
+
+		.el-tree {
+			.tree-node {
+				left: 0;
+			}
+
+			.el-tree-node__content>.el-tree-node__expand-icon {
+				padding: 6px;
+			}
+		}
+
+	}
+</style>

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

@@ -12,7 +12,7 @@
 					<el-input type="text" v-model="informationForm.contact"></el-input>
 				</el-form-item>
 				<el-form-item label="联系方式" prop="contactTel">
-					<el-input type="text" v-model="informationForm.contactTel"></el-input>
+					<el-input type="text" v-model="informationForm.contactTel" disabled></el-input>
 				</el-form-item>
 				<el-form-item label="组织地址" prop="address">
 					<city v-model="informationForm.address"></city>

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

@@ -1,3 +1,11 @@
+const projectType = [{
+	id: 1,
+	name: '房屋租赁'
+}, {
+	id: 2,
+	name: '知识产权'
+}];
+
 const houseType = [{
 	id: 1,
 	name: '纯写字楼'
@@ -10,7 +18,8 @@ const houseType = [{
 }, {
 	id: 4,
 	name: '厂房改造'
-}]
+}];
+
 const payWay = [{
 	id: 1,
 	name: '公对公转账'
@@ -34,7 +43,7 @@ const customerType = [{
 }, {
 	id: 5,
 	name: '流失客户'
-}]
+}];
 
 const followUpState = [{
 	id: 1,
@@ -57,7 +66,8 @@ const followUpState = [{
 }, {
 	id: 7,
 	name: '未联系上'
-}]
+}];
+
 const fieldType = [{
 	id: 1,
 	name: '输入类型'
@@ -110,7 +120,8 @@ const industryType = [{
 const rentWay = [{
 	id: 1,
 	name: '固定租金'
-}]
+}];
+
 const chargingType = [{
 	id: 1,
 	name: '按月计费'
@@ -120,7 +131,8 @@ const chargingType = [{
 }, {
 	id: 3,
 	name: '按年计费'
-}]
+}];
+
 const payTime = [{
 	id: 1,
 	name: '当天提醒'
@@ -133,44 +145,52 @@ const payTime = [{
 }, {
 	id: 4,
 	name: '提前五天提醒'
-}]
+}];
+
 const unnaturalMonthChargingWay = [{
 	id: 1,
 	name: '按天单价计算'
-}]
+}];
+
 const leaseTermWay = [{
 	id: 1,
 	name: '按起始日划分'
 }, {
 	id: 2,
 	name: '延迟一日划分'
-}]
+}];
+
 const earnestMoneyType = [{
 	id: 1,
 	name: '租金保证金'
 }, {
 	id: 2,
 	name: '装修保证金'
-}]
+}];
+
 const currencyType = [{
 	id: 1,
 	name: '人民币CNY'
-}]
+}];
+
 const preferentialType = [{
 	id: 1,
 	name: '免租期'
-}]
+}];
+
 const preferentialRentFreeWay = [{
 	id: 1,
 	name: '免租期划入租期'
-}]
+}];
+
 const invoiceType = [{
 	id: 1,
 	name: '增值税普通发票'
 }, {
 	id: 2,
 	name: '增值税电子普通发票'
-}]
+}];
+
 const serviceWorkWay = [{
 	id: 1,
 	name: '上门修理'
@@ -189,23 +209,26 @@ const serviceWorkWay = [{
 }, {
 	id: 6,
 	name: '网络维修'
-}]
+}];
+
 const clearWorkWay = [{
 	id: 1,
 	name: '日常保洁'
 }, {
 	id: 2,
 	name: '垃圾处理'
-}]
+}];
+
 const findItem = (type, id) => {
 	return eval(type).find(node => node.id == id) || {
 		id: 0,
 		name: '-'
 	};
-}
+};
 
 export default {
 	field: {
+		projectType,
 		houseType,
 		payWay,
 		customerType,

virgo.wzfrontend/console/src/config/identity.txt

@@ -1,6 +0,0 @@
-身份：
-	1-客户
-	2-中介
-	3-组织所有者
-	4-关联客户组织
-	6-组织成员

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

@@ -31,4 +31,69 @@ export function updateMenu(data) {
 		method: 'put',
 		data: data
 	})
+}
+/* 
+ * 获取身份
+ * 
+ */
+export function getIdentityList() {
+	return request({
+		url: `/manager/identity`,
+		method: 'get',
+	})
+}
+/* 
+ * 新增身份
+ * 
+ */
+export function insertIdentity(data) {
+	return request({
+		url: `/manager/identity`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 编辑身份
+ * 
+ */
+export function updateIdentity(data) {
+	return request({
+		url: `/manager/identity/update`,
+		method: 'put',
+		data: data
+	})
+}
+/* 
+ * 身份资源的获取
+ * 
+ */
+export function getIdentityResource(data) {
+	return request({
+		url: `/manager/identity/resource/query`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 新增身份资源
+ * 
+ */
+export function insertIdentityResource(data) {
+	return request({
+		url: `/manager/identity/resource`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 更新身份资源
+ * 
+ */
+export function updateIdentityResource(data) {
+	return request({
+		url: `/manager/identity/resource/update`,
+		method: 'put',
+		data: data
+	})
 }

virgo.wzfrontend/console/src/layout/components/selectProject.vue

@@ -15,7 +15,7 @@
 							<div class="hui-tag hui-tag-success" v-if="scope.row.identityId === 1">客户</div>
 							<div class="hui-tag hui-tag-success" v-else-if="scope.row.identityId === 2">中介</div>
 							<div class="hui-tag hui-tag-success" v-else-if="scope.row.identityId === 3">
-								组织成员
+								公司成员
 							</div>
 							<div class="hui-tag hui-tag-success" v-else-if="scope.row.identityId === 4">
 								关联公司
@@ -79,12 +79,14 @@
 				}).then(res => {
 					if (res.state) {
 						this.tableData = res.data.dataList.map(node => {
+							let organization = user.organizationList.find(item => item.id === node
+								.organizationId);
+							console.log(organization);
 							return {
 								projectId: node.id,
 								projectName: node.name,
 								organizationId: node.organizationId,
-								organizationName: user.organizationList.find(item => item.id === node
-									.organizationId).name,
+								organizationName: !organization ? '' : organization.name,
 								identityId: 6
 							}
 						})
@@ -117,8 +119,8 @@
 														projectId: node.id,
 														projectName: node.name,
 														organizationId: node.organizationId,
-														organizationName: this.$store.getters
-															.organization.name,
+														organizationName: node
+															.organizationName,
 														identityId: 6
 													}
 												})

virgo.wzfrontend/console/src/router/modules/system.js

@@ -15,6 +15,13 @@ const system = [{
 		meta: {
 			title: '更新日志'
 		}
+	}, {
+		path: 'role',
+		component: () => import('@/views/system/role'),
+		name: '角色设置',
+		meta: {
+			title: '角色设置'
+		}
 	}]
 }]
 export default system;

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

@@ -125,6 +125,13 @@
 					<div class="log-item">1、完成会议场所、会议类型的功能。</div>
 					<div class="log-item">2、完成项目会议、公司会议的功能。</div>
 				</div>
+			</el-timeline-item>
+			<el-timeline-item timestamp="2024-06-29" placement="top">
+				<div class="log-box">
+					<div class="log-item">1、新增角色设置的功能以及根据不同项目进行设置菜单。</div>
+					<div class="log-item">2、修复未注册登录不上去的bug。</div>
+					<div class="log-item">3、新增标签组织隔离。</div>
+				</div>
 			</el-timeline-item>
 		</el-timeline>
 	</div>

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

@@ -0,0 +1,106 @@
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-flex-box hui-flex hui-table">
+			<div class="hui-content-insert">
+				<el-button type="primary" size="medium" @click="insertRole">新增身份</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" width="100"></el-table-column>
+					<el-table-column label="身份描述" prop="remark"></el-table-column>
+					<el-table-column :label="item.name" v-for="item in $field.field.projectType" :key="item.id">
+						<template slot-scope="scope">
+							<el-button size="small" type="info" @click="setRole(scope.row.id,item.id)">
+								设置
+							</el-button>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" width="150">
+						<template slot-scope="scope">
+							<div class="hui-table-operation">
+								<span class="table-operation" @click="updateRole(scope.row)">编辑</span>
+							</div>
+						</template>
+					</el-table-column>
+					<template slot="empty">
+						<empty description="暂无数据"></empty>
+					</template>
+				</el-table>
+			</div>
+		</div>
+		<el-dialog :title="title" :visible.sync="visible" width="900px" :append-to-body="true">
+			<edit v-if="visible && type === 1" @callback="callback" :isUpdate="isUpdate" :detail="detail"></edit>
+			<role v-if="visible && type === 2" :identityId="identityId" :projectType="projectType" @callback="callback">
+			</role>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import {
+		getIdentityList
+	} from '@/httpApi/system'
+	import edit from '@/components/system/role/edit'
+	import role from '@/components/system/role/role'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				visible: false,
+				detail: {},
+				isUpdate: false,
+				title: '',
+				identityId: '',
+				projectType: ''
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				getIdentityList().then(res => {
+					if (res.state) {
+						this.tableData = res.data;
+					}
+				})
+			},
+			insertRole() {
+				this.detail = {};
+				this.isUpdate = false;
+				this.title = '新增';
+				this.type = 1;
+				this.visible = true;
+			},
+			updateRole(val) {
+				this.detail = val;
+				this.isUpdate = true;
+				this.title = '编辑';
+				this.type = 1;
+				this.visible = true;
+			},
+			setRole(identityId, projectType) {
+				this.identityId = identityId;
+				this.projectType = projectType;
+				this.title = '设置权限';
+				this.type = 2;
+				this.visible = true;
+			},
+			callback(type) {
+				if (type === 'init') this.init();
+				this.visible = false;
+			}
+		},
+		components: {
+			edit,
+			role
+		},
+	}
+</script>
+
+<style lang="scss"></style>