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
848575a0
Commit
848575a0
authored
Jun 15, 2023
by
盖献康
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
4df86c01
62a050ca
Changes
12
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
389 additions
and
277 deletions
+389
-277
register.js
src/api/business/register.js
+11
-0
registration.js
src/api/business/registration.js
+8
-0
index.vue
src/components/ImageUpload/index.vue
+3
-3
article-management.vue
src/views/article-management/article-management.vue
+1
-0
use-details.vue
...views/equipment-management/use-management/use-details.vue
+41
-5
use-management.vue
...ws/equipment-management/use-management/use-management.vue
+12
-12
doctor-card.vue
...-management/registration-queue/components/doctor-card.vue
+37
-24
doctor-detail.vue
...anagement/registration-queue/components/doctor-detail.vue
+31
-10
register-modle.vue
...nagement/registration-queue/components/register-modle.vue
+75
-49
registration-add.vue
...ervice-management/registration-queue/registration-add.vue
+11
-4
registration-detail.vue
...ice-management/registration-queue/registration-detail.vue
+159
-166
registration-queue.vue
...vice-management/registration-queue/registration-queue.vue
+0
-4
No files found.
src/api/business/register.js
View file @
848575a0
import
request
from
'@/utils/request'
import
{
param
}
from
'@/utils'
// 查询挂号列表
export
function
listRegister
(
query
)
{
...
...
@@ -42,3 +43,13 @@ export function delRegister(id) {
method
:
'delete'
})
}
// 根据userId查询某个医生当天挂号情况
export
function
timeRegister
(
params
)
{
return
request
({
url
:
'/business/register/getRegisterInfo'
,
method
:
'get'
,
params
:
params
})
}
src/api/business/registration.js
View file @
848575a0
...
...
@@ -24,3 +24,11 @@ export function checkPetOwner(query) {
params
:
query
})
}
// 查询当日医生挂号详细信息
export
function
getRegisterDetail
(
id
)
{
return
request
({
url
:
'/system/manage/'
+
id
,
method
:
'get'
})
}
src/components/ImageUpload/index.vue
View file @
848575a0
...
...
@@ -77,7 +77,7 @@ export default {
dialogVisible
:
false
,
hideUpload
:
false
,
baseUrl
:
process
.
env
.
VUE_APP_TEST_API
,
uploadImgUrl
:
process
.
env
.
VUE_APP_BASE_API
+
'/common/upload'
,
// 上传的图片服务器地址
uploadImgUrl
:
process
.
env
.
VUE_APP_BASE_API
+
"/common/upload"
,
// 上传的图片服务器地址
headers
:
{
Authorization
:
'Bearer '
+
getToken
()
},
...
...
@@ -101,9 +101,9 @@ export default {
this
.
fileList
=
list
.
map
(
item
=>
{
if
(
typeof
item
===
'string'
)
{
if
(
item
.
indexOf
(
this
.
baseUrl
)
===
-
1
)
{
item
=
{
name
:
this
.
baseUrl
+
item
,
url
:
this
.
baseUrl
+
item
}
item
=
{
name
:
this
.
baseUrl
+
item
,
url
:
encodeURI
(
this
.
baseUrl
+
item
)
}
}
else
{
item
=
{
name
:
item
,
url
:
item
}
item
=
{
name
:
item
,
url
:
encodeURI
(
item
)
}
}
}
return
item
...
...
src/views/article-management/article-management.vue
View file @
848575a0
...
...
@@ -307,6 +307,7 @@ export default {
articleTitle
:
null
,
articleCreateTime
:
null
,
articleStatus
:
null
,
createBy
:
''
,
// 排序方式声明
params
:
{
sort
:
null
...
...
src/views/equipment-management/use-management/use-details.vue
View file @
848575a0
...
...
@@ -25,7 +25,7 @@
<el-form-item
label=
"医院自有设备"
prop=
"isPrivate"
>
<el-select
v-model=
"form.isPrivate"
:disabled=
"true"
>
<el-option
v-for=
"dict in
dict.type.exam_type
"
v-for=
"dict in
isPrivateList
"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
...
...
@@ -138,7 +138,14 @@
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"支持检查类型"
prop=
"checkType"
>
<el-input
v-model=
"form.checkType"
:disabled=
"true"
/>
<el-select
v-model=
"form.checkType"
placeholder=
"检查项目"
multiple
clearable
:disabled=
"true"
>
<el-option
v-for=
"(item,index) in checkList"
:key=
"index"
:label=
"item.dictName"
:value=
"item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -271,7 +278,14 @@
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"缴费状态"
>
<el-input
v-model=
"form.payType"
:disabled=
"true"
/>
<el-select
v-model=
"form.payType"
:disabled=
"true"
>
<el-option
v-for=
"dict in dict.type.payment_status"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -297,12 +311,12 @@
</
template
>
<
script
>
import
{
useManagementDetail
}
from
'@/api/business/use'
import
{
selectCheckItem
,
useManagementDetail
}
from
'@/api/business/use'
import
{
CodeToText
}
from
'element-china-area-data'
export
default
{
name
:
'UseDetails'
,
dicts
:
[
'exam_type'
,
'device_status'
,
'device_type'
,
'pet_sex'
,
'sterilization_status'
,
'vaccine_situation'
,
'pet_insure'
],
dicts
:
[
'
payment_status'
,
'
exam_type'
,
'device_status'
,
'device_type'
,
'pet_sex'
,
'sterilization_status'
,
'vaccine_situation'
,
'pet_insure'
],
props
:
{
id
:
{
type
:
Number
,
...
...
@@ -311,6 +325,15 @@ export default {
},
data
()
{
return
{
// 自有设备下拉框
isPrivateList
:
[
{
value
:
'0'
,
label
:
'否'
},
{
value
:
'1'
,
label
:
'是'
}
],
// 检查项目下拉框
checkList
:
[],
// 支持服务地区
serviceAreaS
:
[],
serviceArea
:
[],
...
...
@@ -327,8 +350,15 @@ export default {
},
created
()
{
this
.
getUseDetail
()
this
.
getCheckList
()
},
methods
:
{
// 检查项目下拉框
getCheckList
()
{
selectCheckItem
().
then
(
res
=>
{
this
.
checkList
=
res
})
},
cancel
()
{
this
.
$router
.
push
({
name
:
'UseManagement'
...
...
@@ -363,6 +393,12 @@ export default {
}
this
.
regionalChanges
(
this
.
serviceArea
)
}
if
(
res
.
data
.
checkType
!==
''
&&
res
.
data
.
checkType
!==
null
)
{
const
arr
=
this
.
form
.
checkType
.
split
(
','
)
const
newArr
=
arr
.
map
(
num
=>
Number
(
num
))
this
.
form
.
checkType
=
newArr
}
this
.
createTime
=
(
this
.
form
.
createTime
.
slice
(
0
,
this
.
form
.
createTime
.
length
-
8
)).
replace
(
/-/g
,
'/'
)
})
}
}
...
...
src/views/equipment-management/use-management/use-management.vue
View file @
848575a0
...
...
@@ -89,17 +89,17 @@
</el-row>
<el-table
ref=
"table"
v-loading=
"loading"
:data=
"userList"
border
:row-key=
"getRowKeys"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
width=
"55
"
align=
"center"
:reserve-selection=
"true"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"5
0"
/>
<el-table-column
label=
"设备ID"
align=
"left"
prop=
"deviceCode"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"检查项目"
align=
"left"
prop=
"checkItemsName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"宠物昵称"
align=
"left"
prop=
"petNickname"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"宠物保险"
align=
"left"
prop=
"insure"
:show-overflow-tooltip=
"true"
>
<el-table-column
type=
"selection"
min-width=
"50
"
align=
"center"
:reserve-selection=
"true"
/>
<el-table-column
type=
"index"
label=
"序号"
min-width=
"6
0"
/>
<el-table-column
label=
"设备ID"
align=
"left"
prop=
"deviceCode"
min-width=
"80"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"检查项目"
align=
"left"
prop=
"checkItemsName"
min-width=
"80"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"宠物昵称"
align=
"left"
prop=
"petNickname"
min-width=
"80"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"宠物保险"
align=
"left"
prop=
"insure"
min-width=
"80"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<dict-tag
:options=
"
insureList
"
:value=
"scope.row.insure"
/>
<dict-tag
:options=
"
dict.type.pet_insure
"
:value=
"scope.row.insure"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"宠主姓名"
align=
"left"
prop=
"ownerNikename"
/>
<el-table-column
label=
"宠主姓名"
align=
"left"
prop=
"ownerNikename"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"宠主手机号"
align=
"left"
prop=
"phoneNumber"
/>
<el-table-column
label=
"检查日期"
align=
"left"
prop=
"checkStartTime"
>
<
template
slot-scope=
"scope"
>
...
...
@@ -134,7 +134,7 @@
size
=
"mini"
type
=
"success"
icon
=
"el-icon-document"
style
=
"width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(
123, 213, 102
);"
style
=
"width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(
95, 181, 75);color: #5FB54B;background: rgba(91,182,71,0.08
);"
plain
@
click
=
"detailsUse(scope.row)"
>
详情
<
/el-button
>
...
...
@@ -166,15 +166,15 @@ export default {
insureList
:
[
{
label
:
'全部'
,
value
:
'1'
value
:
null
}
,
{
label
:
'已购保险'
,
value
:
'
2
'
value
:
'
1
'
}
,
{
label
:
'未购保险'
,
value
:
'
3
'
value
:
'
0
'
}
],
// 可以使用的时间段时间范围
...
...
src/views/service-management/registration-queue/components/doctor-card.vue
View file @
848575a0
...
...
@@ -3,7 +3,7 @@
<div
class=
"doctor-card"
>
<!--标签-->
<div
class=
"progress-tip"
>
<div
class=
"tip-green"
/>
<div
class=
"tip-green"
/>
<div
class=
"tip-content"
>
挂号信息
...
...
@@ -11,9 +11,10 @@
</div>
<!--进度内容-->
<div
class=
"card-style"
>
<!--获取的当日医生数量作为循环-->
<el-card
v-for=
"
progress in 4
"
:key=
"
progress
"
v-for=
"
(item,index) in docList
"
:key=
"
index
"
class=
"boxside-card"
>
<div
class=
"boxside-content"
>
...
...
@@ -22,21 +23,21 @@
<!--上--左半部分-->
<div
class=
"top-left"
>
<el-image
:src=
"baseURL+item.doctorUrl"
class=
"img"
fit=
"cover"
src=
"http://114.67.241.140:8090/profile/upload/2023/05/10/dog1_20230510063813A013.png"
/>
</div>
<!--上--右半部分-->
<div
class=
"top-right"
>
<div
class=
"name"
>
徐燕君
>
{{
item
.
doctorName
}}
</div>
<div
class=
"content"
>
<div
class=
"career"
>
高级兽医师
>
{{
item
.
doctorTitleValue
}}
</div>
<div
class=
"divider-inner"
...
...
@@ -44,24 +45,24 @@
</div>
<div
class=
"department"
>
宠物外科
>
{{
item
.
departmentName
}}
</div>
</div>
</div>
</div>
<!--分割线-->
<div
class=
"divider"
/>
<div
class=
"divider"
/>
<!--卡片中间部分-->
<div
class=
"mid-bottom-framework"
>
<div
v-for=
"
progressi in 2
"
:key=
"
progressi
"
v-for=
"
(item,index) in docList
"
:key=
"
index
"
class=
"mid-bottom"
>
<el-image
:src=
"baseURL+item.pictureUrl"
class=
"mid-bottom-inner"
fit=
"cover"
src=
"http://114.67.241.140:8090/profile/upload/2023/05/10/dog1_20230510063813A013.png"
/>
</div>
</div>
...
...
@@ -74,7 +75,7 @@
</div>
<div
class=
"register-content"
>
14
>
{{
item
.
recordAllNum
}}
</div>
</div>
...
...
@@ -85,7 +86,7 @@
</div>
<div
class=
"time-content"
>
2
>
{{
item
.
recordTimeNum
}}
</div>
</div>
...
...
@@ -96,7 +97,7 @@
</div>
<div
class=
"remain-content"
>
0
>
{{
item
.
residueNum
}}
</div>
</div>
</div>
...
...
@@ -106,25 +107,26 @@
<div
class=
"content-bottom"
>
<div
class=
"detail"
@
click=
"doctorDetail(
1
)"
>
<div
class=
"detail"
@
click=
"doctorDetail(
item.id
)"
>
<div
class=
"detail-img"
>
<el-image
:src=
"require('@/assets/register/xinzengguahao_xiangqing@2x.png')"
/>
<el-image
:src=
"require('@/assets/register/xinzengguahao_xiangqing@2x.png')"
/>
</div>
<el-button
type=
"text"
>
详情
</el-button>
</div>
<div
class=
"register"
@
click=
"registration(
1,'usual'
)"
>
<!--给它传一个userId,一个类型和一个默认页数-->
<div
class=
"register"
@
click=
"registration(
item.userId,'0',item
)"
>
<div
class=
"register-img"
>
<el-image
:src=
"require('@/assets/register/xinzengguahao_guahaohui@2x.png')"
/>
<el-image
:src=
"require('@/assets/register/xinzengguahao_guahaohui@2x.png')"
/>
</div>
<el-button
type=
"text"
>
挂号
</el-button>
</div>
<div
class=
"add"
@
click=
"registration(1, 'add')"
>
<!--给它传一个userId,一个类型和一个默认页数-->
<div
class=
"add"
@
click=
"registration(item.userId, '1',item)"
>
<div
class=
"add-img"
>
<el-image
:src=
"require('@/assets/register/xinzengguahao_jiahao@2x.png')"
/>
<el-image
:src=
"require('@/assets/register/xinzengguahao_jiahao@2x.png')"
/>
</div>
<el-button
type=
"text"
>
加号
</el-button>
</div>
...
...
@@ -142,9 +144,16 @@ export default {
name
:
'DoctorCard'
,
data
()
{
return
{
doctorList
:
{
doctorLength
:
''
},
docList
:
{},
// 图片基础地址
baseURL
:
process
.
env
.
VUE_APP_TEST_API
}
},
mounted
()
{
/** 获取当日值班医生列表*/
this
.
getDoctorList
()
},
created
()
{
...
...
@@ -156,15 +165,19 @@ export default {
getDoctorList
()
{
getDoctorInfo
().
then
(
response
=>
{
console
.
log
(
'获取当日值班医生列表:'
,
response
)
this
.
doctorList
.
doctorLength
=
response
.
data
.
length
console
.
log
(
'当日值班医生个数:'
,
this
.
doctorList
.
doctorLength
)
this
.
docList
=
response
.
data
console
.
log
(
'医生的遍历信息:'
,
this
.
docList
)
})
},
/** 显示医生详情弹窗*/
doctorDetail
(
id
)
{
this
.
$emit
(
'doctorDetail'
,
id
)
this
.
$emit
(
'doctorDetail'
,
id
.
toString
()
)
},
/** 显示挂号/加号弹窗*/
registration
(
id
,
type
)
{
this
.
$emit
(
'registration'
,
{
id
,
type
})
registration
(
userId
,
type
,
data
)
{
this
.
$emit
(
'registration'
,
{
id
:
userId
.
toString
(),
type
,
data
})
}
}
}
...
...
src/views/service-management/registration-queue/components/doctor-detail.vue
View file @
848575a0
...
...
@@ -4,55 +4,55 @@
<el-row>
<el-col
:span=
"8"
>
<el-form-item
prop=
"name"
label=
"医生姓名:"
>
<el-input
v-model=
"doctorForm.
n
ame"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
doctorN
ame"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
prop=
"name"
label=
"医生ID:"
>
<el-input
v-model=
"doctorForm.
name
"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
id
"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
prop=
"name"
label=
"手机号:"
>
<el-input
v-model=
"doctorForm.
nam
e"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
phon
e"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
prop=
"name"
label=
"所属科室:"
>
<el-input
v-model=
"doctorForm.
n
ame"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
departmentN
ame"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
prop=
"name"
label=
"医生职称:"
>
<el-input
v-model=
"doctorForm.
nam
e"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
doctorTitleValu
e"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
prop=
"name"
label=
"当前诊位:"
>
<el-input
v-model=
"doctorForm.
name
"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
consultingRoom
"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
prop=
"name"
label=
"擅长领域:"
>
<el-input
v-model=
"doctorForm.
nam
e"
type=
"textarea"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
areaExpertis
e"
type=
"textarea"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
prop=
"name"
label=
"医生简介:"
>
<el-input
v-model=
"doctorForm.
nam
e"
type=
"textarea"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
doctorProfil
e"
type=
"textarea"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
prop=
"name"
label=
"证书:"
>
<el-image
style=
"width: 100px; height: 100px"
:src=
"
doctorForm.u
rl"
:src=
"
baseURL+doctorForm.certificateU
rl"
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
prop=
"name"
label=
"门诊诊查费:"
>
<el-input
v-model=
"doctorForm.
nam
e"
:disabled=
"true"
maxlength=
"20"
/>
<el-input
v-model=
"doctorForm.
examinationFe
e"
:disabled=
"true"
maxlength=
"20"
/>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -65,24 +65,45 @@
</
template
>
<
script
>
import
{
getRegisterDetail
}
from
'@/api/business/registration'
export
default
{
name
:
'DoctorDetail'
,
props
:
{
isShow
:
{
type
:
Boolean
,
default
:
false
},
doctorId
:
{
type
:
String
,
default
:
''
}
},
data
()
{
return
{
// 图片基础地址
baseURL
:
process
.
env
.
VUE_APP_TEST_API
,
doctorForm
:
{
name
:
''
}
}
},
watch
:
{
doctorId
(
val
)
{
console
.
log
(
'KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK'
,
val
)
this
.
getRegisterMsg
()
}
},
created
()
{
},
methods
:
{
// 获取相应id的医生详情
getRegisterMsg
()
{
getRegisterDetail
(
this
.
doctorId
).
then
(
response
=>
{
console
.
log
(
'这是单个医生的详情信息:'
,
response
)
this
.
doctorForm
=
response
.
data
})
},
choosePet
()
{
console
.
log
(
'1223'
)
},
...
...
src/views/service-management/registration-queue/components/register-modle.vue
View file @
848575a0
<
template
>
<el-dialog
class=
"register-modle"
:title=
"registrationType === 'usual' ? '挂号' : '加号'"
:visible
.
sync=
"isShow"
width=
"50%"
:before-close=
"closeModle"
append-to-body
>
<el-dialog
:before-close=
"closeModle"
:title=
"registrationType === 'usual' ? '挂号' : '加号'"
:visible
.
sync=
"isShow"
append-to-body
class=
"register-modle"
width=
"50%"
>
<el-form
ref=
"queryForm"
:inline=
"true"
:model=
"queryParams"
label-width=
"100px"
size=
"small"
>
<el-form-item
prop=
"petNickname"
label=
"主治兽医:"
>
<el-input
v-model=
"queryParams.petNickname"
disabled=
"true"
/>
<el-form-item
label=
"主治兽医:"
prop=
"petNickname"
>
<el-input
/>
</el-form-item>
<el-form-item
prop=
"petSex"
label=
"是否首诊:
"
>
<el-form-item
label=
"是否首诊:"
prop=
"petSex
"
>
<el-select
v-model=
"queryParams.sterilizationStatus"
clearable
style=
"width: 100%"
placeholder=
"请选择首诊情况"
style=
"width: 100%"
@
change=
"handleQuery"
>
<el-option
...
...
@@ -27,20 +31,24 @@
<!-- 列表区-->
<el-table
ref=
"table"
v-loading=
"loading"
:data=
"petsList"
:header-cell-class-name=
"cellClass"
:header-cell-style=
"
{background:'#E8E9E8'}"
border
:header-cell-class-name="cellClass"
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column
align=
"center"
label=
"日期"
min-width=
"80"
show-overflow-tooltip
type=
"index"
/>
<el-table-column
align=
"center"
label=
"时段"
min-width=
"80"
prop=
"petOwners.nickname"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"总放号数"
min-width=
"80"
prop=
"petOwners.nickname"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"剩余号数"
min-width=
"80"
prop=
"petOwners.nickname"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"门诊诊查费"
min-width=
"80"
prop=
"petOwners.nickname"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"宠物昵称"
min-width=
"80"
prop=
"petNickname"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"日期"
min-width=
"80"
prop=
"workDate"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"时段"
min-width=
"80"
prop=
"hours"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"总放号数"
min-width=
"80"
prop=
"allCount"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"剩余号数"
min-width=
"80"
prop=
"residueCount"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
label=
"门诊诊查费"
min-width=
"80"
prop=
"fees"
show-overflow-tooltip
/>
<el-table-column
align=
"center"
class-name=
"small-padding fixed-width"
label=
"操作"
min-width=
"160"
>
<template
slot-scope=
"scope"
>
<el-button
...
...
@@ -49,7 +57,7 @@
size=
"mini"
style=
"width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
type=
"success"
@
click=
"
handleView
(scope.row)"
@
click=
"
addReservation
(scope.row)"
>
立即预约
</el-button>
</
template
>
...
...
@@ -61,18 +69,15 @@
:limit
.
sync=
"queryParams.pageSize"
:page
.
sync=
"queryParams.pageNum"
:total=
"total"
@
pagination=
"getList"
/>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submit"
>
确 定
</el-button>
<el-button
@
click=
"closeModle"
>
取 消
</el-button>
</div>
</el-dialog>
</template>
<
script
>
import
{
deepClone
}
from
'@/utils'
import
{
listPets
}
from
'@/api/business/pets'
import
{
addRegister
,
timeRegister
}
from
'@/api/business/register'
export
default
{
name
:
'RegisterModle'
,
...
...
@@ -83,15 +88,23 @@ export default {
},
registrationType
:
{
type
:
String
,
defa
lu
t
:
'usual'
defa
ul
t
:
'usual'
},
doctorId
:
{
type
:
String
,
defalut
:
''
type
:
String
},
// 医生id用来获取详情等信息(挂号)
// 新增挂号宠物的所有信息
doctorForm
:
{
type
:
Object
},
singleDoctor
:
{
type
:
Object
}
},
data
()
{
return
{
currentPage
:
0
,
// 选中数组
ids
:
[],
// 总条数
...
...
@@ -99,8 +112,7 @@ export default {
// 宠物表格数据
petsList
:
[],
loading
:
true
,
queryParams
:
{
},
queryParams
:
{},
fristVisitOptions
:
[
{
label
:
'是'
,
...
...
@@ -113,8 +125,43 @@ export default {
]
}
},
watch
:
{
doctorId
(
val
)
{
console
.
log
(
'KKKK555555555KKKKKKK'
,
val
)
this
.
getRegisterMsg
()
}
},
methods
:
{
submit
()
{},
// 获取相应id的医生详情
getRegisterMsg
()
{
console
.
log
(
'HHHHHHHHHHHHHHHUUUUUUUUUUUUUUUUUU'
,
this
.
doctorId
,
this
.
currentPage
,
this
.
registrationType
)
timeRegister
({
userId
:
this
.
doctorId
,
type
:
this
.
registrationType
,
currentPage
:
this
.
currentPage
}).
then
(
response
=>
{
console
.
log
(
'哈哈哈哈哈哈哈:'
,
response
)
this
.
petsList
=
response
.
rows
.
rows
})
},
// 新增预约接口
addReservation
(
data
)
{
console
.
log
(
'gggggg'
,
data
,
this
.
doctorForm
,
this
.
singleDoctor
)
const
temp
=
{
petOwnersName
:
data
.
petOwnersName
}
console
.
log
(
'KKKKKKKKKKKKKKK'
,
temp
)
// 将整个界面对象传新增挂号接口
// addRegister(temp).then(response => {
// this.$message({
// type: 'success',
// message: '预约成功!'
// })
// this.$emit('registerModleClose', false)
// })
},
submit
()
{
},
/** 关闭弹窗*/
closeModle
()
{
this
.
$emit
(
'registerModleClose'
,
false
)
...
...
@@ -151,29 +198,8 @@ export default {
this
.
$refs
.
table
.
store
.
updateSelectionByRowKey
()
this
.
$refs
.
table
.
store
.
updateAllSelected
()
this
.
$refs
.
table
.
$emit
(
'selection-change'
,
data
)
},
/** 查询宠物列表 */
getList
()
{
this
.
loading
=
true
this
.
queryParams
.
params
=
{
...
this
.
queryParams
.
params
}
if
(
this
.
daterangeCreateTime
!=
null
&&
this
.
daterangeCreateTime
!==
''
)
{
this
.
queryParams
.
params
[
'beginCreateTime'
]
=
this
.
daterangeCreateTime
[
0
]
this
.
queryParams
.
params
[
'endCreateTime'
]
=
this
.
daterangeCreateTime
[
1
]
}
if
(
this
.
daterangeUpdateTime
!=
null
&&
this
.
daterangeUpdateTime
!==
''
)
{
this
.
queryParams
.
params
[
'beginUpdateTime'
]
=
this
.
daterangeUpdateTime
[
0
]
this
.
queryParams
.
params
[
'endUpdateTime'
]
=
this
.
daterangeUpdateTime
[
1
]
}
const
queryParams
=
deepClone
(
this
.
queryParams
)
queryParams
.
petSex
=
this
.
queryParams
.
petSex
&&
this
.
queryParams
.
petSex
.
join
(
','
)
queryParams
.
petBreed
=
this
.
queryParams
.
petBreed
&&
this
.
queryParams
.
petBreed
.
map
(
item
=>
item
.
join
(
''
)).
join
(
','
)
listPets
(
queryParams
).
then
(
response
=>
{
console
.
log
(
'这里面是很多列表页宠物的信息:'
,
this
.
petsList
)
this
.
petsList
=
response
.
rows
this
.
total
=
response
.
total
this
.
loading
=
false
})
}
}
}
</
script
>
...
...
src/views/service-management/registration-queue/registration-add.vue
View file @
848575a0
...
...
@@ -216,10 +216,10 @@
<!-- 医生详情弹出框 -->
<doctor-detail
:is-show=
"showDoctorModle"
:doctor-id=
"doctorId"
@
doctorModleClose=
"closeDoctorModle"
/>
<!-- 挂号/加号弹出框-->
<register-modle
:is-show=
"showRegistrationModle"
:doctor-id=
"doctorId
"
:registration-type=
"registrationType
"
@
registerModleClose=
"closeRegisterModle"
/>
<register-modle
:is-show=
"showRegistrationModle"
:doctor-id=
"doctorId
Nd"
:doctor-form=
"test"
:registration-type=
"registrationType"
:single-doctor=
"singleDoctor
"
@
registerModleClose=
"closeRegisterModle"
/>
<!-- 选择宠物-->
<div
slot=
"footer"
class=
"dialog-footer"
>
<!--
<el-button
class=
"queryBtn"
icon=
"el-icon-check"
@
click=
"submitForm"
>
提 交
</el-button>
--
>
<el-button
class=
"queryBtn"
icon=
"el-icon-check"
@
click=
"submitForm"
>
提 交
</el-button
>
<el-button
class=
"resetBtn"
icon=
"el-icon-back"
@
click=
"cancel"
>
返 回
</el-button>
</div>
</div>
...
...
@@ -245,8 +245,12 @@ export default {
},
data
()
{
return
{
test
:
{},
singleDoctor
:
{},
// 单个医生信息
showPetInfo
:
false
,
// 回显宠主详细信息
doctorId
:
''
,
// 医生id用来获取详情等信息
doctorId
:
''
,
// 医生id用来获取详情等信息(详情)
// 医生id用来获取详情等信息(挂号+加号)
doctorIdNd
:
''
,
registrationType
:
'usual'
,
// 挂号/加号
isEdit
:
false
,
// 表单是否可编辑 默认不可编辑
statusList
:
[
...
...
@@ -396,8 +400,11 @@ export default {
handleRegister
(
params
)
{
console
.
log
(
'params'
,
params
)
this
.
showRegistrationModle
=
true
this
.
doctorId
=
params
.
id
this
.
doctorId
Nd
=
params
.
id
this
.
registrationType
=
params
.
type
this
.
singleDoctor
=
params
.
data
this
.
test
=
{
...
this
.
form
}
console
.
log
(
'this.form'
,
this
.
form
)
},
/** 关闭挂号回调*/
closeRegisterModle
()
{
...
...
src/views/service-management/registration-queue/registration-detail.vue
View file @
848575a0
This diff is collapsed.
Click to expand it.
src/views/service-management/registration-queue/registration-queue.vue
View file @
848575a0
...
...
@@ -81,7 +81,6 @@
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
>
<el-button
v-hasPermi=
"['business:register:add']"
class=
"fourWordsBtn"
icon=
"el-icon-circle-plus-outline"
size=
"mini"
...
...
@@ -91,7 +90,6 @@
</el-col>
<!--选择全部-->
<el-button
v-hasPermi=
"['business:register:export']"
class=
"fourWordsBtn"
icon=
"el-icon-right"
size=
"mini"
...
...
@@ -100,7 +98,6 @@
</el-button>
<!--反向选择-->
<el-button
v-hasPermi=
"['business:register:export']"
class=
"fourWordsBtn"
icon=
"el-icon-back"
size=
"mini"
...
...
@@ -109,7 +106,6 @@
</el-button>
<!--批量导出-->
<el-button
v-hasPermi=
"['business:register:export']"
class=
"fourWordsBtn"
icon=
"el-icon-upload2"
size=
"mini"
...
...
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