From 5cd763edc85f3b14bc98af906828521d65276f48 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期四, 13 十月 2022 17:57:11 +0800
Subject: [PATCH] 修改系统框架、消息管理新增
---
src/views/systemSetting/baseSetting/user/components/createUser/index.vue | 220 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 135 insertions(+), 85 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
index 76db6d1..b3bfb7b 100644
--- a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
@@ -5,24 +5,24 @@
<el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
label-position="right">
<!-- 鐢ㄦ埛鍚嶇О -->
- <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="nickName">
- <el-input v-model="user.nickName" placeholder="濉啓鐢ㄦ埛鍚嶇О"></el-input>
+ <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="username">
+ <el-input v-model="user.username" placeholder="濉啓鐢ㄦ埛鍚嶇О"></el-input>
</el-form-item>
<!-- 鐢ㄦ埛瀵嗙爜 -->
<el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password">
<el-input v-model="user.password" type="password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"></el-input>
</el-form-item>
<!-- 鎵�灞炵敤鎴峰鍚� -->
- <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="username">
- <el-input v-model="user.username" placeholder="璇峰～鍐欑敤鎴峰鍚�"></el-input>
+ <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="nickName">
+ <el-input v-model="user.nickName" placeholder="璇峰～鍐欑敤鎴峰鍚�"></el-input>
</el-form-item>
<!-- 鎬у埆 -->
- <!-- <el-form-item class="optionItem" label="鎬у埆:" prop="gender">
- <el-radio-group v-model="user.gender">
+ <el-form-item class="optionItem" label="鎬у埆:" prop="sex">
+ <el-radio-group v-model="user.sex">
<el-radio :label="1">鐢�</el-radio>
- <el-radio :label="2">濂�</el-radio>
+ <el-radio :label="0">濂�</el-radio>
</el-radio-group>
- </el-form-item> -->
+ </el-form-item>
<!-- 鏄惁鍏氬憳 -->
<el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
<el-radio-group v-model="user.isDy">
@@ -32,7 +32,7 @@
</el-form-item>
<!-- 鎵�灞炴墜鏈哄彿鐮� -->
<el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile">
- <el-input v-model="user.mobile" placeholder="璇峰～鍐欐墜鏈哄彿鐮�"></el-input>
+ <el-input v-model="user.mobile" maxlength="11" placeholder="璇峰～鍐欐墜鏈哄彿鐮�"></el-input>
</el-form-item>
<!-- 閭鍦板潃 -->
<el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
@@ -40,34 +40,41 @@
</el-form-item>
<!-- 閫夋嫨瑙掕壊 -->
<el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
- <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�">
+ <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-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�">
<el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"
:disabled="item.disabled">
</el-option>
- </el-select>
+ </el-select> -->
</el-form-item>
<!-- 鐢ㄦ埛绫诲瀷 -->
<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"
- :disabled="item.disabled">
+ <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<!-- 搴ф満/鍒嗘満 -->
- <el-form-item class="optionItem" label="搴ф満/鍒嗘満:" prop="zj">
- <div class="optionHandleSp">
- <el-input class="areaNumber" v-model="user.zj.areaNumber" placeholder="鐢佃瘽鍖哄彿">
+ <div class="user-item">
+ <el-form-item label="搴ф満/鍒嗘満:" prop="zjarea">
+ <el-input v-model="user.zjarea" placeholder="鐢佃瘽鍖哄彿">
</el-input>
- <el-input class="telNumber" v-model="user.zj.phoneNumber" placeholder="鐢佃瘽鍙风爜">
+ </el-form-item>
+ <el-form-item prop="zjnumber" class="left-px">
+ <el-input v-model="user.zjnumber" placeholder="鐢佃瘽鍙风爜">
</el-input>
- <el-input class="moreNumber" v-model="user.zj.moreNumber" placeholder="鍒嗘満鍙风爜">
+ </el-form-item>
+ <el-form-item prop="zjother" class="left-px">
+ <el-input v-model="user.zjother" placeholder="鍒嗘満鍙风爜">
</el-input>
- </div>
- </el-form-item>
+ </el-form-item>
+ </div>
<!-- 鎵�灞為儴闂� -->
<el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="departmentId">
- <el-select v-model="user.departmentId" placeholder="璇烽�夋嫨鎵�灞為儴闂�">
+ <el-select v-model="user.departmentId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" @change="getDepartName">
<el-option v-for="item in departList" :key="item.name" :label="item.departName"
:value="item.id">
</el-option>
@@ -89,7 +96,7 @@
<div class="optionBtn">
<el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦
</el-button>
- <el-button class="btn reset">閲嶇疆</el-button>
+ <el-button class="btn reset" @click.native.prevent="resetForm">閲嶇疆</el-button>
</div>
</el-form-item>
</el-form>
@@ -104,7 +111,7 @@
const validateNickname = (rule, value, callback) => {
if (!value) {
callback(new Error("鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖"));
- }else{
+ } else {
callback();
}
};
@@ -115,7 +122,7 @@
const rep = /^\w+$/;
if (!rep.test(value)) {
callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
- }else{
+ } else {
callback();
}
}
@@ -127,7 +134,7 @@
const rep = /^[\u4E00-\u9FA5]{2,4}$/;
if (!rep.test(value)) {
callback("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕");
- }else{
+ } else {
callback();
}
}
@@ -139,19 +146,23 @@
const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
if (!rep.test(value)) {
callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
- }else{
+ } 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("璇疯緭鍏ユ纭殑閭"))
- // }
- // }
- // };
+ 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("鎵�灞炶鑹蹭笉鑳戒负绌�"));
@@ -180,35 +191,34 @@
callback();
}
};
- // const validateMac = (rule, value, callback) => {
- // if (value) {
- // callback(new Error(""));
- // }else{
- // callback()
- // }
- // };
- // const validateIp = (rule, value, callback) => {
- // if (value) {
- // }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: '',
- gender: 1,
+ sex: 1,
isDy: 0,
mobile: '',
email: '',
role: null,
userType: null,
- zj: {
- areaNumber: '',
- phoneNumber: "",
- moreNumber: "",
- },
+ zjarea: '',
+ zjnumber: '',
+ zjother: '',
departmentId: null,
jobTitle: null,
mac: '',
@@ -224,7 +234,7 @@
username: [
{ required: true, trigger: "blur", validator: validateTruename },
],
- gender: [
+ sex: [
{ required: true, trigger: "blur" },
],
isDy: [
@@ -233,9 +243,9 @@
mobile: [
{ required: true, trigger: "blur", validator: validatePhone },
],
- // email: [
- // { required: false, trigger: "blur", validator: validateMail },
- // ],
+ email: [
+ { required: false, trigger: "blur", validator: validateMail },
+ ],
role: [
{ required: true, trigger: "change", validator: validateRole },
],
@@ -251,18 +261,18 @@
jobTitle: [
{ required: true, trigger: "blur", validator: validateWork },
],
- // mac: [
- // { required: false, trigger: "blur", validator: validateMac },
- // ],
- // ip: [
- // { required: false, trigger: "blur", validator: validateIp },
- // ],
+ mac: [
+ { required: false, trigger: "blur", validator: validateMac },
+ ],
+ ip: [
+ { required: false, trigger: "blur", validator: validateIp },
+ ],
},
roleList: [
- { name: '瑙掕壊1', id: 1 }, { name: '瑙掕壊2', id: 2 }
+
],
typeList: [
- { name: '绫诲瀷1', id: 1 }, { name: '绫诲瀷2', id: 2 }
+
],
departList: []
}
@@ -275,8 +285,11 @@
this.$axios.get('sccg/depart/page').then(res => {
that.departList = res.data.records;
})
+ // 鑾峰彇鐢ㄦ埛绫诲瀷
+ this.getUserTypeList();
},
methods: {
+ // 鎻愪氦娉ㄥ唽
handleUser() {
this.$refs['user'].validate((valid) => {
console.log(valid);
@@ -286,20 +299,40 @@
this.$axios.post('sccg/admin/register', {
departmentId: user.departmentId,
email: user.email,
- jsDy: user.isDy,
+ icon:'',
+ isDy: `${user.isDy}`,
jobTitle: user.jobTitle,
mobile: user.mobile,
- nickName: user.nickName,
+ note:'',
+ roleIds:user.role,
+ // nickName: user.nickName,
+ sex:`${user.sex}`,
password: user.password,
- userType: user.userType,
+ userType: `${user.userType}`,
username: user.username,
+ zj:user.zjarea+`${user.zjnumber}`+user.zjother,
+ // 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{
+ } else {
return false
}
})
@@ -313,6 +346,29 @@
.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
+ }
+ })
+ },
+ // 鑾峰彇鐢ㄦ埛绫诲瀷
+ getUserTypeList(){
+ this.$axios({
+ method:'get',
+ url:'sccg/dict/query_user_type'
+ })
+ .then(res=>{
+ console.log(res);
+ this.typeList = res.data;
+ })
}
},
props: ['sendDialog']
@@ -352,29 +408,23 @@
}
}
- .optionHandleSp {
+ .user-item {
display: flex;
- .areaNumber,
- .moreNumber {
- flex: 1;
- }
-
- .telNumber {
- flex: 2;
+ .left-px :deep(.el-form-item__content) {
+ margin-left: 0px !important;
}
}
+ .optionBtn {
+ display: flex;
+ margin-top: 20px;
- .optionBtn {
- display: flex;
- margin-top: 20px;
-
- .btn {
- padding: 12px 50px;
+ .btn {
+ padding: 12px 50px;
+ }
}
- }
+ }
}
}
-}
</style>
\ No newline at end of file
--
Gitblit v1.8.0