From 07ad3b531d02a5470079a2ea47edc249b1122f6b Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期二, 20 九月 2022 17:00:23 +0800
Subject: [PATCH] 新增部门修改
---
src/views/systemSetting/baseSetting/department/createUser/index.vue | 6 +-
src/views/systemSetting/baseSetting/department/index.vue | 9 +++-
src/views/systemSetting/baseSetting/department/updateUser/index.vue | 58 +++++++++++++++++------------
src/views/systemSetting/baseSetting/user/createUser/index.vue | 6 --
4 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/department/createUser/index.vue b/src/views/systemSetting/baseSetting/department/createUser/index.vue
index 82c27d4..97e6361 100644
--- a/src/views/systemSetting/baseSetting/department/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/createUser/index.vue
@@ -104,13 +104,13 @@
{ required: true, trigger: "blur", validator: validateNickname },
],
parentId: [
- { required: true, trigger: "blur", validator: validatePass },
+ { required: false, trigger: "blur", validator: validatePass },
],
departType: [
- { required: true, trigger: "blur", validator: validateTruename },
+ { required: false, trigger: "blur", validator: validatePhone },
],
departDes: [
- { required: true, trigger: "blur" },
+ { required: false, trigger: "blur" },
],
},
roleList: [
diff --git a/src/views/systemSetting/baseSetting/department/index.vue b/src/views/systemSetting/baseSetting/department/index.vue
index 4e8779c..b33e99c 100644
--- a/src/views/systemSetting/baseSetting/department/index.vue
+++ b/src/views/systemSetting/baseSetting/department/index.vue
@@ -58,7 +58,7 @@
</el-table>
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate">
- <updateUser :updateFlag="updateFlag" :userInfo=userInfo />
+ <updateUser :updateFlag="updateFlag" :userInfo="userInfo" :getUserList="getUserList" @changeDialog="changMyDialog" />
</el-dialog>
<!-- 鍒嗛〉 -->
<div class="pagination">
@@ -177,7 +177,12 @@
handleNext(page){
this.currentPage = page;
this.search();
- }}
+ },
+ // 鍏抽棴dialog
+ changMyDialog(val){
+ this.dialogUpdate = val.dialogFlag;
+ }
+ },
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/systemSetting/baseSetting/department/updateUser/index.vue b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
index 4cead04..4570f4f 100644
--- a/src/views/systemSetting/baseSetting/department/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
@@ -7,27 +7,31 @@
<div class="mainContent">
<el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
label-position="right">
+ <!-- 閮ㄩ棬id -->
+ <el-form-item class="optionItem" label="閮ㄩ棬鍚嶇О:" prop="id">
+ <el-input v-model="user.id" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="!updateFlag"></el-input>
+ </el-form-item>
<!-- 閮ㄩ棬鍚嶇О -->
<el-form-item class="optionItem" label="閮ㄩ棬鍚嶇О:" prop="departName">
- <el-input v-model="user.departName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="true"></el-input>
+ <el-input v-model="user.departName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="!updateFlag"></el-input>
</el-form-item>
<!-- 涓婄骇閮ㄩ棬 -->
<el-form-item class="optionItems" label="涓婄骇閮ㄩ棬:" prop="parentId">
- <el-select v-model="user.parentId" placeholder="璇烽�夋嫨涓婄骇閮ㄩ棬" disabled>
+ <el-select v-model="user.parentId" placeholder="璇烽�夋嫨涓婄骇閮ㄩ棬" :disabled="!updateFlag">
<el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<!-- 閮ㄩ棬绫诲瀷 -->
<el-form-item class="optionItem" label="閮ㄩ棬绫诲瀷:" prop="departType">
- <el-select v-model="user.departType" placeholder="璇烽�夋嫨閮ㄩ棬绫诲瀷" disabled>
+ <el-select v-model="user.departType" placeholder="璇烽�夋嫨閮ㄩ棬绫诲瀷" :disabled="!updateFlag">
<el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<!-- 閮ㄩ棬鎻忚堪 -->
<el-form-item class="optionItem" label="閮ㄩ棬鎻忚堪:" prop="departDes">
- <el-input v-model="user.departDes" placeholder="璇疯緭鍏ラ儴闂ㄦ弿杩�" :disabled="true"></el-input>
+ <el-input v-model="user.departDes" placeholder="璇疯緭鍏ラ儴闂ㄦ弿杩�" :disabled="!updateFlag"></el-input>
</el-form-item>
<el-form-item v-if="updateFlag">
<div class="optionBtn">
@@ -46,9 +50,14 @@
data() {
const validateNickname = (rule, value, callback) => {
if (!value) {
- callback(new Error("璇峰～鍐欑敤鎴峰悕绉�"));
+ callback(new Error("璇峰～鍐欓儴闂ㄥ悕绉�"));
}
};
+ const validateId = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("璇峰～鍐欓儴闂╥d"));
+ }
+ }
const validatePass = (rule, value, callback) => {
if (!value) {
callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
@@ -56,16 +65,6 @@
const rep = /^\w+$/;
if (!rep.test(value)) {
callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
- }
- }
- };
- const validateTruename = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑敤鎴峰鍚�"));
- } else {
- const rep = /^[\u4E00-\u9FA5]{2,4}$/;
- if (!rep.test(value)) {
- callback("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕");
}
}
};
@@ -81,23 +80,27 @@
};
return {
user: {
+ id: '',
departName: '',
parentId: '',
departDes: '',
- departType:'',
+ departType: '',
},
createUserRules: {
+ id: [
+ { required: true, trigger: "blur", validator: validateId },
+ ],
departName: [
{ required: true, trigger: "blur", validator: validateNickname },
],
parentId: [
- { required: true, trigger: "blur", validator: validatePass },
+ { required: false, trigger: "blur", validator: validatePass },
],
departDes: [
- { required: true, trigger: "blur", validator: validateTruename },
+ { required: false, trigger: "blur" },
],
departType: [
- { required: true, trigger: "blur" },
+ { required: false, trigger: "blur" },
],
},
roleList: [
@@ -123,15 +126,19 @@
methods: {
handleUser() {
const { user } = this;
- this.$axios.post('sccg/depart/status', {
- id: user.departmentId,
- status: user.status ? 1 : 0,
+ const that = this;
+ this.$axios.post('sccg/depart/update', {
+ id: user.id,
+ departName: user.departName,
+ parentId: user.parentId,
+ departDes: user.departDes
}).then(res => {
- console.log(res);
+ this.$emit('changeDialog',{dialogUpdate:false});
+ this.getUserList();
})
}
},
- props: ['userInfo', 'updateFlag']
+ props: ['userInfo', 'updateFlag', 'getUserList', 'changeDialog']
}
</script>
<style lang="scss" scoped>
@@ -146,6 +153,7 @@
line-height: 60px;
padding: 0 20px;
border: 1px solid #fff;
+
.headerTitle {
color: #4b9bb7;
font-weight: 600;
@@ -166,6 +174,7 @@
padding: 0 55px;
background-color: #09152f;
padding-bottom: 50px;
+
.mainTitle {
color: #4b9bb7;
font-weight: 600;
@@ -177,6 +186,7 @@
display: flex;
justify-content: center;
margin-top: 50px;
+
.el-form-item__content {
width: 400px;
diff --git a/src/views/systemSetting/baseSetting/user/createUser/index.vue b/src/views/systemSetting/baseSetting/user/createUser/index.vue
index 99aa8a6..28e70ed 100644
--- a/src/views/systemSetting/baseSetting/user/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/createUser/index.vue
@@ -83,11 +83,7 @@
</el-form-item>
<!-- 褰撳墠鑱屽姟 -->
<el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="jobTitle">
- <el-select v-model="user.work" placeholder="璇烽�夋嫨褰撳墠鑱屽姟">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
- :disabled="item.disabled">
- </el-option>
- </el-select>
+ <el-input v-model="user.work" placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�" ></el-input>
</el-form-item>
<!-- 濉啓鎵�灞瀖ac鍦板潃 -->
<!-- <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
--
Gitblit v1.8.0