~admin/zhba_enterprises.git

			@@ -15,7 +15,8 @@
			</el-col>
			<el-col :span="24">
			<basic-container>
			<avue-crud :option="option"
			<avue-crud
			:option="option"
			:search.sync="search"
			:table-loading="loading"
			:data="data"
			@@ -34,7 +35,8 @@
			@current-change="currentChange"
			@size-change="sizeChange"
			@refresh-change="refreshChange"
			@on-load="onLoad">
			@on-load="onLoad"
			>
			<template slot="menuLeft">
			<el-button
			type="danger"
			@@ -116,49 +118,58 @@
			</el-button>
			</template>

			<template slot-scope="{row}"
			slot="tenantName">
			<template slot-scope="{ row }" slot="sex">
			<el-tag v-if="row.sex == 1">男</el-tag>
			<el-tag v-if="row.sex == 2">女</el-tag>
			</template>

			<template slot-scope="{ row }" slot="tenantName">
			<el-tag>{{row.tenantName}}</el-tag>
			</template>
			<template slot-scope="{row}"
			slot="roleName">
			<template slot-scope="{ row }" slot="roleName">
			<el-tag>{{row.roleName}}</el-tag>
			</template>
			<template slot-scope="{row}"
			slot="deptName">
			<template slot-scope="{ row }" slot="deptName">
			<el-tag>{{row.deptName}}</el-tag>
			</template>
			<template slot-scope="{row}"
			slot="userTypeName">
			<template slot-scope="{ row }" slot="userTypeName">
			<el-tag>{{row.userTypeName}}</el-tag>
			</template>
			</avue-crud>
			<el-dialog title="用户角色配置"
			<el-dialog
			title="用户角色配置"
			append-to-body
			:visible.sync="roleBox"
			width="345px">

			<el-tree :data="roleGrantList"
			width="345px"
			>
			<el-tree
			:data="roleGrantList"
			show-checkbox
			check-strictly
			default-expand-all
			node-key="id"
			ref="treeRole"
			:default-checked-keys="roleTreeObj"
			:props="props">
			:props="props"
			>
			</el-tree>

			<span slot="footer" class="dialog-footer">
			<el-button @click="roleBox = false">取消</el-button>
			<el-button type="primary"
			@click="submitRole">确定</el-button>
			<el-button type="primary" @click="submitRole">确定</el-button>
			</span>
			</el-dialog>
			<el-dialog title="用户数据导入"
			<el-dialog
			title="用户数据导入"
			append-to-body
			:visible.sync="excelBox"
			width="555px">
			<avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
			width="555px"
			>
			<avue-form
			:option="excelOption"
			v-model="excelForm"
			:upload-after="uploadAfter"
			>
			<template slot="excelTemplate">
			<el-button type="primary" @click="handleTemplate">
			点击下载<i class="el-icon-download el-icon--right"></i>
			@@ -166,10 +177,13 @@
			</template>
			</avue-form>
			</el-dialog>
			<el-dialog title="用户平台配置"
			<el-dialog
			title="用户平台配置"
			append-to-body
			:visible.sync="platformBox">
			<avue-crud :option="platformOption"
			:visible.sync="platformBox"
			>
			<avue-crud
			:option="platformOption"
			:table-loading="platformLoading"
			:data="platformData"
			ref="platformCrud"
			@@ -184,13 +198,12 @@
			@current-change="platformCurrentChange"
			@size-change="platformSizeChange"
			@refresh-change="platformRefreshChange"
			@on-load="platformOnLoad">
			<template slot-scope="{row}"
			slot="tenantName">
			@on-load="platformOnLoad"
			>
			<template slot-scope="{ row }" slot="tenantName">
			<el-tag>{{row.tenantName}}</el-tag>
			</template>
			<template slot-scope="{row}"
			slot="userTypeName">
			<template slot-scope="{ row }" slot="userTypeName">
			<el-tag>{{row.userTypeName}}</el-tag>
			</template>
			</avue-crud>
			@@ -202,7 +215,6 @@

			<script>
			import {
			getList,
			getUser,
			getUserPlatform,
			remove,
			@@ -212,30 +224,31 @@
			grant,
			resetPassword,
			getUserPractitionersInfo,
			saveOrUpdateUserPractitionersInfo
			saveOrUpdateUserPractitionersInfo,
			} from "@/api/system/user";
			import { getList } from "@/api/securityGuard/securityGuard";
			import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
			import {getRoleTree} from "@/api/system/role";
			import {getPostList} from "@/api/system/post";
			import {mapGetters} from "vuex";
			import website from '@/config/website';
			import {getToken} from '@/util/auth';
			import { securityFormPageColumn, securityBaseInfoColumns } from "./data";
			import website from "@/config/website";
			import { getToken } from "@/util/auth";
			import { securityFormPageColumn } from "./data";

			export default {
			data() {
			const validatePass = (rule, value, callback) => {
			if (value === '') {
			callback(new Error('请输入密码'));
			if (value === "") {
			callback(new Error("请输入密码"));
			} else {
			callback();
			}
			};
			const validatePass2 = (rule, value, callback) => {
			if (value === '') {
			callback(new Error('请再次输入密码'));
			if (value === "") {
			callback(new Error("请再次输入密码"));
			} else if (value !== this.form.password) {
			callback(new Error('两次输入密码不一致!'));
			callback(new Error("两次输入密码不一致!"));
			} else {
			callback();
			}
			@@ -254,12 +267,12 @@
			page: {
			pageSize: 10,
			currentPage: 1,
			total: 0
			total: 0,
			},
			platformPage: {
			pageSize: 10,
			currentPage: 1,
			total: 0
			total: 0,
			},
			init: {
			roleTree: [],
			@@ -267,38 +280,40 @@
			},
			props: {
			label: "title",
			value: "key"
			value: "key",
			},
			roleGrantList: [],
			roleTreeObj: [],
			treeDeptId: '',
			treeDeptId: "",
			treeData: [],
			treeOption: {
			nodeKey: 'id',
			nodeKey: "id",
			lazy: true,
			treeLoad: function (node, resolve) {
			const parentId = (node.level === 0) ? 0 : node.data.id;
			getDeptLazyTree(parentId).then(res => {
			resolve(res.data.data.map(item => {
			const parentId = node.level === 0 ? 0 : node.data.id;
			getDeptLazyTree(parentId).then((res) => {
			resolve(
			res.data.data.map((item) => {
			return {
			...item,
			leaf: !item.hasChildren
			}
			}))
			leaf: !item.hasChildren,
			};
			})
			);
			});
			},
			addBtn: false,
			menu: false,
			size: 'small',
			size: "small",
			props: {
			labelText: '标题',
			label: 'title',
			value: 'value',
			children: 'children'
			}
			labelText: "标题",
			label: "title",
			value: "value",
			children: "children",
			},
			},
			option: {
			height: 'auto',
			height: "auto",
			calcHeight: 80,
			tip: false,
			searchShow: true,
			@@ -336,7 +351,7 @@
			required: true,
			message: "请选择组织机构",
			trigger: "blur",
			}
			},
			],
			},
			{
			@@ -347,24 +362,29 @@
			required: true,
			message: "请输入登录账号",
			trigger: "blur",
			}
			},
			],
			// disabled: true,
			},{
			label: '密码',
			prop: 'password',
			hide: true,
			editDisplay: false,
			viewDisplay: false,
			rules: [{required: true, validator: validatePass, trigger: 'blur'}]
			},
			{
			label: '确认密码',
			prop: 'password2',
			label: "密码",
			prop: "password",
			hide: true,
			editDisplay: false,
			viewDisplay: false,
			rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
			rules: [
			{ required: true, validator: validatePass, trigger: "blur" },
			],
			},
			{
			label: "确认密码",
			prop: "password2",
			hide: true,
			editDisplay: false,
			viewDisplay: false,
			rules: [
			{ required: true, validator: validatePass2, trigger: "blur" },
			],
			},
			{
			label: "用户姓名",
			@@ -389,7 +409,8 @@
			{
			label: "用户昵称",
			prop: "name",
			}, {
			},
			{
			label: "所属行政区",
			prop: "jurisdiction",
			// multiple: true,
			@@ -408,7 +429,8 @@
			trigger: "click",
			},
			],
			},{
			},
			{
			label: "所属角色",
			prop: "roleId",
			multiple: true,
			@@ -421,12 +443,13 @@
			slot: true,
			rules: [
			{
			required: false,
			required: true,
			message: "请选择所属角色",
			trigger: "click",
			},
			],
			},{
			},
			{
			label: "所属岗位",
			prop: "postId",
			type: "tree",
			@@ -492,7 +515,7 @@
			value: "dictKey",
			},
			dataType: "number",
			slot: true
			slot: true,
			},
			{
			label: "政治面貌",
			@@ -521,6 +544,7 @@
			label: "用户性别",
			prop: "sex",
			type: "select",
			slot: true,
			dicData: [
			{
			label: "男",
			@@ -530,10 +554,10 @@
			label: "女",
			value: 2,
			},
			{
			label: "未知",
			value: 3,
			},
			// {
			// label: "未知",
			// value: 3,
			// },
			],
			},
			{
			@@ -638,31 +662,31 @@
			viewBtn: true,
			dialogClickModal: false,
			menuWidth: 120,
			editBtnText: '配置',
			editBtnText: "配置",
			column: [
			{
			label: "登录账号",
			prop: "account",
			search: true,
			display: false
			display: false,
			},
			{
			label: "所属保安单位",
			prop: "tenantName",
			slot: true,
			display: false
			display: false,
			},
			{
			label: "用户姓名",
			prop: "realName",
			search: true,
			display: false
			display: false,
			},
			{
			label: "用户平台",
			prop: "userTypeName",
			slot: true,
			display: false
			display: false,
			},
			{
			label: "用户平台",
			@@ -670,18 +694,20 @@
			dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
			props: {
			label: "dictValue",
			value: "dictKey"
			value: "dictKey",
			},
			dataType: "number",
			search: true,
			hide: true,
			display: false,
			prop: "userType",
			rules: [{
			rules: [
			{
			required: true,
			message: "请选择用户平台",
			trigger: "blur"
			}]
			trigger: "blur",
			},
			],
			},
			{
			label: "用户拓展",
			@@ -701,17 +727,17 @@
			emptyBtn: false,
			column: [
			{
			label: '模板上传',
			prop: 'excelFile',
			type: 'upload',
			label: "模板上传",
			prop: "excelFile",
			type: "upload",
			drag: true,
			loadText: '模板上传中，请稍等',
			loadText: "模板上传中，请稍等",
			span: 24,
			propsHttp: {
			res: 'data'
			res: "data",
			},
			tip: '请上传 .xls,.xlsx 标准格式文件',
			action: "/api/blade-user/import-user"
			tip: "请上传 .xls,.xlsx 标准格式文件",
			action: "/api/blade-user/import-user",
			},
			{
			label: "数据覆盖",
			@@ -722,12 +748,12 @@
			dicData: [
			{
			label: "否",
			value: 0
			value: 0,
			},
			{
			label: "是",
			value: 1
			}
			value: 1,
			},
			],
			value: 0,
			slot: true,
			@@ -735,32 +761,35 @@
			{
			required: true,
			message: "请选择是否覆盖",
			trigger: "blur"
			}
			]
			trigger: "blur",
			},
			],
			},
			{
			label: '模板下载',
			prop: 'excelTemplate',
			label: "模板下载",
			prop: "excelTemplate",
			formslot: true,
			span: 24,
			}
			]
			}
			},
			],
			},
			};
			},
			watch: {
			'form.tenantId'() {
			if (this.form.tenantId !== '' && this.initFlag) {
			"form.tenantId"() {
			if (this.form.tenantId !== "" && this.initFlag) {
			this.initData(this.form.tenantId);
			}
			},
			'excelForm.isCovered'() {
			if (this.excelForm.isCovered !== '') {
			"form.deptId"() {
			this.initData(this.form.tenantId);
			},
			"excelForm.isCovered"() {
			if (this.excelForm.isCovered !== "") {
			const column = this.findObject(this.excelOption.column, "excelFile");
			column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
			}
			}
			},
			},
			computed: {
			...mapGetters(["userInfo", "permission"]),
			@@ -777,12 +806,12 @@
			addBtn: false,
			viewBtn: false,
			delBtn: false,
			editBtn: this.vaildData(this.permission.user_edit, false)
			editBtn: this.vaildData(this.permission.user_edit, false),
			};
			},
			ids() {
			let ids = [];
			this.selectionList.forEach(ele => {
			this.selectionList.forEach((ele) => {
			ids.push(ele.id);
			});
			return ids.join(",");
			@@ -798,8 +827,8 @@
			//行点击事件
			rowClick(row) {
			this.$router.push({
			path: "/securityGuard/securityGuardDetail",
			query: { row: row },
			path: "/securityGuardDetail",
			query: { row: JSON.stringify(row) },
			});
			},
			nodeClick(data) {
			@@ -808,15 +837,15 @@
			this.onLoad(this.page);
			},
			initData(tenantId) {
			getRoleTree(tenantId).then(res => {
			getRoleTree(tenantId).then((res) => {
			const column = this.findObject(this.option.group, "roleId");
			column.dicData = res.data.data;
			});
			getDeptTree(tenantId).then(res => {
			getDeptTree(tenantId).then((res) => {
			const column = this.findObject(this.option.group, "deptId");
			column.dicData = res.data.data;
			});
			getPostList(tenantId).then(res => {
			getPostList(tenantId).then((res) => {
			const column = this.findObject(this.option.group, "postId");
			column.dicData = res.data.data;
			});
			@@ -827,13 +856,12 @@
			this.roleBox = false;
			this.$message({
			type: "success",
			message: "操作成功!"
			message: "操作成功!",
			});
			this.onLoad(this.page);
			});
			},
			rowSave(row, done, loading) {
			debugger;
			if(row.deptId){
			row.deptId = row.deptId;
			}
			@@ -912,6 +940,8 @@
			});
			}
			var IdCardNo = row.cardid;
			//值替换，education 放在页面会卡死
			row.education = row.education1;
			update(row).then(
			() => {
			const experience = {
			@@ -959,7 +989,7 @@
			},
			searchReset() {
			this.query = {};
			this.treeDeptId = '';
			this.treeDeptId = "";
			this.onLoad(this.page);
			},
			searchChange(params, done) {
			@@ -983,7 +1013,7 @@
			this.$confirm("确定将选择用户注销?", {
			confirmButtonText: "确定",
			cancelButtonText: "取消",
			type: "warning"
			type: "warning",
			})
			.then(() => {
			return remove(this.ids);
			@@ -992,7 +1022,7 @@
			this.onLoad(this.page);
			this.$message({
			type: "success",
			message: "操作成功!"
			message: "操作成功!",
			});
			this.$refs.crud.toggleSelection();
			});
			@@ -1005,7 +1035,7 @@
			this.$confirm("确定将选择账号密码重置为123456?", {
			confirmButtonText: "确定",
			cancelButtonText: "取消",
			type: "warning"
			type: "warning",
			})
			.then(() => {
			return resetPassword(this.ids);
			@@ -1013,7 +1043,7 @@
			.then(() => {
			this.$message({
			type: "success",
			message: "操作成功!"
			message: "操作成功!",
			});
			this.$refs.crud.toggleSelection();
			});
			@@ -1027,7 +1057,7 @@
			if (this.selectionList.length === 1) {
			this.roleTreeObj = this.selectionList[0].roleId.split(",");
			}
			getRoleTree().then(res => {
			getRoleTree().then((res) => {
			this.roleGrantList = res.data.data;
			this.roleBox = true;
			});
			@@ -1048,19 +1078,37 @@
			this.$confirm("是否导出用户数据?", "提示", {
			confirmButtonText: "确定",
			cancelButtonText: "取消",
			type: "warning"
			type: "warning",
			}).then(() => {
			window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
			window.open(
			`/api/blade-user/export-user?${
			this.website.tokenHeader
			}=${getToken()}&account=${this.search.account}&realName=${
			this.search.realName
			}`
			);
			});
			},
			handleTemplate() {
			window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
			window.open(
			`/api/blade-user/export-template?${
			this.website.tokenHeader
			}=${getToken()}`
			);
			},
			beforeOpen(done, type) {
			var that = this;
			if (["edit", "view"].includes(type)) {
			getUser(this.form.id).then(res => {
			getUser(this.form.id).then((res) => {
			this.form = res.data.data;
			var d = {
			education1: res.data.data.education,
			};
			this.form = {
			...this.form,
			...d,
			};
			// this.from["education1"] = res.data.data.education;
			if(this.form.hasOwnProperty("deptId")){
			this.form.deptId = this.form.deptId;
			}
			@@ -1090,31 +1138,43 @@
			this.onLoad(this.page, this.query);
			},
			onLoad(page, params = {}) {
			let values = {
			...params,
			};
			values = {
			...params,
			...this.query,
			};
			this.loading = true;
			getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
			getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(
			(res) => {
			const data = res.data.data;
			this.page.total = data.total;
			this.data = data.records;
			this.loading = false;
			this.selectionClear();
			});
			}
			);
			},
			platformRowUpdate(row, index, done, loading) {
			updatePlatform(row.id, row.userType, row.userExt).then(() => {
			updatePlatform(row.id, row.userType, row.userExt).then(
			() => {
			this.platformOnLoad(this.platformPage);
			this.$message({
			type: "success",
			message: "操作成功!"
			message: "操作成功!",
			});
			done();
			}, error => {
			},
			(error) => {
			window.console.log(error);
			loading();
			});
			}
			);
			},
			platformBeforeOpen(done, type) {
			if (["edit", "view"].includes(type)) {
			getUserPlatform(this.platformForm.id).then(res => {
			getUserPlatform(this.platformForm.id).then((res) => {
			this.platformForm = res.data.data;
			});
			}
			@@ -1148,15 +1208,20 @@
			},
			platformOnLoad(page, params = {}) {
			this.platformLoading = true;
			getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
			getList(
			page.currentPage,
			page.pageSize,
			Object.assign(params, this.query),
			this.treeDeptId
			).then((res) => {
			const data = res.data.data;
			this.platformPage.total = data.total;
			this.platformData = data.records;
			this.platformLoading = false;
			this.selectionClear();
			});
			}
			}
			},
			},
			};
			</script>