From 7705cdd240ea1a07a5772ffb6ba0e1e4995bcc74 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 09 二月 2023 16:36:19 +0800
Subject: [PATCH] 部门组件，bug修改
---
src/views/operate/car/myIndex/create/law/index.vue | 22
src/views/systemSetting/device/grid/components/createUser/index.vue | 1101 ++++++++++++++++++-----------------
src/components/Table/index.vue | 4
src/views/systemSetting/baseSetting/user/components/updateUser/index.vue | 521 ++++++++--------
src/views/systemSetting/baseSetting/user/components/createUser/index.vue | 71 -
src/components/departTree/index.vue | 2
src/views/operate/writManager/writ/index.vue | 8
src/views/systemSetting/device/handheldTerminal/components/dialogForm.vue | 74 -
8 files changed, 870 insertions(+), 933 deletions(-)
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index 4a560a0..72cfb60 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -243,11 +243,11 @@
}
&::v-deep .warning-row {
- background-color: #06122c;
+ // background-color: #06122c;
}
&::v-deep .success-row {
- background-color: #071f39;
+ // background-color: #071f39;
}
.operationBox {
diff --git a/src/components/departTree/index.vue b/src/components/departTree/index.vue
index 945b376..87e1c7d 100644
--- a/src/components/departTree/index.vue
+++ b/src/components/departTree/index.vue
@@ -1,5 +1,5 @@
<template>
- <el-select v-model="model.departName" placeholder="璇烽�夋嫨鎵�灞為儴闂�">
+ <el-select v-model="model.departName" placeholder="璇烽�夋嫨閮ㄩ棬">
<el-option value="1">
<el-tree
ref="tree"
diff --git a/src/views/operate/car/myIndex/create/law/index.vue b/src/views/operate/car/myIndex/create/law/index.vue
index 37cd9e4..9d7bd46 100644
--- a/src/views/operate/car/myIndex/create/law/index.vue
+++ b/src/views/operate/car/myIndex/create/law/index.vue
@@ -212,28 +212,6 @@
this.car.departName = depart.departName;
}
},
- nodeClick(data, checked) {
- this.checkedId = data.comcode;
- this.$refs.tree.setCheckedNodes([data]);
- this.car.departId = data.id;
- this.car.departName = 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.car.departId = data.id;
- this.car.departName = data.departName;
- this.selectOrg.orgsid = [];
- this.selectOrg.orgsid.push(data.id);
- } else {
- // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
- this.selectOrg.orgsid = [];
- this.user.departmentId = "";
- }
- },
},
props: ["closeDialog"],
};
diff --git a/src/views/operate/writManager/writ/index.vue b/src/views/operate/writManager/writ/index.vue
index e177dc0..d60462e 100644
--- a/src/views/operate/writManager/writ/index.vue
+++ b/src/views/operate/writManager/writ/index.vue
@@ -32,9 +32,9 @@
</el-table-column>
<el-table-column prop="writTypeName" label="鏂囦功绉嶇被" min-width="180">
</el-table-column>
- <el-table-column prop="categoryName" label="杩濇硶绫诲瀷" min-width="300">
+ <el-table-column prop="categoryName" label="杩濇硶绫诲瀷" min-width="80">
</el-table-column>
- <el-table-column prop="eventCode" label="浜嬩欢缂栧彿" width="160">
+ <el-table-column prop="eventCode" label="浜嬩欢缂栧彿" min-width="100">
</el-table-column>
<el-table-column prop="sendTime" label="鏂囦功鍙戞斁鏃堕棿" min-width="120">
</el-table-column>
@@ -63,7 +63,7 @@
prop="state"
:formatter="formatSate"
label="鐘舵��"
- width="60"
+ min-width="60"
>
</el-table-column>
@@ -187,7 +187,7 @@
},
handleDelete(row) {
this.$confirm("纭鍒犻櫎锛�").then((_) => {
- this.deleteWrit(row.id).then((res) => {
+ this.deleteWrit(row.baseCaseId).then((res) => {
this.$message({
type: "success",
message: "鍒犻櫎鎴愬姛锛�",
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;
}
},
},
diff --git a/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue b/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
index 68dbf83..601d067 100644
--- a/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
@@ -1,282 +1,287 @@
<template>
- <div class="updateUser">
- <main>
- <div class="mainContent">
- <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
- label-position="right">
- <!-- 閫夋嫨瑙掕壊 -->
- <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role" v-if="flag.role">
- <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags>
- <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 鎵�灞為儴闂� -->
- <el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="departmentId" v-else>
- <el-select v-model="user.departName" placeholder="璇烽�夋嫨鎵�灞為儴闂�" :disabled="!flag.depart">
- <el-option :value="mylabel">
- <el-tree ref="tree" :check-strictly="true" :data="departList" :props="defaultProps"
- show-checkbox @check-change="handleCheck"
- :default-checked-keys="[selectOrg.orgsid[0],]" default-expand-all node-key="id">
- </el-tree>
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item>
- <div class="optionBtn">
- <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦
- </el-button>
- </div>
- </el-form-item>
- </el-form>
-
+ <div class="updateUser">
+ <main>
+ <div class="mainContent">
+ <el-form
+ ref="user"
+ label-width="140px"
+ autoComplete="on"
+ :model="user"
+ :rules="createUserRules"
+ label-position="right"
+ >
+ <!-- 閫夋嫨瑙掕壊 -->
+ <el-form-item
+ class="optionItem"
+ label="閫夋嫨瑙掕壊:"
+ prop="role"
+ v-if="flag.role"
+ >
+ <el-select
+ v-model="user.role"
+ placeholder="璇烽�夋嫨鎵�灞炶鑹�"
+ multiple
+ collapse-tags
+ >
+ <el-option
+ v-for="item in roleList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鎵�灞為儴闂� -->
+ <el-form-item
+ class="optionItem"
+ label="鎵�灞為儴闂�:"
+ prop="departmentId"
+ v-else
+ >
+ <departTree
+ :depart="userDepart"
+ @selectDepart="selectDepart"
+ ></departTree>
+ </el-form-item>
+ <el-form-item>
+ <div class="optionBtn">
+ <el-button
+ type="primary"
+ class="btn submit"
+ @click.native.prevent="handleUser"
+ >鎻愪氦
+ </el-button>
</div>
- </main>
- </div>
+ </el-form-item>
+ </el-form>
+ </div>
+ </main>
+ </div>
</template>
<script>
+import departTree from "@/components/departTree/index.vue";
export default {
- data() {
- return {
- user: {
- },
- createUserRules: {
- },
- roleList: [
+ components: {
+ departTree,
+ },
+ data() {
+ return {
+ user: {},
+ userDepart: {},
+ createUserRules: {},
+ roleList: [],
+ departList: [],
+ mylabel: "",
+ defaultProps: {
+ children: "children",
+ label: "departName",
+ },
+ tempName: "",
+ tempRole: [],
+ };
+ },
+ created() {
+ this.user = JSON.parse(JSON.stringify(this.userInfo));
+ this.tempName = this.user.depart[0].departName;
- ],
- departList: [],
- mylabel: "",
- defaultProps: {
- children: "children",
- label: "departName",
- },
- selectOrg: {
- orgsid: [],
- },
- tempName: '',
- tempRole: []
+ this.userDepart = {
+ departId: this.user.depart[0].departId,
+ departName: this.user.depart[0].departName,
+ };
+ // 鑾峰彇鎵�鏈夎鑹插垪琛�
+ this.getRoleList();
+ // 鑾峰彇褰撳墠鐢ㄦ埛瑙掕壊鍒楄〃
+ this.getUserRole(this.user.id);
+ },
+ methods: {
+ // 淇敼閮ㄩ棬
+ changeDepart(data) {
+ this.departList.forEach((item) => {
+ if (item.id === data) {
+ this.user.departName = item.departName;
}
+ });
},
- created() {
- this.user = JSON.parse(JSON.stringify(this.userInfo));
- this.tempName = this.user.depart[0].departName;
- this.selectOrg.orgsid.push(this.user.depart[0].id);
- // 鑾峰彇鎵�鏈夎鑹插垪琛�
- this.getRoleList();
- // 鑾峰彇褰撳墠鐢ㄦ埛瑙掕壊鍒楄〃
- this.getUserRole(this.user.id)
- // 鑾峰彇鍏ㄩ儴閮ㄩ棬鍒楄〃
- this.$axios.get('/sccg/depart/tree').then(res => {
- this.departList = res.data;
- })
- },
- methods: {
- // 淇敼閮ㄩ棬
- changeDepart(data) {
- this.departList.forEach(item => {
- if (item.id === data) {
- this.user.departName = item.departName;
- }
- })
- },
- // 淇敼鐢ㄦ埛淇℃伅
- handleUser() {
- const { flag, user, tempName, selectOrg, tempRole, isArraySame } = this;
- let umsDepartManage = { userId: user.id, departId: selectOrg.orgsid[0] }
- this.$refs.user.validate((valid) => {
- if (valid) {
- user.isDy = `${user.isDy}`;
- if (flag.depart) {
- if (tempName === user.departName) {
- this.$message({
- type: 'warning',
- message: '鎮ㄧ殑閮ㄩ棬杩樻湭鏇存敼'
- })
- } else {
- if (user.departName) {
- this.$axios({
- method: 'put',
- url: `/sccg/depart/user_update_depart?userId=` + user.id + '&departId=' + selectOrg.orgsid[0]
- })
- .then(res => {
- this.$message({
- type: res.code === 200 ? 'success' : 'warning',
- message: res.message,
- })
- this.getUserList();
- this.$emit('closeDialog', { flag: false });
- })
- } else {
- this.$message({
- type: 'warning',
- message: '鐢ㄦ埛閮ㄩ棬涓嶈兘涓虹┖'
- })
- }
- }
-
- } else {
- if (user.role.length === 0) {
- this.$message({
- type: 'warning',
- message: '鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖',
- })
- }
- else if (isArraySame(tempRole, user.role) && tempRole.length === user.role.length) {
- this.$message({
- type: 'warning',
- message: '鎮ㄨ繕鏈洿鏀硅鑹�',
- })
- }
- else {
- this.$axios({
- method: 'put',
- url: 'sccg/depart/user_update_Role?id=' + user.id + '&roles=' + user.role,
- })
- .then(res => {
- this.$message({
- type: res.code === 200 ? 'success' : 'warning',
- message: res.message,
- })
- this.getUserList();
- this.$emit('closeDialog', { flag: false });
- })
- }
- }
- } else {
- return false;
- }
- })
- },
- // 鑾峰彇瑙掕壊鍒楄〃
- getRoleList() {
- this.$axios({
- method: 'get',
- url: 'sccg/role/listAll',
- })
- .then(res => {
- this.roleList = res.data;
- })
- },
- // 鑾峰彇鐢ㄦ埛鐨勮鑹插垪琛�
- getUserRole(id) {
- this.$axios({
- method: 'get',
- url: `sccg/admin/role/${id}`
- })
- .then(res => {
- const arr = [];
- res.data.forEach(item => {
- arr.push(item.id);
- })
- this.user.role = arr;
- this.tempRole = arr;
- })
- },
- // 閮ㄩ棬淇敼
- handleCheck(data, checked) {
- this.user.departName = data.departName;
- // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
- const indexs = this.selectOrg.orgsid.indexOf(data.id);
- // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
- if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
- this.$message({
- message: "鍙兘閫夋嫨涓�涓儴闂紒",
- type: "warning",
- showClose: true,
+ // 淇敼鐢ㄦ埛淇℃伅
+ handleUser() {
+ const { flag, user, tempName, tempRole, isArraySame } = this;
+ let umsDepartManage = { userId: user.id, departId: user.departId };
+ this.$refs.user.validate((valid) => {
+ if (valid) {
+ user.isDy = `${user.isDy}`;
+ if (flag.depart) {
+ if (tempName === user.departName) {
+ this.$message({
+ type: "warning",
+ message: "鎮ㄧ殑閮ㄩ棬杩樻湭鏇存敼",
+ });
+ } else {
+ if (user.departName) {
+ this.$axios({
+ method: "put",
+ url:
+ `/sccg/depart/user_update_depart?userId=` +
+ user.id +
+ "&departId=" +
+ user.departId,
+ }).then((res) => {
+ this.$message({
+ type: res.code === 200 ? "success" : "warning",
+ message: res.message,
+ });
+ this.getUserList();
+ this.$emit("closeDialog", { flag: false });
});
- // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕�
- this.$refs.tree.setChecked(data, false);
- } else if (this.selectOrg.orgsid.length === 0 && checked) {
- // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨
- // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push
- this.selectOrg.orgsid = [];
- this.selectOrg.orgsid.push(data.id);
- } else if (
- indexs >= 0 &&
- this.selectOrg.orgsid.length === 1 &&
- !checked
- ) {
- // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
- this.selectOrg.orgsid = [];
- this.user.departName = ''
+ } else {
+ this.$message({
+ type: "warning",
+ message: "鐢ㄦ埛閮ㄩ棬涓嶈兘涓虹┖",
+ });
+ }
}
- },
- // 鍒ゆ柇鏁扮粍鏄惁鐩哥瓑
- isArraySame(arr1, arr2) {
- let flag = true
- arr1.sort((a, b) => a - b)
- arr2.sort((a, b) => a - b)
- arr1.forEach(item => {
- arr2.forEach(child => {
- if (item !== child) {
- flag = false
- }
- })
- })
- return flag
+ } else {
+ if (user.role.length === 0) {
+ this.$message({
+ type: "warning",
+ message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖",
+ });
+ } else if (
+ isArraySame(tempRole, user.role) &&
+ tempRole.length === user.role.length
+ ) {
+ this.$message({
+ type: "warning",
+ message: "鎮ㄨ繕鏈洿鏀硅鑹�",
+ });
+ } else {
+ this.$axios({
+ method: "put",
+ url:
+ "sccg/depart/user_update_Role?id=" +
+ user.id +
+ "&roles=" +
+ user.role,
+ }).then((res) => {
+ this.$message({
+ type: res.code === 200 ? "success" : "warning",
+ message: res.message,
+ });
+ this.getUserList();
+ this.$emit("closeDialog", { flag: false });
+ });
+ }
+ }
+ } else {
+ return false;
}
+ });
},
- props: ['userInfo', 'flag', 'closeDialog', 'getUserList']
-}
+ // 鑾峰彇瑙掕壊鍒楄〃
+ getRoleList() {
+ this.$axios({
+ method: "get",
+ url: "sccg/role/listAll",
+ }).then((res) => {
+ this.roleList = res.data;
+ });
+ },
+ // 鑾峰彇鐢ㄦ埛鐨勮鑹插垪琛�
+ getUserRole(id) {
+ this.$axios({
+ method: "get",
+ url: `sccg/admin/role/${id}`,
+ }).then((res) => {
+ const arr = [];
+ res.data.forEach((item) => {
+ arr.push(item.id);
+ });
+ this.user.role = arr;
+ this.tempRole = arr;
+ });
+ },
+
+ selectDepart(depart) {
+ if (depart) {
+ this.user.departId = depart.departId;
+ this.user.departName = depart.departName;
+ }
+ },
+
+ // 鍒ゆ柇鏁扮粍鏄惁鐩哥瓑
+ isArraySame(arr1, arr2) {
+ let flag = true;
+ arr1.sort((a, b) => a - b);
+ arr2.sort((a, b) => a - b);
+ arr1.forEach((item) => {
+ arr2.forEach((child) => {
+ if (item !== child) {
+ flag = false;
+ }
+ });
+ });
+ return flag;
+ },
+ },
+ props: ["userInfo", "flag", "closeDialog", "getUserList"],
+};
</script>
<style lang="scss" scoped>
.updateUser {
- border-radius: 1px;
+ border-radius: 1px;
+ // background-color: #09152f;
+
+ // :deep(.el-tag) {
+ // background-color: #09152f;
+ // }
+
+ // .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
+ // background-color: #09152f;
+ // color: #4b9bb7;
+ // }
+
+ main {
+ text-align: left;
+ padding: 0 55px;
// background-color: #09152f;
+ padding-bottom: 50px;
- // :deep(.el-tag) {
- // background-color: #09152f;
- // }
+ .mainContent {
+ display: flex;
+ justify-content: center;
+ padding-top: 50px;
- // .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
- // background-color: #09152f;
- // color: #4b9bb7;
- // }
+ .el-form-item__content {
+ width: 400px;
- main {
- text-align: left;
- padding: 0 55px;
- // background-color: #09152f;
- padding-bottom: 50px;
-
- .mainContent {
- display: flex;
- justify-content: center;
- padding-top: 50px;
-
- .el-form-item__content {
- width: 400px;
-
- .el-select {
- width: 100%;
- }
- }
-
- .optionHandleSp {
- display: flex;
-
- .areaNumber,
- .moreNumber {
- flex: 1;
- }
-
- .telNumber {
- flex: 2;
- }
- }
-
- .optionBtn {
- display: flex;
- margin-top: 20px;
-
- .btn {
- padding: 12px 50px;
- }
- }
-
+ .el-select {
+ width: 100%;
}
+ }
+
+ .optionHandleSp {
+ display: flex;
+
+ .areaNumber,
+ .moreNumber {
+ flex: 1;
+ }
+
+ .telNumber {
+ flex: 2;
+ }
+ }
+
+ .optionBtn {
+ display: flex;
+ margin-top: 20px;
+
+ .btn {
+ padding: 12px 50px;
+ }
+ }
}
+ }
}
// .updateUser::v-deep .el-form-item__label {
diff --git a/src/views/systemSetting/device/grid/components/createUser/index.vue b/src/views/systemSetting/device/grid/components/createUser/index.vue
index b9e57e3..7930a42 100644
--- a/src/views/systemSetting/device/grid/components/createUser/index.vue
+++ b/src/views/systemSetting/device/grid/components/createUser/index.vue
@@ -1,555 +1,586 @@
<template>
- <div class="createUser">
- <main>
- <div class="mainContent">
- <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
- label-position="right">
- <!-- 鐢ㄦ埛鍚嶇О -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="username">
- <el-input v-model="user.username" placeholder="濉啓鐢ㄦ埛鍚嶇О" autoComplete="new-username">
- </el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鐢ㄦ埛瀵嗙爜 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password">
- <el-input v-model="user.password" type="password" autoComplete="new-password"
- placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- <!-- 閲嶆柊杈撳叆瀵嗙爜鍗充负淇敼锛屽瘑鐮佹湁鏁堟湡榛樿涓�3涓湀 -->
- </div>
- <!-- 鎵�灞炵敤鎴峰鍚� -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="nickName">
- <el-input v-model="user.nickName" placeholder="璇峰～鍐欑敤鎴峰鍚�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鎬у埆 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鎬у埆:" prop="sex">
- <el-radio-group v-model="user.sex">
- <el-radio :label="1">鐢�</el-radio>
- <el-radio :label="0">濂�</el-radio>
- </el-radio-group>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鏄惁鍏氬憳 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
- <el-radio-group v-model="user.isDy">
- <el-radio :label="1">鏄�</el-radio>
- <el-radio :label="0">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鎵�灞炴墜鏈哄彿鐮� -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile">
- <el-input v-model="user.mobile" maxlength="11" placeholder="璇峰～鍐欐墜鏈哄彿鐮�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 閭鍦板潃 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
- <el-input v-model="user.email" placeholder="璇峰～鍐欓偖绠卞湴鍧�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 閫夋嫨瑙掕壊 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
- <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags>
- <el-option v-for="item in roleList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鐢ㄦ埛绫诲瀷 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鐢ㄦ埛绫诲瀷:" prop="userType">
- <el-select v-model="user.userType" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
- <el-option v-for="item in typeList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 搴ф満/鍒嗘満 -->
- <div class="user-item sp-item">
- <div class="item-left">
- <el-form-item label="搴ф満/鍒嗘満:" prop="zjarea">
- <el-input v-model="user.zjarea" placeholder="鐢佃瘽鍖哄彿">
- </el-input>
- </el-form-item>
- <el-form-item prop="zjnumber" class="left-px">
- <el-input v-model="user.zjnumber" placeholder="鐢佃瘽鍙风爜">
- </el-input>
- </el-form-item>
- <el-form-item prop="zjother" class="left-px">
- <el-input v-model="user.zjother" placeholder="鍒嗘満鍙风爜">
- </el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鎵�灞為儴闂� -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" 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"
- default-expand-all node-key="id">
- </el-tree>
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 褰撳墠鑱屽姟 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="jobTitle">
- <el-input v-model="user.jobTitle" placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
- <el-input v-model="user.mac" placeholder="璇峰～鍐欐墍灞瀖ac鍦板潃"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 濉啓鎵�灞瀒p鍦板潃 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
- <el-input v-model="user.ip" placeholder="璇峰～鍐欐墍灞瀒p鍦板潃"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <el-form-item>
- <div class="optionBtn">
- <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦
- </el-button>
- <el-button class="btn reset" @click.native.prevent="resetForm">閲嶇疆</el-button>
- </div>
- </el-form-item>
- </el-form>
-
+ <div class="createUser">
+ <main>
+ <div class="mainContent">
+ <el-form
+ ref="user"
+ label-width="140px"
+ autoComplete="on"
+ :model="user"
+ :rules="createUserRules"
+ label-position="right"
+ >
+ <!-- 鐢ㄦ埛鍚嶇О -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItem"
+ label="鐢ㄦ埛鍚嶇О:"
+ prop="username"
+ >
+ <el-input
+ v-model="user.username"
+ placeholder="濉啓鐢ㄦ埛鍚嶇О"
+ autoComplete="new-username"
+ >
+ </el-input>
+ </el-form-item>
</div>
- </main>
- </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鐢ㄦ埛瀵嗙爜 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItems"
+ label="鐢ㄦ埛瀵嗙爜:"
+ prop="password"
+ >
+ <el-input
+ v-model="user.password"
+ type="password"
+ autoComplete="new-password"
+ placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ <!-- 閲嶆柊杈撳叆瀵嗙爜鍗充负淇敼锛屽瘑鐮佹湁鏁堟湡榛樿涓�3涓湀 -->
+ </div>
+ <!-- 鎵�灞炵敤鎴峰鍚� -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItem"
+ label="鎵�灞炵敤鎴峰鍚�:"
+ prop="nickName"
+ >
+ <el-input
+ v-model="user.nickName"
+ placeholder="璇峰～鍐欑敤鎴峰鍚�"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鎬у埆 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鎬у埆:" prop="sex">
+ <el-radio-group v-model="user.sex">
+ <el-radio :label="1">鐢�</el-radio>
+ <el-radio :label="0">濂�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鏄惁鍏氬憳 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
+ <el-radio-group v-model="user.isDy">
+ <el-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鎵�灞炴墜鏈哄彿鐮� -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItem"
+ label="鎵�灞炴墜鏈哄彿鐮�:"
+ prop="mobile"
+ >
+ <el-input
+ v-model="user.mobile"
+ maxlength="11"
+ placeholder="璇峰～鍐欐墜鏈哄彿鐮�"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 閭鍦板潃 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
+ <el-input
+ v-model="user.email"
+ placeholder="璇峰～鍐欓偖绠卞湴鍧�"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 閫夋嫨瑙掕壊 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
+ <el-select
+ v-model="user.role"
+ placeholder="璇烽�夋嫨鎵�灞炶鑹�"
+ multiple
+ collapse-tags
+ >
+ <el-option
+ v-for="item in roleList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鐢ㄦ埛绫诲瀷 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItem"
+ label="鐢ㄦ埛绫诲瀷:"
+ prop="userType"
+ >
+ <el-select v-model="user.userType" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
+ <el-option
+ v-for="item in typeList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 搴ф満/鍒嗘満 -->
+ <div class="user-item sp-item">
+ <div class="item-left">
+ <el-form-item label="搴ф満/鍒嗘満:" prop="zjarea">
+ <el-input v-model="user.zjarea" placeholder="鐢佃瘽鍖哄彿">
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="zjnumber" class="left-px">
+ <el-input v-model="user.zjnumber" placeholder="鐢佃瘽鍙风爜">
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="zjother" class="left-px">
+ <el-input v-model="user.zjother" placeholder="鍒嗘満鍙风爜">
+ </el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鎵�灞為儴闂� -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItem"
+ label="鎵�灞為儴闂�:"
+ prop="departmentId"
+ >
+ <departTree @selectDepart="selectDepart"></departTree>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 褰撳墠鑱屽姟 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItem"
+ label="褰撳墠鑱屽姟:"
+ prop="jobTitle"
+ >
+ <el-input
+ v-model="user.jobTitle"
+ placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItem"
+ label="濉啓鎵�灞瀖ac鍦板潃:"
+ prop="mac"
+ >
+ <el-input
+ v-model="user.mac"
+ placeholder="璇峰～鍐欐墍灞瀖ac鍦板潃"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 濉啓鎵�灞瀒p鍦板潃 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item
+ class="optionItem"
+ label="濉啓鎵�灞瀒p鍦板潃:"
+ prop="ip"
+ >
+ <el-input
+ v-model="user.ip"
+ placeholder="璇峰～鍐欐墍灞瀒p鍦板潃"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <el-form-item>
+ <div class="optionBtn">
+ <el-button
+ type="primary"
+ class="btn submit"
+ @click.native.prevent="handleUser"
+ >鎻愪氦
+ </el-button>
+ <el-button class="btn reset" @click.native.prevent="resetForm"
+ >閲嶇疆</el-button
+ >
+ </div>
+ </el-form-item>
+ </el-form>
+ </div>
+ </main>
+ </div>
</template>
<script>
-import { getTypeList } from '@/utils/helper'
+import { getTypeList } from "@/utils/helper";
+import departTree from "@/components/departTree/index.vue";
export default {
- data() {
- const validateNickname = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鎵�灞炲鍚嶄笉鑳戒负绌�"));
- } else {
- callback();
- }
- };
- const validatePass = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖"));
- } else {
- const rep = /^\w+$/;
- if (!rep.test(value)) {
- callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
- } else {
- callback();
- }
- }
- };
- const validateTruename = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鐢ㄦ埛濮撳悕涓嶈兘涓虹┖"));
- } else {
- callback();
- }
- };
- const validatePhone = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鎵嬫満鍙风爜涓嶈兘涓虹┖"));
- } else {
- const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
- if (!rep.test(value)) {
- callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
- } else {
- callback();
- }
- }
- };
- const validateMail = (rule, value, callback) => {
- if (value) {
- const rep = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
- if (!rep.test(value)) {
- callback(new Error("璇疯緭鍏ユ纭殑閭"))
- } else {
- callback();
- }
- } else {
- callback();
- }
- };
- const validateRole = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鎵�灞炶鑹蹭笉鑳戒负绌�"));
- } else {
- callback()
- }
- };
- const validateType = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖"));
- } else {
- callback()
- }
- };
- const validateDepartment = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇烽�夋嫨鐢ㄦ埛閮ㄩ棬"));
- } else {
- callback()
- }
- };
- const validateWork = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鐢ㄦ埛褰撳墠鑱屽姟涓嶈兘涓虹┖"));
- } else {
- callback();
- }
- };
- const validateMac = (rule, value, callback) => {
- if (value) {
- callback();
- } else {
- callback()
- }
- };
- const validateIp = (rule, value, callback) => {
- if (value) {
- callback();
- } else {
- callback()
- }
- };
- return {
- user: {
- nickName: '',
- password: '',
- username: '',
- sex: 1,
- isDy: 0,
- mobile: '',
- email: '',
- role: null,
- userType: null,
- zjarea: '',
- zjnumber: '',
- zjother: '',
- departmentId: null,
- jobTitle: null,
- mac: '',
- ip: '',
- },
- createUserRules: {
- nickName: [
- { required: true, trigger: "blur", validator: validateNickname },
- ],
- password: [
- { required: true, trigger: "blur", validator: validatePass },
- ],
- username: [
- { required: true, trigger: "blur", validator: validateTruename },
- ],
- sex: [
- { required: true, trigger: "blur" },
- ],
- isDy: [
- { required: true, trigger: "blur" },
- ],
- mobile: [
- { required: true, trigger: "blur", validator: validatePhone },
- ],
- email: [
- { required: true, trigger: "blur", validator: validateMail },
- ],
- role: [
- { required: true, trigger: "change", validator: validateRole },
- ],
- userType: [
- { required: true, trigger: "change", validator: validateType },
- ],
- zj: [
- { required: false, trigger: "blur" },
- ],
- departmentId: [
- { required: true, trigger: "change", validator: validateDepartment },
- ],
- jobTitle: [
- { required: true, trigger: "blur", validator: validateWork },
- ],
- mac: [
- { required: false, trigger: "blur", validator: validateMac },
- ],
- ip: [
- { required: false, trigger: "blur", validator: validateIp },
- ],
- },
- roleList: [
-
- ],
- typeList: [
-
- ],
- departList: [],
- mylabel: '',
- defaultProps: {
- children: 'children',
- label: 'departName',
- disabled: (data, node) => {
- if (node.level === 1 && node.childNodes.length !== 0) {
- return !data.leaf
- }
- }
- },
- selectOrg: {
- orgsid: []
- },
+ components: {
+ departTree,
+ },
+ data() {
+ const validateNickname = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鎵�灞炲鍚嶄笉鑳戒负绌�"));
+ } else {
+ callback();
+ }
+ };
+ const validatePass = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖"));
+ } else {
+ const rep = /^\w+$/;
+ if (!rep.test(value)) {
+ callback(
+ new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆")
+ );
+ } else {
+ callback();
}
- },
- created() {
- // 鑾峰彇瑙掕壊鍒楄〃
- this.getRoleList();
- // 鑾峰彇鐢ㄦ埛绫诲瀷
- this.getUserTypeList();
- // 鑾峰彇閮ㄩ棬
- this.getDepartList();
- },
- methods: {
- // 鎻愪氦娉ㄥ唽
- handleUser() {
- this.$refs['user'].validate((valid) => {
- console.log(valid);
- if (valid) {
- const { user, selectOrg } = this;
- console.log(user);
- this.$axios.post('sccg/admin/register', {
- departmentId: selectOrg.orgsid[0],
- email: user.email,
- icon: '',
- isDy: `${user.isDy}`,
- jobTitle: user.jobTitle,
- mobile: user.mobile,
- note: '',
- roleIds: user.role,
- // nickName: user.nickName,
- sex: `${user.sex}`,
- password: user.password,
- userType: user.userType,
- username: user.username,
- zj: user.zjarea + `${user.zjnumber}` + user.zjother,
- nickName: user.nickName
- // departName:user.departName,
- }).then(res => {
- if (res.code === 200) {
- console.log(1);
- this.$message({
- type: 'success',
- message: res.message,
- })
- this.$emit('sendDialog', { flag: false });
- } else if (res.code === 500 && res.message === "鎿嶄綔澶辫触") {
- this.$message({
- type: 'warning',
- message: '璇ョ敤鎴峰凡娉ㄥ唽'
- })
- } else {
- this.$message({
- type: 'warning',
- message: res.message
- })
- }
- })
- } else {
- return false
- }
+ }
+ };
+ const validateTruename = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鐢ㄦ埛濮撳悕涓嶈兘涓虹┖"));
+ } else {
+ callback();
+ }
+ };
+ const validatePhone = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鎵嬫満鍙风爜涓嶈兘涓虹┖"));
+ } else {
+ const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
+ if (!rep.test(value)) {
+ callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
+ } else {
+ callback();
+ }
+ }
+ };
+ const validateMail = (rule, value, callback) => {
+ if (value) {
+ const rep =
+ /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
+ if (!rep.test(value)) {
+ callback(new Error("璇疯緭鍏ユ纭殑閭"));
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ };
+ const validateRole = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鎵�灞炶鑹蹭笉鑳戒负绌�"));
+ } else {
+ callback();
+ }
+ };
+ const validateType = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖"));
+ } else {
+ callback();
+ }
+ };
+ const validateDepartment = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("璇烽�夋嫨鐢ㄦ埛閮ㄩ棬"));
+ } else {
+ callback();
+ }
+ };
+ const validateWork = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鐢ㄦ埛褰撳墠鑱屽姟涓嶈兘涓虹┖"));
+ } else {
+ callback();
+ }
+ };
+ const validateMac = (rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ callback();
+ }
+ };
+ const validateIp = (rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ callback();
+ }
+ };
+ return {
+ user: {
+ nickName: "",
+ password: "",
+ username: "",
+ sex: 1,
+ isDy: 0,
+ mobile: "",
+ email: "",
+ role: null,
+ userType: null,
+ zjarea: "",
+ zjnumber: "",
+ zjother: "",
+ departmentId: null,
+ jobTitle: null,
+ mac: "",
+ ip: "",
+ },
+ createUserRules: {
+ nickName: [
+ { required: true, trigger: "blur", validator: validateNickname },
+ ],
+ password: [
+ { required: true, trigger: "blur", validator: validatePass },
+ ],
+ username: [
+ { required: true, trigger: "blur", validator: validateTruename },
+ ],
+ sex: [{ required: true, trigger: "blur" }],
+ isDy: [{ required: true, trigger: "blur" }],
+ mobile: [{ required: true, trigger: "blur", validator: validatePhone }],
+ email: [{ required: true, trigger: "blur", validator: validateMail }],
+ role: [{ required: true, trigger: "change", validator: validateRole }],
+ userType: [
+ { required: true, trigger: "change", validator: validateType },
+ ],
+ zj: [{ required: false, trigger: "blur" }],
+ departmentId: [
+ { required: true, trigger: "change", validator: validateDepartment },
+ ],
+ jobTitle: [
+ { required: true, trigger: "blur", validator: validateWork },
+ ],
+ mac: [{ required: false, trigger: "blur", validator: validateMac }],
+ ip: [{ required: false, trigger: "blur", validator: validateIp }],
+ },
+ roleList: [],
+ typeList: [],
+ departList: [],
+ mylabel: "",
+ defaultProps: {
+ children: "children",
+ label: "departName",
+ disabled: (data, node) => {
+ if (node.level === 1 && node.childNodes.length !== 0) {
+ return !data.leaf;
+ }
+ },
+ },
+ };
+ },
+ created() {
+ // 鑾峰彇瑙掕壊鍒楄〃
+ this.getRoleList();
+ // 鑾峰彇鐢ㄦ埛绫诲瀷
+ this.getUserTypeList();
+ },
+ methods: {
+ // 鎻愪氦娉ㄥ唽
+ handleUser() {
+ this.$refs["user"].validate((valid) => {
+ console.log(valid);
+ if (valid) {
+ const { user } = this;
+ console.log(user);
+ this.$axios
+ .post("sccg/admin/register", {
+ departmentId: user.departmentId,
+ email: user.email,
+ icon: "",
+ isDy: `${user.isDy}`,
+ jobTitle: user.jobTitle,
+ mobile: user.mobile,
+ note: "",
+ roleIds: user.role,
+ // nickName: user.nickName,
+ sex: `${user.sex}`,
+ password: user.password,
+ userType: user.userType,
+ username: user.username,
+ zj: user.zjarea + `${user.zjnumber}` + user.zjother,
+ nickName: user.nickName,
+ // departName:user.departName,
})
- },
- // 鑾峰彇瑙掕壊鍒楄〃
- getRoleList() {
- this.$axios({
- method: 'get',
- url: 'sccg/role/listAll',
- })
- .then(res => {
- this.roleList = res.data;
- })
- },
- // 閲嶇疆琛ㄥ崟
- resetForm() {
- this.$refs['user'].resetFields();
- },
- // 鑾峰緱閮ㄩ棬鍚嶇О
- getDepartName(data) {
- this.departList.forEach(item => {
- if (item.id === data) {
- this.user.departName = item.departName
- }
- })
- },
- // 鑾峰彇鐢ㄦ埛绫诲瀷
- async getUserTypeList() {
- this.typeList = await getTypeList(1, '07');
- },
- // 鑾峰彇閮ㄩ棬鏍�
- getDepartList() {
- this.$axios({
- method: 'get',
- url: 'sccg/depart/tree'
- })
- .then(res => {
- this.departList = res.data;
- })
- },
- handleCheck(data, checked) {
- this.user.departmentId = data.departName;
- // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
- const indexs = this.selectOrg.orgsid.indexOf(data.id)
- // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
- if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
+ .then((res) => {
+ if (res.code === 200) {
+ console.log(1);
this.$message({
- message: '鍙兘閫夋嫨涓�涓儴闂紒',
- type: 'warning',
- showClose: true
- })
- // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕�
- this.$refs.tree.setChecked(data, false)
- } else if (this.selectOrg.orgsid.length === 0 && checked) {
- // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨
- // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push
- this.selectOrg.orgsid = []
- this.selectOrg.orgsid.push(data.id)
- } else if (
- indexs >= 0 &&
- this.selectOrg.orgsid.length === 1 &&
- !checked
- ) {
- // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
- this.selectOrg.orgsid = []
- this.user.departmentId = '';
- }
- },
+ type: "success",
+ message: res.message,
+ });
+ this.$emit("sendDialog", { flag: false });
+ } else if (res.code === 500 && res.message === "鎿嶄綔澶辫触") {
+ this.$message({
+ type: "warning",
+ message: "璇ョ敤鎴峰凡娉ㄥ唽",
+ });
+ } else {
+ this.$message({
+ type: "warning",
+ message: res.message,
+ });
+ }
+ });
+ } else {
+ return false;
+ }
+ });
},
- props: ['sendDialog']
-}
+ // 鑾峰彇瑙掕壊鍒楄〃
+ getRoleList() {
+ this.$axios({
+ method: "get",
+ url: "sccg/role/listAll",
+ }).then((res) => {
+ this.roleList = res.data;
+ });
+ },
+ // 閲嶇疆琛ㄥ崟
+ resetForm() {
+ this.$refs["user"].resetFields();
+ },
+ // 鑾峰緱閮ㄩ棬鍚嶇О
+ getDepartName(data) {
+ this.departList.forEach((item) => {
+ if (item.id === data) {
+ this.user.departName = item.departName;
+ }
+ });
+ },
+ // 鑾峰彇鐢ㄦ埛绫诲瀷
+ async getUserTypeList() {
+ this.typeList = await getTypeList(1, "07");
+ },
+
+ selectDepart(depart) {
+ if (depart) {
+ this.user.departmentId = depart.departId;
+ this.user.departName = depart.departName;
+ }
+ },
+ },
+ props: ["sendDialog"],
+};
</script>
<style lang="scss" scoped>
.createUser {
- border-radius: 1px;
+ border-radius: 1px;
+ // background-color: #09152f;
+
+ main {
+ text-align: left;
+ padding: 0 55px;
// background-color: #09152f;
+ padding-bottom: 50px;
+ padding-top: 20px;
- main {
- text-align: left;
- padding: 0 55px;
- // background-color: #09152f;
- padding-bottom: 50px;
- padding-top: 20px;
+ .mainContent {
+ display: flex;
+ // justify-content: center;
+ margin-top: 50px;
+ width: 100%;
+ // &::v-deep .el-form-item__label {
+ // color: #4b9bb7;
+ // }
- .mainContent {
- display: flex;
- // justify-content: center;
- margin-top: 50px;
- width: 100%;
- // &::v-deep .el-form-item__label {
- // color: #4b9bb7;
- // }
+ // &::v-deep .el-input__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
- // &::v-deep .el-input__inner {
- // background-color: #09152f;
- // border: 1px solid #17324c;
- // }
-
- .el-form-item__content {
- width: 400px;
- .el-select {
- width: 100%;
- }
- }
-
- .sp-item {
- .item-left{
- display: flex;
- }
- }
-
- .user-item {
- display: flex;
- justify-content: space-between;
- .item-left {
- width: 500px;
- }
- .item-right {
- line-height: 40px;
- color: #4b9bb7;
- font-size: 12px;
- // margin-left: 16px;
- }
-
- .left-px :deep(.el-form-item__content) {
- margin-left: 0px !important;
- }
- }
-
- .optionBtn {
- display: flex;
- margin-top: 20px;
-
- .btn {
- padding: 12px 50px;
- }
- }
-
+ .el-form-item__content {
+ width: 400px;
+ .el-select {
+ width: 100%;
}
+ }
+
+ .sp-item {
+ .item-left {
+ display: flex;
+ }
+ }
+
+ .user-item {
+ display: flex;
+ justify-content: space-between;
+ .item-left {
+ width: 500px;
+ }
+ .item-right {
+ line-height: 40px;
+ color: #4b9bb7;
+ font-size: 12px;
+ // margin-left: 16px;
+ }
+
+ .left-px :deep(.el-form-item__content) {
+ margin-left: 0px !important;
+ }
+ }
+
+ .optionBtn {
+ display: flex;
+ margin-top: 20px;
+
+ .btn {
+ padding: 12px 50px;
+ }
+ }
}
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/systemSetting/device/handheldTerminal/components/dialogForm.vue b/src/views/systemSetting/device/handheldTerminal/components/dialogForm.vue
index 0109e2a..b1c6b10 100644
--- a/src/views/systemSetting/device/handheldTerminal/components/dialogForm.vue
+++ b/src/views/systemSetting/device/handheldTerminal/components/dialogForm.vue
@@ -40,21 +40,10 @@
</el-form-item>
<!-- 閮ㄩ棬 -->
<el-form-item class="optionItems" label="鎵�灞為儴闂�:" prop="departId">
- <el-select v-model="form.departName" placeholder="璇疯緭鍏ユ墍灞為儴闂�">
- <el-option :value="mylabel">
- <el-tree
- ref="tree"
- :check-strictly="true"
- :data="departList"
- :props="defaultProps"
- show-checkbox
- @check-change="handleCheck"
- default-expand-all
- node-key="id"
- >
- </el-tree>
- </el-option>
- </el-select>
+ <departTree
+ :depart="userDepart"
+ @selectDepart="selectDepart"
+ ></departTree>
</el-form-item>
<el-form-item>
<div class="optionBtn">
@@ -76,8 +65,11 @@
import { createNamespacedHelpers } from "vuex";
const { mapActions } = createNamespacedHelpers("handheldTerminal");
-
+import departTree from "@/components/departTree/index.vue";
export default {
+ components: {
+ departTree,
+ },
data() {
const checkName = (rule, value, callback) => {
if (value) {
@@ -177,9 +169,7 @@
// }
// ]
},
- selectOrg: {
- orgsid: [],
- },
+ userDepart: {},
mylabel: "",
departList: [],
defaultProps: {
@@ -189,14 +179,15 @@
};
},
created() {
- const { getDepartTree } = this;
- // 鍒濆鍖栭儴闂ㄦ爲
- getDepartTree();
// 鍒濆鍖栨暟鎹�
this.form = this.info;
if (!this.form.departName) {
this.form.departName = this.form.pdepartName;
}
+ this.userDepart = {
+ departId: this.form.departId,
+ departName: this.form.departName,
+ };
},
watch: {
@@ -233,41 +224,12 @@
}
});
},
- // 閮ㄩ棬淇敼
- handleCheck(data, checked) {
- this.form.departId = data.id;
- this.form.departName = data.departName;
- // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
- const indexs = this.selectOrg.orgsid.indexOf(data.id);
- // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
- if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
- this.$message({
- message: "鍙兘閫夋嫨涓�涓儴闂紒",
- type: "warning",
- showClose: true,
- });
- // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕�
- this.$refs.tree.setChecked(data, false);
- } else if (this.selectOrg.orgsid.length === 0 && checked) {
- // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨
- // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push
- this.selectOrg.orgsid = [];
- this.selectOrg.orgsid.push(data.id);
- } else if (
- indexs >= 0 &&
- this.selectOrg.orgsid.length === 1 &&
- !checked
- ) {
- // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
- this.selectOrg.orgsid = [];
- this.form.departName = "";
+
+ selectDepart(depart) {
+ if (depart) {
+ this.form.departId = depart.departId;
+ this.form.departName = depart.departName;
}
- },
- // 鑾峰彇閮ㄩ棬鏍�
- getDepartTree() {
- this.$axios.get("/sccg/depart/tree").then((res) => {
- this.departList = res.data;
- });
},
},
props: ["info", "closeDialog"],
--
Gitblit v1.8.0