Skip to content

P
pica.cloud.web-education-admin
提交 865ba27e 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai
浏览文件
操作

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

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312
上级 d42e4a3a 989a7988
隐藏空白字符变更
内嵌 并排
正在显示 包含 149 行增加 和 57 行删除
src/style/followup/element-reset.css
浏览文件 @ 865ba27e
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
border-color: #449284!important; border-color: #449284!important;
} }
.el-form-item .el-form-item__label{ /*.el-form-item .el-form-item__label{*/
font-size: 14px; /*font-size: 14px;*/
} /*}*/
.el-message-box__content{ .el-message-box__content{
padding: 20px 15px; padding: 20px 15px;
......
src/views/followup/plan-manage/dialog/select-cartoon.vue
浏览文件 @ 865ba27e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
center> center>
<div class="select-content"> <div class="select-content">
<div class="first-section"> <div class="first-section">
<el-select placeholder="请选择疾病" v-model="diseaseId"> <el-select placeholder="请选择疾病" v-model="diseaseId" size="small">
<el-option <el-option
v-for="item in diseaseOptions" v-for="item in diseaseOptions"
:key="item.value" :key="item.value"
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select placeholder="请选择类目" v-model="typeId" style="margin-left:20px;"> <el-select placeholder="请选择类目" size="small" v-model="typeId" style="margin-left:20px;">
</el-select> </el-select>
</div> </div>
<div class="scroll-section"> <div class="scroll-section">
<el-radio-group v-model="sendObj.hasSelected"> <el-radio-group v-model="sendObj.hasSelected" size="small">
<el-radio <el-radio
v-for="(item, index) in cartoonList" v-for="(item, index) in cartoonList"
:key="index" :key="index"
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="button-green" @click="clickClose" plain>取 消</el-button> <el-button class="button-green" size="small" @click="clickClose" plain>取 消</el-button>
<el-button class="button-white" @click="sureSelect" type="primary">确 定</el-button> <el-button class="button-white" size="small" @click="sureSelect" type="primary">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
......
src/views/followup/plan-manage/dialog/set-time-node.vue
浏览文件 @ 865ba27e
<template> <template>
<div> <div>
<p><el-button plain icon="el-icon-plus" round @click="addNewNode(timeForm.formRef)">新增时间节点</el-button><br></p> <p><el-button plain icon="el-icon-plus" size="small" round @click="addNewNode(timeForm.formRef)">新增时间节点</el-button><br></p>
<div class="add-time-content"> <div class="add-time-content">
<div class="time-line-scroll">
<!--<el-button type="primary" size="mini" round>设置随访时间 <i class="el-icon-circle-close-outline"></i></el-button>-->
<!--<el-button type="primary" @click="changeTab(item)" size="mini" round v-for="(item, index) in setTimeNodeList" :key="index">开始后{{item.followupTime}}{{item.followupMark}} <i class="el-icon-circle-close-outline"></i></el-button>-->
<el-radio-group v-model="activeTab" @change="changeTab"> <div class="time-line-scroll">
<el-radio-button v-if="setTimeNodeList.length > 0" :key="item.formRef" v-for="(item, index) in setTimeNodeList" :label="index">开始后{{item.followupTime + item.followupMark}} <i class="el-icon-circle-close-outline" @click="deleteTimeNode(item, index)"></i></el-radio-button> <el-radio-group v-model="activeTab" @change="changeTab" size="small">
<el-radio-button v-if="setTimeNodeList.length > 0" :key="item.formRef" v-for="(item, index) in setTimeNodeList1" :label="index">开始后{{item.followupTime + item.followupMark}} <i class="el-icon-circle-close-outline" @click="deleteTimeNode(item, index)"></i></el-radio-button>
<el-radio-button label="setNewRef" v-if="showSetBtn">设置随访时间 <i class="el-icon-circle-close-outline" @click="deleteAddNode" v-if="setTimeNodeList.length>0"></i></el-radio-button> <el-radio-button label="setNewRef" v-if="showSetBtn">设置随访时间 <i class="el-icon-circle-close-outline" @click="deleteAddNode" v-if="setTimeNodeList.length>0"></i></el-radio-button>
</el-radio-group> </el-radio-group>
<!--<el-button type="primary" :class="(activeTab || activeTab==0) ? 'blur-btn' : ''" @click="setTimeForm()">设置随访时间</el-button>-->
</div> </div>
<div class="form-div">
<el-form :ref="timeForm.formRef" :model="timeForm" :rules="timeFormRules" label-suffix=":" label-width="140px" :inline-message="true"> <div class="form-div" v-if="activeTab != 'setNewRef'">
<div :key="timeFormHas.formRef" v-for="(timeFormHas, index) in setTimeNodeList1" :label="index">
<el-form v-if="index == activeTab" :ref="timeFormHas.formRef" :model="timeFormHas" :rules="timeFormRules" label-suffix=":" label-width="140px" :inline-message="true" size="small">
<el-form-item label="本次随访时间" required>
<div style="display: flex;">
<el-form-item prop="followupTime">
<el-select v-model="timeFormHas.followupTime" placeholder="请选择">
<el-option
v-for="item in indexOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="followupMark" class="ml20">
<el-select v-model="timeFormHas.followupMark" placeholder="请选择">
<el-option
v-for="item in markOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</el-form-item>
</div>
</el-form-item>
<el-form-item label="随访方式" prop="followupWay">
<el-radio-group v-model="timeFormHas.followupWay" size="small">
<el-radio :label="1">门诊随访</el-radio>
<el-radio :label="2">上门随访</el-radio>
<el-radio :label="3">电话随访</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="提醒医生预约居民">
<el-select
v-model="timeFormHas.remindTime"
multiple
:multiple-limit=3
placeholder="请选择">
<el-option
v-for="item in remindOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="推送患教">
<div style="display: flex">
<el-select v-model="timeFormHas.pushTime" placeholder="选择推送时间" clearable>
<el-option
v-for="item in pushTimeOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-button plain class="ml20" @click="goSelectCartoon" v-if="!timeFormHas.hasSelected">选择健康漫画</el-button>
<div class="selected-div ml20" v-if="timeFormHas.hasSelected">
<span>《健康漫画名称》</span>
<el-button type="text" @click="goSelectCartoon">重选</el-button>
<el-button type="text" @click="deleteClick">删除</el-button>
</div>
</div>
</el-form-item>
<div class="tips-contnt" v-if="timeFormHas.hasSelected">
<p class="yellow-font">当前计划中共500位居民（微信：300位，短信：200位），本次定时推送任务在发送当日预计需要200条短信额度（微信推送不消耗额度，建议您让居民关注云鹊健康微信公众号），务必提前确保短信额度的充足。</p>
<p>需要更多额度，请前往「云鹊医App-个人中心-啾啾币中心」兑换短信额度后再进行预约，您也可以联系云鹊医客服购买短信额度，客服电话：400-920-8877</p>
</div>
<el-form-item label="随访登记表">
<el-select
v-model="timeFormHas.followupForm"
multiple
:multiple-limit=3
placeholder="请选择">
<el-option
v-for="item in formOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
</div>
<div class="form-div" v-if="activeTab == 'setNewRef'">
<el-form :ref="timeForm.formRef" :model="timeForm" :rules="timeFormRules" label-suffix=":" label-width="140px" :inline-message="true" size="small">
<el-form-item label="本次随访时间" required> <el-form-item label="本次随访时间" required>
<div style="display: flex;"> <div style="display: flex;">
<el-form-item prop="followupTime"> <el-form-item prop="followupTime">
...@@ -39,7 +125,7 @@ ...@@ -39,7 +125,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="随访方式" prop="followupWay"> <el-form-item label="随访方式" prop="followupWay">
<el-radio-group v-model="timeForm.followupWay"> <el-radio-group v-model="timeForm.followupWay" size="small">
<el-radio :label="1">门诊随访</el-radio> <el-radio :label="1">门诊随访</el-radio>
<el-radio :label="2">上门随访</el-radio> <el-radio :label="2">上门随访</el-radio>
<el-radio :label="3">电话随访</el-radio> <el-radio :label="3">电话随访</el-radio>
...@@ -85,7 +171,7 @@ ...@@ -85,7 +171,7 @@
<el-select <el-select
v-model="timeForm.followupForm" v-model="timeForm.followupForm"
multiple multiple
:multiple-limit=2 :multiple-limit=3
placeholder="请选择"> placeholder="请选择">
<el-option <el-option
v-for="item in formOptions" v-for="item in formOptions"
...@@ -98,7 +184,9 @@ ...@@ -98,7 +184,9 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<select-cartoon :isSelectCartoon="isSelectCartoon" @closeSelectCartoon="closeSelectCartoon"></select-cartoon> <select-cartoon :isSelectCartoon="isSelectCartoon" @closeSelectCartoon="closeSelectCartoon"></select-cartoon>
</div> </div>
</template> </template>
<script> <script>
...@@ -118,7 +206,8 @@ ...@@ -118,7 +206,8 @@
export default { export default {
components: { components: {
SelectCartoon}, SelectCartoon
},
data() { data() {
return { return {
isSelectCartoon: false, isSelectCartoon: false,
...@@ -134,6 +223,12 @@ ...@@ -134,6 +223,12 @@
}, { }, {
value: '1', value: '1',
label: '1' label: '1'
}, {
value: '2',
label: '2'
}, {
value: '3',
label: '3'
}, },
], ],
markOptions: [ markOptions: [
...@@ -199,6 +294,9 @@ ...@@ -199,6 +294,9 @@
} }
}, },
computed: { computed: {
setTimeNodeList1:function(){
return this.sortKey(this.setTimeNodeList,'followupTime')
}
}, },
created() { created() {
//初始化一个随访时间节点 //初始化一个随访时间节点
...@@ -207,16 +305,7 @@ ...@@ -207,16 +305,7 @@
this.timeForm.formRef = this.getNowTime(); this.timeForm.formRef = this.getNowTime();
} }
}, },
watch: { watch: {},
activeTab(newVal, oldVal) {
console.log('tab变化',newVal,oldVal)
if(oldVal == 'setNewRef' || newVal== 'setNewRef') {
return
}else {
this.setTimeNodeList[oldVal] = this.timeForm;
}
}
},
methods: { methods: {
getNowTime() { getNowTime() {
const date = new Date(); const date = new Date();
...@@ -231,9 +320,8 @@ ...@@ -231,9 +320,8 @@
}, },
addNewNode(formName) { addNewNode(formName) {
if(this.activeTab !== 'setNewRef') { if(this.activeTab !== 'setNewRef') {
// 显示设置按钮
this.showSetBtn = true;
this.activeTab = 'setNewRef'; this.activeTab = 'setNewRef';
this.showSetBtn = true;
this.timeForm = _.cloneDeep(timeFormInit); this.timeForm = _.cloneDeep(timeFormInit);
this.timeForm.formRef = this.getNowTime(); this.timeForm.formRef = this.getNowTime();
}else { }else {
...@@ -264,8 +352,6 @@ ...@@ -264,8 +352,6 @@
if(val == 'setNewRef') { if(val == 'setNewRef') {
this.timeForm = _.cloneDeep(timeFormInit); this.timeForm = _.cloneDeep(timeFormInit);
this.timeForm.formRef = this.getNowTime(); this.timeForm.formRef = this.getNowTime();
}else {
this.timeForm = _.cloneDeep(this.setTimeNodeList[val]);
} }
}, },
deleteTimeNode(item, index) { deleteTimeNode(item, index) {
...@@ -273,14 +359,21 @@ ...@@ -273,14 +359,21 @@
this.activeTab = 0; this.activeTab = 0;
if(this.setTimeNodeList.length == 0) { if(this.setTimeNodeList.length == 0) {
this.activeTab = 'setNewRef'; this.activeTab = 'setNewRef';
this.showSetBtn = true;
this.timeForm = _.cloneDeep(timeFormInit); this.timeForm = _.cloneDeep(timeFormInit);
this.timeForm.formRef = this.getNowTime(); //新增一个form this.timeForm.formRef = this.getNowTime(); //新增一个form
} }
}, },
deleteAddNode() { deleteAddNode() {
this.showSetBtn = false; this.showSetBtn = false;
this.activeTab = ''; this.activeTab = 0;
this.timeForm = this.setTimeNodeList[0]; },
sortKey(array,key) {
return array.sort(function(a,b){
var x = a[key];
var y = b[key];
return ((x<y) ? -1 : (x>y) ? 1 : 0)
})
} }
}, },
} }
...@@ -290,12 +383,10 @@ ...@@ -290,12 +383,10 @@
padding-top: 20px; padding-top: 20px;
.time-line-scroll{ .time-line-scroll{
width: 100%; width: 100%;
height: 64px; height: 60px;
box-sizing: border-box; box-sizing: border-box;
background-color: #F0F2F5; background-color: #F0F2F5;
padding: 8px 10px; padding: 10px;
/*display: flex;*/
/*align-items: center;*/
overflow-x: scroll; overflow-x: scroll;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap; white-space: nowrap;
......
src/views/followup/plan-manage/new-plan.vue
浏览文件 @ 865ba27e
...@@ -14,16 +14,16 @@ ...@@ -14,16 +14,16 @@
<span :class="{ 'active-class' : activeTab === 'first' }">随访时间节点</span> <span :class="{ 'active-class' : activeTab === 'first' }">随访时间节点</span>
</div> </div>
<div class="plan-btns-group" v-if="activeTab === 'first'"> <div class="plan-btns-group" v-if="activeTab === 'first'">
<el-button class="button-white" plain @click="cancelEdit" >取 消</el-button> <el-button class="button-white" size="small" plain @click="cancelEdit" >取 消</el-button>
<el-button type="primary"@click="nextClick('baseInfo')">下一步</el-button> <el-button type="primary" size="small" @click="nextClick('baseInfo')">下一步</el-button>
</div> </div>
<div class="plan-btns-group" v-if="activeTab === 'second'"> <div class="plan-btns-group" v-if="activeTab === 'second'">
<el-button class="button-white" plain @click="preClick">上一步</el-button> <el-button class="button-white" size="small" plain @click="preClick">上一步</el-button>
<el-button type="primary" @click="saveEdit">保 存</el-button> <el-button type="primary" size="small" @click="saveEdit">保 存</el-button>
</div> </div>
</div> </div>
<div class="edit-plan-content" v-if="activeTab === 'first'"> <div class="edit-plan-content" v-if="activeTab === 'first'">
<el-form ref="baseInfo" :model="baseInfo" :rules="rules" label-suffix=":" label-width="140px" :inline-message="true"> <el-form ref="baseInfo" :model="baseInfo" :rules="rules" label-suffix=":" label-width="140px" :inline-message="true" size="small">
<el-form-item label="随访计划名称" prop="name"> <el-form-item label="随访计划名称" prop="name">
<el-input v-model="baseInfo.name" maxlength="20" style="width: 30%" clearable></el-input> <el-input v-model="baseInfo.name" maxlength="20" style="width: 30%" clearable></el-input>
</el-form-item> </el-form-item>
......
src/views/followup/plan-manage/plan-list.vue
浏览文件 @ 865ba27e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="page-title">计划管理</div> <div class="page-title">计划管理</div>
<div class="search-div"> <div class="search-div">
<div class="search-input"> <div class="search-input">
<el-form ref="serchForm" :model="searchData" :inline="true" label-suffix=":" label-width="125px"> <el-form ref="serchForm" :model="searchData" :inline="true" label-suffix=":" label-width="125px" size="small">
<el-form-item label="随访计划名称"> <el-form-item label="随访计划名称">
<el-input v-model="searchData.name" placeholder="请输入关键词" maxlength="20" style="width: 250px" clearable></el-input> <el-input v-model="searchData.name" placeholder="请输入关键词" maxlength="20" style="width: 250px" clearable></el-input>
</el-form-item> </el-form-item>
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
</el-form> </el-form>
</div> </div>
<div class="search-btn"> <div class="search-btn">
<el-button class="button-green" type="primary" @click="search(1)">查询</el-button> <el-button class="button-green" size="small" type="primary" @click="search(1)">查询</el-button>
<el-button class="button-white" plain @click="reseat">重置</el-button> <el-button class="button-white" size="small" plain @click="reseat">重置</el-button>
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
<div class="content-group-btn"><el-button type="primary" @click="addNewPlan">新建随访计划</el-button></div> <div class="content-group-btn"><el-button type="primary" size="small" @click="addNewPlan">新建随访计划</el-button></div>
<div> <div>
<el-table :data="planList.fPlanDtoList" style="width: 100%;margin-top: 20px;"> <el-table :data="planList.fPlanDtoList" style="width: 100%;margin-top: 20px;">
<el-table-column prop="name" label="随访计划名称" min-width="100" align="center" :show-overflow-tooltip="true"> <el-table-column prop="name" label="随访计划名称" min-width="100" align="center" :show-overflow-tooltip="true">
......
src/views/followup/record-manage/dialog/change-followup-status.vue
浏览文件 @ 865ba27e
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:close-on-press-escape="false" :close-on-press-escape="false"
:before-close="closeChange" :before-close="closeChange"
width="800px"> width="800px">
<el-form ref="statusForm" :model="statusForm" :rules="rules" label-suffix=":" label-width="120px"> <el-form ref="statusForm" :model="statusForm" :rules="rules" label-suffix=":" label-width="120px" size="small">
<el-form-item label="居民" style="margin-bottom:0;"> <el-form-item label="居民" style="margin-bottom:0;">
<span>{{statusForm.nickname}}</span> <span>{{statusForm.nickname}}</span>
</el-form-item> </el-form-item>
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button plain @click="closeChange">取 消</el-button> <el-button size="small" plain @click="closeChange">取 消</el-button>
<el-button type="primary" @click="saveReason('statusForm')">确 定</el-button> <el-button size="small" type="primary" @click="saveReason('statusForm')">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
......
src/views/followup/record-manage/record-list.vue
浏览文件 @ 865ba27e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="page-title">录入管理</div> <div class="page-title">录入管理</div>
<div class="search-div"> <div class="search-div">
<div class="search-input"> <div class="search-input">
<el-form ref="serchForm" :model="searchData" :inline="true" label-suffix=":" label-width="125px"> <el-form ref="serchForm" :model="searchData" :inline="true" label-suffix=":" label-width="125px" size="small">
<el-form-item label="随访计划名称"> <el-form-item label="随访计划名称">
<el-input v-model="searchData.planName" placeholder="请输入关键词" style="width: 250px" clearable></el-input> <el-input v-model="searchData.planName" placeholder="请输入关键词" style="width: 250px" clearable></el-input>
</el-form-item> </el-form-item>
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
</el-form> </el-form>
</div> </div>
<div class="search-btn"> <div class="search-btn">
<el-button class="button-green" type="primary" @click="search(1)">查询</el-button> <el-button class="button-green" size="small" type="primary" @click="search(1)">查询</el-button>
<el-button class="button-white" plain @click="reseat">重置</el-button> <el-button class="button-white" size="small" plain @click="reseat">重置</el-button>
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
<el-radio-group v-model="activeName" @change="handlerClick"> <el-radio-group v-model="activeName" @change="handlerClick" size="small">
<el-radio-button label="0">全部（{{recordList.count}}）</el-radio-button> <el-radio-button label="0">全部（{{recordList.count}}）</el-radio-button>
<el-radio-button label="1">已完成（{{recordList.acceptCount}}）</el-radio-button> <el-radio-button label="1">已完成（{{recordList.acceptCount}}）</el-radio-button>
<el-radio-button label="2">未完成（{{recordList.refuseCount}}）</el-radio-button> <el-radio-button label="2">未完成（{{recordList.refuseCount}}）</el-radio-button>
......
src/views/followup/reservation-manage/dialog/send-reservation.vue
浏览文件 @ 865ba27e
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
:rules="rules" :rules="rules"
label-suffix=":" label-suffix=":"
label-width="120px" label-width="120px"
:label-position="'left'"> :label-position="'left'"
size="small">
<el-form-item label="已选居民"> <el-form-item label="已选居民">
<span>{{checkData.total}}人</span><span>（微信发送{{checkData.weChatNum}}人；短信发送{{checkData.messageNum}}人）</span> <span>{{checkData.total}}人</span><span>（微信发送{{checkData.weChatNum}}人；短信发送{{checkData.messageNum}}人）</span>
</el-form-item> </el-form-item>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或