From 7eb199649939226c3f11fd6f4cda830a389253b8 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 20 四月 2025 19:14:09 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/self/memo.vue | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 5be49cd..e23049e 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -117,15 +117,16 @@
<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===2" 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%'}">
<el-option label="鏈" value='0'></el-option>
- <el-option label="宸插" value='1'></el-option>
+ <el-option label="鍒濆" value='1'></el-option>
<el-option label="绂诲" value='2'></el-option>
+ <el-option label="鍐嶅" value='3'></el-option>
</el-select>
</template>
</el-form-item>
@@ -785,7 +786,7 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:[".jpg",".jif",'.M4A'],
fileList:[],
fileListOther:[],
//涓嬫媺瀹炵幇
@@ -1028,6 +1029,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 +1047,7 @@
this.loading1 = false;
}
);
+ }
},
/** 鏌ヨ璁板綍鍒楄〃 */
@@ -1147,9 +1150,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
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -1160,17 +1165,21 @@
}, //涓汉鍩烘湰淇℃伅
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
+ else if(this.mrs == '2'||this.mrs=='绂诲')
this.individualList.maritalStatus = 2
+ else
+ this.individualList.maritalStatus = 3
+
+
//alert(123)
// alert(10)
// let ul = this.fileList.map(function (elem){
@@ -1189,13 +1198,15 @@
// 寮哄埗鏇存柊鐩稿叧缁勪欢
// this.individualList={...this.individualList}
-
- // this.open = false;
+ // 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