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
f6b44ae6
Commit
f6b44ae6
authored
Jun 27, 2023
by
高滢
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
08015bbd
ad696e49
Changes
19
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
597 additions
and
80 deletions
+597
-80
banner.js
src/api/business/banner.js
+44
-0
element-ui.scss
src/assets/styles/element-ui.scss
+35
-2
index.vue
src/components/Pagination/index.vue
+1
-1
AppMain.vue
src/layout/components/AppMain.vue
+3
-0
index.js
src/router/index.js
+16
-0
article-insert.vue
src/views/article-management/article-insert.vue
+1
-0
article-management.vue
src/views/article-management/article-management.vue
+1
-1
banner_management.vue
src/views/banner_management/banner_management.vue
+343
-0
equipment-check.vue
...pment-management/equipment-management/equipment-check.vue
+17
-1
equipment-detail.vue
...ment-management/equipment-management/equipment-detail.vue
+16
-24
equipment-management.vue
...-management/equipment-management/equipment-management.vue
+1
-1
medical-record-management.vue
...s/medical-record-management/medical-record-management.vue
+1
-1
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
+17
-9
register-modle.vue
...nagement/registration-queue/components/register-modle.vue
+1
-1
registration-queue.vue
...vice-management/registration-queue/registration-queue.vue
+2
-2
treatment-detail.vue
...vice-management/treatment-management/treatment-detail.vue
+3
-3
treatment-management.vue
...-management/treatment-management/treatment-management.vue
+91
-32
No files found.
src/api/business/banner.js
0 → 100644
View file @
f6b44ae6
import
request
from
'@/utils/request'
// 查询轮播图管理列表
export
function
listBanner
(
query
)
{
return
request
({
url
:
'/business/banner/list'
,
method
:
'get'
,
params
:
query
})
}
// 查询轮播图管理详细
export
function
getBanner
(
id
)
{
return
request
({
url
:
'/business/banner/'
+
id
,
method
:
'get'
})
}
// 新增轮播图管理
export
function
addBanner
(
data
)
{
return
request
({
url
:
'/business/banner'
,
method
:
'post'
,
data
:
data
})
}
// 修改轮播图管理
export
function
updateBanner
(
data
)
{
return
request
({
url
:
'/business/banner'
,
method
:
'put'
,
data
:
data
})
}
// 删除轮播图管理
export
function
delBanner
(
id
)
{
return
request
({
url
:
'/business/banner/'
+
id
,
method
:
'delete'
})
}
src/assets/styles/element-ui.scss
View file @
f6b44ae6
...
...
@@ -371,8 +371,21 @@ input::-webkit-input-placeholder {
// 分頁
.el-pagination.is-background
.el-pager
li
:not
(
.disabled
)
.active
{
background-color
:
#5FB54B
;
color
:
#FFFFFF
;
background
:
#F2F9F0
;
opacity
:
1
;
border
:
1px
solid
#5FB54B
;
color
:
#5FB54B
;
}
.el-pagination.is-background
.btn-prev
,
.el-pagination.is-background
.btn-next
,
.el-pagination.is-background
.el-pager
li
{
font-size
:
13px
;
font-family
:
Source
Han
Sans
CN-Regular
,
Source
Han
Sans
CN
;
font-weight
:
400
;
color
:
#666666
;
background
:
#F4F4F4
;
border-radius
:
4px
4px
4px
4px
;
}
.el-pagination.is-background
.btn-prev
:hover
,
.el-pagination.is-background
.btn-next
:hover
,
.el-pagination.is-background
.el-pager
li
:not
(
.disabled
)
:hover
{
color
:
#5FB54B
;
}
.el-pagination__sizes
.el-input
.el-input__inner
:hover
{
border-color
:
#5FB54B
;
...
...
@@ -455,3 +468,23 @@ input::-webkit-input-placeholder {
.el-table
.disabledCheck
.cell
.el-checkbox__inner
{
margin-right
:
3px
;
}
// 弹出框x按钮大小修改
.el-message-box
.el-message-box__close
{
font-size
:
16px
;
}
.el-message-box__headerbtn
:focus
.el-message-box__close
,
.el-message-box__headerbtn
:hover
.el-message-box__close
{
color
:
#fff
;
}
// 超时退出
.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/components/Pagination/index.vue
View file @
f6b44ae6
...
...
@@ -36,7 +36,7 @@ export default {
pageSizes
:
{
type
:
Array
,
default
()
{
return
[
10
,
20
,
30
,
5
0
]
return
[
20
,
50
,
10
0
]
}
},
// 移动端页码按钮的数量端默认值5
...
...
src/layout/components/AppMain.vue
View file @
f6b44ae6
...
...
@@ -30,6 +30,7 @@ export default {
.app-main
{
/* 50= navbar 50 */
min-height
:
calc
(
100vh
-
50px
);
background-color
:
#F4F4F4
!
important
;
width
:
100%
;
position
:
relative
;
overflow
:
hidden
;
...
...
@@ -43,10 +44,12 @@ export default {
.app-main
{
/* 84 = navbar + tags-view = 50 + 34 */
min-height
:
calc
(
100vh
-
84px
);
background-color
:
#F4F4F4
!
important
;
}
.fixed-header
+
.app-main
{
padding-top
:
84px
;
background-color
:
#F4F4F4
!
important
;
}
}
</
style
>
src/router/index.js
View file @
f6b44ae6
...
...
@@ -253,6 +253,22 @@ export const constantRoutes = [
}
]
},
// 轮播
{
path
:
'/banner/management'
,
component
:
Layout
,
hidden
:
true
,
permissions
:
[
'*:*:*'
],
children
:
[
{
path
:
'index'
,
props
:
true
,
component
:
()
=>
import
(
'@/views/banner_management/banner_management.vue'
),
name
:
'banner_management'
,
meta
:
{
title
:
'轮播管理'
,
icon
:
'component'
}
}
]
},
// 业务管理
{
path
:
'/service-management'
,
...
...
src/views/article-management/article-insert.vue
View file @
f6b44ae6
...
...
@@ -29,6 +29,7 @@
:max=
"9999"
:min=
"0"
controls-position=
"right"
style=
""
/>
</el-form-item>
<el-form-item
label=
"文章封面"
prop=
"articleCover"
>
...
...
src/views/article-management/article-management.vue
View file @
f6b44ae6
...
...
@@ -15,7 +15,7 @@
</el-form-item>
<el-form-item
style=
"margin-left: 10px;"
prop=
"articleStatus"
>
<el-select
v-model
.
trim=
"queryParams.articleStatus"
clearable
placeholder=
"状态"
>
<
el-option
label=
"全部"
:value=
"null"
/
>
<
!--
<el-option
label=
"全部"
:value=
"null"
/>
--
>
<el-option
v-for=
"item in dict.type.article_status"
:key=
"item.value"
...
...
src/views/banner_management/banner_management.vue
0 → 100644
View file @
f6b44ae6
<
template
>
<div
style=
"background-color: #FFFFFF;"
>
<div
class=
"app-container"
>
<el-tabs
v-model=
"activeName"
>
<el-tab-pane
label=
"轮播管理"
name=
"first"
>
<!--顶部搜索区-->
<el-form
v-show=
"showSearch"
ref=
"queryForm"
:inline=
"true"
:model=
"queryParams"
label-width=
"68px"
>
<el-form-item
prop=
"title"
>
<el-input
v-model=
"queryParams.title"
placeholder=
"请输入标题"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
prop=
"img"
>
<el-input
v-model=
"queryParams.img"
placeholder=
"请输入图片地址"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
prop=
"url"
>
<el-input
v-model=
"queryParams.url"
placeholder=
"请输入跳转链接"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
prop=
"sort"
>
<el-input
v-model=
"queryParams.sort"
placeholder=
"请输入权重"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
prop=
"notes"
>
<el-input
v-model=
"queryParams.notes"
placeholder=
"请输入备注"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<div>
<!--顶部操作按钮-->
<el-form-item>
<!--新增文章-->
<el-button
v-hasPermi=
"['business:article:add']"
class=
"fourWordsBtn"
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
>
新增轮播
</el-button>
</el-form-item>
<el-form-item
style=
"position: absolute;right: 0.6%;"
>
<!--搜索 重置-->
<el-button
class=
"queryBtn"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
查询
</el-button>
<el-button
class=
"resetBtn"
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
</div>
</el-form>
<!-- 表格区 -->
<el-table
v-loading=
"loading"
:data=
"bannerList"
@
selection-change=
"handleSelectionChange"
:header-cell-style=
"
{background:'#E8E9E8'}"
>
<el-table-column
label=
"序号"
min-width=
"80"
show-overflow-tooltip
type=
"index"
/>
<el-table-column
label=
"标题"
prop=
"title"
show-overflow-tooltip
/>
<el-table-column
label=
"图片地址"
prop=
"img"
show-overflow-tooltip
/>
<el-table-column
label=
"跳转链接"
prop=
"url"
show-overflow-tooltip
/>
<el-table-column
label=
"权重"
prop=
"sort"
width=
"60"
/>
<el-table-column
label=
"状态"
prop=
"status"
width=
"80"
>
<template
slot-scope=
"scope"
>
<dict-tag
:options=
"dict.type.banner_status"
:value=
"scope.row.status"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"备注"
prop=
"notes"
show-overflow-tooltip
/>
<el-table-column
label=
"操作"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<div
style=
"display: flex;"
>
<div
style=
"padding-right: 20px;"
>
<el-button
icon=
"el-icon-document"
plain
size=
"mini"
style=
"width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
type=
"success"
@
click=
"handleDetail(scope.row)"
>
详情
</el-button>
</div>
<div
style=
"padding-right: 20px;"
>
<el-button
v-hasPermi=
"['business:article:edit']"
icon=
"el-icon-edit"
plain
size=
"mini"
style=
"width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
type=
"primary"
@
click=
"handleUpdate(scope.row)"
>
编辑
</el-button>
</div>
<div
v-if=
"scope.row.articleStatus==='1'"
>
<el-button
key=
"1"
v-hasPermi=
"['business:article:remove']"
icon=
"el-icon-delete"
plain
size=
"mini"
style=
"width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(219,71,71);"
type=
"danger"
@
click=
"handleDelete(scope.row)"
>
删除
</el-button>
</div>
<div
v-else-if=
"scope.row.articleStatus==='0'"
>
<el-button
key=
"2"
icon=
"el-icon-video-pause"
plain
size=
"mini"
style=
"width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
type=
"warning"
@
click=
"handleChange(scope.row)"
>
下架
</el-button>
</div>
</div>
</
template
>
</el-table-column>
</el-table>
<pagination
v-show=
"total>0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"getBannerList"
/>
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<
script
>
import
{
listBanner
,
getBanner
,
delBanner
,
addBanner
,
updateBanner
}
from
'@/api/business/banner'
export
default
{
name
:
'BannerManagement'
,
dicts
:
[
'banner_status'
],
data
()
{
return
{
activeName
:
'first'
,
// 遮罩层
loading
:
true
,
// 选中数组
ids
:
[],
// 非单个禁用
single
:
true
,
// 非多个禁用
multiple
:
true
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 轮播图管理表格数据
bannerList
:
[],
// 弹出层标题
title
:
''
,
// 是否显示弹出层
open
:
false
,
// 查询参数
queryParams
:
{
pageNum
:
1
,
pageSize
:
10
,
title
:
null
,
img
:
null
,
url
:
null
,
sort
:
null
,
status
:
null
,
notes
:
null
},
// 表单参数
form
:
{},
// 表单校验
rules
:
{
}
}
},
watch
:
{},
created
()
{
this
.
getBannerList
()
},
methods
:
{
/** 查询轮播图管理列表 */
getBannerList
()
{
this
.
loading
=
true
listBanner
(
this
.
queryParams
).
then
(
response
=>
{
this
.
bannerList
=
response
.
rows
this
.
total
=
response
.
total
this
.
loading
=
false
})
},
// 取消按钮
cancel
()
{
this
.
open
=
false
this
.
reset
()
},
// 表单重置
reset
()
{
this
.
form
=
{
id
:
null
,
title
:
null
,
img
:
null
,
url
:
null
,
sort
:
null
,
status
:
null
,
notes
:
null
,
createTime
:
null
,
createBy
:
null
,
updateTime
:
null
,
updateBy
:
null
}
this
.
resetForm
(
'form'
)
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
this
.
getBannerList
()
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
resetForm
(
'queryForm'
)
this
.
handleQuery
()
},
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
id
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
},
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
()
this
.
open
=
true
this
.
title
=
'添加轮播图管理'
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
()
const
id
=
row
.
id
||
this
.
ids
getBanner
(
id
).
then
(
response
=>
{
this
.
form
=
response
.
data
this
.
open
=
true
this
.
title
=
'修改轮播图管理'
})
},
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
'form'
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
form
.
id
!=
null
)
{
updateBanner
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
'修改成功'
)
this
.
open
=
false
this
.
getBannerList
()
})
}
else
{
addBanner
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
'新增成功'
)
this
.
open
=
false
this
.
getBannerList
()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
ids
=
row
.
id
||
this
.
ids
this
.
$modal
.
confirm
(
'是否确认删除轮播图管理编号为"'
+
ids
+
'"的数据项?'
).
then
(
function
()
{
return
delBanner
(
ids
)
}).
then
(()
=>
{
this
.
getBannerList
()
this
.
$modal
.
msgSuccess
(
'删除成功'
)
}).
catch
(()
=>
{})
},
/** 导出按钮操作 */
handleExport
()
{
this
.
download
(
'business/banner/export'
,
{
...
this
.
queryParams
},
`banner_
${
new
Date
().
getTime
()}
.xlsx`
)
}
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.app-container
{
padding
:
0
1
.5rem
;
margin-bottom
:
0
.5em
;
}
//所有表格内容选中后的样式-all
::v-deep
.el-table--enable-row-hover
.el-table__body
tr
:hover
>
td
.el-table__cell
{
background-color
:
#F6FCF5
!
important
;
}
::v-deep
.el-table
.disabledCheck
.cell
.el-checkbox__inner
{
display
:
none
;
}
.el-tab-pane
{
padding-bottom
:
15px
;
}
/*表格超出行宽省略号显示并悬浮状态显示全文*/
::v-deep
.el-tooltip__popper
.is-dark
{
background
:
#f1f1f1
!
important
;
color
:
#666666
!
important
;
width
:
200px
!
important
;
}
/*表格上下架状态颜色样式*/
/*上架*/
::v-deep
.status-grounding
{
color
:
#67C23A
;
}
/*下架*/
::v-deep
.status-offshelf
{
color
:
#f5aa6c
;
}
</
style
>
src/views/equipment-management/equipment-management/equipment-check.vue
View file @
f6b44ae6
...
...
@@ -78,14 +78,17 @@
:prop=
"'settingList.'+index+'.price'"
:rules=
"[
{ required: true, message: '请输入项目单价', trigger: 'change' },
{ validator: validatePrice, trigger: 'change, blur' }
]"
>
<el-input-number
v-model=
"item.price"
:min=
"0"
:max=
"9999.99"
controls-position=
"right"
style=
"width: 240px"
placeholder=
"0.00"
:precision=
"2"
@
keydown
.
native=
"keydown($event)"
/>
元
...
...
@@ -122,6 +125,10 @@
:ref=
"'settingList.'+index+'.sort'"
label=
"权重"
:prop=
"'settingList.'+index+'.sort'"
:rules=
"[
{ required: true, message: '请输入权重', trigger: 'change' },
{ validator: validWeigh, trigger: 'change, blur' }
]"
>
<el-input-number
v-model=
"item.sort"
...
...
@@ -256,6 +263,15 @@ export default {
})
},
/** 项目单价校验 */
validatePrice
:
function
(
rule
,
value
,
callback
)
{
console
.
log
(
'value'
,
value
)
if
(
value
===
0
)
{
callback
(
new
Error
(
'项目单价不能为0.00'
))
}
else
{
callback
()
}
},
// 是权重不可以输入小数
handleBlur
()
{
const
parsedValue
=
parseFloat
(
this
.
form
.
sort
)
...
...
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @
f6b44ae6
...
...
@@ -265,22 +265,13 @@
<el-row>
<el-col>
<el-form-item
label=
"支持服务地区"
>
<!--
<el-input-->
<!-- disabled-->
<!-- type="textarea"-->
<!-- placeholder="暂无数据"-->
<!-- maxlength="200"-->
<!-- style="width:705%;"-->
<!-- :rows="4"-->
<!-- />-->
<el-select
v-model=
"form.serviceArea"
multiple
placeholder=
"请选择支持服务地区"
disabled
style=
"width: 300px"
>
<el-option
v-for=
"dict in dict.type.service_area"
:key=
"dict.label"
:label=
"dict.label"
:value=
"dict.value"
<el-input
v-model
.
trim=
"form.serviceAreaList"
type=
"textarea"
style=
"width:705%;;"
:row=
"4"
disabled
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -288,14 +279,13 @@
<el-row>
<el-col>
<el-form-item
label=
"支持检查类型"
>
<el-
select
v-model=
"form.checkType"
multiple
placeholder=
"请选择支持检查类型"
style=
"width: 300px"
disabled
>
<el-option
v-for=
" dict in dict.type.exam_type
"
:key=
"dict.label
"
:label=
"dict.label
"
:value=
"dict.value"
<el-
input
v-model
.
trim=
"form.checkTypeList"
type=
"textarea
"
style=
"width:705%;;
"
:row=
"4
"
disabled
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -1081,6 +1071,8 @@ export default {
// })
// }
if
(
this
.
form
.
checkType
!=
null
&&
this
.
form
.
checkType
!==
''
)
{
this
.
form
.
checkTypeList
=
selectDictLabels
(
this
.
dict
.
type
.
check_type
,
this
.
form
.
checkType
)
console
.
log
(
' this.form.checkTypeList'
,
this
.
form
.
checkTypeList
)
this
.
form
.
checkType
=
response
.
data
.
checkType
.
split
(
','
)
}
...
...
src/views/equipment-management/equipment-management/equipment-management.vue
View file @
f6b44ae6
...
...
@@ -127,7 +127,7 @@
</el-row>
<el-table
ref=
"table"
v-loading=
"loading"
:data=
"deviceList"
:header-cell-style=
"
{ background:'#E8E9E8'}" border :row-key="getRowKeys" @selection-change="handleSelectionChange">
<el-table-column
type=
"selection"
width=
"
50
"
align=
"center"
:reserve-selection=
"true"
/>
<el-table-column
type=
"selection"
width=
"
47
"
align=
"center"
:reserve-selection=
"true"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"50"
/>
<el-table-column
label=
"设备名称"
align=
"left"
prop=
"deviceName"
show-overflow-tooltip
/>
<el-table-column
label=
"设备ID"
align=
"left"
prop=
"deviceCode"
show-overflow-tooltip
/>
...
...
src/views/medical-record-management/medical-record-management.vue
View file @
f6b44ae6
...
...
@@ -264,7 +264,7 @@ export default {
sort
:
null
}
,
pageNum
:
1
,
pageSize
:
1
0
,
pageSize
:
2
0
,
petNickname
:
null
,
nickname
:
null
,
petOwnerNumber
:
null
,
...
...
src/views/service-management/medical-record-management/check-detail.vue
View file @
f6b44ae6
...
...
@@ -158,6 +158,7 @@
<
el
-
row
v
-
show
=
"checkDetail.checkSchedule < 2"
>
<
el
-
col
:
span
=
"8"
>
<
el
-
form
-
item
label
=
"暂未预约"
>
<
span
><
/span
>
<
/el-form-item
>
<
/el-col
>
<
/el-row
>
...
...
src/views/service-management/medical-record-management/check-subscribe.vue
View file @
f6b44ae6
...
...
@@ -154,7 +154,8 @@
<
el
-
table
-
column
label
=
"操作"
align
=
"center"
class
-
name
=
"small-padding fixed-width"
width
=
"180"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
button
class
=
"fourWordsBtn"
style
=
"color: #5FB54B"
type
=
"text"
@
click
=
"handleBookNow(scope.row)"
>
立即预约
<
/el-button
>
<
/template
>
...
...
@@ -286,7 +287,7 @@ export default {
this
.
total
=
res
.
total
if
(
this
.
subscribeMessage
.
checkType
===
'2'
&&
this
.
deviceList
.
length
>
0
)
{
this
.
deviceList
.
forEach
(
item
=>
{
item
[
'price'
]
=
this
.
subscribeMessage
.
devicePrice
item
[
'price'
]
=
this
.
subscribeMessage
.
payAmount
}
)
}
console
.
log
(
'列表'
,
this
.
deviceList
)
...
...
src/views/service-management/medical-record-management/medical-record-management.vue
View file @
f6b44ae6
...
...
@@ -66,28 +66,28 @@
<el-row
:gutter=
"10"
class=
"mb8"
style=
"margin: 0 0 20px 1px"
>
<el-button
class=
"fourWordsBtn"
icon=
"el-icon-
plus
"
icon=
"el-icon-
finished
"
size=
"mini"
@
click=
"selectAll()"
>
选择全部
</el-button>
<el-button
class=
"fourWordsBtn"
icon=
"el-icon-
edit
"
icon=
"el-icon-
back
"
size=
"mini"
@
click=
"reverseSelect()"
>
反向选择
</el-button>
<el-button
class=
"fourWordsBtn"
icon=
"el-icon-
delete
"
icon=
"el-icon-
upload2
"
size=
"mini"
@
click=
"handleExport()"
>
批量导出
</el-button>
<el-button
class=
"fourWordsBtn"
icon=
"el-icon-
download
"
icon=
"el-icon-
setting
"
size=
"mini"
@
click=
"checkItem()"
>
检查项目
...
...
@@ -115,8 +115,8 @@
v-loading=
"loading"
:data=
"manageList"
:row-key=
"getRowKeys"
@
selection-change=
"handleSelectionChange"
:header-cell-style=
"
{background:'#E8E9E8'}"
@selection-change="handleSelectionChange"
>
<el-table-column
type=
"selection"
min-width=
"47"
align=
"center"
:reserve-selection=
"true"
/>
<el-table-column
label=
"序号"
type=
"index"
align=
"left"
/>
...
...
@@ -130,7 +130,7 @@
</el-table-column>
<el-table-column
label=
"检查项目"
align=
"left"
:show-overflow-tooltip=
"true"
prop=
"checkItemsName"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
checkItemsName
||
'-'
}}
</span>
<span>
{{
scope
.
row
.
checkItemsName
||
'-'
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"宠物昵称"
align=
"left"
:show-overflow-tooltip=
"true"
prop=
"petNickname"
/>
...
...
@@ -257,7 +257,7 @@
/>
<
/el-form-item
>
<
/el-col
>
<
el
-
col
:
span
=
"7"
>
<
el
-
col
:
span
=
"7"
v
-
show
=
"currentCheckType === '2'"
>
<
el
-
form
-
item
label
=
"支出账户金额"
prop
=
"shadowReport"
label
-
width
=
"120"
>
1200.00
<
/el-form-item
>
...
...
@@ -281,7 +281,7 @@
<
/template
>
<
/el-table-column
>
<
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
=
"操作"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
button
...
...
@@ -420,7 +420,9 @@ export default {
// 当前的检查ID
currentCheckId
:
null
,
// 当前的设备服务费
currentPayAmount
:
null
currentPayAmount
:
null
,
// 检查类型(0-自有、2-外部)
currentCheckType
:
null
}
}
,
created
()
{
...
...
@@ -568,6 +570,7 @@ export default {
this
.
deviceQueryParams
.
reservationTime
=
this
.
getCurrentTime
()
this
.
currentCheckId
=
row
.
id
this
.
currentPayAmount
=
row
.
payAmount
this
.
currentCheckType
=
row
.
checkType
console
.
log
(
'点击立即预约后的状态'
,
this
.
deviceQueryParams
)
// 设置检查项目id
this
.
getDevice
()
...
...
@@ -620,6 +623,11 @@ export default {
console
.
log
(
'设备'
,
res
)
this
.
deviceList
=
res
.
rows
.
table
this
.
deviceTotal
=
res
.
total
if
(
this
.
currentCheckType
===
'2'
&&
this
.
deviceList
.
length
>
0
)
{
this
.
deviceList
.
forEach
(
item
=>
{
item
[
'price'
]
=
this
.
currentPayAmount
}
)
}
}
)
}
,
/** 重置按钮操作 */
...
...
src/views/service-management/registration-queue/components/register-modle.vue
View file @
f6b44ae6
...
...
@@ -243,7 +243,7 @@ export default {
const
temp
=
{
// 给接口所需的宠物赋值
petOwnerBo
:
this
.
petForm
,
type
:
this
.
registrationType
,
type
:
'1'
,
// 这个字段区分的是现场还是预约 1为现场
// 宠物宠主本身的信息
petsId
:
this
.
doctorForm
.
petsId
||
null
,
petType
:
this
.
doctorForm
.
petStatus
,
...
...
src/views/service-management/registration-queue/registration-queue.vue
View file @
f6b44ae6
...
...
@@ -181,7 +181,7 @@
<
/el-table-column
>
<
el
-
table
-
column
align
=
"center"
label
=
"缴费状态"
min
-
width
=
"70"
prop
=
"payStatus"
show
-
overflow
-
tooltip
>
<
template
slot
-
scope
=
"scope"
>
<
dict
-
tag
:
options
=
"dict.type.payment_status"
:
value
=
"scope.row.payStatus"
/
>
<
span
:
style
=
"scope.row.payStatus === '0' ? 'color: #F56C6C' : 'color: #67C23A'"
><
dict
-
tag
:
options
=
"dict.type.payment_status"
:
value
=
"scope.row.payStatus"
/><
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"center"
class
-
name
=
"small-padding fixed-width"
label
=
"操作"
min
-
width
=
"180"
>
...
...
@@ -295,7 +295,7 @@ export default {
// 排序方式声明
sort
:
''
,
pageNum
:
1
,
pageSize
:
1
0
,
pageSize
:
2
0
,
type
:
null
,
petId
:
null
,
petNickname
:
null
,
...
...
src/views/service-management/treatment-management/treatment-detail.vue
View file @
f6b44ae6
...
...
@@ -227,7 +227,7 @@
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"诊室"
>
<el-select
v-model=
"allocationForm.consultRoomIdList"
clearable
multiple
collapse-tags
placeholder=
"请选择诊室"
@
change=
"allocationFormChangeName"
style=
"width: 200px
"
>
<el-select
v-model=
"allocationForm.consultRoomIdList"
clearable
multiple
collapse-tags
placeholder=
"请选择诊室"
style=
"width: 200px"
@
change=
"allocationFormChangeName
"
>
<el-option
v-for=
"item in consultingName"
:key=
"item.id"
...
...
@@ -240,8 +240,8 @@
<el-col
:span=
"12"
>
<el-form-item
label=
"治疗日期"
>
<el-date-picker
style=
"width: 200px"
v-model=
"treatStartTime"
style=
"width: 200px"
type=
"date"
format=
"yyyy-MM-dd"
value-format=
"yyyy-MM-dd"
...
...
@@ -503,7 +503,7 @@ export default {
return
treatRange
}
,
// 预约诊室搜索
allocationFormChangeName
(
value
)
{
allocationFormChangeName
()
{
this
.
getAppointmentRecord
()
}
,
// 分配诊室治疗时间查询
...
...
src/views/service-management/treatment-management/treatment-management.vue
View file @
f6b44ae6
...
...
@@ -11,10 +11,10 @@
<el-form-item
prop=
"petWeight"
>
<el-select
v-model=
"queryParams.treatItemsIdList"
clearable
multiple
collapse-tags
placeholder=
"治疗类型"
>
<el-option
v-for=
"item in
treatmentDropdown
"
:key=
"item.
id
"
:label=
"item.
name
"
:value=
"item.
id
"
v-for=
"item in
dict.type.treat_type
"
:key=
"item.
value
"
:label=
"item.
label
"
:value=
"item.
value
"
/>
</el-select>
</el-form-item>
...
...
@@ -51,29 +51,47 @@
<el-row
:gutter=
"10"
class=
"mb8"
style=
"margin: 0 0 20px 1px"
>
<el-button
class=
"fourWordsBtn"
icon=
"el-icon-
top-left
"
icon=
"el-icon-
finished
"
@
click=
"selectAll()"
>
选择全部
</el-button>
>
选择全部
</el-button>
<el-button
class=
"fourWordsBtn"
icon=
"el-icon-
top-right
"
icon=
"el-icon-
back
"
size=
"mini"
@
click=
"reverseSelect(treatmentList)"
>
反向选择
</el-button>
>
反向选择
</el-button>
<el-button
class=
"fourWordsBtn"
icon=
"el-icon-
bottom-right
"
icon=
"el-icon-
upload2
"
size=
"mini"
@
click=
"handleExport"
>
批量导出
</el-button>
>
批量导出
</el-button>
<el-button
class=
"fourWordsBtn"
icon=
"el-icon-setting"
size=
"mini"
@
click=
"checkItem()"
>
治疗项目
</el-button>
<el-button
style=
"position: relative; float: right;"
class=
"resetBtn"
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
style=
"position: relative; float: right;"
class=
"queryBtn"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
查询
</el-button>
>
治疗项目
</el-button>
<el-button
style=
"position: relative; float: right;"
class=
"resetBtn"
icon=
"el-icon-refresh"
size=
"mini"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
style=
"position: relative; float: right;"
class=
"queryBtn"
icon=
"el-icon-search"
size=
"mini"
@
click=
"handleQuery"
>
查询
</el-button>
</el-row>
<el-table
...
...
@@ -83,7 +101,7 @@
:row-key=
"getRowKeys"
:header-cell-class-name=
"cellClass"
@
selection-change=
"handleSelectionChange"
:header-cell-style=
"
{
background:'#E8E9E8'
}"
:header-cell-style=
"
{
background:'#E8E9E8'
}"
>
<el-table-column
type=
"selection"
min-width=
"47"
align=
"center"
:reserve-selection=
"true"
/>
<el-table-column
label=
"序号"
type=
"index"
align=
"left"
/>
...
...
@@ -196,7 +214,15 @@
/>
<!--
分配诊室对话框
-->
<
el
-
dialog
title
=
"分配诊室"
:
visible
.
sync
=
"open"
width
=
"800px"
append
-
to
-
body
:
close
-
on
-
press
-
escape
=
"false"
:
close
-
on
-
click
-
modal
=
"false"
@
close
=
"closeDialogRoom"
>
<
el
-
dialog
title
=
"分配诊室"
:
visible
.
sync
=
"open"
width
=
"800px"
append
-
to
-
body
:
close
-
on
-
press
-
escape
=
"false"
:
close
-
on
-
click
-
modal
=
"false"
@
close
=
"closeDialogRoom"
>
<
div
style
=
"display: flex;padding-bottom: 20px;"
>
<
div
class
=
"tip1"
/>
<
div
style
=
"padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;"
>
预约记录
<
/div
>
...
...
@@ -205,7 +231,14 @@
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"诊室"
>
<
el
-
select
v
-
model
=
"allocationForm.consultRoomIdList"
clearable
multiple
collapse
-
tags
placeholder
=
"请选择诊室"
@
change
=
"allocationFormChangeName"
>
<
el
-
select
v
-
model
=
"allocationForm.consultRoomIdList"
clearable
multiple
collapse
-
tags
placeholder
=
"请选择诊室"
@
change
=
"allocationFormChangeName"
>
<
el
-
option
v
-
for
=
"item in consultingName"
:
key
=
"item.id"
...
...
@@ -244,13 +277,15 @@
<
template
slot
-
scope
=
"scope"
>
<
span
v
-
show
=
"scope.row.treatStartTime!== null"
>
{{
parseTime
(
scope
.
row
.
treatStartTime
,
'{h
}
:00'
)
}}
<
/span
>
<
span
v
-
show
=
"scope.row.treatEndTime!== null"
>~
{{
parseTime
(
scope
.
row
.
treatEndTime
,
'{h
}
:00'
)
}}
<
/span
>
<
span
v
-
show
=
"scope.row.treatStartTime === null
&& scope.row.treatEndTime
=== null"
>-<
/span
>
<
span
v
-
show
=
"scope.row.treatStartTime === null
&& scope.row.treatEndTime
=== null"
>-<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"left"
label
=
"治疗时长"
>
<
template
slot
-
scope
=
"scope"
>
<
span
v
-
show
=
"scope.row.treatStartTime!== null"
>
{{
treatRange
(
scope
.
row
.
treatStartTime
,
scope
.
row
.
treatEndTime
)
}}
h
<
/span
>
<
span
v
-
show
=
"scope.row.treatStartTime === null&& scope.row.treatEndTime=== null"
>-<
/span
>
<
span
v
-
show
=
"scope.row.treatStartTime!== null"
>
{{
treatRange
(
scope
.
row
.
treatStartTime
,
scope
.
row
.
treatEndTime
)
}}
h
<
/span
>
<
span
v
-
show
=
"scope.row.treatStartTime === null && scope.row.treatEndTime === null"
>-<
/span
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
prop
=
"treatOperator"
align
=
"left"
label
=
"治疗负责人"
/>
...
...
@@ -263,7 +298,14 @@
<
el
-
row
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"诊室"
prop
=
"consultRoomId"
>
<
el
-
select
v
-
model
=
"reservationForm.consultRoomName"
clearable
placeholder
=
"请选择诊室"
value
-
key
=
"id"
style
=
"width: 200px"
@
change
=
"getconsultingName"
>
<
el
-
select
v
-
model
=
"reservationForm.consultRoomName"
clearable
placeholder
=
"请选择诊室"
value
-
key
=
"id"
style
=
"width: 200px"
@
change
=
"getconsultingName"
>
<
el
-
option
v
-
for
=
"item in consultingName"
:
key
=
"item.id"
...
...
@@ -328,8 +370,11 @@
<
/el-row
>
<
el
-
row
>
<
div
style
=
"padding-top: 20px;"
>
<
el
-
button
style
=
"width: 98px;height: 32px;"
class
=
"queryBtn"
icon
=
"el-icon-check"
@
click
=
"submitForm"
>
提交
<
/el-button
>
<
el
-
button
style
=
"width: 98px;height: 32px;"
icon
=
"el-icon-back"
class
=
"resetBtn"
@
click
=
"cancel"
>
返
回
<
/el-button
>
<
el
-
button
style
=
"width: 98px;height: 32px;"
class
=
"queryBtn"
icon
=
"el-icon-check"
@
click
=
"submitForm"
>
提交
<
/el-button
>
<
el
-
button
style
=
"width: 98px;height: 32px;"
icon
=
"el-icon-back"
class
=
"resetBtn"
@
click
=
"cancel"
>
返
回
<
/el-button
>
<
/div
>
<
/el-row
>
<
/el-form
>
...
...
@@ -344,7 +389,7 @@ import { parseTime } from '@/utils/ruoyi'
export
default
{
name
:
'MedicalRecordManagement'
,
dicts
:
[
'check_type'
,
'pet_insure'
,
'payment_status'
,
'payment_status'
],
dicts
:
[
'check_type'
,
'pet_insure'
,
'payment_status'
,
'payment_status'
,
'treat_type'
],
data
()
{
return
{
// 时间模糊查询
...
...
@@ -368,12 +413,18 @@ export default {
],
// 治疗状态下拉框
treatStatusList
:
[
{
value
:
null
,
label
:
'全部'
}
,
{
value
:
[
'2'
],
label
:
'待治疗'
}
,
{
value
:
[
'3'
],
label
:
'已治疗'
}
{
value
:
null
,
label
:
'全部'
}
,
{
value
:
[
'3'
],
label
:
'已治疗'
}
,
{
value
:
[
'2'
],
label
:
'待治疗'
}
],
// 预约诊室集合
appointmentRoomList
:
[],
...
...
@@ -449,7 +500,9 @@ export default {
methods
:
{
// 表单选择框对齐
cellClass
(
row
)
{
if
(
row
.
columnIndex
===
0
)
{
return
'disabledCheck'
}
if
(
row
.
columnIndex
===
0
)
{
return
'disabledCheck'
}
}
,
// 表格
getRowKeys
(
row
)
{
...
...
@@ -551,7 +604,7 @@ export default {
console
.
log
(
value
)
}
,
// 预约诊室搜索
allocationFormChangeName
(
value
)
{
allocationFormChangeName
()
{
console
.
log
(
typeof
this
.
allocationForm
.
consultRoomIdList
[
0
])
this
.
getAppointmentRecord
()
}
,
...
...
@@ -686,8 +739,9 @@ export default {
border
-
radius
:
6
px
6
px
6
px
6
px
;
border
:
1
px
solid
rgb
(
95
,
181
,
75
);
color
:
#
5
FB54B
;
background
:
rgba
(
91
,
182
,
71
,
0.08
);
background
:
rgba
(
91
,
182
,
71
,
0.08
);
font
-
family
:
Microsoft
YaHei
-
Regular
,
Microsoft
YaHei
;
&
:
hover
{
background
:
rgba
(
95
,
181
,
75
,
0.08
);
opacity
:
1
;
...
...
@@ -695,6 +749,7 @@ export default {
color
:
#
5
FB54B
!
important
;
}
}
/** 立即预约 */
.
bookNow
{
width
:
80
px
;
...
...
@@ -703,6 +758,7 @@ export default {
color
:
#
FF9D4E
;
background
:
rgba
(
255
,
157
,
78
,
0.08
);
font
-
family
:
Microsoft
YaHei
-
Regular
,
Microsoft
YaHei
;
&
:
hover
{
background
:
rgba
(
95
,
181
,
75
,
0.08
);
opacity
:
1
;
...
...
@@ -710,6 +766,7 @@ export default {
color
:
#
FF9D4E
!
important
;
}
}
.
bookNowNo
{
width
:
80
px
;
border
-
radius
:
6
px
6
px
6
px
6
px
;
...
...
@@ -717,6 +774,7 @@ export default {
color
:
#
909399
;
background
:
#
ffffff
;
font
-
family
:
Microsoft
YaHei
-
Regular
,
Microsoft
YaHei
;
&
:
hover
{
background
:
rgba
(
95
,
181
,
75
,
0.08
);
opacity
:
1
;
...
...
@@ -724,6 +782,7 @@ export default {
color
:
#
909399
!
important
;
}
}
.
app
-
container
{
background
-
color
:
#
FFFFFF
;
}
...
...
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