From d173892fe80f02f2779ab0f0fe26ef450bfd79c5 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期五, 07 四月 2023 13:55:18 +0800
Subject: [PATCH] 4.7日成长经历个人信息
---
ruoyi-ui/src/views/self/show.vue | 312 +++++++++++++++++++++++++++++----------------------
1 files changed, 176 insertions(+), 136 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index c5a9f73..41ac96b 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,11 +1,6 @@
<template>
<div class="app-container">
- <el-col :span="6" >
- <el-input size="medium" v-model="input" placeholder="鎼滅储" clearable>
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- </el-col>
- <br>
+
<h1 style="font-size:21px;padding-top:30px">涓汉绠�鍘�</h1>
<el-divider />
<!-- 鍩烘湰淇℃伅-->
@@ -23,10 +18,21 @@
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
+<!-- <el-table-->
+<!-- v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"-->
+<!-- >-->
+<!-- <el-table-column prop="nickName" label="濮撳悕" min-width="5%">-->
+<!-- <template slot-scope="scope">-->
+<!-- {{ scope.row.nickName }}-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
- <el-container>
- <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left">
+
+ <el-container >
+ <el-col >
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left"
+ v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
<el-row :span="6">
<el-form-item label="濮撳悕" prop="nickName">
<el-input v-model="formData.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -48,6 +54,32 @@
</el-form>
</el-col>
</el-container>
+
+<!-- -->
+<!-- <el-container>-->
+<!-- <el-table-->
+<!-- v-loading="listLoading"-->
+<!-- :data="individualList"-->
+<!-- element-loading-text="鏁版嵁鍔犺浇涓�"-->
+<!-- style="width: 100%"-->
+<!-- />-->
+<!-- <el-table-column >-->
+<!-- <template slot-scope="props">-->
+<!-- <el-form label-position="left" >-->
+<!-- <el-form-item label="鐢ㄦ埛鏄电О">-->
+<!-- <span>{{ props.row.nickName }}</span>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鑱旂郴鏂瑰紡">-->
+<!-- <span>{{ props.row.oldName }}</span>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鐢ㄦ埛 ID">-->
+<!-- <span>{{ props.row.idNum }}</span>-->
+<!-- </el-form-item>-->
+
+<!-- </el-form>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- </el-container>-->
</div>
<div style="padding-left:70px">
<el-container>
@@ -75,6 +107,7 @@
</el-col>
</el-container>
</div>
+
<div style="padding-left:70px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
@@ -130,6 +163,20 @@
>缂栬緫</el-button>
+
+ <el-dropdown
+ size="mini"
+ @command="(command) => handleCommand(command, scope.row)"
+ v-hasPermi="['system:role:edit']">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)"
+ >鏌ョ湅璇︽儏</el-button>
+
+ </el-dropdown>
+
<br>
<el-button type="primary" @click="submitForm">瀵煎叆</el-button>
</el-row>
@@ -156,7 +203,10 @@
</el-row>
<el-row :span="15">
<el-form-item label="鍗曚綅鍙婅亴鍔¤亴绉�" prop="unit position ">
- <el-input v-model="formData.unit,formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-model:unit="formData.unit" v-model:position="formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <template slot-scope="scope">
+ {{scope.row.unit}}/{{scope.row.position}}
+ </template>
</el-input>
</el-form-item>
</el-row>
@@ -188,54 +238,46 @@
</div>
</el-container>
-<!-- 涓昏瀛︿範鍙婂伐浣滅粡鍘�-->
- <div style="padding-top:30px">
- <el-container>
- <div style="width:100%"><h2 style="font-size:15px" >涓昏瀛︿範鍙婂伐浣滅粡鍘�</h2></div>
- <el-button type="primary" icon="el-icon-edit" round></el-button>
- <el-button type="primary" icon="el-icon-delete" round></el-button>
- </el-container>
- <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="25" align="center" />
- <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="300" align="center" />
- <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" />
- <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope" v-if="scope.row.roleId !== 1">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
+ <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1" >
+ <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
+ <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="300" align="center" />
+ <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" />
+ <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" />
+ <!-- 鎿嶄綔-->
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ >鍒犻櫎</el-button>
+ <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
- </el-dropdown>
- </template>
- </el-table-column>
- </el-table>
- </div>
-<!-- 瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�-->
- <div style="padding-top:30px">
- <el-container>
- <div style="width:100%"><h2 style="font-size:15px" >瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�</h2></div>
- <el-button type="primary" icon="el-icon-edit" round></el-button>
- <el-button type="primary" icon="el-icon-delete" round></el-button>
- </el-container>
+ </el-dropdown>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-collapse-item>
+ <el-collapse-item title="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�" name="2" >
<el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="25" align="center" />
<el-table-column label="涓庢湰浜哄叧绯�" prop="relation" sortable width="260" align="center" />
<el-table-column label="濮撳悕" prop="nickName" sortable width="260" align="center" />
- <el-table-column label="鍗曚綅鍙婅亴鍔�" prop="unit position" sortable width="260" align="center" />
+ <el-table-column label="鍗曚綅鍙婅亴鍔�" prop="unit position" sortable width="260" align="center">
+ <template slot-scope="scope">
+ {{scope.row.unit}}/{{scope.row.position}}
+ </template>
+ </el-table-column>
<el-table-column label="鏀挎不闈㈣矊" prop="politicalOutlook" sortable width="260" align="center"/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -260,104 +302,60 @@
</template>
</el-table-column>
</el-table>
- </div>
-
- <!-- 绉诲眳鍥斤紙澧冿級鎯呭喌-->
- <div>
- <el-container>
- <div style="width:100%"><h2 style="font-size:15px" >绉诲眳鍥斤紙澧冿級鎯呭喌</h2></div>
- </el-container>
-
- <div style="width:100%">
- <el-container>
- <span style="font-size:15px" >鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�</span>
- <el-radio v-model="formData.outStatus" label="1">鏄�</el-radio>
- <el-radio v-model="formData.outStatus" label="0">鍚�</el-radio>
- </el-container>
- </div>
- <div style="padding-top:20px">
- <el-container>
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px" label-position="left">
- <el-form-item label="璇佷欢鍙风爜" prop="idNo">
- <el-input v-model="formData.idNo" placeholder="" clearable :disabled="dsb">
- </el-input>
- </el-form-item>
+ </el-collapse-item>
+ <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
+ <div>
+ <el-form>
+ <el-form-item label="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�">
+ <el-radio-group v-model="form.outStatus" style="margin-bottom: 0">
+ <el-radio :label="true">鏄�</el-radio>
+ <el-radio :label="false">鍚�</el-radio>
+ </el-radio-group>
+ </el-form-item>
</el-form>
- </el-container>
- </div>
- </div>
+ <div>
+ <el-table :data="individualList.idNo" border stripe>
+ <el-table-column label="璇佷欢鍙风爜" width="80" align="center">
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
- <!-- 鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�-->
- <div style="padding-top:30px">
- <el-container>
- <div style="width:100%"><h2 style="font-size:15px" >鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�</h2></div>
- <el-button type="primary" icon="el-icon-edit" round></el-button>
- <el-button type="primary" icon="el-icon-delete" round></el-button>
- </el-container>
- <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="25" align="center" />
+ </el-collapse-item>
+ <el-collapse-item title="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�" name="4" >
+ <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange">
<el-table-column label="璇佷欢鍚嶇О" sortable width="280" align="center" />
<el-table-column label="鎸佹湁鎯呭喌" sortable width="280" align="center" />
<el-table-column label="璇佷欢鍙风爜" sortable width="280" align="center" />
<el-table-column label="鏈夋晥鏈�" sortable width="280" align="center">
</el-table-column>
</el-table>
-
-
- </div>
-
-
- <!-- 鍑哄浗锛堝锛夋儏鍐�-->
-
- <div style="padding-top:30px">
- <el-container>
- <div style="width:100%"><h2 style="font-size:15px" >鍑哄浗锛堝锛夋儏鍐�</h2></div>
- <el-button type="primary" icon="el-icon-edit" round></el-button>
- <el-button type="primary" icon="el-icon-delete" round></el-button>
- </el-container>
- <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="25" align="center" />
+ </el-collapse-item>
+ <el-collapse-item title="鍑哄浗锛堝锛夋儏鍐�" name="5" >
+ <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange">
<el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="350" align="center" />
<el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="content" sortable width="350" align="center" />
<el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="witness" sortable width="400" align="center" />
</el-table>
+ </el-collapse-item>
+ </el-collapse>
- </div>
-
-
-<!-- 鑷紶-->
+ <!-- 鑷紶-->
<div style="padding-top:30px">
<el-container>
<div style="width:100%"><h2 style="font-size:15px" >鑷紶</h2></div>
</el-container>
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="0~3宀�(濠村効鏈�)" name="first"></el-tab-pane>
- <el-tab-pane label="6~12(灏忓)" name="second"></el-tab-pane>
- <el-tab-pane label="12~15(鍒濅腑)" name="third"></el-tab-pane>
- <el-tab-pane label="15~18(楂樹腑)" name="fourth"></el-tab-pane>
+ <el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" index="1"></el-tab-pane>
+ <el-tab-pane label="6~12(灏忓)" name="2"></el-tab-pane>
+ <el-tab-pane label="12~15(鍒濅腑)" name="3"></el-tab-pane>
+ <el-tab-pane label="15~18(楂樹腑)" name="4"></el-tab-pane>
<el-tab-pane label="18~22(澶у)" name="5"></el-tab-pane>
<el-tab-pane label="22~25(鐮旂┒鐢�)" name="6"></el-tab-pane>
<el-tab-pane label="26~ (宸ヤ綔)" name="7"></el-tab-pane>
<el-tab-pane label="锛熷瞾缁撳" name="8"></el-tab-pane>
</el-tabs>
-
-<!-- <el-card class="box-card">-->
-<!-- <div slot="header" class="clearfix">-->
-<!-- <el-button type="primary" round>0~3宀�(濠村効鏈�)</el-button>-->
-<!-- <el-button type="primary" round>6~12(灏忓)</el-button>-->
-<!-- <el-button type="primary" round>12~15(鍒濅腑)</el-button>-->
-<!-- <el-button type="primary" round>15~18(楂樹腑)</el-button>-->
-<!-- <el-button type="primary" round>18~22(澶у)</el-button>-->
-<!-- <el-button type="primary" round>22~25(鐮旂┒鐢�)</el-button>-->
-<!-- <el-button type="primary" round>26~ (宸ヤ綔)</el-button>-->
-<!-- <el-button type="primary" round>锛熷瞾缁撳</el-button>-->
-<!-- <el-button style="float: right; padding: 3px 0" type="text">鎿嶄綔鎸夐挳</el-button>-->
-<!-- </div>-->
-<!-- <div v-for="o in 4" :key="o" class="text item">-->
-<!-- {{ }}-->
-<!-- </div>-->
-<!-- </el-card>-->
</div>
@@ -385,6 +383,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
addExperience,delExperience} from "@/api/self/index";
+import { getAbroadList, getAutobiographyTermList, getCertificateList } from '../../api/self'
export default {
name: "show",
dicts: ['sys_normal_disable'],
@@ -411,7 +410,14 @@
experienceList: [],
//瀹跺涵鎴愬憳鍏崇郴鏁版嵁
relationList:[],
-
+ //鍑哄叆澧冭瘉浠舵儏鍐�
+ certificateList:[],
+ //鍑哄浗鎯呭喌
+ AbroadList:[],
+ //涓嶅悓鏃舵涓汉鑷紶
+ AutobiographyTermList:[],
+ //涓嬫媺瀹炵幇
+ activeNames:['1'],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -435,7 +441,7 @@
dsb:true,
btn:false,
//涓汉鑷紶
- activeName: 'second',
+ activeName: '1',
formDat: {
//涓汉鍩烘湰淇℃伅
@@ -460,6 +466,7 @@
fatherId:undefined,
momId:undefined,
birth:undefined,
+ familyId:undefined,
//涓昏瀛︿範鍙婂伐浣滅粡鍘�
id:undefined,
@@ -577,13 +584,16 @@
created() {
this.getList();
// this.getCateInfor()
-
},
methods: {
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
this.reset();
+ },
+ //涓嬫媺
+ handleChange(val) {
+ console.log(val);
},
//缂栬緫鎸夐挳
edit(row){
@@ -596,6 +606,14 @@
//涓汉鑷紶
handleClick(tab, event) {
console.log(tab, event);
+ //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
+ getAutobiographyTermList(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.AutobiographyTermList = response.data;
+ this.total = response.data.total;
+ this.loading = false;
+ });
},
/** 鏌ヨ瑙掕壊鍒楄〃 */
@@ -605,35 +623,56 @@
this.loading = true;
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ //涓汉缁忓巻
listExperience(this.queryParams).then(response => {
- alert(123)
- console.log(response.data)
+ // alert(123)
+ // console.log(response.data)
this.experienceList = response.data;
-
this.total = response.data.total;
this.loading = false;
}
);
+ //鎴愬憳鍏崇郴
getIndividualRelation(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
this.relationList = response.data;
-
this.total = response.data.total;
this.loading = false;
}
);
+ //涓汉淇℃伅
getIndividualList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
this.individualList = response.data;
-
this.total = response.data.total;
this.loading = false;
}
);
+ //鍑哄叆澧冭瘉浠舵儏鍐�
+ getCertificateList(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.certificateList = response.data;
+ this.total = response.data.total;
+ this.loading = false;
+ }
+ );
+ //鍑哄浗鎯呭喌
+ getAbroadList(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.AbroadList = response.data;
+ this.total = response.data.total;
+ this.loading = false;
+ }
+ );
+
},
+
+
// 鍙栨秷鎸夐挳
cancel() {
@@ -781,3 +820,4 @@
}
};
</script>
+
--
Gitblit v1.9.1