From 5fd1b2dc8997ab3adc819e8aca55e9831071b9c0 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 10 八月 2023 13:41:20 +0800
Subject: [PATCH] 完善部分模块 导入问题
---
ruoyi-ui/src/views/self/show.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 5661b2b..9bd7f95 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,5 +1,7 @@
<template>
<div class="app-container">
+ <!-- 鍒锋柊椤甸潰 -->
+<!-- <MyComponent :key="componentKey" />-->
<!-- 鍥炲埌椤堕儴-->
<el-backtop :bottom="150" :right="30">
<el-button type="primary" circle
@@ -56,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%'}">
- <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>
@@ -97,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>
@@ -239,7 +242,7 @@
<div>
<el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form-item label="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�" >
- <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;">
+ <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0;color: #FEF7FC;" :disabled="dsb">
<el-radio :label="1">鏄�</el-radio>
<el-radio :label="0">鍚�</el-radio>
</el-radio-group>
@@ -266,7 +269,7 @@
<div class="title-wrapper">
涓昏瀛︿範鍙婂伐浣滅粡鍘�
<div>
- <el-button class="button" size="mini" type="text" @click="showDialog('open')">
+ <el-button class="button" size="mini" type="text" @click="showDialog('open')" >
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</div>
@@ -697,6 +700,9 @@
export default {
name: "show",
dicts: ['sys_normal_disable'],
+ // components: {
+ // MyComponent
+ // },
data() {
return {
// 閬僵灞�
@@ -704,8 +710,13 @@
loading: true,
formData:[],
+ componentKey: 0,
// 閫変腑鏁扮粍
ids: [],
+ //鎬у埆
+ inds:undefined,
+ //濠氬Щ绫诲埆
+ mrs:undefined,
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -1218,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
},
/** 鏌ヨ鑷紶淇℃伅 */
@@ -1362,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(",")
@@ -1375,8 +1401,14 @@
if (this.individualList.userId !== undefined) {
updateIndividual(this.individualList).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
+ // 寮哄埗鏇存柊鐩稿叧缁勪欢
+ this.individualList={...this.individualList}
+
// this.open = false;
+ this.dsb = true
this.btn=false
+ this.isShow_2=false
+ this.isShow=true
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
@@ -1385,7 +1417,7 @@
}
})
// 鍒锋柊椤甸潰
- window.location.reload();
+ // window.location.reload();
},
//涓昏缁忓巻
saveRowExperienceList(row) {
@@ -1586,6 +1618,7 @@
.btn_edit{
background:center no-repeat url('../../assets/icons/edit.png') ;
}
+
.button {
background:center no-repeat url('../../assets/icons/add1.png') ;
margin-left: 69.5vw;
--
Gitblit v1.9.1