Skip to content

P
pica.cloud.web-education-admin
提交 939f4432 编写于 作者: 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

# Conflicts:
#	src/views/followup/reservation-manage/reservation-list.vue
上级 96bb5944 f60350ba
显示空白字符变更
内嵌 并排
正在显示 包含 503 行增加 和 9 行删除
src/style/followup/element-reset.css
浏览文件 @ 939f4432
......@@ -45,3 +45,7 @@
.el-textarea__inner:focus {
border-color: #449284!important;
}
.el-form-item .el-form-item__label{
font-size: 14px;
}
src/views/followup/reservation-manage/dialog/change-reservation.vue 0 → 100644
浏览文件 @ 939f4432
<template>
<div class="dialog-wrap">
<el-dialog title="变更预约"
:visible.sync="reservationDialog"
v-if="isChangeReservation"
center
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="closeChangeReserve1">
<el-form
ref="reservationForm"
:model="reservationForm"
:rules="rules"
label-suffix=":"
label-width="120px">
<el-form-item label="变更居民">
<span>{{reservationForm.nickname}}</span>
</el-form-item>
<el-form-item label="预约状态" required prop="reserveStatus">
<el-radio-group v-model="reservationForm.reserveStatus">
<el-radio label="已接受"></el-radio>
<el-radio label="已拒绝"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="reservationForm.reserveStatus == '已接受'" label="预约时间" required>
<div style="display: flex;">
<el-form-item prop="reservationDate">
<el-date-picker
type="date"
v-model="reservationForm.reservationDate"
placeholder="请选择预约日期"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item prop="timeRange">
<el-select v-model="reservationForm.timeRange" placeholder="请选择时间段" clearable style="margin-left:20px;">
<el-option
v-for="item in timeRangeOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</el-form-item>
</div>
<p class="warn-tips" v-if="reservationForm.reservationDate">该日期已经成功预约{{reservationForm.hasReservedNumber}}人，请确保能在此时间段完成预约的随访任务</p>
</el-form-item>
<el-form-item label="变更原因">
<el-input type="textarea" v-model="reservationForm.reason" placeholder="请输入变更原因" maxlength="30" rows="3" style="width:60%;"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="closeChangeReserve1">取 消</el-button>
<el-button type="primary" @click="closeChangeReserve('reservationForm')">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
components: {},
data(){
return{
reservationDialog: true,
reservationForm: {
nickname: '呆呆',
reserveStatus: '',
reason: '',
reservationDate: '',
timeRange: '',
},
timeRangeOptions: [
{
value: 1,
label: '6:00-7:00'
}, {
value: 2,
label: '7:00-8:00'
}, {
value: 3,
label: '8:00-9:00'
}, {
value: 4,
label: '9:00-10:00'
}, {
value: 5,
label: '10:00-11:00'
}, {
value: 6,
label: '11:00-12:00'
}, {
value: 7,
label: '12:00-13:00'
}, {
value: 8,
label: '13:00-14:00'
}, {
value: 9,
label: '14:00-15:00'
}, {
value: 10,
label: '15:00-16:00'
}, {
value: 11,
label: '16:00-17:00'
}, {
value: 12,
label: '17:00-18:00'
}, {
value: 13,
label: '18:00-19:00'
}, {
value: 14,
label: '19:00-20:00'
}, {
value: 15,
label: '20:00-21:00'
}],
rules: {
reserveStatus: [{ required: true, message: '请选择预约状态', trigger: 'change' }],
reservationDate: [{ required: true, message: '请选择预约日期', trigger: 'change' }],
timeRange: [{ required: true, message: '请选择时间段', trigger: 'change' }],
},
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
}
}
},
props: {
isChangeReservation: {
type: Boolean,
default: false
}
},
computed: {
},
mounted(){
},
methods: {
closeChangeReserve1(){
if (this.$refs['reservationForm']) {
this.$refs['reservationForm'].resetFields();
}
this.$emit('closeChangeReserve',false)
},
closeChangeReserve(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.$refs['reservationForm']) {
this.$refs['reservationForm'].resetFields();
}
this.$emit('closeChangeReserve',false)
} else {
return false;
}
});
},
}
}
</script>
<style scoped lang="scss">
@import '../../../../style/followup/followup-common';
@import '../../../../style/followup/element-reset.css';
.warn-tips{
font-size: 12px;
color: #e6a23c;
padding-top: 5px;
}
.el-dialog{
min-width: 580px!important;
}
</style>
src/views/followup/reservation-manage/dialog/no-enough.vue 0 → 100644
浏览文件 @ 939f4432
<template>
<div class="dialog-wrap">
<el-dialog title=""
:visible.sync="noEnoughDialog"
v-if="isNoEnoughShow"
center
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="closeTipsDialog">
<div class="no-enough-content">
<h3>余额不足提醒</h3>
<p class="section">您的短信额度已欠费，请前往「云鹊医App-个人中心-啾啾币中心」兑换短信额度后再进行预约<br/>您也可以联系云鹊医客服购买短信额度，客服电话：400-920-8877</p>
<p class="tip">提示：微信推送不消耗额度，建议您与居民绑定微信，关注云鹊健康微信公众号</p>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="closeTipsDialog">我知道了</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
components: {},
data(){
return{
noEnoughDialog: true,
}
},
props: {
isNoEnoughShow: {
type: Boolean,
default: false
}
},
computed: {
},
mounted(){
},
methods: {
closeTipsDialog(){
this.$emit('closeTipsDialog',false)
},
}
}
</script>
<style scoped lang="scss">
@import '../../../../style/followup/followup-common';
@import '../../../../style/followup/element-reset.css';
.warn-tips{
font-size: 12px;
color: #e6a23c;
}
.no-enough-content{
text-align: center;
h3{
color: #303133;
font-size: 18px;
padding-bottom: 30px;
}
.section{
line-height: 30px;
padding:20px;
color: #f56c6c;
}
.tip{
font-size: 12px;
padding: 10px 0;
}
}
</style>
src/views/followup/reservation-manage/dialog/send-reservation.vue 0 → 100644
浏览文件 @ 939f4432
<template>
<div class="dialog-wrap">
<el-dialog title="预约随访居民"
:visible.sync="reservationDialog"
v-if="isDialogShow"
center
:close-on-click-modal="false"
:close-on-press-escape="false"
:before-close="closeSendReserve1">
<el-form
ref="reservationForm"
:model="reservationForm"
:rules="rules"
label-suffix=":"
label-width="120px"
:label-position="'left'">
<el-form-item label="已选居民">
<span>{{reservationForm.totalNumber}}人</span><span>（微信发送{{reservationForm.wechatNumber}}人；短信发送{{reservationForm.smsNumber}}人）</span>
</el-form-item>
<el-form-item label="预约时间" required>
<div style="display: flex;">
<el-form-item prop="reservationDate">
<el-date-picker
type="date"
v-model="reservationForm.reservationDate"
placeholder="请选择预约日期"
value-format="yyyy-MM-dd"
value="yyyy-MM-dd"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item prop="timeRange">
<el-select v-model="reservationForm.timeRange" placeholder="请选择时间段" clearable style="margin-left:20px;">
<el-option
v-for="item in timeRangeOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
</el-form-item>
</div>
<p class="warn-tips" v-if="reservationForm.reservationDate">该日期已经成功预约{{reservationForm.hasReservedNumber}}人，请确保能在此时间段完成预约的随访任务</p>
</el-form-item>
</el-form>
<div class="reservation-content content-list" v-if="reservationForm.reservationDate && reservationForm.timeRange">
<div class="item">
<span class="title">发送内容:</span>
<p>{{doctorName}}医生邀请您在{{reservationForm.reservationDate}}的{{reservationForm.timeRange}}进行{{planName}}+{{followupKind}}，请确认是否参加。</p>
</div>
<div class="item">
<span class="title">本次推送:</span>
<p>{{reservationForm.totalNumber}}条（微信不限额推送{{reservationForm.wechatNumber}}条；使用短信额度推送{{reservationForm.smsNumber}}条）</p>
</div>
<div class="item">
<span class="title">推送成功后剩余余额:</span>
<p>{{smsBalanceNumber}}条</p>
</div>
<p>提示：微信推送不消耗额度，建议您与居民绑定微信，关注云鹊健康微信公众号</p>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="closeSendReserve1">取消发送</el-button>
<el-button type="primary" @click="closeSendReserve('reservationForm')">立即发送</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
components: {},
data(){
return{
reservationDialog: true,
reservationForm: {
totalNumber: 88,
wechatNumber: 60,
smsNumber: 28,
reservationDate: '',
timeRange: '',
hasReservedNumber: 60
},
timeRangeOptions: [
{
value: 1,
label: '6:00-7:00'
}, {
value: 2,
label: '7:00-8:00'
}, {
value: 3,
label: '8:00-9:00'
}, {
value: 4,
label: '9:00-10:00'
}, {
value: 5,
label: '10:00-11:00'
}, {
value: 6,
label: '11:00-12:00'
}, {
value: 7,
label: '12:00-13:00'
}, {
value: 8,
label: '13:00-14:00'
}, {
value: 9,
label: '14:00-15:00'
}, {
value: 10,
label: '15:00-16:00'
}, {
value: 11,
label: '16:00-17:00'
}, {
value: 12,
label: '17:00-18:00'
}, {
value: 13,
label: '18:00-19:00'
}, {
value: 14,
label: '19:00-20:00'
}, {
value: 15,
label: '20:00-21:00'
}],
doctorName: '云晓雀',
planName: '高血压随访计划',
followupKind: '上门随访',
smsBalanceNumber: '-20',
rules: {
reservationDate: [{ required: true, message: '请选择预约日期', trigger: 'change' }],
timeRange: [{ required: true, message: '请选择时间段', trigger: 'change' }],
},
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7
}
}
}
},
props: {
isDialogShow: {
type: Boolean,
default: false
}
},
computed: {
},
mounted(){
},
methods: {
closeSendReserve1(){
if (this.$refs['reservationForm']) {
this.$refs['reservationForm'].resetFields();
}
this.$emit('closeSendReserve',false)
},
closeSendReserve(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
if (this.$refs['reservationForm']) {
this.$refs['reservationForm'].resetFields();
}
this.$emit('closeSendReserve',false)
} else {
return false;
}
});
},
}
}
</script>
<style scoped lang="scss">
@import '../../../../style/followup/followup-common';
@import '../../../../style/followup/element-reset.css';
.warn-tips{
font-size: 12px;
color: #e6a23c;
padding-top: 5px;
}
.el-dialog{
min-width: 580px!important;
}
.reservation-content{
padding: 10px;
border-top: 1px dashed #efefef;
&.content-list{
.item{
display: flex;
line-height: 28px;
padding: 10px 0;
.title{
display: inline-block;
margin-right: 15px;
}
p{
flex: 1;
}
}
}
}
</style>
src/views/followup/reservation-manage/reservation-list.vue
浏览文件 @ 939f4432
......@@ -55,7 +55,7 @@
<el-radio-button label="3">已接受({{reservationList.yesCount}})</el-radio-button>
<el-radio-button label="4">已拒绝({{reservationList.refuseCount }})</el-radio-button>
</el-radio-group>
<el-button class="button-green" type="primary">发送预约</el-button>
<el-button class="button-green" type="primary" @click="sendReservation">发送预约</el-button>
<el-table
:data="reservationList.fPlanAppointmentDtoList"
center
......@@ -98,7 +98,7 @@
align="center">
<template slot-scope="scope">
<el-button class="btn-right-class" type="text" >发送预约</el-button>|
<el-button class="btn-right-class" type="text" >变更预约</el-button>
<el-button class="btn-right-class" type="text" @click="changeReserveClick(scope.row)">变更预约</el-button>
</template>
</el-table-column>
</el-table>
......@@ -115,19 +115,28 @@
</el-pagination>
</div>
</div>
<send-reservation :isDialogShow="isDialogShow" @closeSendReserve="closeSendReserve"></send-reservation>
<no-enough :isNoEnoughShow="isNoEnoughShow" @closeTipsDialog="closeTipsDialog"></no-enough>
<change-reservation :isChangeReservation="isChangeReservation" @closeChangeReserve="closeChangeReserve"></change-reservation>
</div>
</template>
<script>
import api from '../../../utils/followup/followapis';
import BreadCrumb from '@/components/breadcrumb'
import { mapState, mapActions } from 'vuex';
import { mapState, mapActions } from 'vuex'
//面包屑
import BreadCrumb from '@/components/breadcrumb';
import sendReservation from './dialog/send-reservation';
import noEnough from './dialog/no-enough';
import ChangeReservation from "./dialog/change-reservation";
export default {
name: "reservation-list",
components: {
BreadCrumb
ChangeReservation,
BreadCrumb,
sendReservation,
noEnough
},
data() {
return {
......@@ -135,7 +144,7 @@
curmbFirst: '随访管理',
curmbSecond: '预约管理',
/*面包屑配置*/
labelWidth: '96px', //标题长度
labelWidth: '125px', //标题长度
searchData: {}, //查询数据
status: 0, //列表筛选条件
statusOptions: [
......@@ -151,7 +160,11 @@
value: 3,
label: '已过期'
}
], //居民预约状态
], //居民预约状态\
hasSmsBalance: true, //短信余额是否充足
isDialogShow: false, //发送预约dialog展示
isNoEnoughShow: false, //余额不足dialog展示
isChangeReservation: false, //变更预约状态dialog展示
}
},
created() {
......@@ -218,6 +231,26 @@
}
}
return para;
},
sendReservation() {
//判断短信余额是否不足
if(this.hasSmsBalance){
this.isDialogShow = true;
}else {
this.isNoEnoughShow = true;
}
},
changeReserveClick(){
this.isChangeReservation = true;
},
closeSendReserve(val){
this.isDialogShow = val;
},
closeTipsDialog(val){
this.isNoEnoughShow = val;
},
closeChangeReserve(val){
this.isChangeReservation = val;
}
},
watch: {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或