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 |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 9d6c767..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">
@@ -543,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)})
           }
@@ -666,8 +672,24 @@
 	},
     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(){
 	    let clanId = this.$store.state.user.clanId
@@ -675,6 +697,8 @@
 		  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++)
 		{
@@ -685,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){
@@ -955,6 +981,7 @@
                 this.open = false;
                 this.getList();
                 _this.rt = undefined
+				 this.getAllIn()
                 // this.isshowMar = false
                 // this.isshowMri = false
               });

--
Gitblit v1.9.1