From ecc1b232f0a3c753db5b121e9a6ecb181c4bc277 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 20 九月 2022 16:04:42 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/views/systemSetting/baseSetting/user/createUser/index.vue | 227 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 134 insertions(+), 93 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/user/createUser/index.vue b/src/views/systemSetting/baseSetting/user/createUser/index.vue
index ff39f08..99aa8a6 100644
--- a/src/views/systemSetting/baseSetting/user/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/createUser/index.vue
@@ -13,76 +13,76 @@
<el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
label-position="right">
<!-- 鐢ㄦ埛鍚嶇О -->
- <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="nick_name">
- <el-input v-model="user.nick_name" 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="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="true_name">
- <el-input v-model="user.true_name" 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="optionItem" label="鎬у埆:" prop="gender">
+ <!-- <el-form-item class="optionItem" label="鎬у埆:" prop="gender">
<el-radio-group v-model="user.gender">
<el-radio :label="1">鐢�</el-radio>
<el-radio :label="2">濂�</el-radio>
</el-radio-group>
- </el-form-item>
+ </el-form-item> -->
<!-- 鏄惁鍏氬憳 -->
- <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="member">
- <el-radio-group v-model="user.member">
+ <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>
<!-- 鎵�灞炴墜鏈哄彿鐮� -->
- <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="phone">
- <el-input v-model="user.phone" placeholder="璇峰～鍐欐墜鏈哄彿鐮�"></el-input>
+ <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile">
+ <el-input v-model="user.mobile" placeholder="璇峰～鍐欐墜鏈哄彿鐮�"></el-input>
</el-form-item>
<!-- 閭鍦板潃 -->
- <el-form-item class="optionItem" label="閭鍦板潃:" prop="mail">
- <el-input v-model="user.mail" placeholder="璇峰～鍐欓偖绠卞湴鍧�"></el-input>
+ <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
+ <el-input v-model="user.email" placeholder="璇峰～鍐欓偖绠卞湴鍧�"></el-input>
</el-form-item>
<!-- 閫夋嫨瑙掕壊 -->
- <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
+ <!-- <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
<el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�">
<el-option v-for="item in roleList" :key="item.name" :label="item.name" :value="item.value"
:disabled="item.disabled">
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<!-- 鐢ㄦ埛绫诲瀷 -->
- <el-form-item class="optionItem" label="鐢ㄦ埛绫诲瀷:" prop="type">
- <el-select v-model="user.type" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
+ <el-form-item class="optionItem" label="鐢ㄦ埛绫诲瀷:" prop="userType">
+ <el-select v-model="user.userType" 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-form-item>
<!-- 搴ф満/鍒嗘満 -->
- <el-form-item class="optionItem" label="搴ф満/鍒嗘満:" prop="telPhone">
+ <el-form-item class="optionItem" label="搴ф満/鍒嗘満:" prop="zj">
<div class="optionHandleSp">
- <el-input class="areaNumber" v-model="user.telPhone.areaNumber" placeholder="鐢佃瘽鍖哄彿">
+ <el-input class="areaNumber" v-model="user.zj.areaNumber" placeholder="鐢佃瘽鍖哄彿">
</el-input>
- <el-input class="telNumber" v-model="user.telPhone.phoneNumber" placeholder="鐢佃瘽鍙风爜">
+ <el-input class="telNumber" v-model="user.zj.phoneNumber" placeholder="鐢佃瘽鍙风爜">
</el-input>
- <el-input class="moreNumber" v-model="user.telPhone.moreNumber" placeholder="鍒嗘満鍙风爜">
+ <el-input class="moreNumber" v-model="user.zj.moreNumber" placeholder="鍒嗘満鍙风爜">
</el-input>
</div>
</el-form-item>
<!-- 鎵�灞為儴闂� -->
- <el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="department">
- <el-select v-model="user.department" placeholder="璇烽�夋嫨鎵�灞為儴闂�">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
- :disabled="item.disabled">
+ <el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="departmentId">
+ <el-select v-model="user.departmentId" placeholder="璇烽�夋嫨鎵�灞為儴闂�">
+ <el-option v-for="item in typeList" :key="item.name" :label="item.departName"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
<!-- 褰撳墠鑱屽姟 -->
- <el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="work">
+ <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">
@@ -90,16 +90,18 @@
</el-select>
</el-form-item>
<!-- 濉啓鎵�灞瀖ac鍦板潃 -->
- <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
+ <!-- <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
<el-input v-model="user.mac" placeholder="璇峰～鍐欐墍灞瀖ac鍦板潃"></el-input>
- </el-form-item>
+ </el-form-item> -->
<!-- 濉啓鎵�灞瀒p鍦板潃 -->
- <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
+ <!-- <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
<el-input v-model="user.ip" placeholder="璇峰～鍐欐墍灞瀒p鍦板潃"></el-input>
- </el-form-item>
- <el-form-item class="optionBtn">
- <el-button type="primary" class="btn submit" @click="handleUser">鎻愪氦</el-button>
+ </el-form-item> -->
+ <el-form-item>
+ <div class="optionBtn">
+ <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦</el-button>
<el-button class="btn reset">閲嶇疆</el-button>
+ </div>
</el-form-item>
</el-form>
@@ -120,7 +122,7 @@
callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
} else {
const rep = /^\w+$/;
- if(!rep.test(value)){
+ if (!rep.test(value)) {
callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
}
}
@@ -130,7 +132,7 @@
callback(new Error("璇峰～鍐欑敤鎴峰鍚�"));
} else {
const rep = /^[\u4E00-\u9FA5]{2,4}$/;
- if(!rep.test(value)){
+ if (!rep.test(value)) {
callback("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕");
}
}
@@ -140,7 +142,7 @@
callback(new Error("璇峰～鍐欐墜鏈哄彿鐮�"));
} else {
const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
- if(!rep.test(value)){
+ if (!rep.test(value)) {
callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
}
}
@@ -148,7 +150,7 @@
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)){
+ if (!rep.test(value)) {
callback(new Error("璇疯緭鍏ユ纭殑閭"))
}
}
@@ -197,95 +199,116 @@
};
return {
user: {
- nick_name: '',
+ nickName: '',
password: '',
- true_name: '',
- gender: 1,
- member: 1,
- phone: '',
- mail: '',
- role: null,
- type: null,
- telPhone: {
+ username: '',
+ // gender: 1,
+ isDy: 0,
+ mobile: '',
+ email: '',
+ // role: null,
+ userType: null,
+ zj: {
areaNumber: '',
phoneNumber: "",
moreNumber: "",
},
- department: null,
- work: null,
- mac: '',
- ip: '',
+ departmentId: null,
+ jobTitle: null,
+ // mac: '',
+ // ip: '',
},
createUserRules: {
- nick_name: [
+ nickName: [
{ required: true, trigger: "blur", validator: validateNickname },
],
password: [
{ required: true, trigger: "blur", validator: validatePass },
],
- true_name: [
+ username: [
{ required: true, trigger: "blur", validator: validateTruename },
],
- gender: [
+ // gender: [
+ // { required: true, trigger: "blur" },
+ // ],
+ isDy: [
{ required: true, trigger: "blur" },
],
- member: [
- { required: true, trigger: "blur" },
- ],
- phone: [
+ mobile: [
{ required: true, trigger: "blur", validator: validatePhone },
],
- mail: [
+ email: [
{ required: false, trigger: "blur", validator: validateMail },
],
- role: [
- { required: true, trigger: "blur", validator: validateRole },
- ],
- type: [
+ // role: [
+ // { required: true, trigger: "blur", validator: validateRole },
+ // ],
+ userType: [
{ required: true, trigger: "blur", validator: validateType },
],
- telPhone: [
+ zj: [
{ required: false, trigger: "blur" },
],
- department: [
+ departmentId: [
{ required: true, trigger: "blur", validator: validateDepartment },
],
- work: [
+ 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', value: 1 }, { name: '瑙掕壊2', value: 2 }
],
- typeList: [
- { name: '绫诲瀷1', value: 1 }, { name: '绫诲瀷2', value: 2 }
- ]
+ typeList: []
}
},
- created() {
- this.$axios.get("sccg/role/listAll").then(res=>{
- console.log(res);
- });
+ created() {
+ const that = this;
+ // 鑾峰彇瑙掕壊鍒楄〃
+ // this.$axios.get('')
+ // 鑾峰彇鐢ㄦ埛绫诲瀷鍒楄〃
+ // this.$axios.get('sccg/admin/list',{userType:0}).then(res=>{
+ // console.log(res);
+ // })
+ // 鑾峰彇鍏ㄩ儴閮ㄩ棬鍒楄〃
+ this.$axios.get('sccg/depart/page').then(res => {
+ that.typeList = res.data.records;
+ })
},
methods: {
handleUser() {
- console.log(this.user);
+ const { user } = this;
+ console.log(user);
+ this.$axios.post('sccg/admin/register', {
+ departmentId: user.departmentId,
+ email: user.email,
+ jsDy: user.isDy,
+ jobTitle: user.jobTitle,
+ mobile: user.mobile,
+ nickName: user.nickName,
+ password: user.password,
+ userType: user.userType,
+ username: user.username,
+ }).then(res => {
+ if (res.code === 200) {
+ this.refresh();
+ }
+ })
}
},
+ props: ['refresh']
}
</script>
-<style lang="scss" scpoed>
+<style lang="scss" scoped>
.createUser {
border-radius: 1px;
- // min-width: 1024px;
- // min-height: 1450px;
- background-color: #fff;
+ background-color: #09152f;
header {
display: flex;
@@ -293,9 +316,11 @@
height: 60px;
line-height: 60px;
padding: 0 20px;
+ border: 1px solid #fff;
+
.headerTitle {
+ color: #4b9bb7;
font-weight: 600;
- color: #666;
}
.headerTip span {
@@ -303,17 +328,18 @@
}
.headerTip label {
- color: #999999;
+ color: #4b9bb7;
}
}
main {
- border-top: 1px solid #f0f2f5;
+ border: 1px solid #fff;
text-align: left;
padding: 0 55px;
+ background-color: #09152f;
+ padding-bottom: 50px;
.mainTitle {
- // margin-left: 60px;
- color: #666;
+ color: #4b9bb7;
font-weight: 600;
line-height: 100px;
font-size: 14px;
@@ -322,6 +348,16 @@
.mainContent {
display: flex;
justify-content: center;
+
+ &::v-deep .el-form-item__label {
+ color: #4b9bb7;
+ }
+
+ &::v-deep .el-input__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+
.el-form-item__content {
width: 400px;
@@ -329,20 +365,25 @@
width: 100%;
}
}
- .optionHandleSp{
+
+ .optionHandleSp {
display: flex;
- .areaNumber,.moreNumber{
+
+ .areaNumber,
+ .moreNumber {
flex: 1;
}
- .telNumber{
+
+ .telNumber {
flex: 2;
}
}
- .optionBtn{
+
+ .optionBtn {
display: flex;
- justify-content: center;
- margin-top: 80px;
- .btn{
+ margin-top: 20px;
+
+ .btn {
padding: 12px 50px;
}
}
--
Gitblit v1.8.0