From d019c1632d2a92ed48b27b9cce1debcbe79afb2c Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期一, 07 八月 2023 16:53:46 +0800
Subject: [PATCH] 修改婚姻部分
---
ruoyi-ui/src/views/self/show.vue | 225 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 141 insertions(+), 84 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 6c72a8e..41e3d9a 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
@@ -59,7 +61,7 @@
<el-input v-model="individualList.sex === 1 ? '鐢�':'濂�'" 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-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>
@@ -234,12 +236,12 @@
</el-container>
<!--鎶樺彔闈㈡澘-->
- <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
<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">
+ <el-form-item label="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�" >
+ <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>
@@ -247,7 +249,7 @@
<el-row :span="7">
<el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form-item label="璇佷欢鍙风爜" prop="idNo" label-width="70px">
- <el-input v-model="individualList.idNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model="individualList.idNo" style="color: #FEF7FC;" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-form>
@@ -266,7 +268,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>
@@ -490,11 +492,15 @@
<div v-if="item.term === '鐮旂┒鐢�'"> {{item.content}}</div>
<div v-if="item.term === '宸ヤ綔'"> {{item.content}}</div>
<div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div>
+ <el-button size='mini' type="text" class="btn_edit" @click="editData(item)" style='position: absolute;right:10px;top:5px;'>
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ </el-button>
</el-tab-pane>
</el-tabs>
-<!-- <el-button size='mini' type="text" class="btn_autobiography" @click="showDialog('autobiography')" style='position: absolute;right:10px;top:5px;'>-->
-<!-- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>-->
-<!-- </el-button>-->
+
+ <el-button size='mini' type="text" class="btn_autobiography" @click="showDialog('autobiography')" style='position: absolute;right:10px;top:5px;'>
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ </el-button>
</div>
</div>
@@ -627,21 +633,26 @@
</div>
</el-dialog>
<!--鏂板鑷紶-->
- <el-dialog :title="title" :visible.sync="dialogVisible.autobiography" width="900px" >
+ <el-dialog :title="isEdit1 ? '缂栬緫璁板綍' : '鏂板璁板綍'" :visible.sync="dialogVisible.autobiography" width="900px" append-to-body>
<el-col >
- <el-form ref="elForm" :model="AutobiographyList" :rules="rules" size="medium" label-position="left"
- v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange" >
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" >
<el-row :span="5">
+<!-- <el-form-item label="闇�瑕佷慨鏀圭殑璁板綍锛�" prop="id">-->
+<!-- <el-select v-model="formDat.id" placeholder="璇烽�夋嫨闇�瑕佷慨鏀圭殑璁板綍" clearable :style="{width: '50%'}" >-->
+<!-- <el-option v-for="(item, index) in AutobiographyList" :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'"-->
+<!-- ></el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="骞撮緞娈碉細" prop="ageBegin ageEnd" label-width="70px">
- <el-input v-model="AutobiographyList.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
+ <el-input v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
</el-input>
<span> 宀� 鈥斺��</span>
- <el-input v-model="AutobiographyList.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
+ <el-input v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
</el-input>
<span> 宀� </span>
</el-form-item>
<el-form-item label="鏃舵湡锛�" prop="term">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鏃舵湡" clearable :style="{width: '50%'}" >
+ <el-select v-model="formDat.term" placeholder="璇烽�夋嫨鏃舵湡" clearable :style="{width: '50%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -676,8 +687,8 @@
listExperience, addExperience, updateExperience, delExperience,
getIndividualRelation, addRelation, updateRelation, delRelation,
getCertificateList, addCertificate, updateCertificate, delCertificate,
- getAbroadList, addAbroad,updateAbroad, delAbroad,
- getAutobiographyList, getAutobiographyTermList, addAutobiography,
+ getAbroadList, addAbroad, updateAbroad, delAbroad,
+ getAutobiographyList, getAutobiographyTermList, addAutobiography,updateAutobiography,
getCategory,
} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
@@ -688,6 +699,9 @@
export default {
name: "show",
dicts: ['sys_normal_disable'],
+ // components: {
+ // MyComponent
+ // },
data() {
return {
// 閬僵灞�
@@ -695,6 +709,7 @@
loading: true,
formData:[],
+ componentKey: 0,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -767,15 +782,13 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
isShow:true,
isShow_2:false,
+ isEdit1:false,
formDat: {
//涓汉鍩烘湰淇℃伅
nickName:undefined,
@@ -830,7 +843,8 @@
//鑷紶
ageBegin:undefined,
ageEnd:undefined,
- term:undefined
+ term:undefined,
+
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -921,8 +935,8 @@
trigger: 'blur'
}],
content: [{
- // required: true,
- message: '璇疯緭鍏�',
+ required: true,
+ message: '璇疯緭鍏ユ枃鏈�',
trigger: 'blur'
}],
witness: [{
@@ -930,8 +944,25 @@
message: '璇疯緭鍏ヨ瘉鏄庝汉',
trigger: 'blur'
}],
+ //鑷紶
+ term: [{
+ required: true,
+ message: '璇烽�夋嫨鏃舵湡',
+ trigger: 'blur'
+ }],
+ ageBegin: [{
+ required: true,
+ message: '',
+ trigger: 'blur'
+ }],
+ ageEnd: [{
+ required: true,
+ message: '',
+ trigger: 'blur'
+ }],
},
+ selectedOption:'',
typeOptions:[],
typeOption: [{
value:'鎶ょ収',
@@ -957,8 +988,13 @@
this.dialogVisible.relation1 = false;
this.dialogVisible.certificate =false;
this.dialogVisible.abroad=false;
- this.dialogVisible.autobiography=false
+ this.dialogVisible.autobiography=false;
+ this.isEdit1 = false;
this.reset();
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
},
//涓嬫媺
handleChange(activeNames) {
@@ -973,7 +1009,19 @@
handleClick(tab, event) {
// console.log(tab, event);
this.getAutobiographyInfor();
+ // this.getSrc1(typeOptions)
+ },
+ //涓汉鑷紶缂栬緫
+ editData(data) {
+ this.isEdit1 = true; // 璁剧疆涓虹紪杈戞搷浣�
+ // 灏嗚淇敼鐨勬暟鎹～鍏呭埌formDat瀵硅薄涓�
+ this.formDat.ageBegin = data.ageBegin;
+ this.formDat.ageEnd = data.ageEnd;
+ this.formDat.term = data.term;
+ this.formDat.content = data.content;
+ // 鎵撳紑寮圭獥
+ this.dialogVisible.autobiography = true;
},
//闅旇鍙樿壊
@@ -1054,16 +1102,16 @@
this.AutobiographyList = response.data;
this.total = response.data.total;
this.loading = false;
+
});
//鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
- getAutobiographyTermList(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- this.AutobiographyTermList = response.data;
- this.total = response.data.total;
- this.loading = false;
- });
-
+ // getAutobiographyTermList(this.queryParams).then(response => {
+ // // alert(123)
+ // // console.log(response.data)
+ // this.AutobiographyTermList = response.data;
+ // this.total = response.data.total;
+ // this.loading = false;
+ // });
},
//鍥剧墖鐨勪笂浼犲強涓婁紶鎸夐挳闅愯棌
@@ -1185,23 +1233,27 @@
let _this = this
getCategory().then(response=>{
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
+ const label = elem.split(":")[0].trim();
+ const value = parseInt(elem.split(":")[1].trim());
+ _this.typeOptions.push({ "label": label, "value": value });
+ // this.getSrc1(value)
})
})
+
+ // if(AutobiographyList.ageEnd==null){
+ // this.AgeEnd='?'
+ // }else{
+ // this.AgeEnd=this.ageEnd
+ // }
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
//鏂板涓昏缁忓巻鐨勪繚瀛�
submitDataScope: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
-
this.$refs["elForm"].validate(valid => {
if (valid) {
addExperience(this.formDat).then(response => {
@@ -1218,14 +1270,6 @@
},
//鏂板鎴愬憳鍏崇郴鐨勪繚瀛�
submitDataScope2: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
-
this.$refs["elForm"].validate(valid => {
if (valid) {
addRelation(this.formDat).then(response => {
@@ -1242,15 +1286,6 @@
},
//鏂板鍑哄叆澧冭瘉浠剁殑淇濆瓨
submitDataScope4: function() {
-
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
-
this.$refs["elForm"].validate(valid => {
if (valid) {
addCertificate(this.formDat).then(response => {
@@ -1267,14 +1302,6 @@
},
//鏂板鍑哄浗澧冪殑淇濆瓨
submitDataScope5: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
-
this.$refs["elForm"].validate(valid => {
if (valid) {
addAbroad(this.formDat).then(response => {
@@ -1289,29 +1316,49 @@
this.formDat[key] = '';
});
},
+ //涓汉鑷紶鐨勪繚瀛�
submitDataScope6: function() {
-
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
-
this.$refs["elForm"].validate(valid => {
if (valid) {
- addAutobiography(this.formDat).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.dialogVisible.autobiography = false;
- this.getList();
- });
+ // 鏍规嵁鍊兼壘鍒伴�変腑鐨勯�夐」瀵硅薄
+ const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);
+
+ if (this.isEdit1) {
+ // 鎵ц淇敼鎿嶄綔
+ updateAutobiography(this.formDat).then(response => {
+ // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
+ this.formDat.term = selectedOption.label;
+ this.formDat.id = selectedOption.id;
+ console.log("1")
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.dialogVisible.autobiography = false;
+ this.isEdit1 = false;
+ this.getList();
+ }).catch(error => {
+ console.log(error);
+ this.isEdit1 = false;
+ this.dialogVisible.autobiography = false;
+ });
+ } else {
+ // 鎵ц鏂板鎿嶄綔
+ addAutobiography(this.formDat).then(response => {
+ this.formDat.term = selectedOption.label;
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.dialogVisible.autobiography = false;
+ this.getList();
+ }).catch(error => {
+ console.log(error);
+ this.dialogVisible.autobiography = false;
+ });
+ }
}
});
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
+ // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆＄偣鍑绘柊澧炴椂涓烘柊澧炴搷浣�
+ this.isEdit1 = false;
},
editRow(row) {
@@ -1334,8 +1381,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("淇敼澶辫触");
@@ -1344,7 +1397,7 @@
}
})
// 鍒锋柊椤甸潰
- window.location.reload();
+ // window.location.reload();
},
//涓昏缁忓巻
saveRowExperienceList(row) {
@@ -1542,6 +1595,10 @@
.btn_autobiography{
background:center no-repeat url('../../assets/icons/add1.png') ;
}
+.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