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 |  337 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 203 insertions(+), 134 deletions(-)

diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index a0c9311..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">
@@ -224,7 +238,7 @@
                 icon="el-icon-edit"
                 @click="showDialog1"
                 v-hasPermi="['system:role:edit']"
-              >鏂板</el-button>
+              >淇敼</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -244,26 +258,36 @@
           </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
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="showDialog2"
-                v-hasPermi="['system:role:edit']"
-              >鏂板</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -275,7 +299,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
-                @click="handDelete(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']">-->
@@ -310,12 +334,26 @@
         </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="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">
@@ -327,13 +365,6 @@
           <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="showDialog3"
-                v-hasPermi="['system:role:edit']"
-              >鏂板</el-button>
               <el-button
                 size="mini"
                 type="text"
@@ -360,7 +391,15 @@
           </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="startTime endTime" sortable width="350" align="center" >
@@ -371,18 +410,16 @@
               <span v-else>鈥斺�斺�斺��</span>
             </template>
           </el-table-column>
-          <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="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="showDialog4"
-                v-hasPermi="['system:role:edit']"
-              >鏂板</el-button>
+
               <el-button
                 size="mini"
                 type="text"
@@ -444,7 +481,7 @@
     />
 
     <!-- 鏂板涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� -->
-    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+    <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>
@@ -467,25 +504,25 @@
       </div>
     </el-dialog>
     <!-- 鏂板瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐典俊鎭厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="relation1" width="900px" append-to-body>
+    <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="nickName">
-          <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" >
+        <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="unit">
-          <el-input v-model="formDat.unit" placeholder="璇疯緭鍏ュ崟浣�" clearable :style="{width: '100%'}" >
+        <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="position">
-          <el-input v-model="formDat.position" placeholder="璇疯緭鍏ヨ亴鍔�" clearable :style="{width: '100%'}" >
+        <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="politicalOutlook">
-          <el-input v-model="formDat.politicalOutlook" placeholder="璇疯緭鍏ユ斂娌婚潰璨�" clearable :style="{width: '100%'}" >
+        <el-form-item label="鏀挎不闈㈣矊" prop="otherPolitical">
+          <el-input v-model="formDat.otherPolitical" placeholder="璇疯緭鍏ユ斂娌婚潰璨�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
 
@@ -493,12 +530,12 @@
       <h4 class="form-header"> </h4>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
+        <el-button type="primary" @click="submitDataScope2">淇� 瀛�</el-button>
         <el-button @click="cancelData">鍙� 娑�</el-button>
       </div>
     </el-dialog>
     <!-- 鏂板鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐典俊鎭厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="certificate" width="900px" append-to-body>
+    <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%'}" >
@@ -523,12 +560,12 @@
       <h4 class="form-header"> </h4>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
+        <el-button type="primary" @click="submitDataScope4">淇� 瀛�</el-button>
         <el-button @click="cancelData">鍙� 娑�</el-button>
       </div>
     </el-dialog>
     <!-- 鏂板鍑哄浗锛堝锛夋儏鍐典俊鎭厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="abroad" width="900px" append-to-body>
+    <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>
@@ -550,7 +587,7 @@
       <h4 class="form-header"> </h4>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
+        <el-button type="primary" @click="submitDataScope5">淇� 瀛�</el-button>
         <el-button @click="cancelData">鍙� 娑�</el-button>
       </div>
     </el-dialog>
@@ -566,32 +603,17 @@
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
-import {
-  getIndividualList,
-  getIndividualRelation,
-  delIndividual,
-  updateIndividual,
-  addIndividual,
-  listExperience,
-  updateExperience,
-  addExperience,
-  delExperience,
-  delCertificate,
-  addCertificate,
-  addAbroad,
-  delAbroad
-} from "@/api/self/index";
-import {
-  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";
-import {addContact} from "@/api/contacts";
+
+
 
 export default {
   name: "show",
@@ -647,14 +669,18 @@
       // current: 0,
 
       //涓嬫媺瀹炵幇
-      activeNames:['1'],
+      activeNames:'',
+      dialogVisible: {
+        open: false,
+        relation1:false,
+        certificate:false,
+        abroad:false,
+      },
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
-      relation1:false,
-      certificate:false,
-      abroad:false,
+
       // open:true,
       // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
       openDataScope: false,
@@ -710,6 +736,10 @@
         remark: undefined,
         //瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�
         relation:undefined,
+        otherName:undefined,
+        otherUnit:undefined,
+        otherPosition:undefined,
+        otherPolitical:undefined,
         //鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
         cerName:undefined,
         validityDate:undefined,
@@ -764,7 +794,7 @@
         }],
         maritalStatus: [{
           // required: true,
-          message: '璇疯緭鍏ユ皯鏃�',
+          message: '璇疯緭鍏ュ濮荤姸鍐�',
           trigger: 'blur'
         }],
         locationAddress: [{
@@ -826,56 +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(activeNames) {
       // console.log(val);
       this.reset();
-      if (activeNames.includes('1')) {
-        this.showDialog1();
-      }else if (activeNames.includes('2')) {
-        this.showDialog2();
-      }else if (activeNames.includes('3')) {
-        this.showDialog3();
-      }else if (activeNames.includes('4')) {
-        this.showDialog4();
-      }else {
-        this.open = false;
-        this.relation1 = false;
-        this.certificate =false;
-        this.abroad=false
-      }
     },
-    //鎵撳紑涓嶅悓鐨勬柊澧炲脊绐�
-    showDialog1() {
-      this.open = true;
-      this.relation1 = false;
-      this.certificate =false;
-      this.abroad=false;
-      this.title = "娣诲姞涓昏涓汉缁忓巻淇℃伅";
-    },
-    showDialog2() {
-      this.open = false;
-      this.relation1 = true;
-      this.certificate =false;
-      this.abroad=false;
-      this.title = "娣诲姞瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�";
-    },
-    showDialog3() {
-      this.open = false;
-      this.relation1 = false;
-      this.certificate =true;
-      this.abroad=false;
-      this.title = "娣诲姞鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�";
-    },
-    showDialog4() {
-      this.open = false;
-      this.relation1 = false;
-      this.certificate =false;
-      this.abroad=true;
-      this.title = "娣诲姞鍑哄浗锛堝锛夋儏鍐�";
+    showDialog(dialogName) {
+      this.dialogVisible[dialogName] = true;
     },
 
     //涓汉鑷紶
@@ -985,12 +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
@@ -1004,7 +997,7 @@
     },
     // 琛ㄥ崟閲嶇疆
     reset() {
-      if (this.$refs.menu != undefined) {
+      if (this.$refs.menu !== undefined) {
         this.$refs.menu.setCheckedKeys([]);
       }
       this.menuExpand = false,
@@ -1130,20 +1123,69 @@
         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 => {
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.open = false;
             this.getList();
           });
+        }
+      });
+    },
+    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;
@@ -1152,6 +1194,7 @@
         }
       });
     },
+
     requestUpload(params)
     {
       var file = params.file;
@@ -1175,11 +1218,22 @@
       })
 
     },
+
     /** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */
     handleExperienceDelete(row) {
       const Ids = row.id || this.ids;
       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("鍒犻櫎鎴愬姛");
@@ -1198,13 +1252,14 @@
     /** 鍒犻櫎鍑哄浗锛堝锛夋儏鍐垫寜閽搷浣� */
     handleAbroadDelete(row) {
       const Ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵'+Ids).then(function() {
         return delAbroad(Ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       }).catch(() => {});
     },
+
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
       this.download('/self/user/export', {
@@ -1245,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