From 4f66e0e7c89dfdbc02ecb300feb20de1ca38022e Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期六, 31 八月 2024 21:41:44 +0800 Subject: [PATCH] 新增之后,修改用户 --- ruoyi-ui/src/views/system/user/index.vue | 66 ++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 13 deletions(-) diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index baf41eb..03803f1 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -115,9 +115,13 @@ <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="50" align="center" /> <el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> - <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> - <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" /> + <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="nickName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> + <el-table-column label="鐢ㄦ埛濮撳悕" align="center" key="userName" prop="userName" v-if="columns[2].visible" :show-overflow-tooltip="true" /> + <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" v-if="columns[2].visible" :show-overflow-tooltip="true" > + <template slot-scope="scope">{{scope.row.sex==0? '鐢�': '濂�'}}</template> + + </el-table-column> <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> <el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible"> <template slot-scope="scope"> @@ -183,13 +187,13 @@ <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-row> <el-col :span="12"> - <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName"> - <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" /> + <el-form-item label="鐢ㄦ埛鍚嶇О" prop="nickName"> + <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" /> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName"> - <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" /> + <el-form-item label="鐢ㄦ埛濮撳悕" prop="userName"> + <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴峰鍚�" maxlength="30" /> </el-form-item> </el-col> @@ -447,6 +451,7 @@ pageSize: 10, userName: undefined, phonenumber: undefined, + clanId: undefined, status: undefined, deptId: undefined }, @@ -542,11 +547,13 @@ if(value != undefined){ this.sex = value } - // alert(this.sex) + // alert(this.sex) const tpfid = this.pOID + let clanId = this.$store.state.user.clanId // 鏂板a=1,淇敼a=2 - if(this.a == 1){ - addPO(this.sex).then(response =>{ + this.allInfo2 = [] + if(this.a ===1){ + addPO(this.sex, clanId).then(response =>{ for(let i in response.data[0]){ this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)}) } @@ -566,6 +573,7 @@ handleClose(){ this.pOID = '' this.allInfo2 = [] + // this.reset(); // alert(this.pOID) }, @@ -611,6 +619,8 @@ //alert(fid) _this.$set(_this.form,'fid',_this.orfid); this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓虹埗浜诧紒"); + this.form.fid = undefined + this.form.mid = undefined } }) }, @@ -655,17 +665,40 @@ //alert(fid) _this.$set(_this.form,'mid',_this.ormid); this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓烘瘝浜诧紒"); + this.form.fid = undefined + this.form.mid = undefined } }) }, handleFamily(value) { + if(this.form.sex==undefined){ + this.$modal.msgSuccess("璇峰厛閫夋嫨鎬у埆锛�"); + return; + } + else{ + let clanId = this.$store.state.user.clanId + this.allInfo2 = [] + //alert(this.form.sex) + addPO(this.form.sex, clanId).then(response =>{ + for(let i in response.data[0]){ + this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)}) + } + console.log(this.allInfo2,'鏂板a=1鏂板a=1鏂板a=1') + }) if(this.form.isMyFamily=="0") this.isshowMri = true + + } }, getAllIn(){ - getAllInfo().then(response => { + let clanId = this.$store.state.user.clanId + getAllInfo(clanId).then(response => { + console.log(response) + console.log('-------00000000000000000-----------') this.allInfo = response.data; + this.fathorInfo = [] + this.motherInfo = [] console.log(response.data,'allInfoallInfoallInfoallInfo') for(var i = 0; i < this.allInfo.length; i++) { @@ -676,8 +709,10 @@ this.motherInfo.push(this.allInfo[i]) } // alert(98) - //console.log(this.fathorInfo) - //console.log('----sdfdsfds') + console.log(this.fathorInfo) + console.log('----sdfdsfds') + + console.log(this.motherInfo) }) }, getRole(value){ @@ -699,6 +734,9 @@ /** 鏌ヨ鐢ㄦ埛鍒楄〃 */ getList() { this.loading = true; + // alert(this.state.clanId) + // alert(this.state.name) + this.queryParams.clanId = this.$store.state.user.clanId listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.userList = response.rows; console.log(this.userList,'userList') @@ -915,7 +953,8 @@ fm.spouseId = this.form.spouseId fm.sysId = this.form.userId fm.userName = this.form.userName - fm.remark = this.form.remark + fm.remark = this.form.remark + fm.clanId = this.$store.state.user.clanId // alert(fm.remark) console.log(fm,'fmfmfmfmfmfmfmfm') @@ -942,6 +981,7 @@ this.open = false; this.getList(); _this.rt = undefined + this.getAllIn() // this.isshowMar = false // this.isshowMri = false }); -- Gitblit v1.9.1