Skip to content

P
pica.cloud.web-education-admin
提交 4b59616c 编写于 作者: bo.dang's avatar bo.dang
浏览文件
操作

Merge remote-tracking branch 'origin/dev-followUp-20190312' into dev-followUp-20190312

上级 a71b20fa 7b1b5539
隐藏空白字符变更
内嵌 并排
正在显示 包含 304 行增加 和 173 行删除
package.json
浏览文件 @ 4b59616c
......@@ -11,6 +11,7 @@
"build": "node build/build.js",
"build:dev": "cross-env BUILD_ENV=dev node build/build.js",
"build:test": "cross-env BUILD_ENV=test node build/build.js",
"build:test2": "cross-env BUILD_ENV=test node build/build.js",
"build:uat": "cross-env BUILD_ENV=uat node build/build.js",
"build:pro": "cross-env BUILD_ENV=pro node build/build.js"
},
......
src/store/followup/planManage.js
浏览文件 @ 4b59616c
......@@ -136,6 +136,9 @@ export default {
...payload
}).then(({data}) => {
context.commit('GET_RESIDENT_LIST', data);
context.dispatch('getSelectResident',{
planId: payload.planId
})
});
},
getGroupList(context, payload) {
......@@ -159,6 +162,9 @@ export default {
getPlanDetail(context, payload) {
getPlanDetail(payload).then(({data}) => {
context.commit('GET_PLAN_DETAIL', data);
context.dispatch('getSelectResident',{
planId: data.id
})
});
},
getRemarkOption(context, payload) {
......@@ -261,6 +267,7 @@ export default {
},
getSelectResident(context, payload) {
getResidentList({
needEnd: 1,
...payload
}).then(({data}) => {
context.commit('GET_SELECT_RESIDENT', data);
......
src/utils/env-config.js
浏览文件 @ 4b59616c
......@@ -42,6 +42,17 @@ export const envConfig = {
yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
saasDomainUrl: 'https://test1.yunqueyi.com/',
},
test2: {
baseUrl: 'https://test1-sc.yunqueyi.com/',
qiniuFileUrl: "https://test1-sc.yunqueyi.com/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
qiniuImgUrl: "https://test1-file.yunqueyi.com",
loginUrl: 'https://test1.yunqueyi.com/pica-login/work_station.html',
innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
followUpSC: 'https://test2-work.yunqueyi.com/sc',
yuequeyiIndexUrl: 'https://test1.yunqueyi.com/pica_index.html',
saasDomainUrl: 'https://test1.yunqueyi.com/',
},
uat: {
baseUrl: 'https://uat-sc.yunqueyi.com/',
qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
......
src/views/followup/plan-manage/dialog/select-patient.vue
浏览文件 @ 4b59616c
......@@ -10,7 +10,13 @@
width="65%"
center>
<div class="finish-content">
<el-form ref="searchData" :model="searchData" :inline="true" class="select-width" size="small">
<el-form
ref="searchData"
:model="searchData"
:inline="true"
class="select-width"
size="small">
<el-form-item>
<el-select v-model="searchData.sex" @change="changeSex">
<el-option
......@@ -62,10 +68,13 @@
ref="multipleTable"
center
style="width: 100%;margin-top: 20px;"
:row-key="getRowKeys"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
align="center">
align="center"
:reserve-selection="true"
:selectable="checkboxInit">
</el-table-column>
<el-table-column
prop="nickname"
......@@ -89,13 +98,13 @@
min-width="150px">
</el-table-column>
<el-table-column
prop="diseaseId"
prop="showDiseaseNames"
label="基础疾病"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="labelId"
prop="showLabelName"
label="分组"
align="center"
:show-overflow-tooltip="true">
......@@ -124,7 +133,7 @@
</template>
<script>
import { mapState, mapActions } from 'vuex'
import { getBasicData, getPlanPatientsList, getAllDiseases, getAllLabels } from '@/utils/followup/followapis'
export default {
components: {},
......@@ -133,7 +142,7 @@
return {
showSelectPatient: true,
allSelects: [],
eachSelects: [],//仅仅是操作选择的总人员
// eachSelects: [],//仅仅是操作选择的总人员
// totalSelect: [],// 当前所选的人
labelId: '',
diseaseId: '',
......@@ -143,7 +152,6 @@
ageEnd: '',
srvPackageId: '',
searchCondition: '',
patientsData: [],
searchData: {
sex: '性别',
......@@ -175,12 +183,22 @@
labelId: '',
labelName: '分组'
}],
trueAdd:[], //真正新加
newSelects: [], //新选中的人
getRowKeys(row) {
// console.log('sshkdhdk',row)
return row.patientId;
},
}
},
computed: {
...mapState('planManage', {
eachSelects: state => state.eachSelects,
})
},
props: {
isShowSelectPatient: Boolean, //是否显示model,
patientIdList: Array,// 确定已经选过的居民
oldPatientIdList: Array,// 确定已经选过的居民
},
watch: {
isShowSelectPatient(val){
......@@ -221,31 +239,16 @@
})
}
},
eachSelects(val, oldVal){
if(val.length&&oldVal.length) {
console.log('新',val);
console.log('新',oldVal);
if(val.length>oldVal.length) {
let add = val.filter(function(n) {
return oldVal.indexOf(n) == -1
});
this.trueAdd.push(add)
console.log('加人',this.trueAdd)
} else if(val.length<=oldVal.length) {
let reduce = oldVal.filter(function(n) {
return val.indexOf(n) == -1
});
/*this.trueAdd = this.trueAdd.filter(function(n) {
return reduce.indexOf(n) == -1
});*/
console.log('减人',reduce)
} else {
}
}
}
},
methods: {
checkboxInit(row,index){
if(row.disableNum == undefined) {
return 1
} else {
return row.disableNum
}
},
getPatientsList(){
const data = {
pageSize: this.paginationSet.pageSize,
......@@ -265,15 +268,53 @@
this.getSex()
this.paginationSet.total = res.data.totalRows
// 设置所请求的当页人员是否成为选中状态
if(this.patientIdList.length > 0){
this.patientsData.forEach((item)=>{
// console.log('传入的已选居民',this.patientIdList)
this.patientsData.forEach((item)=>{
item.disableNum = 1;
let diseaseNames = [];
let groupNames = []
//转化分组
if(item.labelModels) {
item.labelModels.forEach(item => {
groupNames.push(item.label)
});
item.showLabelName = groupNames.join('、');
} else {
item.showLabelName = '-';
}
//转化疾病
if(item.patientTypeModels) {
item.patientTypeModels.forEach(item => {
diseaseNames.push(item.name)
})
item.showDiseaseNames = diseaseNames.join('、');
}else {
item.showDiseaseNames = '-';
}
if(this.patientIdList.length > 0){
if(this.patientIdList.includes(item.patientId)){// 如果已经选过居民
this.$nextTick(()=>{
this.$refs.multipleTable.toggleRowSelection(item,true);
})
}
})
}
}
if(this.oldPatientIdList!=undefined&&this.oldPatientIdList.length) {
this.patientsData.forEach((item)=>{
if(this.oldPatientIdList.includes(item.patientId)){// 如果已经选过居民
item.disableNum = 0
} else {
item.disableNum = 1
}
})
}
})
// console.log(this.oldPatientIdList)
}else{
this.patientsData = []
}
......@@ -296,12 +337,16 @@
},
// 选择居民
handleSelectionChange(val) {
console.log('每次选中居民',val)
this.eachSelects = val
const _this = this;
_this.newSelects = [];
val.forEach(item => {
if(item.disableNum == 1) {
_this.newSelects.push(item)
}
})
},
// 切换分页
handleCurrentChangePre(val) {
// console.log('handleCurrentChangePre')
this.paginationSet.pageNum = val
this.getPatientsList()
},
......@@ -309,7 +354,7 @@
this.$emit('closeSelectPatient',false)
},
sureClick(){
this.$emit('sureSelectPatient',false,this.eachSelects)
this.$emit('sureSelectPatient',false,this.newSelects)
},
handleSizeChangePre(val) {
// console.log('handleSizeChangePre')
......
src/views/followup/plan-manage/dialog/set-time-node.vue
浏览文件 @ 4b59616c
......@@ -101,11 +101,11 @@
</el-option>
</el-select>
<el-button plain class="ml20" @click="goSelectCartoon" v-if="showConment(itemTimeForm.change,itemTimeForm.hasSelected)">选择健康漫画</el-button>
<el-button plain class="ml20" @click="goSelectCartoon" v-if="showChoseComtent(itemTimeForm)">选择健康漫画</el-button>
<div class="selected-div ml20" v-if="itemTimeForm.hasSelected">
<span>《{{itemTimeForm.comentMsg.header_name}}》</span>
<el-button type="text" @click="goSelectCartoon" v-if="!isStandedTemplate">重选</el-button>
<el-button type="text" @click="deleteClick" v-if="!isStandedTemplate">删除</el-button>
<el-button type="text" @click="goSelectCartoon" v-if="showRechoseDelete(itemTimeForm)">重选</el-button>
<el-button type="text" @click="deleteClick" v-if="showRechoseDelete(itemTimeForm)">删除</el-button>
</div>
</div>
</el-form-item>
......@@ -311,22 +311,29 @@
},
created() {
this.setTimeNodeList = this.standedTimeNodeList
this.initNewForm();
this.getConstData();
// 如果是固定模板
// console.log(this.planId)
if(this.isStandedTemplate || this.planId){
this.activeTab = 0;
if(!this.isStandedTemplate && !this.planId){//新建计划并且是自定义模板
this.initNewForm();
}
},
watch: {
standedTimeNodeList(val){
this.setTimeNodeList = val
if(this.planId){//这一步，是处理新建计划选择固定模板，或者修改计划（无论固定还是自定义模板）监听传递进来的list
this.activeTab = 0;
this.timeForm = this.setTimeNodeList[this.activeTab]
this.timeForm.formRef = 'form' + this.activeTab;
}
this.$forceUpdate();
},
isStandedTemplate(val){
this.isStandedTemplate = val
console.log('是否固定模板',this.isStandedTemplate)
if(this.isStandedTemplate){
this.setTimeNodeList = this.standedTimeNodeList
this.activeTab = 0;
}
},
setTimeNodeList(val){
this.setTimeNodeList = val
......@@ -424,6 +431,7 @@
}else{ //自定义模板
// 如果直接点击保存，需要进行对当前填写的表单进行校验
console.log(this.timeForm)
const isValied = this.checkCurrentForm(this.timeForm.formRef);
this.isValied = isValied
if(isValied){
......@@ -439,14 +447,12 @@
// 新增成功之后
this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo')
}
if(this.isValied){
this.$emit('addListenSave',{
status: true,
setTimeNodeList: this.setTimeNodeList
})
}else{
this.$emit('addListenSave',{
status: false,
......@@ -611,20 +617,42 @@
})
}
},
showConment(change,hasSelected){
// 是否显示选择添加漫画按钮
showChoseComtent(timeObj){
let flag;
if(this.isStandedTemplate){
flag = false
}else{
if(this.planId){
flag = (change && !hasSelected) ? true : false
flag = (timeObj.change && !timeObj.id) ? true : false
}else{
flag = (!hasSelected) ? true : false
flag = (!timeObj.id) ? true : false
}
}
return flag
},
// 是否显示删除重选漫画按钮
showRechoseDelete(timeObj){
let flag;
if(this.isStandedTemplate){
flag = false
}else{
if(this.planId){
if(timeObj.change){
if(timeObj.id){
flag = true
}else{
flag = false
}
}else{
flag = false
}
}else{
flag = (!timeObj.id) ? true : false
}
}
return flag
},
// 初始化新的表单
initNewForm(){
const timeFormInit = {
......@@ -703,16 +731,24 @@
this.$forceUpdate();
},
deleteTimeNode(item, index) {
this.setTimeNodeList.splice(index, 1)
this.$confirm('是否删除该时间节点?', '', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.setTimeNodeList.splice(index, 1)
// this.activeTab = 0;
// this.timeForm = this.setTimeNodeList[0];
if(this.setTimeNodeList.length == 0) {
//新增一个form
this.activeTab = 'setNewRef';
this.showSetBtn = true;
this.initNewForm();
}
this.$forceUpdate();
if(this.setTimeNodeList.length == 0) {
//新增一个form
this.activeTab = 'setNewRef';
this.showSetBtn = true;
this.initNewForm();
}
this.$forceUpdate();
})
},
deleteAddNode() {
this.showSetBtn = false;
......
src/views/followup/plan-manage/new-plan.vue
浏览文件 @ 4b59616c
......@@ -82,7 +82,6 @@
ref="getTimeNodeList"
:standedTimeNodeList="standedTimeNodeList"
:isStandedTemplate="isStandedTemplate"
@setTimeNodeListOnCom="setTimeNodeListOnCom"
:patientIdList="baseInfo.patientIdList"
:checkForm="checkForm"
@addListenSave="addListenSave"
......@@ -175,7 +174,6 @@
},
computed: {
...mapState('planManage',{
// setTimeNodeList: state => state.setTimeNodeList,
remarkOption: state => state.remarkOption,
templateOptions: state => state.templateOptions,
})
......@@ -219,9 +217,6 @@
})
}
},
setTimeNodeListOnCom(val){
this.getTimeNodeList(val)
},
selectPatientHandler() {
this.isShowSelectPatient = true;
},
......@@ -238,13 +233,13 @@
let getArguments = arguments[0];
this.isShowSelectPatient = getArguments[0];
const selectPatients = getArguments[1]; // 每次选中获取的人
this.hasSelectedList = selectPatients;
console.log('呵呵呵呵',arguments)
this.baseInfo.patientIdList = [];
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.hasSelectedList.length;
},
continueAdd(val) {
this.isShowSelectedDialog = val;
......@@ -277,6 +272,7 @@
if (valid) {
console.log('当前选择的随访模板id为',this.baseInfo.resourceId)
this.resourceId = this.baseInfo.resourceId
console.log( this.baseInfo.resourceId)
if(this.baseInfo.resourceId){
this.isStandedTemplate = true
getFollowupTableTemplate(this.baseInfo.resourceId).then(res=>{
......
src/views/followup/plan-manage/plan-detail.vue
浏览文件 @ 4b59616c
......@@ -149,7 +149,7 @@
href: `#/followup/plan-manage/plan-detail?planId=${this.$route.query.planId}`
},
{
name: '居民列表',
name: '查看居民',
href: null
}
]
......
src/views/followup/plan-manage/plan-list.vue
浏览文件 @ 4b59616c
......@@ -196,7 +196,7 @@
href: `#/followup/plan-manage/plan-list`
},
{
name: '居民列表',
name: '查看居民',
href: null
}
]
......
src/views/followup/plan-manage/plan-modify.vue
浏览文件 @ 4b59616c
<template>
<div class="plan-modify">
<div class="bread-crumb">
<el-breadcrumb separator-class="el-icon-arrow-right" >
<el-breadcrumb separator="/" >
<el-breadcrumb-item v-for="item in planModifyCrumb">
<a v-if="item.href" :href="item.href">{{item.name}}</a>
<span v-else >{{item.name}}</span>
......@@ -54,7 +54,6 @@
:isStandedTemplate="isStandedTemplate"
:standedTimeNodeList="setTimeNodeList"
:patientIdList="planDetailData.patientIdList"
@setTimeNodeListOnCom="setTimeNodeListOnCom"
:checkForm="checkForm"
:planId="planId"
@addListenSave="addListenSave"
......@@ -64,6 +63,7 @@
<select-patient
:isShowSelectPatient="isShowSelectPatient"
:patientIdList="planDetailData.patientIdList"
:oldPatientIdList="selectResidentIdList"
@closeSelectPatient="closeSelectPatient"
@sureSelectPatient="sureSelectPatient(arguments)">
</select-patient>
......@@ -135,10 +135,12 @@
showFollowTime: false, //是否展示全部时间
showAddPatientTime: false,//是否展示添加居民选择时间
addPatientData: {}, //选择时间数据
/*joinSelectedList: [], //新添加居民
joinPatientIdList: [], //新添加居民id
joinSelectedNames: [], //新添加居民名字*/
selectPatients: [], //选择居民列表已选人
oldSelect:[],
selectResidentIdList: [], //oldID
newHasSelectedList: [],
initResidentList: [], //重置需要的居民列表
initResidentIdList: [], //重置需要的id
}
},
created() {
......@@ -146,9 +148,7 @@
this.getPlanDetail(this.$route.query.planId); //获取计划详情
this.getRemarkOption()
this.getNodeTimeList(this.$route.query.planId); // 获取随访时间列表
this.getSelectResident({
planId: this.$route.query.planId
}); //已选居民
let planModifyCrumbList = sessionStorage.getItem('planModifyCrumb');
this.planModifyCrumb = JSON.parse(planModifyCrumbList);
},
......@@ -158,7 +158,6 @@
nodeTimeList: state => state.nodeTimeList,
residentList: state => state.residentList,
remarkOption: state => state.remarkOption,
// setTimeNodeList: state => state.setTimeNodeList,
selectResidentList: state => state.selectResidentList
})
},
......@@ -185,37 +184,39 @@
this.isShowSelectedDialog = val;
},
sureSelectPatient() {
console.log('getArguments',arguments[0])
let getArguments = arguments[0];
// alert(this.selectResidentList.length+'-'+getArguments[1].length)
this.isShowSelectPatient = getArguments[0];
this.selectPatients = getArguments[1]; // 每次选中获取的人
let selectPeople = [];
let selectPeopleIds = [];
let selectNames = []
this.hasSelectedList.forEach(function (item) {
selectPeople.push(item)
});
this.patientIdList.forEach(function (item) {
selectPeopleIds.push(item)
const newAddPatientList = getArguments[1]; // 新选中的人
let showNames = [];
const newIds = [];
newAddPatientList.forEach(item => {
showNames.push(item.nickname)
newIds.push(item.patientId)
})
this.selectPatients.forEach((item)=>{
if(!this.planDetailData.patientIdList.includes(item.patientId)){// 页面中数据存储所有选择的人，没有去重
selectPeople.push(item);
selectPeopleIds.push(item.id)
selectNames.push(item.nickname)
this.newHasSelectedList = JSON.parse(JSON.stringify(this.initResidentList));
this.newHasSelectedList = this.newHasSelectedList.concat(newAddPatientList);
if(this.newHasSelectedList.length > this.hasSelectedList.length) {
this.showAddPatientTime = true;
if(showNames.length>4) {
const le = showNames.length
showNames = showNames.slice(0,4)
showNames = `${showNames.join('、')}等${le}人`
} else {
showNames = showNames.join('、')
}
})
this.addPatientData = {
id: this.$route.query.planId,
addPatients: true,
patientIdList: selectPeopleIds,
patientNames: selectNames.join('、'),
this.addPatientData = {
id: this.$route.query.planId,
addPatients: true,
patientNames: showNames,
}
} else {
this.hasSelectedList = JSON.parse(JSON.stringify(this.newHasSelectedList));
this.planDetailData.patientIdList = JSON.parse(JSON.stringify(this.initResidentIdList));
const _this = this;
newAddPatientList.forEach(item => {
_this.planDetailData.patientIdList.push(item.patientId)
})
}
this.showAddPatientTime = true
},
continueAdd(val) {
this.isShowSelectedDialog = val;
......@@ -294,43 +295,37 @@
closeFollowTime(isShow) {
this.showFollowTime = isShow
},
setTimeNodeListOnCom(val){
this.getTimeNodeList(val)
},
closeAddPatientTime(isShow) {
this.showAddPatientTime = isShow
},
sendJoinTime(joinData) {
console.log('this.hasSelectedList new',this.hasSelectedList)
const _this = this;
if(joinData) {
// alert(joinData)
this.planDetailData.joinTime =joinData;
console.log('新添加时间',this.planDetailData.joinTime)
this.selectPatients.forEach((item)=>{
if(!this.planDetailData.patientIdList.includes(item.patientId)){// 页面中数据存储所有选择的人，没有去重
this.hasSelectedList.push(item)
this.planDetailData.patientIdList.push(item.patientId);
}
_this.hasSelectedList = [];
_this.planDetailData.patientIdList = [];
_this.newHasSelectedList.forEach(item => {
_this.hasSelectedList.push(item)
_this.planDetailData.patientIdList.push(item.patientId)
})
this.planDetailData.hasSelectedNum = this.patientIdList.length;
this.planDetailData.joinTime = joinData;
} else {
}
},
},
watch: {
planDetail(val) {
// console.log(val)
this.planDetailData = val
this.planDetailData = val;
this.setTimeNodeList = val.fPlanTimeReqList
if(this.planDetailData.resourceId){
this.isStandedTemplate = true
}else{
this.isStandedTemplate = false
}
},
selectResidentList(val) {
const _this = this
_this.planDetailData.patientIdList = []
let people = {}
if(val) {
val.forEach(function (item, index) {
......@@ -341,10 +336,14 @@
mobilePhone: item.mobilePhone,
labelId: item.labelName,
patientId: item.patientId
}
_this.patientIdList.push(item.patientId)
_this.hasSelectedList.push(people)
};
_this.hasSelectedList.push(people);
_this.planDetailData.patientIdList.push(item.patientId)
_this.selectResidentIdList.push(item.patientId)
_this.initResidentList.push(people);
_this.initResidentIdList.push(item.patientId);
})
_this.newHasSelectedList = JSON.parse(JSON.stringify(_this.initResidentIdList));
}
}
}
......@@ -354,6 +353,23 @@
<style lang="scss" scoped>
@import '../../../style/followup/followup-common';
@import '../../../style/followup/element-reset.css';
.bread-crumb {
position: fixed;
left: 255px;
top: 64px;
width: 100%;
background: #fff;
height: 61px;
padding: 20px 20px 30px;
z-index: 99;
border-top: 3px solid #F0F2F5;
.el-breadcrumb__inner {
font-size: 14px;
}
a:hover {
color: #449284;
}
}
.header{
display: flex;
align-items: center;
......
src/views/followup/plan-manage/resident-detail.vue
浏览文件 @ 4b59616c
<template>
<div class="resident-detail">
<div class="bread-crumb">
<el-breadcrumb separator-class="el-icon-arrow-right" >
<el-breadcrumb separator="/">
<el-breadcrumb-item v-for="item in residentCrumb">
<a v-if="item.href" :href="item.href">{{item.name}}</a>
<span v-else >{{item.name}}</span>
......
src/views/followup/plan-manage/resident-list.vue
浏览文件 @ 4b59616c
<template>
<div class="resident-list">
<div class="bread-crumb">
<el-breadcrumb separator-class="el-icon-arrow-right" >
<el-breadcrumb separator="/" >
<el-breadcrumb-item v-for="item in residentCrumb">
<a v-if="item.href" :href="item.href">{{item.name}}</a>
<span v-else >{{item.name}}</span>
......@@ -129,6 +129,7 @@
<select-patient
:isShowSelectPatient="isShowSelectPatient"
:patientIdList="initialPatientIdList"
:oldPatientIdList="initialPatientIdList"
@closeSelectPatient="closeSelectPatient"
@sureSelectPatient="sureSelectPatient(arguments)">
</select-patient>
......@@ -195,20 +196,20 @@
this.getFollowStartTimeList(this.$route.query.planId);// 获取随访时间列表
let residentCrumbList = sessionStorage.getItem('residentCrumb');
residentCrumbList = JSON.parse(residentCrumbList);
if(residentCrumbList.length==4&&residentCrumbList[residentCrumbList.length-1].name!='居民列表') {
if(residentCrumbList.length==4&&residentCrumbList[residentCrumbList.length-1].name!='查看居民') {
this.residentCrumb = residentCrumbList.slice(0,2)
this.residentCrumb.push(
{
name: '居民列表',
name: '查看居民',
href: null
}
)
} else if(residentCrumbList.length>4&&residentCrumbList[residentCrumbList.length-1].name!='居民列表') {
} else if(residentCrumbList.length>4&&residentCrumbList[residentCrumbList.length-1].name!='查看居民') {
this.residentCrumb = residentCrumbList.slice(0,3)
this.residentCrumb.push(
{
name: '居民列表',
name: '查看居民',
href: null
}
)
......@@ -223,6 +224,7 @@
groupList: state => state.groupList,
planStatusOption: state => state.planStatusOption,
followStartTimeList: state => state.followStartTimeList,
selectResidentList: state => state.selectResidentList
})
},
methods: {
......@@ -256,7 +258,7 @@
href: `#/followup/plan-manage/plan-list`
},
{
name: '居民列表',
name: '查看居民',
href: `#/followup/plan-manage/resident-list?planId=${this.$route.query.planId}`
},
{
......@@ -279,7 +281,7 @@
href: `#/followup/plan-manage/plan-detail??planId=${this.$route.query.planId}`
},
{
name: '居民列表',
name: '查看居民',
href: `#/followup/plan-manage/resident-list?planId=${this.$route.query.planId}`
},
{
......@@ -334,10 +336,17 @@
patientNames.push(item.patientName)
});
console.log(patientIds)
if(patientNames.length>4) {
const le = patientNames.length
patientNames = patientNames.slice(0,4)
patientNames = `${patientNames.join('、')}等${le}人`
} else {
patientNames = patientNames.join('、')
}
this.finishData = {
changeCode: this.status,
planId: this.$route.query.planId,
patientName: patientNames.join('、'),
patientName: patientNames,
patientIdList: patientIds,
title: this.status==3?'恢复随访':'结束随访',
reasonName: this.status==3?'恢复原因：':'结束原因：',
......@@ -369,30 +378,32 @@
this.showAddPatientTime = isShow
},
sureSelectPatient() {
console.log('arguments',arguments)
let getArguments = arguments[0];
this.isShowSelectPatient = getArguments[0];
const selectPatients = getArguments[1]; // 每次选中获取的人
// this.hasSelectedList = selectPatients;
console.log(selectPatients)
let patientIds = []
let patientNames = []
selectPatients.forEach((item)=>{
if(!this.initialPatientIdList.includes(item.patientId)){
patientIds.push(item.patientId)
patientNames.push(item.nickname)
}
patientIds.push(item.patientId)
patientNames.push(item.nickname)
})
if(patientNames.length>4) {
const le = patientNames.length
patientNames = patientNames.slice(0,4)
patientNames = `${patientNames.join('、')}等${le}人`
} else {
patientNames = patientNames.join('、')
}
this.addPatientData = {
id: this.$route.query.planId,
addPatients: true,
patientIdList: patientIds,
patientNames: patientNames.join('、'),
patientNames: patientNames,
status: this.status
}
this.showAddPatientTime = true
// this.baseInfo.hasSelectedNum = this.baseInfo.patientIdList.length;
},
handleSelectionChange(val) {
console.log('已选居民',val)
......@@ -408,21 +419,21 @@
})
},
residentList(val) {
const _this = this
if(val.fPlanPatientInfoDtoList) {
val.fPlanPatientInfoDtoList.forEach(function (item,index) {
_this.initialPatientIdList.push(item.patientId)
})
}
if(_this.status == 1) {
_this.statusTotal = val.notCount
} else if (_this.status == 2) {
_this.statusTotal = val.handCount
if(this.status == 1) {
this.statusTotal = val.notCount
} else if (this.status == 2) {
this.statusTotal = val.handCount
} else if (_this.status == 3) {
_this.statusTotal = val.yesCount
this.statusTotal = val.yesCount
}
}
},
selectResidentList(val) {
const _this = this
val.forEach(function (item,index) {
_this.initialPatientIdList.push(item.patientId)
});
},
},
beforeRouteEnter(to, from, next) {
next(vm=> {
......
src/views/followup/reservation-manage/reservation-list.vue
浏览文件 @ 4b59616c
......@@ -61,10 +61,13 @@
:data="reservationList.enteringDtos"
center
style="width: 100%;margin-top: 20px;"
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"
:row-key="getRowKeys"
ref="multipleReservation">
<el-table-column
type="selection"
align="center">
align="center"
:reserve-selection="true">
</el-table-column>
<el-table-column
prop="nickname"
......@@ -190,6 +193,9 @@
needPara: {},
dialogDetailShow: false,
validContents: [],
getRowKeys(row) {
return row.fuPlanPatientTimesId;
},
}
},
created() {
......@@ -295,17 +301,18 @@
}
},
sendReservation() {
if(this.selectionData.length > 0){
this.selectList = this.selectionData;
// 发送预约校验
this.initCheck();
}else if(this.selectionData.length > 100){
this.$message.warning('每次最多选择100条单条随访进行预约!');
return false;
} else {
this.$message.warning('请选择要发送预约的居民!');
return false;
}
// console.log('选择人员长度',this.selectionData.length)
if(this.selectionData.length > 100) {
this.$message.warning('每次最多选择100条单条随访进行预约!');
return;
}else if(this.selectionData.length <= 0){
this.$message.warning('请选择要发送预约的居民!');
return;
}else{
this.selectList = this.selectionData;
// 发送预约校验
this.initCheck();
}
},
sendReservationRow(row){
let newList = [];
......@@ -345,6 +352,7 @@
...this.setSearchData(),
status: this.status,
})
this.$refs.multipleReservation.clearSelection();
},
closeTipsDialog(val){
this.isNoEnoughShow = val;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或