From f81e83fca9cfca4d5149450433d9650b9dd59197 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 21 八月 2024 17:14:00 +0800
Subject: [PATCH] 增加了新的模块

---
 ruoyi-ui/src/views/system/user/index.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 4f0408d..dc992d8 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -297,8 +297,8 @@
              <el-form-item label="閰嶅伓淇℃伅" prop="spouseId" >
               <el-select v-model="form.spouseId"   placeholder="璇烽�夋嫨閰嶅伓淇℃伅" @change="handleSpouse">
                 <el-option
-                  v-for="item in allInfo2"
-                  :key="item.userId"
+                  v-for="(item, index) in allInfo2"
+                  :key="index"
                   :label="item.nickName"
                   :value="item.userId"
                 ></el-option>
@@ -447,6 +447,7 @@
         pageSize: 10,
         userName: undefined,
         phonenumber: undefined,
+		clanId: undefined,
         status: undefined,
         deptId: undefined
       },
@@ -548,14 +549,14 @@
       if(this.a == 1){
         addPO(this.sex).then(response =>{
           for(let i in response.data[0]){
-            this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
+            this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
           }
           console.log(this.allInfo2,'鏂板a=1鏂板a=1鏂板a=1')
         })
       }else{
         updatePO(tpfid,this.sex).then(response =>{
           for(let i in response.data[0]){
-            this.allInfo2.push({'nickName':response.data[0][i],'userId':i})
+            this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
           }
           console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
         })
@@ -566,6 +567,7 @@
     handleClose(){
       this.pOID = ''
       this.allInfo2 = []
+      // this.reset();
       // alert(this.pOID)
     },
 
@@ -611,6 +613,8 @@
 				//alert(fid)
 				_this.$set(_this.form,'fid',_this.orfid);
 				this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓虹埗浜诧紒");
+        this.form.fid = undefined
+        this.form.mid = undefined
 			}
 		})
 	},
@@ -655,6 +659,8 @@
 				//alert(fid)
 				_this.$set(_this.form,'mid',_this.ormid);
 				this.$modal.msgSuccess("涓嶈兘閫夋嫨瀛愬瓩涓烘瘝浜诧紒");
+        this.form.fid = undefined
+        this.form.mid = undefined
 			}
 		})
 	},
@@ -699,6 +705,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')
@@ -802,7 +811,7 @@
           this.roleOptions= []
         this.roleOptions.push(response.roles[1])
           this.roleOptions.push(response.roles[3])
-		  console.log(this.roleOptions)
+		  console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
 		  console.log("0-009888")
         this.open = true;
         this.title = "娣诲姞鐢ㄦ埛";
@@ -823,10 +832,13 @@
       getUser(userId).then(response => {
         this.form = response.data;
         console.log(response.data,'formformformformform')
-		// console.log(response.data)
+        console.log(this.form.spouseId,'浼翠荆id')
         this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-		console.log(this.roleOptions)
+        this.roleOptions= []
+        this.roleOptions.push(response.roles[1])
+        this.roleOptions.push(response.roles[3])
+        // this.roleOptions = response.roles;
+        console.log(this.roleOptions,'roleOptionsroleOptionsroleOptions')
         // this.$set(this.form, "postIds", response.postIds);
         // this.$set(this.form, "roleIds", response.roleIds);
        // alert(response.roleIds.length)
@@ -837,7 +849,7 @@
      getIndividual(userId).then(response => {
            //  alert(123)
 		   // console.log('++++++++-----0000((((((9999))))))')
-     //          console.log(response.data)
+              console.log(response.data,'getIndividualgetIndividualgetIndividual')
             if(response.data!=undefined)
             {
 
@@ -913,9 +925,9 @@
 		  fm.sysId = this.form.userId
 		  fm.userName = this.form.userName
       fm.remark = this.form.remark
-      alert(fm.remark)
+      // alert(fm.remark)
 
-		  console.log(fm)
+		  console.log(fm,'fmfmfmfmfmfmfmfm')
           if (valid) {
             if (this.form.userId != undefined) {
               updateUser(fm).then(response => {
@@ -924,7 +936,7 @@
                    // this.isshowMar = false
                    // this.isshowMri = false
               //   updateUserInfo(fm).then(response=>{
-              //      this.$modal.msgSuccess("淇敼鎴愬姛");
+                   this.$modal.msgSuccess("淇敼鎴愬姛");
               //      this.open = false;
               //      this.getList();
               //      _this.rt = undefined

--
Gitblit v1.9.1