From b29f1588f2bb8b46df38a52cbae07ea8590f099a Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:10:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/self/show.vue | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 41e3d9a..9bd7f95 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -58,12 +58,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 ? '鐢�':'濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-model="individualList.sex === 1 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
</template>
<template v-else>
- <el-select v-model="individualList.sex" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb">
- <el-option label="鐢�" value="1"></el-option>
- <el-option label="濂�" value="0"></el-option>
+ <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-select>
</template>
</el-form-item>
@@ -99,13 +99,14 @@
<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>
- <el-select v-model="individualList.maritalStatus" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
- <el-option label="鏈" value="0"></el-option>
- <el-option label="宸插" value="1"></el-option>
- <el-option label="绂诲" value="2"></el-option>
+ <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='2'></el-option>
</el-select>
</template>
</el-form-item>
@@ -712,6 +713,10 @@
componentKey: 0,
// 閫変腑鏁扮粍
ids: [],
+ //鎬у埆
+ inds:undefined,
+ //濠氬Щ绫诲埆
+ mrs:undefined,
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -1224,7 +1229,12 @@
this.isShow=false
this.isShow_2=true
this.isEditing=true
- // this.isEdit=false
+ if(this.individualList.maritalStatus == 0)
+ this.mrs = '鏈'
+ else if(this.individualList.maritalStatus == 1)
+ this.mrs = '宸插'
+ else
+ this.mrs = '绂诲'// this.isEdit=false
},
/** 鏌ヨ鑷紶淇℃伅 */
@@ -1368,6 +1378,16 @@
//淇敼鍚庣殑淇濆瓨
//涓汉鍩烘湰淇℃伅
submitForm() {
+ if(this.inds=='1')
+ this.individualList.sex = 1;
+ else
+ this.individualList.sex = 0;
+ if(this.mrs=='0')
+ this.individualList.maritalStatus = 0
+ else if(this.mrs == '1')
+ this.individualList.maritalStatus = 1
+ else
+ this.individualList.maritalStatus = 2
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
--
Gitblit v1.9.1