From 43e1199ca0c75787fb6b52bef7d595abd115ceab Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 02 一月 2025 21:44:58 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-ui/src/views/self/memo.vue |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 1f660e0..128f77c 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -77,12 +77,12 @@
 <!--                  <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
 <!--                  </el-input>-->
                   <template v-if="!isEditing">
-                    <el-input v-model="individualList.sex === 1 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+                    <el-input v-model="individualList.sex === 0 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                   </template>
                   <template v-else>
                     <el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb">
-                      <el-option label="鐢�" value='1'></el-option>
-                      <el-option label="濂�" value='0'></el-option>
+                      <el-option label="鐢�" value='0'></el-option>
+                      <el-option label="濂�" value='1'></el-option>
                     </el-select>
                   </template>
                 </el-form-item>
@@ -118,7 +118,7 @@
                   <template v-if="!isEditing" >
                     <el-input v-if="individualList.maritalStatus===0" placeholder="鏈"></el-input>
                     <el-input v-if="individualList.maritalStatus===1" placeholder="宸插"></el-input>
-                    <el-input v-if="individualList.maritalStatus===2" placeholder="鏈"></el-input>
+                    <el-input v-if="individualList.maritalStatus===2" placeholder="绂诲"></el-input>
 
                   </template>
                   <template v-else>
@@ -785,7 +785,7 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       // 鏁版嵁鑼冨洿閫夐」
-      fot:[".jpg",".jif"],
+      fot:[".jpg",".jif",'.M4A'],
       fileList:[],
       fileListOther:[],
      //涓嬫媺瀹炵幇
@@ -1028,6 +1028,7 @@
     		// //  alert(this.$store.state.user.clanId)
     		//       this.listRoot = []
     		 let clanId = this.$store.state.user.clanId
+			  if(clanId!=null){
             getAllInfo(clanId).then(response => {
                 this.listRoot = response.data;
                 const kon = {}
@@ -1045,6 +1046,7 @@
                 this.loading1 = false;
               }
             );
+			}
         },
 
     /** 鏌ヨ璁板綍鍒楄〃 */
@@ -1159,16 +1161,21 @@
       }, `self_${new Date().getTime()}.xlsx`)
     },  //涓汉鍩烘湰淇℃伅
     submitForm() {
-      if(this.inds=='1')
+
+      if(this.inds=='1'||this.inds=='濂�')
         this.individualList.sex = 1;
       else
         this.individualList.sex = 0;
-      if(this.mrs=='0')
+	  
+      if(this.mrs=='0'||this.mrs=='鏈')
         this.individualList.maritalStatus = 0
-      else if(this.mrs == '1')
+      else if(this.mrs == '1'||this.mrs=='宸插')
         this.individualList.maritalStatus = 1
       else
         this.individualList.maritalStatus = 2
+		
+		
+	//alert(123)
        // alert(10)
     //   let ul = this.fileList.map(function (elem){
     //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -1184,15 +1191,18 @@
             updateIndividual(this.individualList).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               // 寮哄埗鏇存柊鐩稿叧缁勪欢
-              this.individualList={...this.individualList}
-
-              // this.open = false;
+			   
+            //  this.individualList={...this.individualList}
+			// alert(this.individualList.sex)
+			  
+   //            // this.open = false;
               this.dsb = true
               this.btn=false
               this.isShow_2=false
               this.isShow=true
               this.isEditing = false
-            });
+			  //this.getList()
+			})
           } else {
             this.$modal.msgSuccess("淇敼澶辫触");
 

--
Gitblit v1.9.1