From 3f2e2443a61d1ff98a829925e3d42cdfa1275f0b Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期六, 05 八月 2023 02:33:52 +0800
Subject: [PATCH] 个人自传已可以新增
---
ruoyi-ui/src/views/self/show.vue | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index c30d739..2ea3fd1 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -234,12 +234,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;">
<el-radio :label="1">鏄�</el-radio>
<el-radio :label="0">鍚�</el-radio>
</el-radio-group>
@@ -247,7 +247,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>
@@ -627,16 +627,15 @@
</div>
</el-dialog>
<!--鏂板鑷紶-->
- <el-dialog :title="title" :visible.sync="dialogVisible.autobiography" width="900px" >
+ <el-dialog :title="title" :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="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>
@@ -830,8 +829,10 @@
//鑷紶
ageBegin:undefined,
ageEnd:undefined,
- term:undefined
+ term:undefined,
+
},
+ AgeEnd:'',
// 鑿滃崟鍒楄〃
menuOptions: [],
// 閮ㄩ棬鍒楄〃
@@ -921,13 +922,29 @@
trigger: 'blur'
}],
content: [{
- // required: true,
- message: '璇疯緭鍏�',
+ required: true,
+ message: '璇疯緭鍏ユ枃鏈�',
trigger: 'blur'
}],
witness: [{
required: true,
message: '璇疯緭鍏ヨ瘉鏄庝汉',
+ trigger: 'blur'
+ }],
+ //鑷紶
+ term: [{
+ required: true,
+ message: '璇烽�夋嫨鏃舵湡',
+ trigger: 'blur'
+ }],
+ ageBegin: [{
+ required: true,
+ message: '',
+ trigger: 'blur'
+ }],
+ ageEnd: [{
+ required: true,
+ message: '',
trigger: 'blur'
}],
@@ -973,7 +990,7 @@
handleClick(tab, event) {
// console.log(tab, event);
this.getAutobiographyInfor();
-
+ // this.getSrc1(typeOptions)
},
//闅旇鍙樿壊
@@ -996,6 +1013,11 @@
return '鈥斺�斺�斺�斺�斺��'
}
},
+ getSrc1(term){
+ if(term==='7'){
+ return '鐮旂┒鐢�'
+ }
+ },
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
@@ -1010,6 +1032,7 @@
this.total = response.data.total;
this.loading = false;
}
+
);
//鎴愬憳鍏崇郴
getIndividualRelation(this.queryParams).then(response => {
@@ -1054,6 +1077,7 @@
this.AutobiographyList = response.data;
this.total = response.data.total;
this.loading = false;
+
});
//鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
// getAutobiographyTermList(this.queryParams).then(response => {
@@ -1185,10 +1209,22 @@
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
+ // }
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
@@ -1256,9 +1292,14 @@
this.formDat[key] = '';
});
},
+ //涓汉鑷紶
submitDataScope6: function() {
this.$refs["elForm"].validate(valid => {
if (valid) {
+ // 鏍规嵁鍊兼壘鍒伴�変腑鐨勯�夐」瀵硅薄
+ const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);
+ // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
+ this.formDat.term = selectedOption.label;
addAutobiography(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.dialogVisible.autobiography = false;
--
Gitblit v1.9.1