From b3bd8bb2cedee4e60a2aac12ed88c7ebe8ba98ed Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 25 五月 2023 13:46:25 +0800
Subject: [PATCH] 修改保洁收纳
---
ruoyi-ui/src/views/self/show.vue | 647 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 417 insertions(+), 230 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 41ac96b..7526b7e 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,105 +1,62 @@
<template>
<div class="app-container">
-
+ <!-- 鍥炲埌椤堕儴-->
+ <el-backtop :bottom="150" :right="30">
+ <el-button type="primary" circle
+ class="el-icon-top"
+ ></el-button>
+ </el-backtop>
<h1 style="font-size:21px;padding-top:30px">涓汉绠�鍘�</h1>
<el-divider />
-<!-- 鍩烘湰淇℃伅-->
+ <!-- 鍩烘湰淇℃伅-->
<h2 style="font-size:16px">鍩烘湰淇℃伅</h2>
-
-<!-- <el-column prop="nickName" label="濮撳悕"></el-column>-->
-
<el-container>
-<!-- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>-->
- <div style="padding-left:30px">
-
-<!-- <el-form-item label="userId" prop="userId">-->
-<!-- <el-select v-model="formDat.userId" clearable :style="{width: '100%'}" >-->
-<!-- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"-->
-<!-- ></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- <el-table-->
-<!-- v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"-->
-<!-- >-->
-<!-- <el-table-column prop="nickName" label="濮撳悕" min-width="5%">-->
-<!-- <template slot-scope="scope">-->
-<!-- {{ scope.row.nickName }}-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- </el-table>-->
-
-
+ <div >
<el-container >
<el-col >
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left"
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left"
v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
- <el-row :span="6">
- <el-form-item label="濮撳悕" prop="nickName">
- <el-input v-model="formData.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-row :span="5">
+ <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="6">
- <el-form-item label="鏇剧敤鍚�" prop="oldName">
- <el-input v-model="formData.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-row :span="5">
+ <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="8">
- <el-form-item label="韬唤璇佸彿" prop="idNum">
- <el-input v-model="formData.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-row :span="5">
+ <el-form-item label="韬唤璇佸彿" prop="idNum" label-width="70px">
+ <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
</el-form>
</el-col>
</el-container>
-
-<!-- -->
-<!-- <el-container>-->
-<!-- <el-table-->
-<!-- v-loading="listLoading"-->
-<!-- :data="individualList"-->
-<!-- element-loading-text="鏁版嵁鍔犺浇涓�"-->
-<!-- style="width: 100%"-->
-<!-- />-->
-<!-- <el-table-column >-->
-<!-- <template slot-scope="props">-->
-<!-- <el-form label-position="left" >-->
-<!-- <el-form-item label="鐢ㄦ埛鏄电О">-->
-<!-- <span>{{ props.row.nickName }}</span>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鑱旂郴鏂瑰紡">-->
-<!-- <span>{{ props.row.oldName }}</span>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鐢ㄦ埛 ID">-->
-<!-- <span>{{ props.row.idNum }}</span>-->
-<!-- </el-form-item>-->
-
-<!-- </el-form>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- </el-container>-->
</div>
- <div style="padding-left:70px">
+ <div style="padding-left:30px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left">
- <el-row :span="6">
- <el-form-item label="鎬у埆" prop="sex">
- <el-input v-model="formData.sex" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
+ <el-row :span="5">
+ <el-form-item label="鎬у埆" prop="sex" label-width="40px">
+ <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="6">
- <el-form-item label="姘戞棌" prop="nation">
- <el-input v-model="formData.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
+ <el-row :span="5">
+ <el-form-item label="姘戞棌" prop="nation"label-width="40px">
+ <el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="8">
- <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber">
- <el-input v-model="formData.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
+ <el-row :span="5">
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="70px">
+ <el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -107,20 +64,19 @@
</el-col>
</el-container>
</div>
-
- <div style="padding-left:70px">
+ <div style="padding-left:30px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left":disabled="dsb">
- <el-row :span="6">
- <el-form-item label="鍥界睄" prop="nationality">
- <el-input v-model="formData.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left":disabled="dsb">
+ <el-row :span="5">
+ <el-form-item label="鍥界睄" prop="nationality" label-width="40px">
+ <el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
- <el-row :span="6">
- <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus">
- <el-input v-model="formData.maritalStatus" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-row :span="5">
+ <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="70px">
+ <el-input v-model="individualList.maritalStatus === 1 ? '宸插':'鏈'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-row>
@@ -129,84 +85,92 @@
</el-col>
</el-container>
</div>
- <div style="padding-left:90px;padding-top:30px">
- <el-row :gutter="6" >
- <el-upload ref="ref1"
- action=""
- :file-list="fileList"
- list-type="picture-card"
- accept="image/*"
- :auto-upload="false"
- :multiple="false"
- :limit="1">
- <i class="el-icon-plus"></i>
- </el-upload>
- </el-row>
+ <div style="padding-left:30px;padding-top:30px">
+ <el-col :span="6" :data="individualList">
+ <div class="block" :model="individualList" >
+ <el-col v-model="individualList.url" prop="url">
+ <el-avatar shape="square" :size=200 >
+ <el-image
+ :src="'http://47.93.189.255:8080/'+ individualList.url"
+ :fit="fit"
+ ></el-image>
+ </el-avatar>
+ </el-col>
+ </div>
+
+ </el-col>
+
+
+ <!-- <el-row>-->
+ <!--<!– <el-table border style="width: 100%">–>-->
+ <!--<!– <el-table-column–>-->
+ <!--<!– prop="img"–>-->
+ <!--<!– v-model="individualList.img"–>-->
+ <!--<!– placeholder=""–>-->
+ <!--<!– width="180">–>-->
+ <!--<!– <template slot-scope="scope">–>-->
+ <!--<!– <img :src="scope.row.src" style="width:100px;height:50px;"/>–>-->
+ <!--<!– </template>–>-->
+ <!--<!– </el-table-column>–>-->
+
+ <!--<!– </el-table>–>-->
+ <!--<!– <el-upload :class="{uoloadSty:showBtnDealImg,disUoloadSty:noneBtnImg}"–>-->
+ <!--<!– ref="ref1"–>-->
+ <!--<!– action=""–>-->
+ <!--<!– :file-list="fileList"–>-->
+ <!--<!– list-type="picture-card"–>-->
+ <!--<!– accept="image/*"–>-->
+ <!--<!– :auto-upload="false"–>-->
+ <!--<!– :multiple="false"–>-->
+ <!--<!– :limit="limitCountImg">–>-->
+ <!--<!– <i class="el-icon-plus"></i>–>-->
+ <!--<!– </el-upload>–>-->
+ <!-- </el-row>-->
</div>
- <div style="padding-left:50px;padding-top:30px" >
+
+ <div style="padding-left:30px;padding-top:30px" >
<el-container >
-<!-- <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>-->
-
-<!-- </template>-->
- <el-row :span="2" style="flex-direction: column;">
+ <el-row >
<el-button
type="primary"
- @click="edit(scope.row)"
+ @click="handleEdit()"
+ v-if="isShow"
v-hasPermi="['system:role:edit']"
-
-
>缂栬緫</el-button>
-
- <el-dropdown
- size="mini"
- @command="(command) => handleCommand(command, scope.row)"
- v-hasPermi="['system:role:edit']">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)"
- >鏌ョ湅璇︽儏</el-button>
-
- </el-dropdown>
-
<br>
- <el-button type="primary" @click="submitForm">瀵煎叆</el-button>
+ <el-button
+ type="primary"
+ @click="handleExport"
+ v-hasPermi="['family:note:export']"
+ >瀵煎嚭</el-button>
+ <br>
+ <el-button v-if="isShow_2" type="primary" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
</el-row>
+
</el-container>
</div>
-<!-- </el-dialog>-->
+ <!-- </el-dialog> self:user:export-->
</el-container>
<el-container>
- <div style="padding-left:30px">
+ <div>
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="110px" label-position="left">
- <el-row :span="15">
- <el-form-item label="鎴风睄鍦板潃" prop="locationAddress">
- <el-input v-model="formData.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <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="15">
- <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress">
- <el-input v-model="formData.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <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="15">
- <el-form-item label="鍗曚綅鍙婅亴鍔¤亴绉�" prop="unit position ">
- <el-input v-model:unit="formData.unit" v-model:position="formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- <template slot-scope="scope">
- {{scope.row.unit}}/{{scope.row.position}}
- </template>
+ <el-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>
@@ -218,47 +182,54 @@
<div style="padding-left:30px">
<el-container>
<el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="110px" label-position="left">
+ <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-position="left">
<el-row :span="12">
- <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice">
- <el-input v-model="formData.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <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">
- <el-input v-model="formData. alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <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-form>
</el-col>
</el-container>
</div>
</el-container>
+ <!--鎶樺彔闈㈡澘-->
<el-collapse v-model="activeNames" @change="handleChange">
- <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1" >
- <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
+ <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1">
+ <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="鎿嶄綔" 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="handleUpdate(scope.row)"
+ @click="handleAdd"
v-hasPermi="['system:role:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
- @click="handleDelete(scope.row)"
+ @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']">
@@ -270,7 +241,8 @@
</el-table>
</el-collapse-item>
<el-collapse-item title="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�" name="2" >
- <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
+ <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">
@@ -292,7 +264,7 @@
size="mini"
type="text"
icon="el-icon-delete"
- @click="handleDelete(scope.row)"
+ @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']">
@@ -305,56 +277,88 @@
</el-collapse-item>
<el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
<div>
- <el-form>
+ <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
<el-form-item label="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�">
- <el-radio-group v-model="form.outStatus" style="margin-bottom: 0">
- <el-radio :label="true">鏄�</el-radio>
- <el-radio :label="false">鍚�</el-radio>
+ <el-radio-group 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-table :data="individualList.idNo" border stripe>
- <el-table-column label="璇佷欢鍙风爜" width="80" align="center">
- </el-table-column>
- </el-table>
- </div>
+
</div>
</el-collapse-item>
- <el-collapse-item title="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�" name="4" >
- <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange">
- <el-table-column label="璇佷欢鍚嶇О" sortable width="280" align="center" />
- <el-table-column label="鎸佹湁鎯呭喌" sortable width="280" align="center" />
- <el-table-column label="璇佷欢鍙风爜" sortable width="280" align="center" />
- <el-table-column label="鏈夋晥鏈�" sortable width="280" align="center">
+ <el-collapse-item title="鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�" name="4">
+ <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>
</el-table>
</el-collapse-item>
- <el-collapse-item title="鍑哄浗锛堝锛夋儏鍐�" name="5" >
- <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange">
+ <el-collapse-item title="鍑哄浗锛堝锛夋儏鍐�" name="5">
+ <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="content" sortable width="350" align="center" />
- <el-table-column label="浜嬬敱锛堟梾娓搞�佽蛋璁裤�佹帰浜层�佺户鎵胯储浜с�佸叾浠栵級" prop="witness" sortable width="400" 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>
</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>
- <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="0~3宀�(濠村効鏈�)" name="1" index="1"></el-tab-pane>
- <el-tab-pane label="6~12(灏忓)" name="2"></el-tab-pane>
- <el-tab-pane label="12~15(鍒濅腑)" name="3"></el-tab-pane>
- <el-tab-pane label="15~18(楂樹腑)" name="4"></el-tab-pane>
- <el-tab-pane label="18~22(澶у)" name="5"></el-tab-pane>
- <el-tab-pane label="22~25(鐮旂┒鐢�)" name="6"></el-tab-pane>
- <el-tab-pane label="26~ (宸ヤ綔)" name="7"></el-tab-pane>
- <el-tab-pane label="锛熷瞾缁撳" name="8"></el-tab-pane>
+ <el-tabs 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-tab-pane>
+<!-- <el-tab-pane label="濠村効" >-->
+<!-- <div v-if="AutobiographyList.term === '濠村効'" v-model="AutobiographyList.content">-->
+<!-- {{AutobiographyList.content}}-->
+<!-- </div>-->
+<!-- </el-tab-pane>-->
+<!-- <el-tab-pane label="3~6宀�(骞煎効鏈�)" name="2" ></el-tab-pane>-->
+<!-- <el-tab-pane label="6~12(灏忓)" name="3" ></el-tab-pane>-->
+<!-- <el-tab-pane label="12~15(鍒濅腑)" name="4"></el-tab-pane>-->
+<!-- <el-tab-pane label="15~18(楂樹腑)" name="5"></el-tab-pane>-->
+<!-- <el-tab-pane label="18~22(澶у)" name="6"></el-tab-pane>-->
+<!-- <el-tab-pane label="22~25(鐮旂┒鐢�)" name="7"></el-tab-pane>-->
+<!-- <el-tab-pane label="26~ (宸ヤ綔)" name="8"></el-tab-pane>-->
+<!-- <el-tab-pane label="锛熷瞾缁撳" name="9"></el-tab-pane>-->
+<!-- <!– </div>–>-->
+<!-- <!– <el-tab-pane–>-->
+<!-- <!– v-for="(item, index) in AutobiographyTermList"–>-->
+<!-- <!– :key="index"–>-->
+<!-- <!– :name="item"–>-->
+<!-- <!– :label="item"–>-->
+<!-- <!– />–>-->
</el-tabs>
@@ -367,6 +371,30 @@
:limit.sync="queryParams.pageSize"
@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-form-item>
+ <el-form-item label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content">
+ <el-input v-model="formDat.content" placeholder="璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="璇佹槑浜�" prop="witness">
+ <el-input v-model="formDat.witness" 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="submitForm">淇� 瀛�</el-button>
+ <el-button @click="cancelData">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
@@ -383,7 +411,18 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
addExperience,delExperience} from "@/api/self/index";
-import { getAbroadList, getAutobiographyTermList, getCertificateList } from '../../api/self'
+import {
+ delCertificate,
+ getAbroadList,
+ getAutobiography,
+ getAutobiographyList,
+ getAutobiographyTermList,
+ getCertificateList
+} 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",
dicts: ['sys_normal_disable'],
@@ -404,8 +443,13 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ //澶村儚涓婁紶
+ showBtnDealImg:true,
+ noneBtnImg:false,
+ limitCountImg:1,//涓婁紶鍥剧墖鐨勬渶澶ф暟閲�
//涓汉淇℃伅鏁版嵁
individualList:[],
+ fit:['fill'],
// 涓汉缁忓巻鏁版嵁
experienceList: [],
//瀹跺涵鎴愬憳鍏崇郴鏁版嵁
@@ -414,8 +458,24 @@
certificateList:[],
//鍑哄浗鎯呭喌
AbroadList:[],
+
+ //涓汉鑷紶
+ activeName: '0',
+ AutobiographyList:[],
+ content1:'',
//涓嶅悓鏃舵涓汉鑷紶
- AutobiographyTermList:[],
+ // AutobiographyTermList:[],
+ // // 璁块棶鍚庡彴鐨勬暟鎹�
+ // query: {
+ // current: 1,
+ // termId: "",
+ // },
+ // // 鍚庡彴杩斿洖鐨勬暟鎹�
+ // AutobiographyTermList: {
+ // rows: [{}],
+ // },
+ // current: 0,
+
//涓嬫媺瀹炵幇
activeNames:['1'],
// 寮瑰嚭灞傛爣棰�
@@ -440,9 +500,8 @@
],
dsb:true,
btn:false,
- //涓汉鑷紶
- activeName: '1',
-
+ isShow:true,
+ isShow_2:false,
formDat: {
//涓汉鍩烘湰淇℃伅
nickName:undefined,
@@ -468,6 +527,7 @@
birth:undefined,
familyId:undefined,
+
//涓昏瀛︿範鍙婂伐浣滅粡鍘�
id:undefined,
userId:undefined,
@@ -476,11 +536,14 @@
witness:undefined,
remark: undefined,
//瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�
-
relation:undefined,
-
-
- //
+ //鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+ cerName:undefined,
+ validityDate:undefined,
+ ownStatus:undefined,
+ //鍑哄浗锛堝锛夋儏鍐�
+ destination:undefined,
+ cause:undefined,
url: undefined,
},
// 鑿滃崟鍒楄〃
@@ -583,7 +646,7 @@
},
created() {
this.getList();
- // this.getCateInfor()
+ this.getAutobiographyInfor()
},
methods: {
// 鍙栨秷鎸夐挳
@@ -595,30 +658,25 @@
handleChange(val) {
console.log(val);
},
- //缂栬緫鎸夐挳
- edit(row){
- const id= row.id;
- this.reset();
- // this.$router.push('/self/self/edit')
- this.title='缂栬緫涓汉淇℃伅';
- this.$router.push('/family2/self/edit/' + id);
- },
+
//涓汉鑷紶
handleClick(tab, event) {
- console.log(tab, event);
- //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
- getAutobiographyTermList(this.queryParams).then(response => {
- // alert(123)
- // console.log(response.data)
- this.AutobiographyTermList = response.data;
- this.total = response.data.total;
- this.loading = false;
- });
+ // console.log(tab, event);
+ this.getAutobiographyInfor();
+
},
- /** 鏌ヨ瑙掕壊鍒楄〃 */
- //鍒楄〃鏄剧ず瀹跺ぇ浜嬭
+ //闅旇鍙樿壊
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+
+ /** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
this.loading = true;
// console.log(this.queryParams)
@@ -661,17 +719,33 @@
);
//鍑哄浗鎯呭喌
getAbroadList(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.AbroadList = response.data;
+ this.total = response.data.total;
+ this.loading = false;
+ }
+ );
+ //鏌ヨ涓汉鎵�鏈夎嚜浼�
+ getAutobiographyList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.AbroadList = response.data;
+ this.AutobiographyList = 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;
+ });
},
+ //鍥剧墖鐨勪笂浼犲強涓婁紶鎸夐挳闅愯棌
// 鍙栨秷鎸夐挳
@@ -683,6 +757,33 @@
cancelDataScope() {
this.openDataScope = false;
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.formDat.url = ul+","+uls
+
+ this.$refs['elForm'].validate(valid => {
+
+
+ if (valid) {
+ if (this.formDat.id != undefined) {
+ updateIndividual(this.formDat).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ this.btn=false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+
+ }
+ }
+ })
},
// 琛ㄥ崟閲嶇疆
reset() {
@@ -727,17 +828,17 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞瀹跺涵澶т簨璁颁俊鎭�";
- },
+ // handleAdd() {
+ // this.reset();
+ // this.open = true;
+ // this.title = "娣诲姞涓汉淇℃伅";
+ // },
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.$router.push("/family1/bignote/familyeventInfo/" + id);
+ this.$router.push("/self/self/edit/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -745,17 +846,62 @@
let jd = true
this.$router.push({
- path:"/self/self/edit" + id,
+ path:"/self/self/edit/" + id,
query:{
detail:jd
}
});
},
-
+ handleRemoveFile(file) {
+ alert(23)
+ },
+ handleRemove(file) {
+ alert("323")
+ },
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
+ },
+ //鐐瑰嚮涓嬭浇鍑芥暟
+ handleDownload(url) {
+ var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+
+ let lens = formData.path.split(".")
+ let suffix = lens[lens.length-1]
+ download(formData).then(async (response) => {
+ const isLogin = await blobValidate(response);
+ let nt = new Date().getTime()
+ let filename = 'selfevent_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+ // 缂栬緫鎸夐挳
+ handleEdit()
+ {
+ this.dsb = false
+ this.btn = true
+ this.isShow=false
+ this.isShow_2=true
+ },
+ //淇敼鎸夐挳
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "淇敼璇︾粏淇℃伅";
+ },
+ /** 鏌ヨ鑷紶淇℃伅 */
+ getAutobiographyInfor()
+ {
+ let _this = this
+ getCategory().then(response=>{
+
+ response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ })
+ })
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
@@ -770,10 +916,10 @@
this.$refs["elForm"].validate(valid => {
if (valid) {
- addFamilyevent(this.formDat).then(response => {
+ addIndividual(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
- this.getList1();
+ this.getList();
});
}
});
@@ -801,23 +947,64 @@
})
},
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
+ /** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */
+ handleExperienceDelete(row) {
const Ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
- return delFamilyevent(Ids);
+ return delExperience(Ids);
}).then(() => {
- this.getList1();
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 鍒犻櫎鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐垫寜閽搷浣� */
+ handleCertificateDelete(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ return delCertificate(Ids);
+ }).then(() => {
+ this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('/family/zfEvent/export', {
+ this.download('/self/user/export', {
...this.queryParams
- }, `zfEvent_${new Date().getTime()}.xlsx`)
+ }, `self_${new Date().getTime()}.xlsx`)
}
}
};
</script>
+<style >
+/*.uoloadSty {*/
+/* width:110px;*/
+/* height:110px;*/
+/* line-height:110px;*/
+/*}*/
+/*.disUoloadSty {*/
+/* display:none; !* 涓婁紶鎸夐挳闅愯棌 *!*/
+/*}*/
+.app-container{
+ background-color: #FEF7FC;
+}
+
+.el-icon-top {
+ background: no-repeat center url("../../assets/icons/top.png");
+}
+.el-table__row.statistics-warning-row {
+ background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+ background: #FFEFF2;
+
+}
+/*.co-item{*/
+/* background-color: #EBAFB4;*/
+/*}*/
+.el-collapse-item__header {
+ background-color:#FEF7FC;
+}
+</style>
--
Gitblit v1.9.1