From d0136913a2c74a44f5bb30327ebbb3fd85e24fce Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期二, 23 一月 2024 10:56:30 +0800 Subject: [PATCH] 修改了很多 --- ruoyi-ui/src/views/system/user/index.vue | 248 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 192 insertions(+), 56 deletions(-) diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index b2b305a..ce425f0 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -190,7 +190,7 @@ <el-col :span="12"> <el-form-item label="瑙掕壊" prop="roleIds"> <el-select v-model="rt" placeholder="璇烽�夋嫨瑙掕壊" @change="getRole"> - <el-option :key="-1" :label="鏃�" :value="-1">鏃�</el-option> + <el-option v-for="item in roleOptions" :key="item.roleId" @@ -203,44 +203,7 @@ </el-col> </el-row> - <el-row> - <el-col :span="12"> - <el-form-item label="瀹跺涵鍙�"> - <el-select v-model="fid" placeholder="璇烽�夋嫨瀹跺涵鍙�"> - <el-option :key="-1" :label="鏃�" - value="鏃�">鏃�</el-option> - - <el-option - v-for="item in famiInfo" - :key="item.id" - :label="item.name" - :value="item.id" - - ></el-option> - </el-select> - - </el-form-item> - </el-col> - - <el-col :span="12"> - <el-form-item label="閭" prop="email"> - <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" maxlength="50" /> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="12"> - <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛鍚嶇О" prop="userName"> - <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" /> - </el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛瀵嗙爜" prop="password"> - <el-input v-model="form.password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" type="password" maxlength="20" show-password/> - </el-form-item> - </el-col> - </el-row> <el-row> <el-col :span="12"> <el-form-item label="鐢ㄦ埛鎬у埆"> @@ -268,10 +231,78 @@ </el-row> <el-row> <el-col :span="12"> - <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber"> - <el-input v-model="form.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" /> + <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛鍚嶇О" prop="userName"> + <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" /> </el-form-item> </el-col> + <el-col :span="12"> + <el-form-item v-if="form.userId == undefined" label="鐢ㄦ埛瀵嗙爜" prop="password"> + <el-input v-model="form.password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" type="password" maxlength="20" show-password/> + </el-form-item> + </el-col> + </el-row> + <el-row> + + <el-col :span="12"> + <el-form-item label="瀹跺涵鍙�"> + <el-select v-model="fid" placeholder="璇烽�夋嫨瀹跺涵鍙�" @change="handleChange"> + + <el-option + key="-1" + label="鏃�" + value="-1" + ></el-option> + <el-option + v-for="item in famiInfo" + :key="item.id" + :label="item.name" + :value="item.id" + + ></el-option> + </el-select> + + </el-form-item> + </el-col> + + </el-row> + + <el-row v-if="isshowMar"> + + <el-col :span="12"> + <el-form-item label="鏄惁鏈" prop="isMyFamily"> + <el-select v-model="form.isMyFamily" placeholder="璇疯緭鍏ユ槸鍚︽湰瀹�" @change="handleFamily"> + + + <el-option + key=1 + label="鏄�" + value=1 + ></el-option> + <el-option + key=0 + label="鍚�" + value=0 + ></el-option> + </el-select> + + </el-form-item> + </el-col> + + </el-row> + <el-row v-if="isshowMri"> + <el-col :span="12"> + <el-form-item label="閰嶅伓淇℃伅" prop="spouseId"> + <el-select v-model="form.spouseId" placeholder="璇烽�夋嫨閰嶅伓淇℃伅"> + <el-option + v-for="item in allInfo" + :key="item.userId" + :label="item.nickName" + :value="item.userId" + ></el-option> + </el-select> + + </el-form-item> + </el-col> </el-row> <el-row> <el-col :span="24"> @@ -320,7 +351,10 @@ </template> <script> -import { listUser, getUser, delUser, updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"; +import { getIndividual,getInfoByFid, +getAllInfo,listUser, getUser, delUser, + updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd, + changeUserStatus, deptTreeSelect } from "@/api/system/user"; import { getToken } from "@/utils/auth"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; @@ -345,6 +379,8 @@ showSearch: true, // 鎬绘潯鏁� total: 0, + isshowMri: false, + isshowMar: false, // 鐢ㄦ埛琛ㄦ牸鏁版嵁 userList: null, // 寮瑰嚭灞傛爣棰� @@ -367,7 +403,11 @@ // 瑙掕壊閫夐」 roleOptions: [], // 琛ㄥ崟鍙傛暟 - + motherInfo:[], + fathorInfo:[], + allInfo:[], + faid: 0, + maid: 0, form: {}, defaultProps: { children: "children", @@ -419,10 +459,15 @@ roleIds: [ { required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" } ], + isMyFamily: [ + { required: true, message: "鏄惁澶栧珌涓嶈兘涓虹┖", trigger: "blur" } + ], deptId: [ { required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" } ], - + spouseId: [ + { required: true, message: "閰嶅伓淇℃伅涓嶈兘涓虹┖", trigger: "blur" } + ], password: [ { required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' } @@ -454,11 +499,48 @@ this.getList(); this.getFamlilyInfo(); this.getDeptTree(); + //鎷垮埌鑷繁瀹氫箟鐨勭敤鎴蜂俊鎭� + // this.getAllIn(); this.getConfigKey("sys.user.initPassword").then(response => { this.initPassword = response.msg; }); }, methods: { + handleChange() + { + // alert(this.fid) + if(this.fid=="鏃�") + this.fid = "-1" + if(this.fid!="-1") + { + //鏌ヨ涓嶆槸鏈鐨勬椂鍊欙紝鍙互閫夋嫨鐨勯厤鍋朵俊鎭� + alert(this.fid) + + getInfoByFid(this.fid).then(response=>{ + console.log("--------------------") + console.log(response.data) + this.allInfo = response.data + }) + this.isshowMar = true + } + else{ + this.isshowMar = false + } + }, + handleFamily() + { + alert(this.form.isMyFamily) + if(this.form.isMyFamily=="0") + this.isshowMri = true + }, + getAllIn(){ + // alert(123) + getAllInfo().then(response => { + // this.allInfo = response.data; + // console.log(response.data) + // alert(982) + }) + }, getRole(){ this.form.roleIds = [] //alert(123) @@ -467,8 +549,13 @@ getFamlilyInfo(){ let _this = this getAllFamilys().then(response => { - //console.log(response.data) - _this.famiInfo = response.data + // console.log(response.data) + // alert(response.data[0]) + _this.famiInfo= response.data.filter(function(item){ + return item.name !== "涓�鍙峰搴�"; +}); + + }) }, /** 鏌ヨ鐢ㄦ埛鍒楄〃 */ @@ -511,6 +598,9 @@ // 鍙栨秷鎸夐挳 cancel() { this.open = false; + this.fid = "鏃�" + this.isshowMar = false + this.isshowMri = false this.reset(); }, // 琛ㄥ崟閲嶇疆 @@ -568,7 +658,10 @@ this.reset(); getUser().then(response => { this.postOptions = response.posts; - this.roleOptions = response.roles; + // this.roleOptions = response.roles; + this.roleOptions= [] + this.roleOptions.push(response.roles[1]) + this.roleOptions.push(response.roles[3]) this.open = true; this.title = "娣诲姞鐢ㄦ埛"; this.form.password = this.initPassword; @@ -578,11 +671,29 @@ handleUpdate(row) { this.reset(); const userId = row.userId || this.ids; + // alert(userId) + + // this.fid = response.data.familyId + //alert(this.fid) getUser(userId).then(response => { this.form = response.data; + console.log(response.data) this.postOptions = response.posts; this.roleOptions = response.roles; + // alert(response.roleIds.length) + if(response.roleIds.length!=0) this.rt = response.roleIds[0] + let _this = this + + getIndividual(userId).then(response => { + // alert(123) + console.log(response.data) + if(response.data!=undefined) + { + _this.fid = response.data.familyId; + } + } + ); this.$set(this.form, "postIds", response.postIds); this.$set(this.form, "roleIds", response.roleIds); this.open = true; @@ -618,45 +729,70 @@ // alert(this.form.roleIds) let ps = true - // alert(this.rt) - // alert(this.fid) + // alert(this.rt) + // alert(this.fid) + if(this.fid=="鏃�") + this.fid = -1 let _this = this - if(this.rt===2 && (this.fid!="鏃�")) + if(this.rt===2 && (this.fid!=-1)) { ps = false } + if(this.rt!=2&&this.fid==-1) + { + this.$modal.msgSuccess("瀹跺涵鎴愬憳锛屽繀椤昏鎷ユ湁瀹跺涵鍙凤紒"); + return + } // alert(ps) if(ps) { + let fm = {} + fm.userId = _this.form.userId + + if(_this.fid==="鏃�") + fm.familyId= -1 + else + fm.familyId = _this.fid + this.form.familyId = fm.familyId + if (valid) { if (this.form.userId != undefined) { updateUser(this.form).then(response => { - let fm = {} - fm.userId = _this.form.userId - - if(_this.fid==="鏃�") - fm.familyId= -1 - else - fm.familyId = _this.fid + updateUserInfo(fm).then(response=>{ this.$modal.msgSuccess("淇敼鎴愬姛"); this.open = false; this.getList(); + _this.rt = undefined + _this.fid = "鏃�" + this.isshowMar = false + this.isshowMri = false }) }); } else { + // alert(this.form.ismarry) + // alert(987) addUser(this.form).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); this.open = false; this.getList(); + _this.rt = undefined + _this.fid = "鏃�" + this.isshowMar = false + this.isshowMri = false }); } } + + } else{ this.$modal.msgSuccess("鏅�氳鑹蹭笉鑳芥嫢鏈夊搴彿锛�"); + // _this.rt = undefined + _this.fid = "鏃�" + _this.isshowMar = false } }); }, -- Gitblit v1.9.1