From 5a643d05479504adca94d23abbbbbfccf2283f0c Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 30 七月 2023 17:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/self/show.vue | 597 +++++++++++++++++++++++++++--------------------------------
1 files changed, 275 insertions(+), 322 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 2219953..c30d739 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -235,6 +235,31 @@
<!--鎶樺彔闈㈡澘-->
<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-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
+ </el-radio-group>
+ <el-container >
+ <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>
+ </el-form-item>
+ </el-form>
+ </el-row>
+ </el-container>
+ </el-form-item>
+ </el-form>
+
+ </div>
+
+ </el-collapse-item>
+
<!--涓昏瀛︿範鍙婂伐浣滅粡鍘�-->
<el-collapse-item name="1" >
<template v-slot:title>
@@ -249,76 +274,37 @@
<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="250" align="center" >
<template slot-scope="scope">
- <template v-if="!scope.row.isEdit">
- {{ scope.row.startDate }}
- </template>
- <template v-else>
- <el-input v-model="scope.row.startDate"></el-input>
- </template>
+ <template v-if="!scope.row.isEdit">{{ scope.row.startDate }}</template>
+ <template v-else><el-input v-model="scope.row.startDate"></el-input></template>
</template>
</el-table-column>
<el-table-column label="缁撴潫鏃ユ湡" prop="endDate" sortable width="250" align="center" >
<template slot-scope="scope">
- <template v-if="!scope.row.isEdit">
- {{ scope.row.endDate }}
- </template>
- <template v-else>
- <el-input v-model="scope.row.endDate"></el-input>
- </template>
+ <template v-if="!scope.row.isEdit">{{ scope.row.endDate }}</template>
+ <template v-else><el-input v-model="scope.row.endDate"></el-input></template>
</template>
</el-table-column>
<el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" >
<template slot-scope="scope">
- <template v-if="!scope.row.isEdit">
- {{ scope.row.content }}
- </template>
- <template v-else>
- <el-input v-model="scope.row.content"></el-input>
- </template>
+ <template v-if="!scope.row.isEdit">{{ scope.row.content }}</template>
+ <template v-else><el-input v-model="scope.row.content"></el-input></template>
</template>
</el-table-column>
<el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" >
<template slot-scope="scope">
- <template v-if="!scope.row.isEdit">
- {{ scope.row.witness }}
- </template>
- <template v-else>
- <el-input v-model="scope.row.witness"></el-input>
- </template>
+ <template v-if="!scope.row.isEdit">{{ scope.row.witness }}</template>
+ <template v-else><el-input v-model="scope.row.witness"></el-input></template>
</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"
- v-if="!editStatus[scope.row.id]"
- @click="editRow(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button size="mini"
- type="text"
- v-if="editStatus[scope.row.id]"
- @click="saveRow(scope.row)"
- >淇濆瓨</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @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>-->
+ <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
+ @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
+ <el-button size="mini" type="text"
+ v-if="editStatus[scope.row.id]" @click="saveRowExperienceList(scope.row)">淇濆瓨</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="handleExperienceDelete(scope.row)" v-hasPermi="['system:role:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -336,69 +322,46 @@
<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" >
- <template slot-scope="scope">{{scope.row.relation? scope.row.relation: '鈥斺�斺�斺��'}}</template>
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.relation }}</template>
+ <template v-else><el-input v-model="scope.row.relation"></el-input></template>
+ </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">
- <span v-if="scope.row.otherUnit || scope.row.otherPosition == true">
- {{scope.row.otherUnit}}/{{scope.row.otherPosition}}
- </span>
- <span v-else>鈥斺�斺�斺��</span>
+ <template v-if="!scope.row.isEdit">{{ scope.row.otherName }}</template>
+ <template v-else><el-input v-model="scope.row.otherName"></el-input></template>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曚綅" prop="otherUnit" sortable width="220" align="center" >
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.otherUnit }}</template>
+ <template v-else><el-input v-model="scope.row.otherUnit"></el-input></template>
+ </template>
+ </el-table-column>
+ <el-table-column label="鑱屽姟" prop="otherPosition" sortable width="220" align="center">
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.otherPosition }}</template>
+ <template v-else><el-input v-model="scope.row.otherPosition"></el-input></template>
</template>
</el-table-column>
<el-table-column label="鏀挎不闈㈣矊" prop="otherPolitical" sortable width="260" align="center">
- <template slot-scope="scope">{{scope.row.otherPolitical? scope.row.otherPolitical: '鈥斺�斺�斺��'}}</template>
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.otherPolitical }}</template>
+ <template v-else><el-input v-model="scope.row.otherPolitical"></el-input></template>
+ </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="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @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>-->
+ <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
+ @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" v-if="editStatus[scope.row.id]"
+ @click="saveRowRelationList(scope.row)">淇濆瓨</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="handleRelationDelete(scope.row)" v-hasPermi="['system:role:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- </el-collapse-item>
- <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-radio :label="1">鏄�</el-radio>
- <el-radio :label="0">鍚�</el-radio>
- </el-radio-group>
- <el-container >
- <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>
- </el-form-item>
- </el-form>
- </el-row>
- </el-container>
- </el-form-item>
- </el-form>
-
- </div>
-
</el-collapse-item>
<!--鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�-->
<el-collapse-item name="4">
@@ -411,53 +374,50 @@
</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" >
- <template slot-scope="scope">{{scope.row.cerName? scope.row.cerName: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
- <el-table-column label="璇佷欢绫诲瀷" prop="type" sortable width="280" align="center" >
- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</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">
+ <el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="230" 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 v-if="!scope.row.isEdit">{{ scope.row.cerName }}</template>
+ <template v-else><el-input v-model="scope.row.cerName"></el-input></template>
+ </template>
+ </el-table-column>
+ <el-table-column label="璇佷欢绫诲瀷" prop="type" sortable width="230" align="center" >
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.type }}</template>
+ <template v-else><el-input v-model="scope.row.type"></el-input></template>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎸佹湁鎯呭喌" prop="ownStatus" sortable width="230" align="center" >
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.ownStatus }}</template>
+ <template v-else><el-input v-model="scope.row.ownStatus"></el-input></template>
+ </template>
+ </el-table-column>
+ <el-table-column label="璇佷欢鍙风爜" prop="idNo" sortable width="230" align="center" >
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.idNo }}</template>
+ <template v-else><el-input v-model="scope.row.idNo"></el-input></template>
+ </template>
+ </el-table-column>
+ <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="230" align="center">
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template>
+ <template v-else><el-input v-model="scope.row.startTime"></el-input></template>
+ </template>
+ </el-table-column>
+ <el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable width="230" align="center">
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.endTime }}</template>
+ <template v-else><el-input v-model="scope.row.endTime"></el-input></template>
</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"
- v-if="scope.row.isEdit"
- @click="handleEdit"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button v-if="scope.row.isEdit" @click="saveRow(scope.row)">淇濆瓨</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>-->
+ <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
+ @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" v-if="editStatus[scope.row.id]"
+ @click="saveRowCertificateList(scope.row)">淇濆瓨</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="handleCertificateDelete(scope.row)" v-hasPermi="['system:role:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -473,46 +433,38 @@
</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" >
+ <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="200" 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 v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template>
+ <template v-else><el-input v-model="scope.row.startTime"></el-input></template>
</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 label="缁撴潫鏃堕棿" prop="endTime" sortable width="200" align="center">
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.endTime }}</template>
+ <template v-else><el-input v-model="scope.row.endTime"></el-input></template>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="300" align="center" >
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.destination }}</template>
+ <template v-else><el-input v-model="scope.row.destination"></el-input></template>
+ </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>
+ <template slot-scope="scope">
+ <template v-if="!scope.row.isEdit">{{ scope.row.cause }}</template>
+ <template v-else><el-input v-model="scope.row.cause"></el-input></template>
+ </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>-->
+ <el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
+ @click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" v-if="editStatus[scope.row.id]"
+ @click="saveRowAbroadList(scope.row)">淇濆瓨</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleAbroadDelete(scope.row)"
+ v-hasPermi="['system:role:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -540,9 +492,9 @@
<div v-if="item.term === '缁撳鍚�'"> {{item.content}}</div>
</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>
@@ -689,7 +641,7 @@
<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>
@@ -716,17 +668,18 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
-
+import axios from 'axios';
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
-import {getIndividualList, addIndividual, updateIndividual, delIndividual,
- listExperience, addExperience,updateExperience, delExperience,
- getIndividualRelation,addRelation,updateRelation,delRelation,
- getCertificateList, addCertificate, delCertificate,
- getAbroadList,addAbroad, delAbroad,
- getAutobiographyList, getAutobiographyTermList,addAutobiography,
- getCategory} from "@/api/self/index";
+import {
+ getIndividualList, addIndividual, updateIndividual, delIndividual,
+ listExperience, addExperience, updateExperience, delExperience,
+ getIndividualRelation, addRelation, updateRelation, delRelation,
+ getCertificateList, addCertificate, updateCertificate, delCertificate,
+ getAbroadList, addAbroad,updateAbroad, delAbroad,
+ getAutobiographyList, getAutobiographyTermList, addAutobiography,
+ getCategory,
+} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'
@@ -790,7 +743,7 @@
// current: 0,
//涓嬫媺瀹炵幇
- activeNames:'',
+ activeNames:'3',
dialogVisible: {
open: false,
relation1:false,
@@ -995,9 +948,7 @@
created() {
this.getList();
this.getAutobiographyInfor()
- // this.experienceList.forEach(item => {
- // this.$set(this.editStatus, item.id, false);
- // });
+
},
methods: {
// 鍙栨秷鎸夐挳
@@ -1105,13 +1056,13 @@
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;
+ // });
},
@@ -1128,66 +1079,6 @@
this.reset();
},
- //涓汉鍩烘湰淇℃伅
- submitForm() {
- 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.individualList.url = ul+","+uls
-
- this.$refs['elForm'].validate(valid => {
- if (valid) {
- if (this.individualList.userId !== undefined) {
- updateIndividual(this.individualList).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- // this.open = false;
- this.btn=false
- });
- } else {
- this.$modal.msgSuccess("淇敼澶辫触");
-
- }
- }
- })
- // 鍒锋柊椤甸潰
- window.location.reload();
- },
- //涓昏缁忓巻
- editRow(row) {
- this.$set(row, 'isEdit', true);
- this.$set(this.editStatus, row.id, true);
- },
- saveRow(row) {
- // 鍦ㄨ繖閲屽鐞嗕繚瀛樹慨鏀瑰悗鐨勬暟鎹殑閫昏緫锛屽彲浠ュ彂閫佺粰鍚庣淇濆瓨
- 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.experienceList.url = ul+","+uls
-
- this.$refs['elForm'].validate(valid => {
- if (valid) {
- if (this.experienceList.id !== undefined) {
- updateExperience(this.experienceList).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- // this.open = false;
- // this.btn=false
-
- });
- } else {
- this.$modal.msgSuccess("淇敼澶辫触");
-
- }
- }
- })
- this.$set(row, 'isEdit', false);
- this.$set(this.editStatus, row.id, false);
- },
// 琛ㄥ崟閲嶇疆
reset() {
if (this.$refs.menu !== undefined) {
@@ -1229,13 +1120,6 @@
this.single = selection.length!=1
this.multiple = !selection.length
},
-
- /** 鏂板鎸夐挳鎿嶄綔 */
- // handleAdd() {
- // this.reset();
- // this.open = true;
- // this.title = "娣诲姞涓汉淇℃伅";
- // },
//涓汉璁颁簨鏈�
toMemo(){
@@ -1294,12 +1178,7 @@
this.isEditing=true
// this.isEdit=false
},
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- // this.open = true;
- this.title = "鏂板璇︾粏淇℃伅";
- },
+
/** 鏌ヨ鑷紶淇℃伅 */
getAutobiographyInfor()
{
@@ -1311,17 +1190,10 @@
})
})
},
+
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+ //鏂板涓昏缁忓巻鐨勪繚瀛�
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 => {
@@ -1336,16 +1208,8 @@
this.formDat[key] = '';
});
},
+ //鏂板鎴愬憳鍏崇郴鐨勪繚瀛�
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 => {
@@ -1360,16 +1224,8 @@
this.formDat[key] = '';
});
},
+ //鏂板鍑哄叆澧冭瘉浠剁殑淇濆瓨
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 => {
@@ -1384,16 +1240,8 @@
this.formDat[key] = '';
});
},
+ //鏂板鍑哄浗澧冪殑淇濆瓨
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 => {
@@ -1409,15 +1257,6 @@
});
},
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 => {
@@ -1433,6 +1272,122 @@
});
},
+ editRow(row) {
+ this.$set(row, 'isEdit', true);
+ this.$set(this.editStatus, row.id, true);
+ },
+ //淇敼鍚庣殑淇濆瓨
+ //涓汉鍩烘湰淇℃伅
+ submitForm() {
+ 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.individualList.url = ul+","+uls
+
+ this.$refs['elForm'].validate(valid => {
+ if (valid) {
+ if (this.individualList.userId !== undefined) {
+ updateIndividual(this.individualList).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ this.btn=false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+
+ }
+ }
+ })
+ // 鍒锋柊椤甸潰
+ window.location.reload();
+ },
+ //涓昏缁忓巻
+ saveRowExperienceList(row) {
+ this.$refs['elForm'].validate(valid => {
+ if (valid) {
+ const foundIndex = this.experienceList.findIndex(item => item.id === row.id);
+ if (foundIndex !== -1) {
+ const updatedData = Object.assign({}, this.experienceList[foundIndex], row);
+ updateExperience(updatedData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ }).catch(error => {
+ this.$modal.msgError("淇敼澶辫触");
+ console.log(error);
+ });
+ } else {
+ this.$modal.msgError("淇敼澶辫触");
+ }
+ }
+ });
+ this.$set(row, 'isEdit', false);
+ this.$set(this.editStatus, row.id, false);
+ },
+ //鎴愬憳鍏崇郴
+ saveRowRelationList(row) {
+ this.$refs['elForm'].validate(valid => {
+ if (valid) {
+ const foundIndex = this.relationList.findIndex(item => item.id === row.id);
+ if (foundIndex !== -1) {
+ const updatedData = Object.assign({}, this.relationList[foundIndex], row);
+ updateRelation(updatedData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ }).catch(error => {
+ this.$modal.msgError("淇敼澶辫触");
+ console.log(error);
+ });
+ } else {
+ this.$modal.msgError("淇敼澶辫触");
+ }
+ }
+ });
+ this.$set(row, 'isEdit', false);
+ this.$set(this.editStatus, row.id, false);
+ },
+ //璇佷欢鎯呭喌
+ saveRowCertificateList(row) {
+ this.$refs['elForm'].validate(valid => {
+ if (valid) {
+ const foundIndex = this.certificateList.findIndex(item => item.id === row.id);
+ if (foundIndex !== -1) {
+ const updatedData = Object.assign({}, this.certificateList[foundIndex], row);
+ updateCertificate(updatedData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ }).catch(error => {
+ this.$modal.msgError("淇敼澶辫触");
+ console.log(error);
+ });
+ } else {
+ this.$modal.msgError("淇敼澶辫触");
+ }
+ }
+ });
+ this.$set(row, 'isEdit', false);
+ this.$set(this.editStatus, row.id, false);
+ },
+ //鍑哄浗鎯呭喌
+ saveRowAbroadList(row) {
+ this.$refs['elForm'].validate(valid => {
+ if (valid) {
+ const foundIndex = this.AbroadList.findIndex(item => item.id === row.id);
+ if (foundIndex !== -1) {
+ const updatedData = Object.assign({}, this.AbroadList[foundIndex], row);
+ updateAbroad(updatedData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ }).catch(error => {
+ this.$modal.msgError("淇敼澶辫触");
+ console.log(error);
+ });
+ } else {
+ this.$modal.msgError("淇敼澶辫触");
+ }
+ }
+ });
+ this.$set(row, 'isEdit', false);
+ this.$set(this.editStatus, row.id, false);
+ },
requestUpload(params)
{
var file = params.file;
@@ -1456,8 +1411,6 @@
})
},
-
- //淇敼涓昏缁忓巻
/** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */
handleExperienceDelete(row) {
--
Gitblit v1.9.1