Commit c1009eae by hjl

xg

parent 41b0de89
......@@ -36,6 +36,7 @@
:prop="column.key"
:label="column.label"
:width="column.width"
:fixed ='column.fixed'
align="center"
></el-table-column>
</template>
......
......@@ -3,9 +3,9 @@ import { Message } from "element-ui";
import { getToken } from "@/utils/auth";
const config = {
proxy: 'http://192.168.3.87:8881', // 本地
// proxy: "https://exam.smart-zj.cn:9100/exam/", // 新线上地址
// proxy: "http://81.69.231.72:8881/", // 测试地址
proxy: "http://81.69.231.72:8881/", // 测试地址
};
//axios基本配置
......
......@@ -207,7 +207,6 @@
<el-button type="primary" @click="confirmBtn">确 定</el-button>
</span>
</el-dialog>
<!-- 人才详情的对话框 -->
<el-dialog
title="家庭详情"
:visible.sync="viewShow"
......@@ -217,7 +216,8 @@
>
<div class="content">
<!-- 开始 -->
<div style="background: #f3f4f6">
<div class="applicant">
<div class="title">申请人信息</div>
<div class="cell">
<p class="label">家庭码</p>
<p class="value">{{ viewDetail.familyCode }}</p>
......@@ -227,28 +227,24 @@
<p class="value">{{ viewDetail.name }}</p>
</div>
<div class="cell">
<p class="label">uid</p>
<p class="value">{{ viewDetail.userId }}</p>
<p class="label">身份证号</p>
<p class="value">{{ viewDetail.idCard }}</p>
</div>
<div class="cell">
<p class="label">证件</p>
<p class="value">{{ viewDetail.idCard }}</p>
<p class="label">手机号</p>
<p class="value">{{ viewDetail.phone }}</p>
</div>
<div class="cell">
<p class="label">户籍</p>
<p class="label">户籍地址</p>
<p class="value">{{ viewDetail.domicile }}</p>
</div>
<div class="cell">
<p class="label">现居市区</p>
<p class="label">现居地址</p>
<p class="value">{{ viewDetail.area }}</p>
</div>
<div class="cell">
<p class="label">市区码</p>
<p class="value">{{ viewDetail.areaCode }}</p>
</div>
<div class="cell">
<p class="label">电话</p>
<p class="value">{{ viewDetail.phone }}</p>
<p class="label">现居详细地址</p>
<p class="value">{{ viewDetail.address }}</p>
</div>
<div class="cell">
<p class="label">工作单位</p>
......@@ -270,6 +266,160 @@
<p class="label">是否有孩子</p>
<p class="value">{{ viewDetail.haveChildren }}</p>
</div>
<div class="cell" >
<p class="label">结婚证照片</p>
<p class="value">
<el-image v-for="(item, index) in viewDetail.marrigePicture" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
<div class="cell">
<p class="label">身份证(正,反)照</p>
<p class="value">
<el-image v-for="(item, index) in viewDetail.idCardPicture" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
<div class="cell">
<p class="label">生育登记证明</p>
<p class="value">
<el-image v-for="(item, index) in viewDetail.birthCertificate" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
</div>
<div class="partner" v-if="viewDetail.partnerVO">
<div class="title">丈夫/妻子信息</div>
<div class="cell">
<p class="label">姓名</p>
<p class="value">{{ viewDetail.partnerVO.name }}</p>
</div>
<div class="cell">
<p class="label">身份证号</p>
<p class="value">{{ viewDetail.partnerVO.idCard }}</p>
</div>
<div class="cell">
<p class="label">手机号</p>
<p class="value">{{ viewDetail.partnerVO.phone }}</p>
</div>
<div class="cell">
<p class="label">户籍地址</p>
<p class="value">{{ viewDetail.partnerVO.domicile }}</p>
</div>
<div class="cell">
<p class="label">现居地址</p>
<p class="value">{{ viewDetail.partnerVO.area }}</p>
</div>
<div class="cell">
<p class="label">现居详细地址</p>
<p class="value">{{ viewDetail.partnerVO.address }}</p>
</div>
<div class="cell">
<p class="label">工作地址</p>
<p class="value">{{ viewDetail.partnerVO.workUnit }}</p>
</div>
<div class="cell" >
<p class="label">结婚证照片</p>
<p class="value">
<el-image v-for="(item, index) in viewDetail.partnerVO.marrigePicture" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
<div class="cell">
<p class="label">丈夫/妻子身份证(正,反)照</p>
<p class="value">
<el-image v-for="(item, index) in viewDetail.partnerVO.idCardPicture" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
<div class="cell">
<p class="label">生育登记证明</p>
<p class="value">
<el-image v-for="(item, index) in viewDetail.partnerVO.birthCertificate" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
</div>
<div class="children" v-if="viewDetail.childrenVOList">
<div class="card" v-for="(item, index) in viewDetail.childrenVOList" :key="index">
<div class="title">子女信息{{ index + 1 }}</div>
<div class="cell">
<p class="label">姓名</p>
<p class="value">{{ item.name }}</p>
</div>
<div class="cell">
<p class="label">身份证号</p>
<p class="value">{{ item.idCard }}</p>
</div>
<div class="cell">
<p class="label">孩次</p>
<p class="value">{{ item.childOrder }}</p>
</div>
<div class="cell">
<p class="label">性别</p>
<p class="value">{{ item.sex }}</p>
</div>
<div class="cell">
<p class="label">类别</p>
<p class="value">{{ item.type }}</p>
</div>
<div class="cell">
<p class="label">出生年月</p>
<p class="value">{{ item.birthDate }}</p>
</div>
<div class="cell">
<p class="label">身份证明</p>
<p class="value">{{ item.identification == 1 ? '身份证' :'户口本' }}</p>
</div>
<div class="cell">
<p class="label">身份证照片</p>
<p class="value">
<el-image v-for="(item, index) in (item.pictureVOList.filter(picture => picture.pictureType == 1))" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
<div class="cell">
<p class="label">出生医学证明</p>
<p class="value">
<el-image v-for="(item, index) in (item.pictureVOList.filter(picture => picture.pictureType == 2))" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
<div class="cell">
<p class="label">收养证明</p>
<p class="value">
<el-image v-for="(item, index) in (item.pictureVOList.filter(picture => picture.pictureType == 3))" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
<div class="cell">
<p class="label">户口本(孩子页)</p>
<p class="value">
<el-image v-for="(item, index) in (item.pictureVOList.filter(picture => picture.pictureType == 4))" :key="index"
style="width: 100px; height: 100px; margin-right: 10px" :src="item.picture" :z-index="7777777"
:preview-src-list="[item.picture]">
</el-image>
</p>
</div>
</div>
</div>
</div>
<span slot="footer" class="dialog-footer">
......@@ -294,7 +444,7 @@
<div class="cell" :key="index" v-for="(item, index) in record">
<p class="label" style="margin-right: 20px">
{{ item?.state }}
<span v-if="item?.record">({{ item?.record }})</span>
<!-- <span v-if="item?.record">({{ item?.record }})</span> -->
</p>
<div class="info">
<p class="item">操作人:{{ item?.departName }}</p>
......@@ -362,14 +512,13 @@ export default {
width: 250,
},
{
key: "area",
label: "居住地址",
key: "name",
label: "姓名",
width: 250,
},
{
key: "haveChildren",
label: "是否有孩子",
key: "phone",
label: "手机号",
width: 250,
},
{
......@@ -377,19 +526,20 @@ export default {
label: "证件",
width: 250,
},
// {
// key: "area",
// label: "居住地址",
// width: 250,
// },
{
key: "marriageState",
label: "婚姻状况",
width: 250,
},
{
key: "name",
label: "姓名",
key: "haveChildren",
label: "是否有孩子",
width: 250,
},
{
key: "phone",
label: "手机号",
key: "marriageState",
label: "婚姻状况",
width: 250,
},
{
......@@ -398,12 +548,17 @@ export default {
width: 250,
type: "slot",
},
// {
// key: "workUnit",
// label: "工作单位",
// width: 250,
// },
{
key: "workUnit",
label: "工作单位",
width: 250,
},
key:'createTime',
label:'创建时间',
width:250,
fixed:'right'
}
],
pagination: {
total: 0,
......@@ -532,6 +687,17 @@ export default {
this.viewDetail = res.data;
this.viewRow = row;
this.viewShow = true;
this.viewDetail.marrigePicture = res.data.applicantPictureList.filter(item => item.pictureType == 2);
this.viewDetail.idCardPicture = res.data.applicantPictureList.filter(item => item.pictureType == 1);
this.viewDetail.birthCertificate = res.data.applicantPictureList.filter(item => item.pictureType == 3)
//伴侣照片信息
if(this.viewDetail.partnerVO){
this.viewDetail.partnerVO.idCardPicture = this.viewDetail.partnerVO.partnerPictureList.filter(item => item.pictureType == 1 )
this.viewDetail.partnerVO.marrigePicture = this.viewDetail.partnerVO.partnerPictureList.filter(item => item.pictureType == 2 )
this.viewDetail.partnerVO.birthCertificate = this.viewDetail.partnerVO.partnerPictureList.filter(item => item.pictureType == 3 )
}
});
},
getRecord(row) {
......@@ -539,7 +705,8 @@ export default {
code: row.familyCode,
};
getRecord(params).then((res) => {
this.record = res.data.data.data;
console.log(res);
this.record = res.data;
this.recordShow = true;
});
},
......@@ -644,7 +811,16 @@ export default {
.content {
max-height: 60vh;
overflow-y: auto;
.title {
display: flex;
justify-content: center;
align-items: center;
padding: 10px;
font-size: 20px;
font-weight: 500;
color: #fff;
background: #409EFF;
}
.cell {
display: flex;
align-items: center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment