From bd4b9aa6ab74a8aa6f55265d24b4a4249abcb636 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 11 十二月 2023 19:18:39 +0800
Subject: [PATCH] 问题解决
---
ruoyi-ui/src/views/self/show.vue | 580 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 332 insertions(+), 248 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 5c61880..fa51a96 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="app-container" id="printable-content">
<!-- 鍒锋柊椤甸潰 -->
<!-- <MyComponent :key="componentKey" />-->
<!-- 鍥炲埌椤堕儴-->
@@ -8,11 +8,40 @@
class="el-icon-top"
></el-button>
</el-backtop>
- <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
+ <h1 style="font-size:21px;padding-top:30px;display: flex;">
<span>涓汉绠�鍘�</span>
+ <div class="button-container" >
+ <el-button
+ size="mini"
+ style="background: #E0EEFE;
+ border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;"
+ @click="handleEdit()"
+ v-if="isShow"
+ v-hasPermi="['system:role:edit']"
+ >缂栬緫</el-button>
+ <el-button v-if="isShow_2" size="mini"
+ style=" width: 67px;height: 27px;background:#E0EEFE;
+ border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "@click="submitForm" :disabled="dsb">瀹屾垚</el-button>
+
+ <el-button
+ size="mini"
+ style=" width: 67px;height: 27px;background: #D2F3E0;
+ border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "
+ @click="handleExport"
+ v-hasPermi="['family:note:export']"
+ >瀵煎嚭</el-button>
+
+ <el-button
+ size="mini"
+ style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;"
+ v-print="'#printable-content'"
+ v-hasPermi="['family:note:export']"
+ >鎵撳嵃</el-button>
+ </div>
<div style="display: flex; align-items: center;">
- <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']">
- <div class="form" ><el-icon style="padding-right:110px;"></el-icon>
+ <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
+ <div class="form" ><el-icon style="padding-right:100px;"></el-icon>
<span class="text" style="width: 69px;height: 26px;font-size: 16px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉璁颁簨鏈�</span></div>
</el-button>
@@ -27,19 +56,19 @@
<el-col >
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"
v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
- <el-row :span="5">
+ <el-row :span="6">
<el-form-item label="濮撳悕" prop="nickName" label-width="40px">
<el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="5">
+ <el-row :span="6">
<el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="60px">
<el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="5">
+ <el-row :span="6">
<el-form-item label="韬唤璇佸彿" prop="idNum" label-width="70px">
<el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
@@ -49,7 +78,7 @@
</el-col>
</el-container>
</div>
- <div style="padding-left:30px">
+ <div style="padding-left:60px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
@@ -84,7 +113,7 @@
</el-col>
</el-container>
</div>
- <div style="padding-left:30px">
+ <div style="padding-left:60px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left":disabled="dsb">
@@ -116,50 +145,32 @@
</el-col>
</el-container>
</div>
- <div style="padding-left:30px;padding-top:30px">
+ <div style="padding-left:100px;padding-top:30px">
<el-col :span="6" :data="individualList">
<div class="block" :model="individualList">
- <div v-if="!isEditing">
- <el-avatar shape="square" style="width: 200px; height: 150px;">
- <el-image
- class="el-upload-list__item-thumbnail"
- v-if="!individualList.img"
- src="default-avatar-url"
- :fit="fit"
- style="width: 100%; height: 100%;"
- ></el-image>
- <el-image
- v-else
- :src="'http://47.93.189.255:8080/' + individualList.img"
- :fit="fit"
- style="width: 100%; height: 100%;"
- ></el-image>
- </el-avatar>
- </div>
- <el-upload v-else
- class="upload-demo"
- action="#"
- :auto-upload="false"
- :http-request="requestUpload"
- :limit="1"
- :file-list="fileList"
- >
- <el-avatar shape="square" style="width: 200px; height: 150px;">
- <el-image
- class="el-upload-list__item-thumbnail"
- v-if="!individualList.img"
- src="default-avatar-url"
- :fit="fit"
- style="width: 100%; height: 100%;"
- ></el-image>
- <el-image
- v-else
- :src="'http://47.93.189.255:8080/' + individualList.img"
- :fit="fit"
- style="width: 100%; height: 100%;"
- ></el-image>
- </el-avatar>
- </el-upload>
+
+
+
+
+ <el-upload ref="uploadDemo"
+ action=""
+ :file-list="fileList1"
+ list-type="picture-card"
+ accept="image/*"
+ :multiple="false"
+ :http-request="requestUpload"
+ :on-success="handleSucess"
+ :limit="1">
+
+ <el-avatar shape="square" style="width: 200px;;height: 200px;" >
+ <el-image
+ :src="'https://www.bendudu.com:8080/'+ individualList.url"
+ :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
+ ></el-image>
+
+
+ </el-avatar>
+ </el-upload>
<div class="edit-text" v-if="isEditing" @click="uploadImage">鐐瑰嚮鏇存崲鍥剧墖</div>
</div>
</el-col>
@@ -167,29 +178,7 @@
</div>
<div style="padding-left:30px;padding-top:30px" >
- <el-container >
- <el-row >
- <el-button
- type="primary"
- @click="handleEdit()"
- v-if="isShow"
- v-hasPermi="['system:role:edit']"
- >缂栬緫</el-button>
- <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
- <br>
- <el-button
- type="primary"
- @click="handleExport"
- v-hasPermi="['family:note:export']"
- >瀵煎嚭</el-button>
- <br>
- <el-button
- type="primary"
- v-hasPermi="['family:note:export']"
- >鎵撳嵃</el-button>
- </el-row>
- </el-container>
</div>
<!-- </el-dialog> self:user:export-->
</el-container>
@@ -198,51 +187,54 @@
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
- <el-row :span="16">
- <el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="70px">
- <el-input v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="16">
- <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="70px">
- <el-input v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
<el-row :span="16" >
<el-form-item label="鍗曚綅" prop="unit" label-width="40px">
<el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
+ <el-row :span="16">
+ <el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="70px">
+ <el-input type="textarea" v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
+ <el-row :span="28">
+ <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="70px">
+ <el-input type="textarea" v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
</el-form>
</el-col>
</el-container>
</div>
- <div style="padding-left:30px">
+ <div style="padding-left:60px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
- <el-row :span="12">
- <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice" label-width="110px">
- <el-input v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
- <el-row :span="12">
- <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice" label-width="110px">
- <el-input v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- </el-row>
<el-row :span="12" >
<el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="70px">
<el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
+ <el-row :span="12">
+ <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice" label-width="110px">
+ <el-input type="textarea" v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+ <el-row :span="12">
+ <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice" label-width="110px">
+ <el-input type="textarea" v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-row>
+
</el-form>
</el-col>
</el-container>
@@ -280,7 +272,7 @@
<el-collapse-item name="1" >
<template v-slot:title>
<div class="title-wrapper">
- 涓昏瀛︿範鍙婂伐浣滅粡鍘�
+ <div class="left-content">涓昏瀛︿範鍙婂伐浣滅粡鍘�</div>
<div>
<el-button class="button" size="mini" type="text" @click="showDialog('open')" >
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
@@ -291,13 +283,18 @@
<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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
+ <template v-else>
+ <el-date-picker v-model="scope.row.startDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
+ <template v-else><el-date-picker v-model="scope.row.endDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></template>
</template>
</el-table-column>
<el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" >
@@ -329,10 +326,11 @@
<el-collapse-item name="2" >
<template v-slot:title>
<div class="title-wrapper">
- 瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�
+ <div class="left-content">瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�</div>
<div>
- <el-button class="button2" size="mini" type="text" @click="showDialog('relation1')">
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button></div>
+ <el-button class="button" size="mini" type="text" @click="showDialog('relation1')">
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
+ </div>
</div>
</template>
<el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
@@ -383,8 +381,8 @@
<el-collapse-item name="4">
<template v-slot:title>
<div class="title-wrapper">
- 鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
- <el-button class="button4" size="mini" type="text" @click="showDialog('certificate')">
+ <div class="left-content">鎸佹湁璇佷欢鎯呭喌</div>
+ <el-button class="button" size="mini" type="text" @click="showDialog('certificate')">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
@@ -417,13 +415,19 @@
<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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
+ <template v-else>
+ <el-date-picker v-model="scope.row.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
+ <template v-else>
+ <el-date-picker v-model="scope.row.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></template>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -442,8 +446,8 @@
<el-collapse-item name="5">
<template v-slot:title>
<div class="title-wrapper">
- 鍑哄浗锛堝锛夋儏鍐�
- <el-button class="button5" size="mini" type="text" @click="showDialog('abroad')">
+ <div class="left-content">鍑哄浗锛堝锛夋儏鍐�</div>
+ <el-button class="button" size="mini" type="text" @click="showDialog('abroad')">
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
@@ -452,13 +456,19 @@
<el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="200" 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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
+ <template v-else>
+ <el-date-picker v-model="scope.row.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></template>
</template>
</el-table-column>
<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" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
+ <template v-else>
+ <el-date-picker v-model="scope.row.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></template>
</template>
</el-table-column>
<el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="300" align="center" >
@@ -485,39 +495,42 @@
</el-table-column>
</el-table>
</el-collapse-item>
+ <!-- 鑷紶-->
+ <el-collapse-item name="6">
+ <template v-slot:title>
+ <div class="title-wrapper">
+ <div class="left-content">鑷紶</div>
+ <div>
+ <el-button size='mini' type="text" class="button" @click="showDialog('autobiography')" >
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ </el-button>
+ </div>
+ </div>
+ </template>
+ <el-contain>
+ <div>
+ <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
+ 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>{{ item.content }}</div>
+ <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ </el-button>
+
+ <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='position: absolute;right:10px;top:5px;'>
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ </el-button>
+
+ </el-tab-pane>
+ </el-tabs></div>
+ </el-contain>
+ </el-collapse-item>
+
</el-collapse>
- <!-- 鑷紶-->
- <div style="padding-top:30px">
- <el-container>
- <div style="width:100%"><h2 style="font-size:15px" >鑷紶</h2></div>
- </el-container>
- <div style='position: relative;'>
- <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
- 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-button size='mini' type="text" class="btn_edit" @click="editData(item)" style='position: absolute;right:10px;top:5px;'>
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
- </el-button>
- </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>
- </div>
- </div>
<pagination
v-show="total>0"
@@ -528,13 +541,17 @@
/>
<!-- 鏂板涓昏缁忓巻淇℃伅閰嶇疆瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="dialogVisible.open" width="900px" append-to-body>
+ <el-dialog 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" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
+ <el-date-picker v-model="formDat.startDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡" prop="endDate">
- <el-input v-model="formDat.endDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
+ <el-date-picker v-model="formDat.endDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content">
<el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" >
@@ -554,7 +571,7 @@
</div>
</el-dialog>
<!-- 鏂板瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐典俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="dialogVisible.relation1" width="900px" append-to-body>
+ <el-dialog 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>
@@ -584,18 +601,20 @@
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
- <!-- 鏂板鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐典俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="dialogVisible.certificate" width="900px" append-to-body>
+ <!-- 鏂板鎸佹湁璇佷欢鎯呭喌淇℃伅閰嶇疆瀵硅瘽妗� -->
+ <el-dialog 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="type">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲瀷" clearable :style="{width: '100%'}" >
+ <el-select v-model="formDat.type" placeholder="璇烽�夋嫨璇佷欢绫诲瀷" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
+ <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍨嬶紝璇峰湪姝よ緭鍏ユ柊鐨勮瘉浠剁被鍨�" @change="addNewOption"></el-input>
+
</el-form-item>
<el-form-item label="鎸佹湁鎯呭喌" prop="ownStatus">
<el-input v-model="formDat.ownStatus" placeholder="璇疯緭鍏ユ寔鏈夋儏鍐�" clearable :style="{width: '100%'}" >
@@ -606,11 +625,14 @@
</el-input>
</el-form-item>
<el-form-item label="寮�濮嬫棩鏈�" prop="startTime">
- <el-input v-model="formDat.startTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
+ <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-form-item>
<el-form-item label="缁撴潫鏃ユ湡" prop="endTime">
- <el-input v-model="formDat.endTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
+ <el-date-picker v-model="formDat.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></el-form-item>
</el-form>
<h4 class="form-header"> </h4>
@@ -620,14 +642,16 @@
</div>
</el-dialog>
<!-- 鏂板鍑哄浗锛堝锛夋儏鍐典俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="dialogVisible.abroad" width="900px" append-to-body>
+ <el-dialog 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" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
- </el-form-item>
+ <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker></el-form-item>
<el-form-item label="缁撴潫鏃ユ湡" prop="endTime">
- <el-input v-model="formDat.endTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
- </el-input>
+ <el-date-picker v-model="formDat.endTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination">
<el-input v-model="formDat.destination" type="textarea" :rows="5" placeholder="璇疯緭鍏ユ墍鍒板浗瀹舵垨鑰呭湴鍖�" clearable :style="{width: '100%'}" >
@@ -666,10 +690,12 @@
<span> 宀� </span>
</el-form-item>
<el-form-item label="鏃舵湡锛�" prop="term">
- <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>
+<!-- <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>-->
+ <el-input v-model="formDat.term" placeholder="璇疯緭鍏ユ椂鏈�" clearable :style="{width: '100%'}" >
+ </el-input>
</el-form-item>
<el-form-item label="鍐呭缂栬緫锛�" prop="content">
<el-input v-model="formDat.content" type="textarea" :rows="5" placeholder="" clearable :style="{width: '100%'}" >
@@ -686,7 +712,6 @@
</div>
</el-dialog>
-
</div>
</template>
@@ -701,8 +726,8 @@
listExperience, addExperience, updateExperience, delExperience,
getIndividualRelation, addRelation, updateRelation, delRelation,
getCertificateList, addCertificate, updateCertificate, delCertificate,
- getAbroadList, addAbroad, updateAbroad, delAbroad,
- getAutobiographyList, getAutobiographyTermList, addAutobiography,updateAutobiography,
+ getAbroadList, addAbroad, updateAbroad, delAbroad, listType,
+ getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
getCategory,
} from "@/api/self/index";
import { delFamilyevent, uploadPic } from '../../api/bignote'
@@ -713,9 +738,7 @@
export default {
name: "show",
dicts: ['sys_normal_disable'],
- // components: {
- // MyComponent
- // },
+
data() {
return {
// 閬僵灞�
@@ -755,6 +778,7 @@
relationList:[],
//鍑哄叆澧冭瘉浠舵儏鍐�
certificateList:[],
+ typeList:[],
//鍑哄浗鎯呭喌
AbroadList:[],
@@ -786,8 +810,6 @@
},
// 寮瑰嚭灞傛爣棰�
title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
// open:true,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
@@ -799,7 +821,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
@@ -965,7 +990,7 @@
//鑷紶
term: [{
required: true,
- message: '璇烽�夋嫨鏃舵湡',
+ message: '璇疯緭鍏ユ椂鏈�',
trigger: 'blur'
}],
ageBegin: [{
@@ -982,16 +1007,9 @@
},
selectedOption:'',
typeOptions:[],
- typeOption: [{
- value:'鎶ょ収',
- label:'鎶ょ収'
- },{
- value:'閫氳璇�',
- label:'閫氳璇�'
- },{
- value:'韬唤璇�',
- label:'韬唤璇�'
- }],
+ typeOption:[],
+ newOption: undefined,
+ showInput: true
};
},
created() {
@@ -1021,7 +1039,7 @@
//涓嬫媺
handleChange(activeNames) {
- // console.log(val);
+ // console.log(activeNames);
this.reset();
},
showDialog(dialogName) {
@@ -1046,6 +1064,11 @@
// 鎵撳紑寮圭獥
this.dialogVisible.autobiography = true;
},
+ editAutobiography(item) {
+ this.isEdit1 = true;
+ this.dialogVisible.autobiography = true;
+ this.formDat = { ...item };
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
@@ -1067,64 +1090,73 @@
return '鈥斺�斺�斺�斺�斺��'
}
},
-
+//绫诲埆
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOption.includes(newOption)) {
+ this.typeOption.push(newOption);
+ this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ }
+ },
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
this.loading = true;
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
//涓汉缁忓巻
+ let _this = this;
listExperience(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.experienceList = response.data;
- this.total = response.data.total;
- this.loading = false;
+ _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;
+ _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;
+ _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;
+ _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;
+ _this.AbroadList = response.data;
+ // this.total = response.data.total;
+ _this.loading = false;
}
);
//鏌ヨ涓汉鎵�鏈夎嚜浼�
getAutobiographyList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.AutobiographyList = response.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.AutobiographyList = response.data;
+ // this.total = response.data.total;
+ _this.loading = false;
});
//鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
@@ -1135,6 +1167,32 @@
// this.total = response.data.total;
// this.loading = false;
// });
+ listType(this.queryParams).then(response => {
+ _this.typeList = response.data;
+ // this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ _this.getTypeOptions();
+ _this.loading = false;
+ }
+ );
+ },
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+ // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」
+ const uniqueOptions = {};
+ // 鏋勫缓涓嬫媺閫夐」鍒楄〃
+ this.typeOption = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
+
},
//鍥剧墖鐨勪笂浼犲強涓婁紶鎸夐挳闅愯棌
@@ -1215,12 +1273,6 @@
});
},
- handleRemoveFile(file) {
- alert(23)
- },
- handleRemove(file) {
- alert("323")
- },
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
@@ -1276,22 +1328,18 @@
});
});
- // if(AutobiographyList.ageEnd==null){
- // this.AgeEnd='?'
- // }else{
- // this.AgeEnd=this.ageEnd
- // }
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
//鏂板涓昏缁忓巻鐨勪繚瀛�
submitDataScope: function() {
+ let _this = this
this.$refs["elForm"].validate(valid => {
if (valid) {
- addExperience(this.formDat).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.dialogVisible.open = false;
- this.getList();
+ addExperience(_this.formDat).then(response => {
+ _this.$modal.msgSuccess("鏂板鎴愬姛");
+ _this.dialogVisible.open = false;
+ _this.getList();
});
}
});
@@ -1353,14 +1401,14 @@
this.$refs["elForm"].validate(valid => {
if (valid) {
// 鏍规嵁鍊兼壘鍒伴�変腑鐨勯�夐」瀵硅薄
- const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);
+ // const selectedOption = this.typeOptions.find(option => option.value === this.formDat.term);
if (this.isEdit1) {
// 鎵ц淇敼鎿嶄綔
updateAutobiography(this.formDat).then(response => {
// 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
- this.formDat.term = selectedOption.label;
- this.formDat.id = selectedOption.id;
+ // this.formDat.term = selectedOption.value;
+ // this.formDat.id = selectedOption.id;
console.log("1")
this.$modal.msgSuccess("淇敼鎴愬姛");
this.dialogVisible.autobiography = false;
@@ -1374,7 +1422,7 @@
} else {
// 鎵ц鏂板鎿嶄綔
addAutobiography(this.formDat).then(response => {
- this.formDat.term = selectedOption.label;
+ // this.formDat.term = selectedOption.label;
this.$modal.msgSuccess("鏂板鎴愬姛");
this.dialogVisible.autobiography = false;
this.getList();
@@ -1410,14 +1458,14 @@
this.individualList.maritalStatus = 1
else
this.individualList.maritalStatus = 2
- 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
-
+ // 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
+ // console.log(this.individualList)
this.$refs['elForm'].validate(valid => {
if (valid) {
if (this.individualList.userId !== undefined) {
@@ -1578,7 +1626,12 @@
formData.append('uploadFile', file);
let _this = this
+ // console.log(this.individualList)
+ this.$refs.uploadDemo.clearFiles();
+ // alert(234)
uploadPic(formData).then(response => {
+ // alert(response.data.url)
+ // alert(response.data.originalFilename)
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
if(_this.fot.includes(pth) === true)
@@ -1588,9 +1641,25 @@
}
else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ _this.fileList.push({name:response.data.fileName, url:response.data.url})
}
+ _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ updateIndividual(_this.individualList).then(response => {
+ // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
+ // this.formDat.term = selectedOption.value;
+ // this.formDat.id = selectedOption.id;
+ console.log("1")
+ _this.$modal.msgSuccess("淇敼鎴愬姛");
+ _this.dialogVisible.autobiography = false;
+ _this.isEdit1 = false;
+ _this.getList();
+ }).catch(error => {
+ console.log(error);
+ _this.isEdit1 = false;
+ _this.dialogVisible.autobiography = false;
+ });
})
},
@@ -1635,6 +1704,16 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+ /** 鍒犻櫎涓汉鑷紶鎸夐挳鎿嶄綔 */
+ handleAutobiography(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+ return delAutobiography(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -1646,7 +1725,7 @@
};
</script>
-<style >
+<style scoped="">
/*.uoloadSty {*/
/* width:110px;*/
/* height:110px;*/
@@ -1670,39 +1749,44 @@
background: #FFEFF2;
}
-/*.co-item{*/
-/* background-color: #EBAFB4;*/
-/*}*/
+
.el-collapse-item__header {
background-color:#FEF7FC;
+ width: 100%;
}
.title-wrapper {
display: flex;
justify-content: space-between;
+ align-items: center;
+ width: calc(100% - 50px);
+}
+.left-content {
+
+ width: 100%;
}
.btn_autobiography{
background:center no-repeat url('../../assets/icons/add1.png') ;
+ margin-left: 76vw;
}
.btn_edit{
background:center no-repeat url('../../assets/icons/edit.png') ;
}
-
+.btn_del{
+ background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ;
+}
+.button-container {
+ text-align: right;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ flex-grow: 1;
+}
.button {
background:center no-repeat url('../../assets/icons/add1.png') ;
- margin-left: 69.5vw;
-
-}
-.button2 {
- background: center no-repeat url('../../assets/icons/add1.png') ;
- margin-left: 66vw;
-}
-.button4 {
- background: center no-repeat url('../../assets/icons/add1.png') ;
- margin-left: 69.5vw;
-}
-.button5 {
- background:center no-repeat url('../../assets/icons/add1.png') ;
- margin-left: 71vw;
+ /*margin-right: -10px ;*/
+ flex-shrink: 0;
+ width: 30px;
+ height: 28px;
}
.form{
background:center/11% no-repeat url('../../assets/icons/form.png') ;
--
Gitblit v1.9.1