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 | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 053cb1e..0047dba 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>
@@ -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===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%'}">
@@ -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;
}
);
+ }
},
/** 鏌ヨ璁板綍鍒楄〃 */
@@ -1147,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
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -1159,16 +1163,23 @@
}, `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
+ 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){
// return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -1184,15 +1195,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("淇敼澶辫触");
@@ -1223,7 +1237,7 @@
this.$refs.uploadDemo.clearFiles();
// alert(234)
uploadPics(formData).then(response => {
- alert(response.data.url)
+ // alert(response.data.url)
// // alert(response.data.originalFilename)
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
--
Gitblit v1.9.1