Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pet-business-web
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘怀志
pet-business-web
Commits
0f5fdf33
Commit
0f5fdf33
authored
Jun 27, 2023
by
盖献康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
检查管理-立即预约-在外部服务的时候显示支出账户余额和设备服务费
parent
2ecf5e29
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
137 additions
and
50 deletions
+137
-50
element-ui.scss
src/assets/styles/element-ui.scss
+13
-0
check-detail.vue
...ice-management/medical-record-management/check-detail.vue
+1
-0
check-subscribe.vue
...-management/medical-record-management/check-subscribe.vue
+3
-2
medical-record-management.vue
...t/medical-record-management/medical-record-management.vue
+16
-8
treatment-detail.vue
...vice-management/treatment-management/treatment-detail.vue
+1
-1
treatment-management.vue
...-management/treatment-management/treatment-management.vue
+103
-39
No files found.
src/assets/styles/element-ui.scss
View file @
0f5fdf33
...
@@ -455,3 +455,16 @@ input::-webkit-input-placeholder {
...
@@ -455,3 +455,16 @@ input::-webkit-input-placeholder {
.el-table
.disabledCheck
.cell
.el-checkbox__inner
{
.el-table
.disabledCheck
.cell
.el-checkbox__inner
{
margin-right
:
3px
;
margin-right
:
3px
;
}
}
// 超时退出
.el-button--primary
:hover
,
.el-button--primary
:focus
{
background
:
#5FB54B
;
border-color
:
#5FB54B
;
color
:
#FFFFFF
;
}
// 超时退出
.el-button--primary
{
background
:
#5FB54B
;
border-color
:
#5FB54B
;
color
:
#FFFFFF
;
}
src/views/service-management/medical-record-management/check-detail.vue
View file @
0f5fdf33
...
@@ -158,6 +158,7 @@
...
@@ -158,6 +158,7 @@
<
el
-
row
v
-
show
=
"checkDetail.checkSchedule < 2"
>
<
el
-
row
v
-
show
=
"checkDetail.checkSchedule < 2"
>
<
el
-
col
:
span
=
"8"
>
<
el
-
col
:
span
=
"8"
>
<
el
-
form
-
item
label
=
"暂未预约"
>
<
el
-
form
-
item
label
=
"暂未预约"
>
<
span
><
/span
>
<
/el-form-item
>
<
/el-form-item
>
<
/el-col
>
<
/el-col
>
<
/el-row
>
<
/el-row
>
...
...
src/views/service-management/medical-record-management/check-subscribe.vue
View file @
0f5fdf33
...
@@ -154,7 +154,8 @@
...
@@ -154,7 +154,8 @@
<
el
-
table
-
column
label
=
"操作"
align
=
"center"
class
-
name
=
"small-padding fixed-width"
width
=
"180"
>
<
el
-
table
-
column
label
=
"操作"
align
=
"center"
class
-
name
=
"small-padding fixed-width"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
button
<
el
-
button
class
=
"fourWordsBtn"
style
=
"color: #5FB54B"
type
=
"text"
@
click
=
"handleBookNow(scope.row)"
@
click
=
"handleBookNow(scope.row)"
>
立即预约
<
/el-button
>
>
立即预约
<
/el-button
>
<
/template
>
<
/template
>
...
@@ -286,7 +287,7 @@ export default {
...
@@ -286,7 +287,7 @@ export default {
this
.
total
=
res
.
total
this
.
total
=
res
.
total
if
(
this
.
subscribeMessage
.
checkType
===
'2'
&&
this
.
deviceList
.
length
>
0
)
{
if
(
this
.
subscribeMessage
.
checkType
===
'2'
&&
this
.
deviceList
.
length
>
0
)
{
this
.
deviceList
.
forEach
(
item
=>
{
this
.
deviceList
.
forEach
(
item
=>
{
item
[
'price'
]
=
this
.
subscribeMessage
.
devicePrice
item
[
'price'
]
=
this
.
subscribeMessage
.
payAmount
}
)
}
)
}
}
console
.
log
(
'列表'
,
this
.
deviceList
)
console
.
log
(
'列表'
,
this
.
deviceList
)
...
...
src/views/service-management/medical-record-management/medical-record-management.vue
View file @
0f5fdf33
...
@@ -66,28 +66,28 @@
...
@@ -66,28 +66,28 @@
<el-row
:gutter=
"10"
class=
"mb8"
style=
"margin: 0 0 20px 1px"
>
<el-row
:gutter=
"10"
class=
"mb8"
style=
"margin: 0 0 20px 1px"
>
<el-button
<el-button
class=
"fourWordsBtn"
class=
"fourWordsBtn"
icon=
"el-icon-
plus
"
icon=
"el-icon-
finished
"
size=
"mini"
size=
"mini"
@
click=
"selectAll()"
@
click=
"selectAll()"
>
选择全部
>
选择全部
</el-button>
</el-button>
<el-button
<el-button
class=
"fourWordsBtn"
class=
"fourWordsBtn"
icon=
"el-icon-
edit
"
icon=
"el-icon-
back
"
size=
"mini"
size=
"mini"
@
click=
"reverseSelect()"
@
click=
"reverseSelect()"
>
反向选择
>
反向选择
</el-button>
</el-button>
<el-button
<el-button
class=
"fourWordsBtn"
class=
"fourWordsBtn"
icon=
"el-icon-
delete
"
icon=
"el-icon-
upload2
"
size=
"mini"
size=
"mini"
@
click=
"handleExport()"
@
click=
"handleExport()"
>
批量导出
>
批量导出
</el-button>
</el-button>
<el-button
<el-button
class=
"fourWordsBtn"
class=
"fourWordsBtn"
icon=
"el-icon-
download
"
icon=
"el-icon-
setting
"
size=
"mini"
size=
"mini"
@
click=
"checkItem()"
@
click=
"checkItem()"
>
检查项目
>
检查项目
...
@@ -130,7 +130,7 @@
...
@@ -130,7 +130,7 @@
</el-table-column>
</el-table-column>
<el-table-column
label=
"检查项目"
align=
"left"
:show-overflow-tooltip=
"true"
prop=
"checkItemsName"
>
<el-table-column
label=
"检查项目"
align=
"left"
:show-overflow-tooltip=
"true"
prop=
"checkItemsName"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
checkItemsName
||
'-'
}}
</span>
<span>
{{
scope
.
row
.
checkItemsName
||
'-'
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"宠物昵称"
align=
"left"
:show-overflow-tooltip=
"true"
prop=
"petNickname"
/>
<el-table-column
label=
"宠物昵称"
align=
"left"
:show-overflow-tooltip=
"true"
prop=
"petNickname"
/>
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
/>
/>
<
/el-form-item
>
<
/el-form-item
>
<
/el-col
>
<
/el-col
>
<
el
-
col
:
span
=
"7"
>
<
el
-
col
:
span
=
"7"
v
-
show
=
"currentCheckType === '2'"
>
<
el
-
form
-
item
label
=
"支出账户金额"
prop
=
"shadowReport"
label
-
width
=
"120"
>
<
el
-
form
-
item
label
=
"支出账户金额"
prop
=
"shadowReport"
label
-
width
=
"120"
>
1200.00
1200.00
<
/el-form-item
>
<
/el-form-item
>
...
@@ -281,7 +281,7 @@
...
@@ -281,7 +281,7 @@
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
prop
=
"num"
align
=
"left"
label
=
"剩余可预约"
/>
<
el
-
table
-
column
prop
=
"num"
align
=
"left"
label
=
"剩余可预约"
/>
<
el
-
table
-
column
prop
=
"date"
align
=
"left"
label
=
"设备服务费"
/>
<
el
-
table
-
column
v
-
if
=
"currentCheckType === '2'"
prop
=
"date"
align
=
"left"
label
=
"设备服务费"
/>
<
el
-
table
-
column
align
=
"left"
label
=
"操作"
>
<
el
-
table
-
column
align
=
"left"
label
=
"操作"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
button
<
el
-
button
...
@@ -420,7 +420,9 @@ export default {
...
@@ -420,7 +420,9 @@ export default {
// 当前的检查ID
// 当前的检查ID
currentCheckId
:
null
,
currentCheckId
:
null
,
// 当前的设备服务费
// 当前的设备服务费
currentPayAmount
:
null
currentPayAmount
:
null
,
// 检查类型(0-自有、2-外部)
currentCheckType
:
null
}
}
}
,
}
,
created
()
{
created
()
{
...
@@ -568,6 +570,7 @@ export default {
...
@@ -568,6 +570,7 @@ export default {
this
.
deviceQueryParams
.
reservationTime
=
this
.
getCurrentTime
()
this
.
deviceQueryParams
.
reservationTime
=
this
.
getCurrentTime
()
this
.
currentCheckId
=
row
.
id
this
.
currentCheckId
=
row
.
id
this
.
currentPayAmount
=
row
.
payAmount
this
.
currentPayAmount
=
row
.
payAmount
this
.
currentCheckType
=
row
.
checkType
console
.
log
(
'点击立即预约后的状态'
,
this
.
deviceQueryParams
)
console
.
log
(
'点击立即预约后的状态'
,
this
.
deviceQueryParams
)
// 设置检查项目id
// 设置检查项目id
this
.
getDevice
()
this
.
getDevice
()
...
@@ -620,6 +623,11 @@ export default {
...
@@ -620,6 +623,11 @@ export default {
console
.
log
(
'设备'
,
res
)
console
.
log
(
'设备'
,
res
)
this
.
deviceList
=
res
.
rows
.
table
this
.
deviceList
=
res
.
rows
.
table
this
.
deviceTotal
=
res
.
total
this
.
deviceTotal
=
res
.
total
if
(
this
.
currentCheckType
===
'2'
&&
this
.
deviceList
.
length
>
0
)
{
this
.
deviceList
.
forEach
(
item
=>
{
item
[
'price'
]
=
this
.
currentPayAmount
}
)
}
}
)
}
)
}
,
}
,
/** 重置按钮操作 */
/** 重置按钮操作 */
...
...
src/views/service-management/treatment-management/treatment-detail.vue
View file @
0f5fdf33
...
@@ -503,7 +503,7 @@ export default {
...
@@ -503,7 +503,7 @@ export default {
return
treatRange
return
treatRange
}
,
}
,
// 预约诊室搜索
// 预约诊室搜索
allocationFormChangeName
(
value
)
{
allocationFormChangeName
()
{
this
.
getAppointmentRecord
()
this
.
getAppointmentRecord
()
}
,
}
,
// 分配诊室治疗时间查询
// 分配诊室治疗时间查询
...
...
src/views/service-management/treatment-management/treatment-management.vue
View file @
0f5fdf33
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment