From 426d3d33f23bd04e7cafda728cdcc82f11d5baa3 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 二月 2023 17:09:07 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/systemSetting/baseSetting/user/components/createUser/index.vue | 71 ++++++++---------------------------
1 files changed, 16 insertions(+), 55 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
index 14a91a7..2009dba 100644
--- a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
@@ -185,26 +185,10 @@
label="鎵�灞為儴闂�:"
prop="departmentId"
>
- <el-select
- v-model="user.departmentId"
- placeholder="璇烽�夋嫨鎵�灞為儴闂�"
- @change="getDepartName"
- >
- <el-option :value="mylabel">
- <el-tree
- ref="tree"
- :check-strictly="true"
- :data="departList"
- :props="defaultProps"
- show-checkbox
- @check-change="handleCheck"
- @node-click="nodeClick"
- default-expand-all
- node-key="id"
- >
- </el-tree>
- </el-option>
- </el-select>
+ <departTree
+ :depart="userDepart"
+ @selectDepart="selectDepart"
+ ></departTree>
</el-form-item>
</div>
<div class="item-right"></div>
@@ -277,7 +261,11 @@
</template>
<script>
import { getTypeList } from "@/utils/helper";
+import departTree from "@/components/departTree/index.vue";
export default {
+ components: {
+ departTree,
+ },
data() {
const validateNickname = (rule, value, callback) => {
if (!value) {
@@ -406,7 +394,8 @@
jobTitle: null,
mac: "",
ip: "",
- },
+ },
+ userDepart: {},
createUserRules: {
nickName: [
{ required: true, trigger: "blur", validator: validateNickname },
@@ -448,9 +437,6 @@
}
},
},
- selectOrg: {
- orgsid: [],
- },
};
},
created() {
@@ -458,8 +444,6 @@
this.getRoleList();
// 鑾峰彇鐢ㄦ埛绫诲瀷
this.getUserTypeList();
- // 鑾峰彇閮ㄩ棬
- this.getDepartList();
},
methods: {
// 鎻愪氦娉ㄥ唽
@@ -467,11 +451,11 @@
this.$refs["user"].validate((valid) => {
console.log(valid);
if (valid) {
- const { user, selectOrg } = this;
+ const { user } = this;
console.log(user);
this.$axios
.post("sccg/admin/register", {
- departmentId: selectOrg.orgsid[0],
+ departmentId: user.departmentId,
email: user.email,
icon: "",
isDy: `${user.isDy}`,
@@ -538,33 +522,10 @@
async getUserTypeList() {
this.typeList = await getTypeList(1, "07");
},
- // 鑾峰彇閮ㄩ棬鏍�
- getDepartList() {
- this.$axios({
- method: "get",
- url: "sccg/depart/tree",
- }).then((res) => {
- this.departList = res.data;
- });
- },
- nodeClick(data, checked) {
- this.checkedId = data.comcode;
- this.$refs.tree.setCheckedNodes([data]);
- this.user.departmentId = data.departName;
- this.selectOrg.orgsid = [];
- this.selectOrg.orgsid.push(data.id);
- },
- handleCheck(data, checked) {
- if (checked == true) {
- this.checkedId = data.comcode;
- this.$refs.tree.setCheckedNodes([data]);
- this.user.departmentId = data.departName;
- this.selectOrg.orgsid = [];
- this.selectOrg.orgsid.push(data.id);
- } else {
- // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
- this.selectOrg.orgsid = [];
- this.user.departmentId = "";
+ selectDepart(depart) {
+ if (depart) {
+ this.user.departmentId = depart.departId;
+ this.user.departName = depart.departName;
}
},
},
--
Gitblit v1.8.0