From b849886a6e1004c32cee00c2ee4e15f9d848f061 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 19 四月 2025 22:06:27 +0800
Subject: [PATCH] 修改

---
 ruoyi-ui/src/views/self/memo.vue                  |   16 ++++++++++------
 ruoyi-ui/src/views/clanManager/ancestor/index.vue |    6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/clanManager/ancestor/index.vue b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
index 8fb6926..945a396 100644
--- a/ruoyi-ui/src/views/clanManager/ancestor/index.vue
+++ b/ruoyi-ui/src/views/clanManager/ancestor/index.vue
@@ -181,7 +181,7 @@
             </el-form-item>
           </el-col>
 	<el-col :span="12">
-	  <el-form-item label="鐢ㄦ埛鎬у埆">
+	  <el-form-item label="绁栧厛鎬у埆">
 	    <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
 	      <el-option
 	        v-for="dict in dict.type.sys_user_sex"
@@ -551,7 +551,7 @@
       const userId = row.id || this.ids;
 	  this.cuid= row.id || this.ids;
       //  this.fid = response.data.familyId
-	 alert(userId)
+	// alert(userId)
         //alert(this.fid)
       getUser(userId).then(response => {
         this.form = response.data;
@@ -597,7 +597,7 @@
         );
 
         this.open = true;
-        this.title = "淇敼鐢ㄦ埛";
+        this.title = "娣诲姞鐢ㄦ埛";
         this.form.password = "";
       });
     },
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 128f77c..0047dba 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -117,9 +117,9 @@
                 <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="70px">
                   <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===1" placeholder="鍒濆"></el-input>
                     <el-input v-if="individualList.maritalStatus===2" placeholder="绂诲"></el-input>
-
+      <el-input v-if="individualList.maritalStatus===3" placeholder="鍐嶅"></el-input>
                   </template>
                   <template v-else>
                     <el-select v-model="mrs" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
@@ -1149,9 +1149,11 @@
       if(this.individualList.maritalStatus == 0)
           this.mrs = '鏈'
       else if(this.individualList.maritalStatus == 1)
-          this.mrs = '宸插'
-      else
+          this.mrs = '鍒濆'
+           else if(this.individualList.maritalStatus == 2)
           this.mrs = '绂诲'// this.isEdit=false
+	  else
+	  this.mrs = '鍐嶅'// this.isEdit=false
     },
 
  /** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -1169,10 +1171,12 @@
 	  
       if(this.mrs=='0'||this.mrs=='鏈')
         this.individualList.maritalStatus = 0
-      else if(this.mrs == '1'||this.mrs=='宸插')
+      else if(this.mrs == '1'||this.mrs=='鍒濆')
         this.individualList.maritalStatus = 1
-      else
+      else if(this.mrs == '2'||this.mrs=='绂诲')
         this.individualList.maritalStatus = 2
+	  else
+	  this.individualList.maritalStatus = 3
 		
 		
 	//alert(123)

--
Gitblit v1.9.1