Skip to content

F
frontend-h5
Commit c78d2c48 authored by songrui's avatar songrui
Browse files
Options

Merge branch 'chronic-master' of… 

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master
parents 16b46283 3d39a38f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 25 deletions
src/api/doctor/resident.js
View file @ c78d2c48
...@@ -8,3 +8,8 @@ export function queryResidentInfo(params) { ...@@ -8,3 +8,8 @@ export function queryResidentInfo(params) {
export function queryVisitByPage(params, loading) { export function queryVisitByPage(params, loading) {
return fetchBase({ url: `/chronic-admin/v1/chronic-visit-record/page`, body: params, loading }) return fetchBase({ url: `/chronic-admin/v1/chronic-visit-record/page`, body: params, loading })
} }
//更新居民基本信息
export function updateResident(params) {
return fetchBase({ url: `/chronic-admin/v1/chronic-residents-record/update`, body: params, loading: true })
}
\ No newline at end of file
src/doctor/followUp/generalFU/form/GeneralFUForm.vue
View file @ c78d2c48
...@@ -184,8 +184,12 @@ export default { ...@@ -184,8 +184,12 @@ export default {
return { return {
store: useStore(), store: useStore(),
form: {}, form: {},
//展示用
imgList: [], imgList: [],
imgList2: [], imgList2: [],
//input图片值
imgInputList1: [],
imgInputList2: [],
showDate: false, showDate: false,
rules: { rules: {
nextVisitDate: [{required: true,message: '请选择'}] nextVisitDate: [{required: true,message: '请选择'}]
...@@ -197,8 +201,8 @@ export default { ...@@ -197,8 +201,8 @@ export default {
handler() { handler() {
this.form = this.setForm(this.info) this.form = this.setForm(this.info)
if (this.info.id) { if (this.info.id) {
this.imgList = this.info.uploadVisitRecordImageList || [] this.imgList = this.imgListInfo1
this.imgList2 = this.info.sceneVisitImageList || [] this.imgList2 = this.imgListInfo2
} }
}, },
immediate: true immediate: true
...@@ -231,7 +235,35 @@ export default { ...@@ -231,7 +235,35 @@ export default {
res = true res = true
} }
return res return res
},
imgListInfo1() {
const {uploadVisitRecordImageList = []} = this.info
uploadVisitRecordImageList.forEach((item, index) => {
item['imgFlag'] = ''
item['indexF'] = index + 1
if (item.fileType == 'pdf') {
item['imgFlag'] = 'pdf'
}
if (item.fileType == 'img') {
item['imgFlag'] = 'img'
}
})
return uploadVisitRecordImageList
},
imgListInfo2() {
const {sceneVisitImageList = []} = this.info
sceneVisitImageList.forEach((item, index) => {
item['imgFlag'] = ''
item['indexF'] = index + 1
if (item.fileType == 'pdf') {
item['imgFlag'] = 'pdf'
} }
if (item.fileType == 'img') {
item['imgFlag'] = 'img'
}
})
return sceneVisitImageList
},
}, },
methods: { methods: {
setForm(info = {}) { setForm(info = {}) {
...@@ -302,6 +334,7 @@ export default { ...@@ -302,6 +334,7 @@ export default {
} }
}) })
this.imgList = this.imgList.concat(newFile) this.imgList = this.imgList.concat(newFile)
this.imgInputList1 = this.imgInputList1.concat(newFile)
}, },
choiceImg2() { choiceImg2() {
let input = document.getElementById('imgId2') let input = document.getElementById('imgId2')
...@@ -320,6 +353,8 @@ export default { ...@@ -320,6 +353,8 @@ export default {
} }
}) })
this.imgList2 = this.imgList2.concat(newFile) this.imgList2 = this.imgList2.concat(newFile)
console.log(this.imgList2)
this.imgInputList2 = this.imgInputList2.concat(newFile)
}, },
//图片预览 //图片预览
toPreview(index) { toPreview(index) {
...@@ -340,9 +375,11 @@ export default { ...@@ -340,9 +375,11 @@ export default {
}, },
delImg(index) { delImg(index) {
this.imgList = this.imgList.filter(item => item.indexF != index) this.imgList = this.imgList.filter(item => item.indexF != index)
this.imgInputList1 = this.imgInputList1.filter(item => item.indexF != index)
}, },
delImg2(index) { delImg2(index) {
this.imgList2 = this.imgList2.filter(item => item.indexF != index) this.imgList2 = this.imgList2.filter(item => item.indexF != index)
this.imgInputList2 = this.imgInputList2.filter(item => item.indexF != index)
}, },
dataConfirm({ selectedValues }) { dataConfirm({ selectedValues }) {
this.form.nextVisitDate = selectedValues.join('-') this.form.nextVisitDate = selectedValues.join('-')
...@@ -354,6 +391,8 @@ export default { ...@@ -354,6 +391,8 @@ export default {
let par = { let par = {
img1: this.imgList || [], img1: this.imgList || [],
img2: this.imgList2 || [], img2: this.imgList2 || [],
imgInput1: this.imgInputList1,
imgInput2: this.imgInputList2,
...this.form, ...this.form,
healthGuideContent: JSON.stringify(this.form.visitHealthGuideList) healthGuideContent: JSON.stringify(this.form.visitHealthGuideList)
} }
......
src/doctor/followUp/generalFU/form/Index.vue
View file @ c78d2c48
<template> <template>
<div> <div>
<van-nav-bar title='新增通用随访' left-text='' left-arrow @click-left='toBack'></van-nav-bar> <van-nav-bar :title="routerDetail.id ? '修改通用随访': '新增通用随访'" left-text='' left-arrow @click-left='toBack'></van-nav-bar>
<div class='p-4 h-overflow'> <div class='p-4 h-overflow'>
<base-info :info='info' v-show='step == 1' ref='baseInfo' <base-info :info='info' v-show='step == 1' ref='baseInfo'
@changeVisitSituation='changeVisitSituation'></base-info> @changeVisitSituation='changeVisitSituation'></base-info>
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
</div> </div>
<div class='pt-2 pb-2'> <div class='pt-2 pb-2'>
<div class='px-5 grow flex flex-col justify-end' v-if='step == 1'> <div class='px-5 grow flex flex-col justify-end' v-if='step == 1'>
<van-button type='primary' block round v-if='visitSituation ==1' <van-button type='primary' block round v-if='visitSituation == 1'
@click='toNext(2)'>下一步 @click='toNext(2)'>下一步
</van-button> </van-button>
<van-button type='primary' block round v-if='visitSituation ==2' <van-button type='primary' block round v-if='visitSituation == 2'
@click='toNext(3)'>下一步 @click='toNext(3)'>下一步
</van-button> </van-button>
</div> </div>
...@@ -72,6 +72,17 @@ export default { ...@@ -72,6 +72,17 @@ export default {
methods: { methods: {
async init() { async init() {
this.info = {} this.info = {}
if (this.routerDetail.id) {
const res = await fetchCurrencyById({ id: this.routerDetail.id })
let result = res.data || {}
const {residentsRecord = {}} = result
const {id, ...others} = residentsRecord
this.info = {
...others,
personId: id,
...result
}
} else {
const res = await getChronicResidentsId(this.routerDetail.residentInfoId) const res = await getChronicResidentsId(this.routerDetail.residentInfoId)
const { const {
id, id,
...@@ -90,13 +101,8 @@ export default { ...@@ -90,13 +101,8 @@ export default {
...others ...others
} }
this.info.diseaseType = this.routerDetail.diseaseType this.info.diseaseType = this.routerDetail.diseaseType
if (this.routerDetail.id) {
const res = await fetchCurrencyById({ id: this.routerDetail.id })
let result = res.data || {}
this.info = {
...result
}
} }
}, },
async toNext(val) { async toNext(val) {
if (val == 2) { if (val == 2) {
...@@ -113,6 +119,7 @@ export default { ...@@ -113,6 +119,7 @@ export default {
//图片上传 //图片上传
async upload(imgList = []) { async upload(imgList = []) {
let list = [] let list = []
if (imgList.length) {
let fileId = Math.random().toString(16).substring(2, 8) let fileId = Math.random().toString(16).substring(2, 8)
let data = new FormData() let data = new FormData()
data.append('parentId', fileId) data.append('parentId', fileId)
...@@ -124,29 +131,48 @@ export default { ...@@ -124,29 +131,48 @@ export default {
result.forEach(item => { result.forEach(item => {
list.push(item.id) list.push(item.id)
}) })
return list.join() }
return list
},
//原图片数据处理
baseImgHandle(imgList = []) {
let list = []
imgList.forEach(item => {
list.push(item.id)
})
return list
}, },
async onsubmit() { async onsubmit() {
debugger
let baseInfo = await this.$refs.baseInfo.onSubmit() let baseInfo = await this.$refs.baseInfo.onSubmit()
let generalFUForm = await this.$refs.generalFUForm.onSubmit() let generalFUForm = await this.$refs.generalFUForm.onSubmit()
let commonBottom = await this.$refs.commonBottom.onSubmit() let commonBottom = await this.$refs.commonBottom.onSubmit()
let imgInput1List = []
let imgInput2List = []
let uploadVisitRecord = '' let uploadVisitRecord = ''
let sceneVisitImage = '' let sceneVisitImage = ''
let fileId2 = Math.random().toString(16).substring(2, 8)
//图片上传 //图片上传
if (generalFUForm.imgInput1.length) {
imgInput1List = await this.upload(generalFUForm.imgInput1)
}
if (generalFUForm.imgInput2.length) {
imgInput2List = await this.upload(generalFUForm.imgInput2)
}
if (generalFUForm.img1.length) { if (generalFUForm.img1.length) {
uploadVisitRecord = await this.upload(generalFUForm.img1) let img1List = this.baseImgHandle(generalFUForm.img1)
let lsit1 = [...imgInput1List, ...img1List]
uploadVisitRecord = Array.from(new Set(lsit1)).join()
} }
if (generalFUForm.img2.length) { if (generalFUForm.img2.length) {
sceneVisitImage = await this.upload(generalFUForm.img2) let img2List = this.baseImgHandle(generalFUForm.img2)
let lsit2 = [...imgInput2List, ...img2List]
sceneVisitImage = Array.from(new Set(lsit2)).join()
} }
let params = { let params = {
...baseInfo, ...baseInfo,
...generalFUForm, ...generalFUForm,
...commonBottom, ...commonBottom,
uploadVisitRecord, uploadVisitRecord,
sceneVisitImage sceneVisitImage,
} }
if (this.info.id) { if (this.info.id) {
params.visitRecordId = this.info.visitRecordId params.visitRecordId = this.info.visitRecordId
...@@ -165,15 +191,15 @@ export default { ...@@ -165,15 +191,15 @@ export default {
if (this.visitSituation == 1) { if (this.visitSituation == 1) {
if (this.step != 1) { if (this.step != 1) {
this.step-- this.step--
}
return return
} }
}
if (this.visitSituation == 2) { if (this.visitSituation == 2) {
if (this.step != 1) { if (this.step != 1) {
this.step = 1 this.step = 1
}
return return
} }
}
this.$router.back() this.$router.back()
} }
} }
......
src/doctor/resident/Base.vue
View file @ c78d2c48
...@@ -86,7 +86,10 @@ export default { ...@@ -86,7 +86,10 @@ export default {
}, },
methods: { methods: {
toEdit() { toEdit() {
let par = {
residentInfoId: this.info.residentInfoId
}
this.$router.push({path: `/doctor/resident/base/update`, query: par})
} }
} }
......
src/doctor/resident/Visit.vue
View file @ c78d2c48
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
finished-text="没有更多了" finished-text="没有更多了"
@load="onMore" @load="onMore"
> >
<div v-for='item in list' :key="item.id" class="p-4 mt-3 card"> <div v-for='item in list' :key="item.id" class="p-4 mt-3 card" @click.stop='toDetail(item)'>
<div class='flex items-center'> <div class='flex items-center'>
<div class='detail-left'> <div class='detail-left'>
随访情况 随访情况
...@@ -67,8 +67,8 @@ ...@@ -67,8 +67,8 @@
<div class="flex justify-end"> <div class="flex justify-end">
<van-button round type="primary" class="card-bt" style="margin-right: .12rem" <van-button round type="primary" class="card-bt" style="margin-right: .12rem"
@click="editBtn(item)">修改</van-button> @click.stop="editBtn(item)">修改</van-button>
<van-button round type="primary" class="card-bt" @click="delBtn(item)">删除</van-button> <van-button round type="primary" class="card-bt" @click.stop="delBtn(item)">删除</van-button>
</div> </div>
<span class="px-3 float-bt"> <span class="px-3 float-bt">
...@@ -176,9 +176,32 @@ export default { ...@@ -176,9 +176,32 @@ export default {
showToast('该居民已标记为死亡，无法新增随访') showToast('该居民已标记为死亡，无法新增随访')
return return
} }
let par = {
residentInfoId: this.baseInfo.residentInfoId
}
this.$router.push({
path: `/doctor/followUp/generalFU/add`,
query: par
})
},
toDetail(item) {
let par = {
relationId: item. relationId
}
this.$router.push({
path: `/doctor/followUp/generalFU/detail`,
query: par
})
}, },
editBtn(item) { editBtn(item) {
let par = {
id: item.relationId,
residentInfoId: this.baseInfo.residentInfoId
}
this.$router.push({
path: `/doctor/followUp/generalFU/add`,
query: par
})
}, },
delBtn(item) { delBtn(item) {
showConfirmDialog({ showConfirmDialog({
......
src/doctor/resident/form/BaseInfo.vue 0 → 100644
View file @ c78d2c48
This diff is collapsed.
src/router/index.js
View file @ c78d2c48
...@@ -67,7 +67,13 @@ const routes = [ ...@@ -67,7 +67,13 @@ const routes = [
component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/resident/Visit.vue') component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/resident/Visit.vue')
}, },
] ]
} },
//修改基本信息
{
path: 'resident/base/update',
name: 'doctor-resident-base-update',
component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/resident/form/BaseInfo.vue')
},
] ]
} }
] ]
......
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