From c3e5497b9691f948253d41efde2fd5f7978ff2a7 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期六, 24 八月 2024 17:13:55 +0800
Subject: [PATCH] 修正了拼写错误

---
 ruoyi-ui/src/views/system/user/index.vue |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index dcb53c0..89eccb6 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -447,6 +447,7 @@
         pageSize: 10,
         userName: undefined,
         phonenumber: undefined,
+		clanId: undefined,
         status: undefined,
         deptId: undefined
       },
@@ -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
 			}
 		})
 	},
@@ -664,7 +670,10 @@
         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;
         console.log(response.data,'allInfoallInfoallInfoallInfo')
 		for(var i = 0; i < this.allInfo.length; i++)
@@ -699,6 +708,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 +814,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 = "娣诲姞鐢ㄦ埛";
@@ -824,10 +836,12 @@
         this.form = response.data;
         console.log(response.data,'formformformformform')
         console.log(this.form.spouseId,'浼翠荆id')
-		// console.log(response.data)
         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)
@@ -913,10 +927,11 @@
 		  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)
+		  console.log(fm,'fmfmfmfmfmfmfmfm')
           if (valid) {
             if (this.form.userId != undefined) {
               updateUser(fm).then(response => {
@@ -925,7 +940,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