From 65ef66fb1ea61a450cb75e206a3a4784794868e6 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 30 五月 2023 22:45:06 +0800
Subject: [PATCH] 1.将通讯录的”成员姓名“改成”家人姓名“ 2.修改成长经历阅历几处新增的bug
---
ruoyi-ui/src/views/self/show.vue | 492 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 401 insertions(+), 91 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 3f897d2..dc67c27 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -209,11 +209,25 @@
<!--鎶樺彔闈㈡澘-->
<el-collapse v-model="activeNames" @change="handleChange">
- <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1">
+ <!--涓昏瀛︿範鍙婂伐浣滅粡鍘�-->
+ <el-collapse-item name="1" >
+ <template v-slot:title>
+ <div class="title-wrapper">
+ 涓昏瀛︿範鍙婂伐浣滅粡鍘�
+ <el-button class="button" type="primary" size='mini' @click="showDialog('open')">
+ 鏂板</el-button>
+ </div>
+ </template>
<el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <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="寮�濮嬫棩鏈�" prop="startDate" sortable width="300" align="center" >
+ <template slot-scope="scope">{{scope.row.startDate? scope.row.startDate: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" >
+ <template slot-scope="scope">{{scope.row.content? scope.row.content: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" >
+ <template slot-scope="scope">{{scope.row.witness? scope.row.witness: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
<!-- 鎿嶄綔-->
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -222,7 +236,7 @@
size="mini"
type="text"
icon="el-icon-edit"
- @click="handleAdd"
+ @click="showDialog1"
v-hasPermi="['system:role:edit']"
>淇敼</el-button>
<el-button
@@ -232,25 +246,46 @@
@click="handleExperienceDelete(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 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>
+<!-- </el-dropdown>-->
</template>
</el-table-column>
</el-table>
</el-collapse-item>
- <el-collapse-item title="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�" name="2" >
+ <!-- 瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐� -->
+ <el-collapse-item name="2" >
+ <template v-slot:title>
+ <div class="title-wrapper">
+ 瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�
+ <el-button class="button2" type="primary" size='mini' @click="showDialog('relation1')">
+ 鏂板</el-button>
+ </div>
+ </template>
<el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <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="relation" sortable width="260" align="center" >
+ <template slot-scope="scope">{{scope.row.relation? scope.row.relation: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" prop="otherName" sortable width="260" align="center" >
+ <template slot-scope="scope">{{scope.row.otherName? scope.row.otherName: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鍗曚綅鍙婅亴鍔�" prop="otherUnit position" sortable width="260" align="center">
<template slot-scope="scope">
- {{scope.row.unit}}/{{scope.row.position}}
+ <span v-if="scope.row.otherUnit || scope.row.otherPosition == true">
+ {{scope.row.otherUnit}}/{{scope.row.otherPosition}}
+ </span>
+ <span v-else>鈥斺�斺�斺��</span>
</template>
</el-table-column>
- <el-table-column label="鏀挎不闈㈣矊" prop="politicalOutlook" sortable width="260" align="center"/>
+ <el-table-column label="鏀挎不闈㈣矊" prop="otherPolitical" sortable width="260" align="center">
+ <template slot-scope="scope">{{scope.row.otherPolitical? scope.row.otherPolitical: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -264,13 +299,13 @@
size="mini"
type="text"
icon="el-icon-delete"
- @click="handleCertificateDelete(scope.row)"
+ @click="handleRelationDelete(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 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>
+<!-- </el-dropdown>-->
</template>
</el-table-column>
</el-table>
@@ -299,23 +334,116 @@
</div>
</el-collapse-item>
- <el-collapse-item title="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�" name="4">
+ <!--鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�-->
+ <el-collapse-item name="4">
+ <template v-slot:title>
+ <div class="title-wrapper">
+ 鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+ <el-button class="button" type="primary" size='mini' @click="showDialog('certificate')">
+ 鏂板</el-button>
+ </div>
+ </template>
<el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="280" align="center" />
- <el-table-column label="鎸佹湁鎯呭喌" prop="ownStatus" sortable width="280" align="center" />
- <el-table-column label="璇佷欢鍙风爜" prop="idNo" sortable width="280" align="center" />
- <el-table-column label="鏈夋晥鏈�" prop="validityDate" sortable width="280" align="center">
+ <el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="280" align="center" >
+ <template slot-scope="scope">{{scope.row.cerName? scope.row.cerName: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鎸佹湁鎯呭喌" prop="ownStatus" sortable width="280" align="center" >
+ <template slot-scope="scope">{{scope.row.ownStatus? scope.row.ownStatus: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="璇佷欢鍙风爜" prop="idNo" sortable width="280" align="center" >
+ <template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鏈夋晥鏈�" prop="startTime endTime" sortable width="280" align="center">
+ <template slot-scope="scope">
+ <span v-if="scope.row.startTime || scope.row.endTime == true">
+ {{scope.row.startTime}} 鑷� {{scope.row.endTime}}
+ </span>
+ <span v-else>鈥斺�斺�斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <!-- @click="handleUpdate(scope.row)"-->
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleAdd"
+ v-hasPermi="['system:role:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleCertificateDelete(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>
</el-collapse-item>
- <el-collapse-item title="鍑哄浗锛堝锛夋儏鍐�" name="5">
+ <!--鍑哄浗锛堝锛夋儏鍐�-->
+ <el-collapse-item name="5">
+ <template v-slot:title>
+ <div class="title-wrapper">
+ 鍑哄浗锛堝锛夋儏鍐�
+ <el-button class="button5" type="primary" size='mini' @click="showDialog('abroad')">
+ 鏂板</el-button>
+ </div>
+ </template>
<el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="350" align="center" />
- <el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="350" align="center" />
- <el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="cause" sortable width="400" align="center" />
+ <el-table-column label="璧锋鏃ユ湡" prop="startTime endTime" sortable width="350" align="center" >
+ <template slot-scope="scope">
+ <span v-if="scope.row.startTime || scope.row.endTime == true">
+ {{scope.row.startTime}} 鑷� {{scope.row.endTime}}
+ </span>
+ <span v-else>鈥斺�斺�斺��</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="350" align="center" >
+ <template slot-scope="scope">{{scope.row.destination? scope.row.destination: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="cause" sortable width="420" align="center" >
+ <template slot-scope="scope">{{scope.row.cause? scope.row.cause: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <!-- @click="handleUpdate(scope.row)"-->
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleAdd"
+ v-hasPermi="['system:role:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleAbroadDelete(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>
</el-collapse-item>
</el-collapse>
@@ -326,36 +454,19 @@
<div style="width:100%"><h2 style="font-size:15px" >鑷紶</h2></div>
</el-container>
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
- v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange">
- <el-tab-pane v-for="item in AutobiographyList" :key="item.id" :label="item.label" :name="item.id">
- <div v-if="item.id === '1'">
- // 鏄剧ず涓巌d涓�1鐨勫瓧鍏搁」鐩稿叧鐨勫唴瀹�
- </div>
- <div v-else-if="item.id === '2'">
- // 鏄剧ず涓巌d涓�2鐨勫瓧鍏搁」鐩稿叧鐨勫唴瀹�
- </div>
- <div v-else>
- // 鏄剧ず涓庡叾浠栧瓧鍏搁」鐩稿叧鐨勫唴瀹�
- </div>
+ v-loading="loading" :data="AutobiographyList" >
+ <el-tab-pane v-for="(item, index) in AutobiographyList"
+ :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'宀�'+'('+item.term+')'">
+ <div v-if="item.term === '濠村効'"> {{item.content}}</div>
+ <div v-if="item.term === '骞煎効'"> {{item.content}}</div>
+ <div v-if="item.term === '灏忓'"> {{item.content}}</div>
+ <div v-if="item.term === '鍒濅腑'"> {{item.content}}</div>
+ <div v-if="item.term === '楂樹腑'"> {{item.content}}</div>
+ <div v-if="item.term === '澶у'"> {{item.content}}</div>
+ <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-tab-pane>
-<!-- <el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" >-->
-<!--<!– <el-input v-model="AutobiographyList.content" prop="content" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">–>-->
-<!--<!– </el-input>–>-->
-<!-- </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>-->
-<!-- <!– </div>–>-->
-<!-- <!– <el-tab-pane–>-->
-<!-- <!– v-for="(item, index) in AutobiographyTermList"–>-->
-<!-- <!– :key="index"–>-->
-<!-- <!– :name="item"–>-->
-<!-- <!– :label="item"–>-->
-<!-- <!– />–>-->
</el-tabs>
@@ -369,11 +480,11 @@
@pagination="getList"
/>
- <!-- 淇敼涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
- <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
- <el-form-item label="璧锋鏃ユ湡" prop="startDate">
- <el-input v-model="formDat.startDate" placeholder="璇疯緭鍏ヨ捣姝㈡棩鏈�" clearable :style="{width: '100%'}" ></el-input>
+ <!-- 鏂板涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="dialogVisible.open" width="900px" append-to-body>
+ <el-form ref="elForm1" :model="formDat" :rules="rules" size="medium" label-width="140px">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startDate">
+ <el-input v-model="formDat.startDate" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content">
<el-input v-model="formDat.content" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" >
@@ -388,12 +499,98 @@
<h4 class="form-header"> </h4>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">淇� 瀛�</el-button>
+ <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
+ <!-- 鏂板瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐典俊鎭厤缃璇濇 -->
+ <el-dialog :title="title" :visible.sync="dialogVisible.relation1" width="900px" append-to-body>
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
+ <el-form-item label="涓庢湰浜哄叧绯�" prop="relation">
+ <el-input v-model="formDat.relation" placeholder="璇疯緭鍏ヤ笌鏈汉鍏崇郴" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="濮撳悕" prop="otherName">
+ <el-input v-model="formDat.otherName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鍗曚綅" prop="otherUnit">
+ <el-input v-model="formDat.otherUnit" placeholder="璇疯緭鍏ュ崟浣�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鑱屽姟" prop="otherPosition">
+ <el-input v-model="formDat.otherPosition" placeholder="璇疯緭鍏ヨ亴鍔�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏀挎不闈㈣矊" prop="otherPolitical">
+ <el-input v-model="formDat.otherPolitical" placeholder="璇疯緭鍏ユ斂娌婚潰璨�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ </el-form>
+ <h4 class="form-header"> </h4>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope2">淇� 瀛�</el-button>
+ <el-button @click="cancelData">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <!-- 鏂板鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐典俊鎭厤缃璇濇 -->
+ <el-dialog :title="title" :visible.sync="dialogVisible.certificate" width="900px" append-to-body>
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
+ <el-form-item label="璇佷欢鍚嶇О" prop="cerName">
+ <el-input v-model="formDat.cerName" placeholder="璇疯緭鍏ヨ瘉浠跺悕绉�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鎸佹湁鎯呭喌" prop="ownStatus">
+ <el-input v-model="formDat.ownStatus" placeholder="璇疯緭鍏ユ寔鏈夋儏鍐�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="璇佷欢鍙风爜" prop="idNo">
+ <el-input v-model="formDat.idNo" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime">
+ <el-input v-model="formDat.startTime" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime">
+ <el-input v-model="formDat.endTime" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ </el-form>
+ <h4 class="form-header"> </h4>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope4">淇� 瀛�</el-button>
+ <el-button @click="cancelData">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <!-- 鏂板鍑哄浗锛堝锛夋儏鍐典俊鎭厤缃璇濇 -->
+ <el-dialog :title="title" :visible.sync="dialogVisible.abroad" width="900px" append-to-body>
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="140px">
+ <el-form-item label="寮�濮嬫棩鏈�" prop="startTime">
+ <el-input v-model="formDat.startTime" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡" prop="endTime">
+ <el-input v-model="formDat.endTime" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination">
+ <el-input v-model="formDat.destination" placeholder="璇疯緭鍏ユ墍鍒板浗瀹舵垨鑰呭湴鍖�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="浜嬬敱(鏃呮父銆佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠�)" prop="cause">
+ <el-input v-model="formDat.cause" placeholder="璇疯緭鍏ヤ簨鐢�(鏃呮父銆佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠�)" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+
+ </el-form>
+ <h4 class="form-header"> </h4>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope5">淇� 瀛�</el-button>
+ <el-button @click="cancelData">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
</div>
@@ -406,19 +603,17 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
- addExperience,delExperience} from "@/api/self/index";
-import {
- delCertificate,
- getAbroadList,
- getAutobiography,
- getAutobiographyList,
- getAutobiographyTermList,
- getCertificateList
-} from "@/api/self/index"
+import {getIndividualList, addIndividual, updateIndividual, delIndividual,
+ listExperience, addExperience,updateExperience, delExperience,
+ getIndividualRelation,addRelation,updateRelation,delRelation,
+ getCertificateList, addCertificate, delCertificate,
+ getAbroadList,addAbroad, delAbroad,
+ getAutobiographyList, getAutobiographyTermList,
+ getCategory} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'
-import {getCategory} from "@/api/self/index";
+
+
export default {
name: "show",
@@ -474,11 +669,18 @@
// current: 0,
//涓嬫媺瀹炵幇
- activeNames:['1'],
+ activeNames:'',
+ dialogVisible: {
+ open: false,
+ relation1:false,
+ certificate:false,
+ abroad:false,
+ },
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+
// open:true,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
openDataScope: false,
@@ -534,12 +736,18 @@
remark: undefined,
//瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�
relation:undefined,
+ otherName:undefined,
+ otherUnit:undefined,
+ otherPosition:undefined,
+ otherPolitical:undefined,
//鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
cerName:undefined,
validityDate:undefined,
ownStatus:undefined,
//鍑哄浗锛堝锛夋儏鍐�
destination:undefined,
+ startTime:undefined,
+ endTime:undefined,
cause:undefined,
url: undefined,
},
@@ -586,7 +794,7 @@
}],
maritalStatus: [{
// required: true,
- message: '璇疯緭鍏ユ皯鏃�',
+ message: '璇疯緭鍏ュ濮荤姸鍐�',
trigger: 'blur'
}],
locationAddress: [{
@@ -648,12 +856,19 @@
methods: {
// 鍙栨秷鎸夐挳
cancelData() {
- this.open = false;
+ this.dialogVisible.open = false;
+ this.dialogVisible.relation1 = false;
+ this.dialogVisible.certificate =false;
+ this.dialogVisible.abroad=false
this.reset();
},
//涓嬫媺
- handleChange(val) {
- console.log(val);
+ handleChange(activeNames) {
+ // console.log(val);
+ this.reset();
+ },
+ showDialog(dialogName) {
+ this.dialogVisible[dialogName] = true;
},
//涓汉鑷紶
@@ -763,14 +978,12 @@
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.individualList.url = ul+","+uls
this.$refs['elForm'].validate(valid => {
-
-
if (valid) {
- if (this.formDat.id != undefined) {
- updateIndividual(this.formDat).then(response => {
+ if (this.individualList.id !== undefined) {
+ updateIndividual(this.individualList).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
this.btn=false
@@ -784,7 +997,7 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
- if (this.$refs.menu != undefined) {
+ if (this.$refs.menu !== undefined) {
this.$refs.menu.setCheckedKeys([]);
}
this.menuExpand = false,
@@ -883,11 +1096,11 @@
this.isShow_2=true
},
//淇敼鎸夐挳
- /** 淇敼鎸夐挳鎿嶄綔 */
+ /** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
- this.open = true;
- this.title = "淇敼璇︾粏淇℃伅";
+ // this.open = true;
+ this.title = "鏂板璇︾粏淇℃伅";
},
/** 鏌ヨ鑷紶淇℃伅 */
getAutobiographyInfor()
@@ -910,10 +1123,10 @@
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
this.formDat.url = ul+","+uls
+
this.$refs["elForm"].validate(valid => {
if (valid) {
-
- addIndividual(this.formDat).then(response => {
+ addExperience(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -921,6 +1134,67 @@
}
});
},
+ 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 => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.relation1 = false;
+ this.getList();
+ });
+ }
+ });
+ },
+ 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 => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.certificate = false;
+ this.getList();
+ });
+ }
+ });
+ },
+ 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 => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.abroad = false;
+ this.getList();
+ });
+ }
+ });
+ },
+
requestUpload(params)
{
var file = params.file;
@@ -944,11 +1218,22 @@
})
},
+
/** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */
handleExperienceDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
return delExperience(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 鍒犻櫎鎴愬憳鍏崇郴鎸夐挳鎿嶄綔 */
+ handleRelationDelete(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵'+Ids).then(function() {
+ return delRelation(Ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
@@ -957,13 +1242,24 @@
/** 鍒犻櫎鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐垫寜閽搷浣� */
handleCertificateDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
return delCertificate(Ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+ /** 鍒犻櫎鍑哄浗锛堝锛夋儏鍐垫寜閽搷浣� */
+ handleAbroadDelete(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵'+Ids).then(function() {
+ return delAbroad(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download('/self/user/export', {
@@ -1004,4 +1300,18 @@
.el-collapse-item__header {
background-color:#FEF7FC;
}
+.title-wrapper {
+ display: flex;
+ justify-content: space-between;
+}
+
+.button {
+ margin-left: 67.6vw;
+}
+.button2 {
+ margin-left: 64vw;
+}
+.button5 {
+ margin-left: 69.5vw;
+}
</style>
--
Gitblit v1.9.1