Skip to content

F
folacin-front
Commit fe759723 authored by 罗成兵's avatar 罗成兵
Browse files
Options

获取用户信息

parent 5d2a9635
Expand all Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 56 deletions
folacin-app/src/views/canvas/canvas.vue
View file @ fe759723
......@@ -6,7 +6,7 @@
</template>
</van-nav-bar>
<div class="height_44"></div>
<vue-esign ref="esign" :isCrop="false" :width="400" :height="700"/>
<vue-esign ref="esign" :isCrop="false" :width="400" :height="600"/>
<div class="btn">
<div class="btn_right" @click="handleReset">
<img src="../../assets/images/abrase.png" alt="">
......
folacin-app/src/views/index/index.vue
View file @ fe759723
......@@ -31,7 +31,7 @@ export default {
scrollPosition: 0,
userInfo: {
account: null,
token: "52d30e396dff44eca2f51f614e42a8c0",
token: "44c1ef4e-de9e-4d32-9af4-3c0196e1ec83",
userId: null,
residentId: null,
nickName: null,
......
folacin-pc/.env.dev
View file @ fe759723
......@@ -3,8 +3,8 @@ NODE_ENV = dev
VUE_APP_BASE_URL2222= https://beta-ysservice.yiboshi.com
VUE_APP_BASE_URL22 = https://ys-service.yiboshi.com
VUE_APP_BASE_URL4 = http://59.230.237.90:8115
VUE_APP_BASE_URL2 = http://127.0.0.1:8083
VUE_APP_BASE_URL = https://beta-cqbp-yesuan.yiboshi.com:86/service-api
VUE_APP_BASE_URL = http://127.0.0.1:8083
VUE_APP_BASE_URL33 = https://beta-cqbp-yesuan.yiboshi.com:86/service-api
VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
......
folacin-pc/src/views/Home.vue
View file @ fe759723
......@@ -47,7 +47,7 @@ export default {
},
created() {
//获取妇幼权限和登录基本信息
let cookieToken = "dd21a4cd-844a-47df-8627-d0dff82482c1";
let cookieToken = "44c1ef4e-de9e-4d32-9af4-3c0196e1ec83";
if (process.env.NODE_ENV != "dev") {
cookieToken = getCookie('bGNnd3lwdF9hdA');
}
......
folacin-pc/src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue
View file @ fe759723
......@@ -17,27 +17,30 @@
</div>
<div style="clear: both"></div>
</div>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="姓名">
<a-descriptions bordered class="folvite_title" :column="6">
<a-descriptions-item label="姓名" :span="2">
{{ detailInfo.womanName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="证件类型">
<a-descriptions-item label="证件类型" :span="2">
{{ detailInfo.womenCertificateTypeName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="证件号码">
<a-descriptions-item label="证件号码" :span="2">
{{ detailInfo.womenIdCard || '--' }}
</a-descriptions-item>
<a-descriptions-item label="出生日期">
<a-descriptions-item label="出生日期" :span="2">
{{ detailInfo.birthDate || '--' }}
</a-descriptions-item>
<a-descriptions-item label="身高">
<a-descriptions-item label="联系电话" :span="2">
{{ detailInfo.telephone || '--' }}
</a-descriptions-item>
<a-descriptions-item label="身高" :span="2">
{{ detailInfo.height ? detailInfo.height + "cm" : '--' }}
</a-descriptions-item>
<a-descriptions-item label="体重">
<a-descriptions-item label="体重" :span="2">
{{ detailInfo.weight ? detailInfo.weight + "kg" : '--' }}
</a-descriptions-item>
<a-descriptions-item label="BMI">
{{ detailInfo.bmi ? detailInfo.bmi: '--' }}
<a-descriptions-item label="BMI" :span="2">
{{ detailInfo.bmi ? detailInfo.bmi : '--' }}
</a-descriptions-item>
</a-descriptions>
<div class="detail_title" style="border-top: 0px">
......@@ -46,28 +49,31 @@
</div>
<div style="clear: both"></div>
</div>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="联系电话">
{{ detailInfo.telephone || '--' }}
<a-descriptions bordered class="folvite_title" :column="6">
<a-descriptions-item label="户籍地址" :span="2">
{{ detailInfo.registeredCodeName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="户籍地址详细" :span="2">
{{ detailInfo.permanentAddress || '--' }}
</a-descriptions-item>
<a-descriptions-item label="现在住址">
<a-descriptions-item label="现住址" :span="2">
{{ detailInfo.presentCodeName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="详细地址">
<a-descriptions-item label="现住址详细" :span="2">
{{ detailInfo.nowAddress || '--' }}
</a-descriptions-item>
<a-descriptions-item label="签署方式" :span="detailInfo.source == 2 ? 2: 1">
<a-descriptions-item label="签署方式" :span="2">
{{ detailInfo.signedModeName || '--' }}
</a-descriptions-item>
<a-descriptions-item label="签署日期" :span="detailInfo.source == 2 ? 2: 1">
<a-descriptions-item label="签署日期" :span="2">
{{ detailInfo.parentDate || '--' }}
</a-descriptions-item>
<a-descriptions-item label="上传照片" v-if="detailInfo.source != 2">
<a-descriptions-item label="上传照片" v-if="detailInfo.source != 2" :span="2">
<img style="cursor: pointer" width="120px" height="120px" :src="detailInfo.consentUrl"
@click="showVisible=true"/>
</a-descriptions-item>
<a-descriptions-item label="签名" v-if="detailInfo.source == 2">
<a-descriptions-item label="签名" v-if="detailInfo.source == 2" :span="4">
<img style="margin-left: 30px;width: auto;height: 80px;transform: rotate(-90deg)"
:src="detailInfo.applySignUrl">
</a-descriptions-item>
......@@ -78,14 +84,14 @@
<div class="divider_my"><span class="midText">问卷</span></div>
<div style="clear: both"></div>
</div>
<a-descriptions bordered class="folvite_title">
<a-descriptions-item label="结果" >
<a-descriptions bordered class="folvite_title" :column="4">
<a-descriptions-item label="结果" :span="2">
<div v-if="checkedList&&checkedList.length>0">
<p v-for="item in checkedList ">{{item}}</p>
<p v-for="item in checkedList ">{{ item }}</p>
</div>
<p v-else>--</p>
</a-descriptions-item>
<a-descriptions-item label="建议服用">
<a-descriptions-item label="建议服用" :span="2">
{{ detailInfo.recommendEat || '--' }}
</a-descriptions-item>
</a-descriptions>
......@@ -172,10 +178,10 @@ export default {
if (data.question) {
let questionList = data.question.split(",");
questionList.forEach(x => {
this.checkedList.push(this.plainOptions["key"+x]);
this.checkedList.push(this.plainOptions["key" + x]);
})
}
}).catch(res=>{
}).catch(res => {
this.spinning = false;
})
},
......
folacin-pc/src/views/indexComponent/folviteDistribution/folviteDistribution.vue
View file @ fe759723
......@@ -51,6 +51,14 @@
<span class="ellipsis">{{ (record.presentCodeName || "") + record.nowAddress }}</span>
</a-tooltip>
</template>
<template slot="registeredCode" slot-scope="text, record">
<a-tooltip placement="top">
<template slot="title">
<span> {{ (record.registeredCodeName || "") + record.permanentAddress }}</span>
</template>
<span class="ellipsis">{{ (record.registeredCodeName || "") + record.permanentAddress }}</span>
</a-tooltip>
</template>
<template slot="action" slot-scope="record">
<a-button class="ant-table-btn" size="small" @click="toDetail(record)">查看</a-button>
<a-button style="margin-left: 10px" class="ant-table-btn" size="small" @click="updateRecord(record)">修改
......@@ -205,6 +213,13 @@ const columns = [
dataIndex: 'sourceName',
width: '140px'
},
{
title: '户籍地址',
// dataIndex: 'nowAddress',
key: 'registeredCode',
ellipsis: true,
scopedSlots: {customRender: 'registeredCode'},
},
{
title: '现住址',
// dataIndex: 'nowAddress',
......@@ -212,6 +227,7 @@ const columns = [
ellipsis: true,
scopedSlots: {customRender: 'nowAddress'},
},
{
title: '操作',
fixed: 'right',
......
folacin-pc/src/views/utils/common.js
View file @ fe759723
......@@ -105,30 +105,6 @@ export const timeFormat = (time, format = 'YYYY-MM-DD') => {
return atime
}
/**
* 非空判断 已挂载到原型上$isNot
* 解决Vue Template模板中无法使用可选链的问题
* eg:
* let ces = {
data: {
data1: {
name: '测试'
}
}
}
let b = this.$isNot(ces, 'data', 'data1', 'name') //测试
{{$isNot(ces, 'data', 'data1', 'name')}} //测试
*/
// export const optionalChaining = (obj, ...rest) => {
// let tmp = obj;
// for (let key in rest) {
// let name = rest[key];
// tmp = tmp?.[name]; //es11可选链
// }
// return tmp ?? "未知";
// };
// 校验手机号
export const checkPhone = (rule, value, callback) => {
if (value == '' || value == undefined) {
......@@ -231,18 +207,22 @@ export function areCodeTrans(areaCode) {
//末尾填充0实现
return areCodeTrans2(areaCode);
}
areaCode = areaCode.replaceAll("0000000000", "");
areaCode = areaCode.replaceAll("00000000", "");
areaCode = areaCode.replaceAll("000000", "");
areaCode = areaCode.replaceAll("000", "");
//末尾不填充0实现
if (areaCode.length >= 2) {
areaCodeList.push(areaCode.substring(0, 2))
}
if (areaCode.length >= 4) {
areaCodeList.push(areaCode.substring(0, 4))
areaCodeList.push(areaCode.substring(0, 4) + "00000000")
}
if (areaCode.length >= 6) {
areaCodeList.push(areaCode.substring(0, 6))
areaCodeList.push(areaCode.substring(0, 6) + "000000")
}
if (areaCode.length >= 9) {
areaCodeList.push(areaCode.substring(0, 9))
areaCodeList.push(areaCode.substring(0, 9) + "000")
}
if (areaCode.length >= 12) {
areaCodeList.push(areaCode)
......
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