From 6669c680f79663fc220935d61c3f3f6eee078e7c Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期日, 21 七月 2024 16:56:03 +0800
Subject: [PATCH] 修改了报错

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

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 2084858..dcb53c0 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 allInfo"
-                  :key="item.userId"
+                  v-for="(item, index) in allInfo2"
+                  :key="index"
                   :label="item.nickName"
                   :value="item.userId"
                 ></el-option>
@@ -357,7 +357,7 @@
 import { getIndividual,getInfoByFid,
 getAllInfo,listUser, getUser, delUser,
  updateUserInfo,addUser, updateUser, getAllFamilys,resetUserPwd,
- changeUserStatus, deptTreeSelect ,updateFM, updatePO} from "@/api/system/user";
+ changeUserStatus, deptTreeSelect ,updateFM, updatePO, addPO} from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -546,11 +546,18 @@
       const tpfid = this.pOID
       // 鏂板a=1,淇敼a=2
       if(this.a == 1){
-        alert('鏂板a=1')
+        addPO(this.sex).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')
+        })
       }else{
         updatePO(tpfid,this.sex).then(response =>{
-          this.allInfo2 = response.data
-          console.log(this.allInfo2,'淇敼a=2')
+          for(let i in response.data[0]){
+            this.allInfo2.push({'nickName':response.data[0][i],'userId': parseInt(i)})
+          }
+          console.log(this.allInfo2,'淇敼a=2淇敼a=2淇敼a=2')
         })
       }
       // console.log(sex,'sexsexsex')
@@ -558,6 +565,7 @@
     // 鍏抽棴寮圭獥鍚�
     handleClose(){
       this.pOID = ''
+      this.allInfo2 = []
       // alert(this.pOID)
     },
 
@@ -814,11 +822,12 @@
         //alert(this.fid)
       getUser(userId).then(response => {
         this.form = response.data;
-        console.log(response.data)
-		console.log(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)
+		// console.log(this.roleOptions)
         // this.$set(this.form, "postIds", response.postIds);
         // this.$set(this.form, "roleIds", response.roleIds);
        // alert(response.roleIds.length)
@@ -829,7 +838,7 @@
      getIndividual(userId).then(response => {
            //  alert(123)
 		   // console.log('++++++++-----0000((((((9999))))))')
-     //          console.log(response.data)
+              console.log(response.data,'getIndividualgetIndividualgetIndividual')
             if(response.data!=undefined)
             {
 
@@ -891,10 +900,10 @@
           let fm = {}
           fm.userId = _this.zinfid;
 		  fm.nickName = this.form.nickName
-		  alert(this.form.role)
+		  // alert(this.form.role)
 		  fm.roleId = this.form.role
 		  fm.sex = this.form.sex
-		  alert(fm.sex)
+		  // alert(fm.sex)
 		  fm.status = this.form.status
 		  fm.fid = this.form.fid
 		  fm.mid = this.form.mid
@@ -904,16 +913,15 @@
 		  fm.spouseId = this.form.spouseId
 		  fm.sysId = this.form.userId
 		  fm.userName = this.form.userName
+      fm.remark = this.form.remark
+      // alert(fm.remark)
 
 		  console.log(fm)
           if (valid) {
             if (this.form.userId != undefined) {
               updateUser(fm).then(response => {
-
-				this.open = false;
+                  this.open = false;
                    this.getList();
-
-
                    // this.isshowMar = false
                    // this.isshowMri = false
               //   updateUserInfo(fm).then(response=>{
@@ -927,20 +935,16 @@
               //   })
                });
             } else {
-
               addUser(fm).then(response => {
                 this.$modal.msgSuccess("鏂板鎴愬姛");
                 this.open = false;
                 this.getList();
                 _this.rt = undefined
-
                 // this.isshowMar = false
                 // this.isshowMri = false
               });
             }
             }
-
-
         }
         else{
           this.$modal.msgSuccess("鏅�氳鑹蹭笉鑳芥嫢鏈夊搴彿锛�");

--
Gitblit v1.9.1