Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica.cloud.web-education-admin
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
提交
打开侧边栏
com.pica.cloud.education.frontend
pica.cloud.web-education-admin
提交
8a31d4be
提交
8a31d4be
编写于
4月 03, 2019
作者:
yi.li
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
预约相关接口调试
上级
65840761
变更
6
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
75 行增加
和
59 行删除
+75
-59
reservationManage.js
src/store/followup/reservationManage.js
+1
-1
followapis.js
src/utils/followup/followapis.js
+2
-2
plan-list.vue
src/views/followup/plan-manage/plan-list.vue
+3
-3
change-reservation.vue
...followup/reservation-manage/dialog/change-reservation.vue
+7
-19
send-reservation.vue
...s/followup/reservation-manage/dialog/send-reservation.vue
+5
-3
reservation-list.vue
src/views/followup/reservation-manage/reservation-list.vue
+57
-31
未找到文件。
src/store/followup/reservationManage.js
浏览文件 @
8a31d4be
...
...
@@ -58,7 +58,7 @@ export default {
getReservationPatients
({
...
payload
}).
then
(({
data
})
=>
{
context
.
commit
(
'GET_REVERVATION_NUM'
,
data
.
number
)
context
.
commit
(
'GET_REVERVATION_NUM'
,
data
)
})
},
// getConstantsData({commit}) {
...
...
src/utils/followup/followapis.js
浏览文件 @
8a31d4be
...
...
@@ -141,7 +141,7 @@ export const getReservationPatients = (data) => {
export
const
changeReservationStatus
=
(
data
)
=>
{
return
fetch
({
headers
,
url
:
getFollowUpSC
(
`/appoint/status/`
),
url
:
getFollowUpSC
(
`/
followup/
appoint/status/`
),
method
:
'post'
,
data
:
data
,
description
:
'手动变更预约状态'
,
...
...
@@ -150,7 +150,7 @@ export const changeReservationStatus = (data) => {
export
const
sendReservation
=
(
data
)
=>
{
return
fetch
({
headers
,
url
:
getFollowUpSC
(
`/appoint/`
),
url
:
getFollowUpSC
(
`/
followup/
appoint/`
),
method
:
'post'
,
data
:
data
,
description
:
'发送预约'
,
...
...
src/views/followup/plan-manage/plan-list.vue
浏览文件 @
8a31d4be
...
...
@@ -146,17 +146,17 @@
pageNo
:
currentPage
||
this
.
paginationSet
.
pageNo
,
pageSize
:
this
.
paginationSet
.
pageSize
,
});
const
{
pageN
um
,
pageSize
,
totalRow
}
=
this
.
planList
;
const
{
pageN
o
,
pageSize
,
totalRow
}
=
this
.
planList
;
this
.
paginationSet
.
total
=
totalRow
;
this
.
paginationSet
=
{
...
this
.
paginationSet
,
pageNo
:
pageN
um
,
pageNo
:
pageN
o
,
pageSize
:
pageSize
,
}
},
reseat
(){
this
.
searchData
.
name
=
''
;
this
.
searchData
.
startYear
=
'
0
'
;
this
.
searchData
.
startYear
=
''
;
this
.
search
(
1
);
},
addNewPlan
(){
...
...
src/views/followup/reservation-manage/dialog/change-reservation.vue
浏览文件 @
8a31d4be
...
...
@@ -18,19 +18,19 @@
</el-form-item>
<el-form-item
label=
"预约状态"
required
prop=
"appointStatus"
>
<el-radio-group
v-model=
"reservationForm.appointStatus"
>
<el-radio
label=
"
1
"
>
已接受
</el-radio>
<el-radio
label=
"
2
"
>
已拒绝
</el-radio>
<el-radio
label=
"
3
"
>
已接受
</el-radio>
<el-radio
label=
"
4
"
>
已拒绝
</el-radio>
</el-radio-group>
</el-form-item>
<!--appointStatus:
1是已接受,2
是已拒绝-->
<el-form-item
v-if=
"reservationForm.appointStatus ==
1
"
label=
"预约时间"
required
>
<!--appointStatus:
3是已接受,4
是已拒绝-->
<el-form-item
v-if=
"reservationForm.appointStatus ==
3
"
label=
"预约时间"
required
>
<div
style=
"display: flex;"
>
<el-form-item
prop=
"appointmentDate"
>
<el-date-picker
type=
"date"
v-model=
"reservationForm.appointmentDate"
placeholder=
"请选择预约日期"
value-format=
"
timestamp
"
value-format=
"
yyyy-MM-dd
"
value=
"yyyy-MM-dd"
:picker-options=
"pickerOptions"
@
change=
"changeHandler"
>
...
...
@@ -68,18 +68,6 @@
data
(){
return
{
reservationDialog
:
true
,
// reservationForm: {
// nickName: row.nickName,
// appointmentDate: '',
// appointmentRange: '',
// planId: row.planId,
// patientId: row.patientId,
// planName: row.planName,
// patientsTimesId: row.patientsTimesId,
// typeStr: '',
// changeReason: '',
// appointStatus: null
// },
timeRangeOptions
:
[
{
value
:
1
,
...
...
@@ -174,7 +162,6 @@
closeChangeReserve
(
formName
){
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
console
.
log
(
'保存的内容'
,
this
.
reservationForm
)
changeReservationStatus
({
...
this
.
reservationForm
}).
then
(({
data
})
=>
{
...
...
@@ -188,7 +175,8 @@
});
},
changeHandler
(
val
)
{
this
.
getReservationPatients
({
time
:
val
});
this
.
getReservationPatients
({
makeAnAppointDate
:
val
});
console
.
log
(
'日期'
,
this
.
getRevervationNum
)
},
}
}
...
...
src/views/followup/reservation-manage/dialog/send-reservation.vue
浏览文件 @
8a31d4be
...
...
@@ -16,7 +16,9 @@
:label-position=
"'left'"
size=
"small"
>
<el-form-item
label=
"已选居民"
>
<span>
{{
checkData
.
total
}}
人
</span><span>
(微信发送
{{
checkData
.
weChatNum
}}
人;短信发送
{{
checkData
.
messageNum
}}
人)
</span>
<!--
<span>
{{
checkData
.
total
}}
人
</span>
-->
<span>
{{
selectList
.
length
}}
人
</span>
<span>
(微信发送
{{
checkData
.
weChatNum
}}
人;短信发送
{{
checkData
.
messageNum
}}
人)
</span>
</el-form-item>
<el-form-item
label=
"预约时间"
required
>
<div
style=
"display: flex;"
>
...
...
@@ -77,7 +79,7 @@
reservationForm
:
{
appointmentDate
:
''
,
appointmentRange
:
''
,
patientAppointList
:
[],
//
patientAppointList: [],
},
timeRangeOptions
:
[
{
...
...
@@ -164,7 +166,7 @@
methods
:
{
...
mapActions
(
'reservationManage'
,
[
'getReservationPatients'
]),
changeHandler
(
val
)
{
this
.
getReservationPatients
({
tim
e
:
val
});
this
.
getReservationPatients
({
makeAnAppointDat
e
:
val
});
},
closeSendReserve1
(){
if
(
this
.
$refs
[
'reservationForm'
])
{
...
...
src/views/followup/reservation-manage/reservation-list.vue
浏览文件 @
8a31d4be
...
...
@@ -242,8 +242,6 @@
this
.
$refs
[
formName
].
resetFields
();
},
async
goPatientDetail
(
row
)
{
//预约详情页
// alert(1+patientId)
// this.$router.push('/followup/plan-manage/resident-detail')
await
this
.
getEnteringInfo
({
patientId
:
row
.
patientId
,
fuPlanPatientTimesId
:
row
.
fuPlanPatientTimesId
});
this
.
dialogDetailShow
=
true
;
},
...
...
@@ -274,17 +272,20 @@
async
sendReservation
()
{
if
(
this
.
selectionData
.
length
>
0
){
this
.
selectList
=
this
.
selectionData
;
await
this
.
getCheckReservation
({
patientIds
:
this
.
ids
})
const
{
messageCount
,
messageNum
,
weChatNum
,
total
}
=
this
.
checkRevervationData
//判断短信余额是否不足
// if(this.hasSmsBalance){
if
(
parseInt
(
messageNum
)
<=
parseInt
(
messageCount
)){
this
.
isDialogShow
=
true
;
}
else
{
this
.
isNoEnoughShow
=
true
;
}
//发送预约校验接口
// await this.getCheckReservation({
// patientIds: this.ids
// })
// const { messageCount, messageNum, weChatNum, total} = this.checkRevervationData
// //判断短信余额是否不足
// // if(this.hasSmsBalance){
// if(parseInt(messageNum)
<=
parseInt
(
messageCount
)){
// this.isDialogShow = true;
// }else {
// this.isNoEnoughShow = true;
// }
//暂时不校验
this
.
isDialogShow
=
true
;
}
else
if
(
this
.
selectionData
.
length
>
100
){
this
.
$message
.
warning
(
'每次最多选择100条单条随访进行预约!'
);
...
...
@@ -296,31 +297,39 @@
},
async
sendReservationRow
(
row
){
let
newList
=
[];
newList
.
push
(
row
);
newList
.
push
({
planId
:
row
.
fuPlanId
,
patientId
:
row
.
patientId
,
planName
:
row
.
name
,
patientsTimesId
:
row
.
fuPlanPatientTimesId
,
type
:
row
.
fuPlanType
,
});
this
.
selectList
=
newList
;
await
this
.
getCheckReservation
({
patientIds
:
row
.
nickId
})
const
{
messageCount
,
messageNum
,
weChatNum
,
total
}
=
this
.
checkRevervationData
//判断短信余额是否不足
// if(this.hasSmsBalance){
if
(
parseInt
(
messageNum
)
<=
parseInt
(
messageCount
)){
this
.
isDialogShow
=
true
;
}
else
{
this
.
isNoEnoughShow
=
true
;
}
//发送预约校验
// await this.getCheckReservation({
// patientIds: row.patientId
// })
// const { messageCount, messageNum, weChatNum, total} = this.checkRevervationData
// //判断短信余额是否不足
// // if(this.hasSmsBalance){
// if(parseInt(messageNum)
<=
parseInt
(
messageCount
)){
// this.isDialogShow = true;
// }else {
// this.isNoEnoughShow = true;
// }
//暂时不做校验
this
.
isDialogShow
=
true
;
},
changeReserveClick
(
row
){
// this.needPara = row;
this
.
needPara
=
{
nickname
:
row
.
nickname
,
appointmentDate
:
''
,
appointmentRange
:
''
,
planId
:
row
.
p
lanId
,
planId
:
row
.
fuP
lanId
,
patientId
:
row
.
patientId
,
planName
:
row
.
planN
ame
,
patientsTimesId
:
row
.
patients
TimesId
,
type
Str
:
''
,
planName
:
row
.
n
ame
,
patientsTimesId
:
row
.
fuPlanPatient
TimesId
,
type
:
row
.
fuPlanType
,
changeReason
:
''
,
appointStatus
:
null
};
...
...
@@ -336,11 +345,28 @@
this
.
isChangeReservation
=
val
;
},
handleSelectionChange
(
val
){
for
(
let
i
in
val
){
for
(
let
j
in
val
[
i
])
{
if
(
j
==
'fuPlanId'
)
{
val
[
i
][
'planId'
]
=
val
[
i
][
j
];
// delete val[i]['fuPlanId'];
}
if
(
j
==
'name'
)
{
val
[
i
][
'planName'
]
=
val
[
i
][
j
];
}
if
(
j
==
'fuPlanPatientTimesId'
)
{
val
[
i
][
'patientsTimesId'
]
=
val
[
i
][
j
];
}
if
(
j
==
'fuPlanType'
)
{
val
[
i
][
'type'
]
=
val
[
i
][
j
];
}
}
}
this
.
selectionData
=
val
;
let
idsArray
=
[];
if
(
val
.
length
>
0
)
{
for
(
let
i
=
0
;
i
<
val
.
length
;
i
++
){
idsArray
.
push
(
val
[
i
].
nick
Id
)
idsArray
.
push
(
val
[
i
].
patient
Id
)
}
this
.
ids
=
idsArray
.
join
(
","
)
}
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录