Skip to content

P
pica.cloud.web-education-admin
提交 25f50462 编写于 作者: yi.li's avatar yi.li
浏览文件
操作

Merge branch 'dev-followUp-20190312' of... 

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312
上级 b84eebdb b2a60e52
显示空白字符变更
内嵌 并排
正在显示 包含 163 行增加 和 115 行删除
src/store/followup/planManage.js
浏览文件 @ 25f50462
...@@ -50,8 +50,9 @@ export default { ...@@ -50,8 +50,9 @@ export default {
state.groupList = payload.labelDtoList state.groupList = payload.labelDtoList
}, },
GET_RESIDENT_DETAIL(state, payload) { GET_RESIDENT_DETAIL(state, payload) {
console.log('居民信息', payload)
state.residentDetail = payload state.residentDetail = payload
state.timeNodeList = payload.fPlanPatientDatilDtoList.timeNodeList state.timeNodeList = payload.fPlanDto.fPlanTimeReqList
}, },
GET_PLAN_DETAIL(state, payload) { GET_PLAN_DETAIL(state, payload) {
state.planDetail = payload state.planDetail = payload
...@@ -120,9 +121,10 @@ export default { ...@@ -120,9 +121,10 @@ export default {
}); });
}, },
getResidentDetail(context, payload) { getResidentDetail(context, payload) {
getResidentDetail({ getResidentDetail(
...payload payload.planId,
}).then(({data}) => { payload.patientId
).then(({data}) => {
context.commit('GET_RESIDENT_DETAIL', data); context.commit('GET_RESIDENT_DETAIL', data);
}); });
}, },
......
src/utils/fetch.js
浏览文件 @ 25f50462
import axios from 'axios' import axios from 'axios'
import { Loading } from 'element-ui';
import store from '../store' import store from '../store'
// import { getHostnameAndPort } from '../utils' // import { getHostnameAndPort } from '../utils'
// axios.defaults.withCredentials = true // axios.defaults.withCredentials = true
...@@ -9,12 +10,18 @@ const service = axios.create({ ...@@ -9,12 +10,18 @@ const service = axios.create({
withCredentials: false withCredentials: false
}) })
let loadingInstance = Loading.service({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
// request拦截器 // request拦截器
service.interceptors.request.use(config => { service.interceptors.request.use(config => {
if( config.headers['sysCode']==undefined) { if( config.headers['sysCode']==undefined) {
config.headers['sysCode'] = 12 config.headers['sysCode'] = 12
} }
// config.headers['token'] = '8143DC2A026B4602BF7B746FB5AEE9A1' // config.headers['token'] = 'F211893E7F3042CCA8CBBB0B90951722'
config.headers['token'] = localStorage.getItem('storageToken') config.headers['token'] = localStorage.getItem('storageToken')
config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' }) config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
// if (config.data && config.data.setEntry) { // if (config.data && config.data.setEntry) {
...@@ -28,12 +35,14 @@ service.interceptors.request.use(config => { ...@@ -28,12 +35,14 @@ service.interceptors.request.use(config => {
return config return config
}, error => { }, error => {
// logger.debug('service.interceptors.request: ', error) // logger.debug('service.interceptors.request: ', error)
loadingInstance.close();
Promise.reject(error) Promise.reject(error)
}) })
// respone拦截器 // respone拦截器
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
loadingInstance.close();
const res = response.data const res = response.data
/* /*
baseUrl时，返回000000为成功 baseUrl时，返回000000为成功
...@@ -47,6 +56,7 @@ service.interceptors.response.use( ...@@ -47,6 +56,7 @@ service.interceptors.response.use(
}, },
error => { error => {
// logger.error('err' + error) // logger.error('err' + error)
loadingInstance.close();
return Promise.reject(error) return Promise.reject(error)
} }
) )
......
src/utils/followup/followapis.js
浏览文件 @ 25f50462
...@@ -100,21 +100,20 @@ export const getGroupList = (params) => { ...@@ -100,21 +100,20 @@ export const getGroupList = (params) => {
description: '获取分组列表', description: '获取分组列表',
}) })
}; };
export const getResidentDetail = (params) => { export const getResidentDetail = (planId,patientId) => {
return fetch({ return fetch({
headers, headers,
url: getFollowUpSC(`/followup/planPatient/detail`), url: getFollowUpSC(`/followup/planPatient/${planId}/detail/${patientId}`),
method: 'get', method: 'get',
params: params,
description: '获取居民详情', description: '获取居民详情',
}) })
}; };
export const changePlan = (params) => { export const changePlan = (data) => {
return fetch({ return fetch({
headers, headers,
url: getFollowUpSC(`/followup/planPatient/change`), url: getFollowUpSC(`/followup/planPatient/change`),
method: 'put', method: 'put',
params: params, data: data,
description: '变更计划', description: '变更计划',
}) })
}; };
......
src/views/followup/plan-manage/dialog/set-time-form.vue
浏览文件 @ 25f50462
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
callback(); callback();
} }
return { return {
// comentMsg: {},//选择的漫画信息
isSelectCartoon: false, isSelectCartoon: false,
followResourceId: '', followResourceId: '',
pushDay: '', pushDay: '',
...@@ -123,9 +122,6 @@ ...@@ -123,9 +122,6 @@
timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
type: [{ required: true, message: '请选择随访方式', trigger: 'change' }], type: [{ required: true, message: '请选择随访方式', trigger: 'change' }],
}, },
// totalNumber: 0,
// wechatPatientNum: 0,
// messagePatientNum: 0
} }
}, },
props: { props: {
...@@ -140,6 +136,10 @@ ...@@ -140,6 +136,10 @@
patientIdList: Array patientIdList: Array
}, },
watch: { watch: {
// timeForm(val){
// this.timeForm = val
// console.log('表单子组件监听到的form数据',this.timeForm)
// },
valBegin(val){ valBegin(val){
if(val){ if(val){
this.$refs[this.timeForm.formRef].validate((valid) => { this.$refs[this.timeForm.formRef].validate((valid) => {
...@@ -181,14 +181,22 @@ ...@@ -181,14 +181,22 @@
this.timeForm.hasSelected = ''; this.timeForm.hasSelected = '';
}, },
pushConmentMsg(val){ pushConmentMsg(val){
// this.comentMsg = val
this.timeForm.comentMsg = val this.timeForm.comentMsg = val
getPatientNumber({ getPatientNumber({
patientIdList: this.patientIdList patientIdList: this.patientIdList
}).then(res=>{ }).then(res=>{
if(res.code=='000000'){
this.timeForm.wechatPatientNum = res.data.wechatPatientNum this.timeForm.wechatPatientNum = res.data.wechatPatientNum
this.timeForm.messagePatientNum = res.data.messagePatientNum this.timeForm.messagePatientNum = res.data.messagePatientNum
this.timeForm.totalNumber = this.timeForm.wechatPatientNum + this.timeForm.messagePatientNum this.timeForm.totalNumber = this.timeForm.wechatPatientNum + this.timeForm.messagePatientNum
}else{
this.$notify.success({
title: '提交失败',
message: res.message,
showClose: false
});
}
}) })
} }
}, },
......
src/views/followup/plan-manage/dialog/set-time-node.vue
浏览文件 @ 25f50462
<template> <template>
<div> <div>
<p><el-button plain icon="el-icon-plus" size="small" round @click="addNewNode(timeForm.formRef)">新增时间节点</el-button><br></p> <p><el-button plain icon="el-icon-plus" size="small" round @click="addNewNode">新增时间节点</el-button><br></p>
<div class="add-time-content"> <div class="add-time-content">
<div class="time-line-scroll"> <div class="time-line-scroll">
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
</el-radio-group> </el-radio-group>
</div> </div>
<!--查看时间节点-->
<div class="form-div" v-if="activeTab != 'setNewRef'"> <div class="form-div" v-if="activeTab != 'setNewRef'">
<div v-for="(timeFormHas, index) in setTimeNodeList1" :key="index" :label="index"> <div v-for="(timeFormHas, index) in setTimeNodeList1" :key="index" :label="index">
<set-time-form <set-time-form
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
</div> </div>
</div> </div>
<!--新增时间节点-->
<div class="form-div" v-if="activeTab == 'setNewRef'"> <div class="form-div" v-if="activeTab == 'setNewRef'">
<set-time-form <set-time-form
:timeForm="timeForm" :timeForm="timeForm"
...@@ -64,24 +66,7 @@ ...@@ -64,24 +66,7 @@
import {getFormOptions} from '@/utils/followup/followapis' import {getFormOptions} from '@/utils/followup/followapis'
import { mapState,mapActions } from 'vuex' import { mapState,mapActions } from 'vuex'
const timeFormInit = {
formRef: '',
type: '',//随访方式
timeNo: '',//随访时间
timeUnit: '',//随访时间单位
remindList: [],//提醒医生预约提前天数
pushContentList: [],//推送患教提前天数 漫画id
followupList: [],//随访量表id
hasSelected: '',
isDisabled: false,
remindDay: '',
pushDay: '',
followResourceId: '',
comentMsg: {},
totalNumber: 0,
wechatPatientNum: 0,
messagePatientNum: 0
};
export default { export default {
components: { components: {
...@@ -96,7 +81,7 @@ ...@@ -96,7 +81,7 @@
activeTab: null, activeTab: null,
currentFormRef: 1, currentFormRef: 1,
showSetBtn: true, showSetBtn: true,
timeForm: _.cloneDeep(timeFormInit), timeForm: {},
timeFormRules: { timeFormRules: {
timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeNo: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }], timeUnit: [{ required: true, message: '请添加随访时间', trigger: 'change' }],
...@@ -108,6 +93,7 @@ ...@@ -108,6 +93,7 @@
setTimeNodeList: Array, setTimeNodeList: Array,
patientIdList: Array, patientIdList: Array,
checkForm: Boolean, checkForm: Boolean,
saveStatus: Boolean,
}, },
computed: { computed: {
...mapState('planManage',{ ...mapState('planManage',{
...@@ -129,8 +115,8 @@ ...@@ -129,8 +115,8 @@
}, },
}, },
created() { created() {
this.initNewForm();
this.getConstData() this.getConstData()
//初始化一个随访时间节点 //初始化一个随访时间节点
this.activeTab = 'setNewRef'; this.activeTab = 'setNewRef';
this.timeForm.formRef = this.getNowTime(); this.timeForm.formRef = this.getNowTime();
...@@ -140,25 +126,31 @@ ...@@ -140,25 +126,31 @@
} }
}, },
watch: { watch: {
checkForm(val){ saveStatus(val){
// console.log(val)
if(val){ if(val){
// 触发 保存 校验 // 校验通过并且保存一个时间节点，通知外层
this.saveValiedBegin = true // this.setTimeNodeList.push(this.timeForm);
}else{ }else{
this.saveValiedBegin = false
} }
}, },
checkForm(val){
// 触发 保存 校验
this.saveValiedBegin = val
},
valBegin(val){ valBegin(val){
this.valBegin = val this.valBegin = val
}, },
timeForm(newVal, oldVal) { timeForm(val) {
if(this.setTimeNodeList.length>0) { if(this.setTimeNodeList.length>0) {
this.timeForm.isDisabled = true; this.timeForm.isDisabled = true;
this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit; this.timeForm.timeUnit = this.setTimeNodeList[0].timeUnit;
} }
this.timeForm = val
console.log('表单父组件的数据',this.timeForm)
}, },
setTimeNodeList1(newVal, oldVal) { setTimeNodeList1(val) {
if(val.length > 0){
this.setTimeNodeList1.map(item=>{ this.setTimeNodeList1.map(item=>{
item.isDisabled = true; item.isDisabled = true;
item.timeUnit = this.setTimeNodeList1[0].timeUnit item.timeUnit = this.setTimeNodeList1[0].timeUnit
...@@ -169,6 +161,7 @@ ...@@ -169,6 +161,7 @@
}) })
}); });
this.setTimeNodeList1[0].isDisabled = false; this.setTimeNodeList1[0].isDisabled = false;
}
}, },
}, },
methods: { methods: {
...@@ -193,6 +186,7 @@ ...@@ -193,6 +186,7 @@
this.getFormOptions() this.getFormOptions()
}, },
// 校验通过之后，需要新增一个新的初始化的表单
checkValid(obj){ checkValid(obj){
this.valBegin = false this.valBegin = false
console.log('校验结果',obj.valid) console.log('校验结果',obj.valid)
...@@ -207,7 +201,9 @@ ...@@ -207,7 +201,9 @@
if(this.timeForm.pushDay){ if(this.timeForm.pushDay){
this.timeForm.pushContentList.push({ this.timeForm.pushContentList.push({
startDays: this.timeForm.pushDay, startDays: this.timeForm.pushDay,
resourceId: '' // resourceId: '',
resourceId: this.timeForm.comentMsg.id
}) })
} }
if(this.timeForm.followResourceId.length>0){ if(this.timeForm.followResourceId.length>0){
...@@ -219,19 +215,21 @@ ...@@ -219,19 +215,21 @@
} }
this.setTimeNodeList.push(this.timeForm); this.setTimeNodeList.push(this.timeForm);
this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
if(obj.type=='save'){ if(obj.type=='save'){
console.log('是点击保存时候的校验，因此告诉最外层的 new-plan 组件，校验结果') console.log('是点击保存时候的校验，因此告诉最外层的 new-plan 组件，校验结果')
this.$emit('addListenSave',true) this.$emit('addListenSave',true)
} }else{
// this.timeForm = _.cloneDeep(timeFormInit);
this.timeForm = timeFormInit this.initNewForm();
// console.log('初始化过之后activeTab=====> ',this.activeTab)
this.timeForm.formRef = this.getNowTime(); this.timeForm.formRef = this.getNowTime();
this.timeForm.isDisabled = true; this.timeForm.isDisabled = true;
}
this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
} else { } else {
// 告诉 保存 按钮， 校验没通过 // 告诉 保存 按钮， 校验没通过
if(obj.type=='save'){ if(obj.type=='save'){
...@@ -242,21 +240,47 @@ ...@@ -242,21 +240,47 @@
return return
} }
}, },
addNewNode(formName) { // 点击 新增时间节点
console.log(this.activeTab) addNewNode() {
console.log('是否新增一个新的时间节点 ' + (this.activeTab == 'setNewRef'))
// 新增，则进行校验表单字段 触发校验
if(this.activeTab == 'setNewRef') {
if(this.activeTab !== 'setNewRef') { this.valBegin = true
}else {
// 否则切换 已经新增的表单至新增节点表单
this.activeTab = 'setNewRef'; this.activeTab = 'setNewRef';
this.showSetBtn = true; this.showSetBtn = true;
this.timeForm = _.cloneDeep(timeFormInit); this.initNewForm()
this.timeForm.formRef = this.getNowTime();
}else {
// 触发校验
this.valBegin = true
} }
console.log(this.timeForm) console.log(this.timeForm)
}, },
// 初始化新的表单
initNewForm(){
const timeFormInit = {
formRef: '',
type: '',//随访方式
timeNo: '',//随访时间
timeUnit: '',//随访时间单位
remindList: [],//提醒医生预约提前天数
pushContentList: [],//推送患教提前天数 漫画id
followupList: [],//随访量表id
hasSelected: '',
isDisabled: false,
remindDay: [],
pushDay: '',
followResourceId: [],
comentMsg: {},
totalNumber: 0,
wechatPatientNum: 0,
messagePatientNum: 0
};
this.timeForm = timeFormInit;
this.timeForm.formRef = this.getNowTime();
},
goSelectCartoon() { goSelectCartoon() {
this.isSelectCartoon = true; this.isSelectCartoon = true;
}, },
...@@ -268,11 +292,12 @@ ...@@ -268,11 +292,12 @@
this.timeForm.hasSelected = ''; this.timeForm.hasSelected = '';
}, },
changeTab(val){ changeTab(val){
console.log(val)
this.activeTab = val; this.activeTab = val;
console.log('当前的activeTab ',val)
if(val == 'setNewRef') { if(val == 'setNewRef') {
this.timeForm = _.cloneDeep(timeFormInit); this.initNewForm();
this.timeForm.formRef = this.getNowTime();
} }
}, },
deleteTimeNode(item, index) { deleteTimeNode(item, index) {
...@@ -282,8 +307,7 @@ ...@@ -282,8 +307,7 @@
//新增一个form //新增一个form
this.activeTab = 'setNewRef'; this.activeTab = 'setNewRef';
this.showSetBtn = true; this.showSetBtn = true;
this.timeForm = _.cloneDeep(timeFormInit); this.initNewForm();
this.timeForm.formRef = this.getNowTime();
} }
}, },
deleteAddNode() { deleteAddNode() {
......
src/views/followup/plan-manage/new-plan.vue
浏览文件 @ 25f50462
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
</el-form-item> </el-form-item>
<el-form-item label="随访居民" required prop="hasSelectedNum"> <el-form-item label="随访居民" required prop="hasSelectedNum">
<div style="display: flex"> <div style="display: flex">
<div class="select-patients"> <div>
<el-button plain icon="el-icon-plus" @click="selectPatientHandler">{{baseInfo.hasSelectedNum ? '继续添加' : '选择居民'}}</el-button><br> <el-button plain icon="el-icon-plus" :style="noChoice?'border:1px solid red;':''" @click="selectPatientHandler">{{baseInfo.hasSelectedNum ? '继续添加' : '选择居民'}}</el-button><br>
<el-button type="text" class="mt10" @click="seeSelectedHandler" v-if="baseInfo.hasSelectedNum">已选{{baseInfo.hasSelectedNum}}人<i class="el-icon-arrow-right"></i></el-button> <el-button type="text" class="mt10" @click="seeSelectedHandler" v-if="baseInfo.hasSelectedNum">已选{{baseInfo.hasSelectedNum}}人<i class="el-icon-arrow-right"></i></el-button>
</div> </div>
<p class="err-tips" v-if="noChoice">请添加随访居民</p> <p class="err-tips" v-if="noChoice">请添加随访居民</p>
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
clearable clearable
style="width:380px;"> style="width:380px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-select <el-select
...@@ -84,6 +85,7 @@ ...@@ -84,6 +85,7 @@
@setTimeNodeListOnCom="setTimeNodeListOnCom" @setTimeNodeListOnCom="setTimeNodeListOnCom"
:patientIdList="baseInfo.patientIdList" :patientIdList="baseInfo.patientIdList"
:checkForm="checkForm" :checkForm="checkForm"
:saveStatus="saveStatus"
@addListenSave="addListenSave" @addListenSave="addListenSave"
/> />
</div> </div>
...@@ -123,13 +125,16 @@ ...@@ -123,13 +125,16 @@
data() { data() {
return { return {
checkForm: false, checkForm: false,
saveStatus: false,
/*面包屑配置*/ /*面包屑配置*/
curmbFirst: '随访管理', curmbFirst: '随访管理',
curmbSecond: '计划管理', curmbSecond: '计划管理',
curmbThird: '新建随访计划', curmbThird: '新建随访计划',
jumPathThird: '/followUp/plan-manage', jumPathThird: '/followUp/plan-manage',
activeTab: 'first', activeTab: 'first',
noName: false,
noResourceId: false,
noTime: false,
noChoice: false, noChoice: false,
baseInfo: { baseInfo: {
name: '',//随访计划名称 name: '',//随访计划名称
...@@ -166,11 +171,6 @@ ...@@ -166,11 +171,6 @@
//清理store中存的数据setTimeNodeList //清理store中存的数据setTimeNodeList
}, },
// watch: {
// checkForm(val){
// this.checkForm = val
// }
// },
computed: { computed: {
...mapState('planManage',{ ...mapState('planManage',{
setTimeNodeList: state => state.setTimeNodeList, setTimeNodeList: state => state.setTimeNodeList,
...@@ -214,6 +214,7 @@ ...@@ -214,6 +214,7 @@
message: res.message, message: res.message,
showClose: false showClose: false
}); });
this.saveStatus = false
} }
}) })
// console.log('保存setTimeNodeList1',this.$refs.getTimeNodeList.setTimeNodeList1) // console.log('保存setTimeNodeList1',this.$refs.getTimeNodeList.setTimeNodeList1)
...@@ -239,10 +240,12 @@ ...@@ -239,10 +240,12 @@
let getArguments = arguments[0]; let getArguments = arguments[0];
this.isShowSelectPatient = getArguments[0]; this.isShowSelectPatient = getArguments[0];
const selectPatients = getArguments[1]; // 每次选中获取的人 const selectPatients = getArguments[1]; // 每次选中获取的人
this.hasSelectedList = selectPatients; // this.hasSelectedList = selectPatients;
this.baseInfo.patientIdList = [];
selectPatients.forEach((item)=>{ selectPatients.forEach((item)=>{
if(!this.baseInfo.patientIdList.includes(item.patientId)){
this.hasSelectedList.push(item)
this.baseInfo.patientIdList.push(item.patientId); // 页面中数据存储所有选择的人，没有去重 this.baseInfo.patientIdList.push(item.patientId); // 页面中数据存储所有选择的人，没有去重
}
}) })
this.baseInfo.hasSelectedNum = this.baseInfo.patientIdList.length; this.baseInfo.hasSelectedNum = this.baseInfo.patientIdList.length;
}, },
...@@ -267,6 +270,8 @@ ...@@ -267,6 +270,8 @@
// this.getTimeNodeList([]); // this.getTimeNodeList([]);
//为方便调试，不做校验 //为方便调试，不做校验
// this.activeTab = 'second'; // this.activeTab = 'second';
this.$refs[formName].validate((valid) => {
//用作校验 //用作校验
if(!this.baseInfo.hasSelectedNum) { if(!this.baseInfo.hasSelectedNum) {
this.noChoice = true this.noChoice = true
...@@ -274,7 +279,6 @@ ...@@ -274,7 +279,6 @@
}else { }else {
this.noChoice = false this.noChoice = false
} }
this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
// this.$refs['statusForm'].resetFields(); // this.$refs['statusForm'].resetFields();
this.activeTab = 'second'; this.activeTab = 'second';
...@@ -350,9 +354,6 @@ ...@@ -350,9 +354,6 @@
} }
}
.select-patients{
} }
.err-tips{ .err-tips{
color: #F56C6C; color: #F56C6C;
......
src/views/followup/plan-manage/resident-detail.vue
浏览文件 @ 25f50462
...@@ -14,51 +14,51 @@ ...@@ -14,51 +14,51 @@
<el-button class="button-white" plain size="small" @click="finishFollowup">结束随访</el-button> <el-button class="button-white" plain size="small" @click="finishFollowup">结束随访</el-button>
</div> </div>
</div> </div>
<div class="base-info" v-if="residentDetail.fPlanPatientDatilDtoList"> <div class="base-info">
<div class="resident-info base-content"> <div class="resident-info base-content">
<div class="content-div"> <div class="content-div">
<div class="c-title">姓名：</div> <div class="c-title">姓名：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.nickName}}</div> <div class="c-content">{{residentDetail.patientName}}</div>
</div> </div>
<div class="content-div "> <div class="content-div ">
<div class="c-title">性别：</div> <div class="c-title">性别：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.sexName}}</div> <div class="c-content">{{residentDetail.sexName}}</div>
</div> </div>
<div class="content-div"> <div class="content-div">
<div class="c-title">年龄：</div> <div class="c-title">年龄：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.sexName}}</div> <div class="c-content">{{residentDetail.age}}</div>
</div> </div>
<div class="content-div"> <div class="content-div">
<div class="c-title">身份证号：</div> <div class="c-title">身份证号：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.cardNo}}</div> <div class="c-content">{{residentDetail.idNo}}</div>
</div> </div>
<div class="content-div"> <div class="content-div">
<div class="c-title">联系方式：</div> <div class="c-title">联系方式：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.mobile}}</div> <div class="c-content">{{residentDetail.mobilePhone}}</div>
</div> </div>
</div> </div>
<div class="group-info base-content"> <div class="group-info base-content">
<div class="content-div"> <div class="content-div">
<div class="c-title">分组：</div> <div class="c-title">分组：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.labelName}}</div> <div class="c-content">{{residentDetail.labelName}}</div>
</div> </div>
</div> </div>
<div class="followup-info base-content"> <div class="followup-info base-content">
<div class="content-div"> <div class="content-div">
<div class="c-title">随访模板：</div> <div class="c-title">随访模板：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.planTemplate}}</div> <div class="c-content">{{planDetails.resourceName}}</div>
</div> </div>
<div class="content-div"> <div class="content-div">
<div class="c-title">随访开始时间：</div> <div class="c-title">随访开始时间：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.time}}</div> <div class="c-content">{{planDetails.timeStr}}</div>
</div> </div>
<div class="content-div"> <div class="content-div">
<div class="c-title">备注：</div> <div class="c-title">备注：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.remark}}</div> <div class="c-content">{{planDetails.remarksStatusStr}}</div>
</div> </div>
<div class="content-div"> <div class="content-div">
<div class="c-title">随访状态：</div> <div class="c-title">随访状态：</div>
<div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.statusName}}</div> <div class="c-content">{{planDetails.statusName}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<p class="title">随访时间节点</p> <p class="title">随访时间节点</p>
<div class="node-div"> <div class="node-div">
<el-radio-group v-model="timeNodes" size="small"> <el-radio-group v-model="timeNodes" size="small">
<el-radio-button :key="item.nodeId" v-for="item in timeNodeList" :label="item.nodeId">{{item.timeNodeContent}}</el-radio-button> <el-radio-button :key="item.id" v-for="item in timeNodeList" :label="item.id">{{item.timeStr}}</el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="followup-contents"> <div class="followup-contents">
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
showFinishFollowup: false, //是否展示结束随访, showFinishFollowup: false, //是否展示结束随访,
planChangeData: {}, //变更信息 planChangeData: {}, //变更信息
finishData: {}, //结束信息 finishData: {}, //结束信息
planDetails: {}, //计划详情
} }
}, },
created() { created() {
...@@ -155,7 +156,7 @@ ...@@ -155,7 +156,7 @@
...mapActions('planManage', ['getResidentDetail', 'getNodeTimeContent', 'getGroupList']), ...mapActions('planManage', ['getResidentDetail', 'getNodeTimeContent', 'getGroupList']),
changePlan() { changePlan() {
this.planChangeData = { this.planChangeData = {
group: this.residentDetail.fPlanPatientDatilDtoList.labelIds, group: this.residentDetail.labelName,
planId: this.residentDetail.fPlanPatientDatilDtoList.planId, planId: this.residentDetail.fPlanPatientDatilDtoList.planId,
startTime: this.residentDetail.fPlanPatientDatilDtoList.time startTime: this.residentDetail.fPlanPatientDatilDtoList.time
} }
...@@ -177,10 +178,13 @@ ...@@ -177,10 +178,13 @@
watch: { watch: {
timeNodeList(val) { timeNodeList(val) {
console.log('val1',val) console.log('val1',val)
this.timeNodes = val[0].nodeId this.timeNodes = val[0].id
}, },
timeNodes(val) { timeNodes(val) {
this.getNodeTimeContent(val) this.getNodeTimeContent(val)
},
residentDetail(val) {
this.planDetails = val.fPlanDto
} }
} }
} }
......
src/views/followup/reservation-manage/reservation-list.vue
浏览文件 @ 25f50462
...@@ -247,14 +247,14 @@ ...@@ -247,14 +247,14 @@
this.dialogDetailShow = true; this.dialogDetailShow = true;
}, },
setSearchData() { setSearchData() {
const { planName, mobilePhone, timeStatus, nickName } = this.searchData; const { planName, mobilePhone, timeStatus, nickname } = this.searchData;
let para = {} let para = {}
if(this.searchData.planTimes) { if(this.searchData.planTimes) {
para = { para = {
planName, planName,
mobilePhone, mobilePhone,
timeStatus, timeStatus,
nickName, nickname,
beginTime: this.searchData.planTimes[0], beginTime: this.searchData.planTimes[0],
endTime: this.searchData.planTimes[1], endTime: this.searchData.planTimes[1],
status: this.status status: this.status
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
planName, planName,
mobilePhone, mobilePhone,
timeStatus, timeStatus,
nickName, nickname,
status: this.status status: this.status
} }
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或