Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
peizhen-vue
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PeiZhen-Java
peizhen-vue
Commits
b817b20b
Commit
b817b20b
authored
Dec 05, 2023
by
裴梁博
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/v1/plb' into 'master'
代办买药 See merge request
!16
parents
1c68a138
2772776b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
940 additions
and
346 deletions
+940
-346
src/views/orderManagement/dbmyOrder/index.vue
+436
-156
src/views/orderManagement/zqghOrder/index.vue
+20
-12
src/views/orderManagement/zyphOrder/index.vue
+482
-176
vue.config.js
+2
-2
No files found.
src/views/orderManagement/dbmyOrder/index.vue
View file @
b817b20b
...
...
@@ -16,41 +16,45 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"接单人"
prop=
"
orderSn
"
>
<el-form-item
label=
"接单人"
prop=
"
receiverName
"
>
<el-input
v-model=
"queryParams.
orderSn
"
v-model=
"queryParams.
receiverName
"
placeholder=
"请输入接单人"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"当前状态"
prop=
"orderSn"
>
<el-select
v-model=
"queryParams.value"
placeholder=
"全部"
clearable=
""
>
<el-form-item
label=
"当前状态"
prop=
"yStatus"
>
<el-select
v-model=
"queryParams.yStatus"
placeholder=
"全部"
clearable=
""
>
<el-option
v-for=
"item in [
{
label: '已发布',
value:
'0'
,
value:
0
,
},
{
label: '已接单',
value:
'1'
,
value:
1
,
},
{
label: '已完成',
value:
'2'
,
value:
2
,
},
{
label: '退款中',
value:
'3'
,
value:
3
,
},
{
label: '已退款',
value:
'4'
,
value:
4
,
},
{
label: '进行中',
value:
'6'
,
value:
6
,
},
]"
:key="item.value"
...
...
@@ -60,17 +64,21 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"订单类型"
prop=
"orderSn"
>
<el-select
v-model=
"queryParams.value"
placeholder=
"全部"
clearable=
""
>
<el-form-item
label=
"订单类型"
prop=
"orderType"
>
<el-select
v-model=
"queryParams.orderType"
placeholder=
"全部"
clearable=
""
>
<el-option
v-for=
"item in [
{
label: '小程序',
value:
'0'
,
value:
0
,
},
{
label: '美团',
value:
'1'
,
value:
1
,
},
]"
:key="item.value"
...
...
@@ -395,9 +403,14 @@
<el-table-column
label=
"订单类型"
align=
"center"
prop=
""
key=
""
></el-table-column>
prop=
"orderType"
key=
"orderType"
>
<
template
slot-scope=
"{ row }"
>
<span
v-if=
"row.orderType == 0"
>
小程序
</span>
<span
v-if=
"row.orderType == 1"
>
美团
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"是否好评"
align=
"center"
...
...
@@ -494,7 +507,13 @@
v-hasPermi=
"['system:dbmyOrder:remove']"
>
删除
</el-button
>
-->
<el-button
size=
"large"
type=
"text"
>
取消
</el-button>
<el-button
size=
"large"
type=
"text"
@
click=
"handleClickCancell(scope.row)"
v-if=
"[1, '1'].includes(scope.row.tstatus)"
>
取消
</el-button
>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -514,12 +533,12 @@
width=
"1000px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"1
0
0px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"1
2
0px"
>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"订单类型"
prop=
"order
Id
"
>
<el-form-item
label=
"订单类型"
prop=
"order
Type
"
>
<el-select
v-model=
"form.order
Id
"
v-model=
"form.order
Type
"
clearable
placeholder=
"请选择订单类型"
style=
"width: 270px"
...
...
@@ -528,11 +547,11 @@
v-for=
"item in [
{
label: '小程序',
value:
'0'
,
value:
0
,
},
{
label: '美团',
value:
'1'
,
value:
1
,
},
]"
:key=
"item.value"
...
...
@@ -544,9 +563,9 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"用户手机号"
prop=
"
orderId
"
>
<el-form-item
label=
"用户手机号"
prop=
"
userPhone
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
userPhone
"
placeholder=
"请输入用户手机号"
style=
"width: 270px"
maxlength=
"11"
...
...
@@ -556,28 +575,29 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"订单号"
prop=
"order
Id
"
>
<el-form-item
label=
"订单号"
prop=
"order
Sn
"
>
<el-input
v-model=
"form.order
Id
"
v-model=
"form.order
Sn
"
placeholder=
"请输入订单号"
style=
"width: 270px"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"城市"
prop=
"
order
Id"
>
<el-form-item
label=
"城市"
prop=
"
city
Id"
>
<el-select
v-model=
"form.
order
Id"
v-model=
"form.
city
Id"
clearable
placeholder=
"请选择城市"
filterable
style=
"width: 270px"
>
<!-- @change="changeCityId" -->
<el-option
v-for=
"item in
[]
"
:key=
"item.
value
"
:label=
"item.
label
"
:value=
"item.
value
"
v-for=
"item in
cityVoList
"
:key=
"item.
id
"
:label=
"item.
name
"
:value=
"item.
id
"
>
</el-option>
</el-select>
...
...
@@ -586,9 +606,9 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"订单价"
prop=
"
orderId
"
>
<el-form-item
label=
"订单价"
prop=
"
payMoney
"
>
<el-input-number
v-model=
"form.
orderId
"
v-model=
"form.
payMoney
"
:min=
"0"
label=
"订单价"
:precision=
"2"
...
...
@@ -599,9 +619,9 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"药品名称"
prop=
"
orderId
"
>
<el-form-item
label=
"药品名称"
prop=
"
ypName
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
ypName
"
placeholder=
"请输入药品名称"
style=
"width: 270px"
/>
...
...
@@ -610,18 +630,18 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"药店地址"
prop=
"
orderId
"
>
<el-form-item
label=
"药店地址"
prop=
"
ydAddress
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
ydAddress
"
placeholder=
"请输入药店地址"
style=
"width: 270px"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"是否处方药"
prop=
"
orderId
"
>
<el-form-item
label=
"是否处方药"
prop=
"
isCf
"
>
<el-select
v-model=
"form.
orderId
"
v-model=
"form.
isCf
"
clearable
placeholder=
"请选择"
style=
"width: 270px"
...
...
@@ -630,11 +650,11 @@
v-for=
"item in [
{
label: '否',
value:
'0'
,
value:
0
,
},
{
label: '是',
value:
'1'
,
value:
1
,
},
]"
:key=
"item.value"
...
...
@@ -648,9 +668,9 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"取药方式"
prop=
"
orderId
"
>
<el-form-item
label=
"取药方式"
prop=
"
way
"
>
<el-select
v-model=
"form.
orderId
"
v-model=
"form.
way
"
clearable
placeholder=
"请选择"
style=
"width: 270px"
...
...
@@ -659,11 +679,11 @@
v-for=
"item in [
{
label: '邮寄到家',
value:
'0'
,
value:
0
,
},
{
label: '送货上门',
value:
'1'
,
value:
1
,
},
]"
:key=
"item.value"
...
...
@@ -675,9 +695,9 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"收件人"
prop=
"
orderId
"
>
<el-form-item
label=
"收件人"
prop=
"
recipient
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
recipient
"
placeholder=
"请输入收件人"
maxlength=
"5"
style=
"width: 270px"
...
...
@@ -687,9 +707,9 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"收件人手机号"
prop=
"
orderId
"
>
<el-form-item
label=
"收件人手机号"
prop=
"
pzShPhone
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
pzShPhone
"
placeholder=
"请输入收件人手机号"
style=
"width: 270px"
maxlength=
"11"
...
...
@@ -697,9 +717,9 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"收货地址"
prop=
"
orderId
"
>
<el-form-item
label=
"收货地址"
prop=
"
pzAddress
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
pzAddress
"
placeholder=
"请输入收货地址"
style=
"width: 270px"
/>
...
...
@@ -708,19 +728,19 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"详细地址"
prop=
"
orderId
"
>
<el-form-item
label=
"详细地址"
prop=
"
addressInfo
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
addressInfo
"
placeholder=
"请输入详细地址"
style=
"width: 270px"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"接单人"
prop=
"
order
Id"
>
<div
@
click=
"
openCheckPerson = true
"
>
<el-form-item
label=
"接单人"
prop=
"
em
Id"
>
<div
@
click=
"
clickOpenCheckPerson
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
emId_name
"
placeholder=
"请选择接单人"
style=
"width: 270px"
readonly=
""
...
...
@@ -731,9 +751,9 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"是否需要冷藏"
prop=
"
orderId
"
>
<el-form-item
label=
"是否需要冷藏"
prop=
"
isRefrigerate
"
>
<el-select
v-model=
"form.
orderId
"
v-model=
"form.
isRefrigerate
"
clearable
placeholder=
"请选择"
style=
"width: 270px"
...
...
@@ -742,11 +762,11 @@
v-for=
"item in [
{
label: '否',
value:
'0'
,
value:
0
,
},
{
label: '是',
value:
'1'
,
value:
1
,
},
]"
:key=
"item.value"
...
...
@@ -761,23 +781,26 @@
</el-row>
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"处方附件"
prop=
"
orderId
"
>
<el-form-item
label=
"处方附件"
prop=
"
prescriptionAttachment
"
>
<div
style=
"width: calc(100% - 100px)"
>
<imageUpload
v-model=
"form.cover"
:limit=
"20"
></imageUpload>
<imageUpload
v-model=
"form.prescriptionAttachment"
:limit=
"20"
></imageUpload>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"备注"
prop=
"
orderId
"
>
<el-form-item
label=
"备注"
prop=
"
remark
"
>
<el-input
type=
"textarea"
:rows=
"2"
placeholder=
"请输入备注"
maxlength=
"100"
show-word-limit
v-model=
"form.
textarea
"
v-model=
"form.
remark
"
style=
"width: calc(100% - 100px)"
>
</el-input>
...
...
@@ -805,17 +828,17 @@
:inline=
"true"
label-width=
"100px"
>
<el-form-item
label=
"接单人姓名"
prop=
"
orderSn
"
>
<el-form-item
label=
"接单人姓名"
prop=
"
name
"
>
<el-input
v-model=
"queryParamsMin.
orderSn
"
v-model=
"queryParamsMin.
name
"
placeholder=
"请输入接单人姓名"
clearable
style=
"width: 200px"
/>
</el-form-item>
<el-form-item
label=
"接单人手机号"
prop=
"
orderSn
"
>
<el-form-item
label=
"接单人手机号"
prop=
"
phone
"
>
<el-input
v-model=
"queryParamsMin.
orderSn
"
v-model=
"queryParamsMin.
phone
"
placeholder=
"请输入接单人姓名"
clearable
maxlength=
"11"
...
...
@@ -823,88 +846,73 @@
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"large"
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"large"
@
click=
"handleQueryMin"
>
搜索
</el-button
>
<el-button
icon=
"el-icon-refresh"
size=
"large"
>
重置
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"large"
@
click=
"resetQueryMin"
>
重置
</el-button
>
</el-form-item>
<el-form-item
label=
"所属商户"
prop=
"
orderSn
"
>
<el-form-item
label=
"所属商户"
prop=
"
companyId
"
>
<el-select
v-model=
"queryParamsMin.
value
"
v-model=
"queryParamsMin.
companyId
"
placeholder=
"请选择"
clearable=
""
style=
"width: 200px"
filterable=
""
>
<el-option
v-for=
"item in
[]
"
:key=
"item.
value
"
:label=
"item.
label
"
:value=
"item.
value
"
v-for=
"item in
companyList
"
:key=
"item.
id
"
:label=
"item.
name
"
:value=
"item.
id
"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div
class=
"popmodel-person"
>
<div
class=
"popmodel-person-item popmodel-person-itema"
>
<div
class=
"popmodel-person-item-top"
>
<img
src=
""
alt=
""
/>
<div>
<p>
张丹
</p>
<p>
12345678912
</p>
</div>
</div>
<p
class=
"popmodel-person-item-botm"
>
所属商户:Lorem ipsum dolor sit amet consectetur, adipisicing
elit. Officia animi optio delectus! In earum voluptate ipsa
tempora, incidunt beatae cupiditate, adipisci voluptatibus neque
dolor fugiat, quidem corporis exercitationem quo accusantium.
</p>
</div>
<div
class=
"popmodel-person-item"
>
<div
class=
"popmodel-person-item-top"
>
<img
src=
""
alt=
""
/>
<div>
<p>
张丹
</p>
<p>
12345678912
</p>
</div>
</div>
<p
class=
"popmodel-person-item-botm"
>
所属商户:Lorem ipsum dolor sit amet consectetur, adipisicing
elit. Officia animi optio delectus! In earum voluptate ipsa
tempora, incidunt beatae cupiditate, adipisci voluptatibus neque
dolor fugiat, quidem corporis exercitationem quo accusantium.
</p>
</div>
<div
class=
"popmodel-person-item"
>
<div
:class=
"
item.check_is
? 'popmodel-person-item popmodel-person-itema'
: 'popmodel-person-item'
"
v-for=
"(item, index) in employeesList"
:key=
"index"
@
click=
"clickCheckEMply(item, index)"
>
<div
class=
"popmodel-person-item-top"
>
<img
src=
"
"
alt=
""
/>
<img
:src=
"item.avatar_change_url
"
alt=
""
/>
<div>
<p>
张丹
</p>
<p>
12345678912
</p>
<p>
{{
item
.
name
}}
</p>
<p>
{{
item
.
phone
}}
</p>
</div>
</div>
<p
class=
"popmodel-person-item-botm"
>
所属商户:Lorem ipsum dolor sit amet consectetur, adipisicing
elit. Officia animi optio delectus! In earum voluptate ipsa
tempora, incidunt beatae cupiditate, adipisci voluptatibus neque
dolor fugiat, quidem corporis exercitationem quo accusantium.
所属商户:
{{
item
.
companyName
}}
</p>
</div>
</div>
<pagination
v-show=
"total > 0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"
getList
"
v-show=
"
employeesList_
total > 0"
:total=
"
employeesList_
total"
:page
.
sync=
"queryParams
Min
.pageNum"
:limit
.
sync=
"queryParams
Min
.pageSize"
@
pagination=
"
employeesListAxios
"
/>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"
openCheckPerson = false
"
<el-button
type=
"primary"
@
click=
"
clickClosepERSON(1)
"
>
确 定
</el-button
>
<el-button
@
click=
"
openCheckPerson = false
"
>
取 消
</el-button>
<el-button
@
click=
"
clickClosepERSON(2)
"
>
取 消
</el-button>
</div>
</el-dialog>
</
template
>
...
...
@@ -1074,6 +1082,42 @@ import {
addDbmyOrder
,
updateDbmyOrder
,
}
from
"@/api/orderManagement/dbmyOrder"
;
import
{
addThirdOrderPOST
,
cityVoListGET
,
hospitalListGET
,
servicesListGET
,
companyListGET
,
employeesListGET
,
totalOrderPUT
,
}
from
"@/api/addForm/index"
;
import
{
listByIds
}
from
"@/api/system/oss"
;
const
validatePhone
=
(
rule
,
value
,
callback
)
=>
{
if
(
!
value
)
{
callback
(
new
Error
(
"手机号不能为空"
));
}
//正则表达式进行验证手机号,从1开始,第二位是35789中的任意一位,以9数字结尾
if
(
!
/^1
[
35789
]\d{9}
$/
.
test
(
value
))
{
callback
(
new
Error
(
"手机号格式不正确"
));
}
callback
();
};
const
validateIsCardId
=
(
rule
,
value
,
callback
)
=>
{
if
(
!
value
)
{
return
new
Error
(
"请输入身份证号)"
);
}
else
{
const
reg
=
/^
\d{6}(
18|19|20
)?\d{2}(
0
[
1-9
]
|1
[
0-2
])(([
0-2
][
1-9
])
|10|20|30|31
)\d{3}(\d
|X|x
)
$/
;
const
card
=
reg
.
test
(
value
);
if
(
!
card
)
{
callback
(
new
Error
(
"身份证号格式有误!"
));
}
else
{
callback
();
}
}
};
export
default
{
name
:
"DbmyOrder"
,
...
...
@@ -1120,6 +1164,9 @@ export default {
pageNum
:
1
,
pageSize
:
10
,
orderSn
:
undefined
,
orderType
:
undefined
,
receiverName
:
undefined
,
yStatus
:
undefined
,
// orderId: undefined,
// ypName: undefined,
// ydAddress: undefined,
...
...
@@ -1142,7 +1189,85 @@ export default {
// 表单参数
form
:
{},
// 表单校验
rules
:
{},
rules
:
{
//blur change
orderType
:
[
{
required
:
true
,
message
:
"订单类型不能为空"
,
trigger
:
"change"
},
],
userPhone
:
[
{
required
:
true
,
message
:
"用户手机号不能为空"
,
trigger
:
"blur"
},
{
required
:
true
,
trigger
:
"blur"
,
min
:
11
,
max
:
11
,
message
:
"长度不符合"
,
},
{
required
:
true
,
trigger
:
"blur"
,
validator
:
validatePhone
},
],
orderSn
:
[
{
required
:
true
,
message
:
"订单号不能为空"
,
trigger
:
"blur"
},
],
cityId
:
[
{
required
:
true
,
message
:
"城市不能为空"
,
trigger
:
"change"
},
],
payMoney
:
[
{
required
:
true
,
message
:
"订单价不能为空"
,
trigger
:
"blur"
},
],
ypName
:
[
{
required
:
true
,
message
:
"药品名称不能为空"
,
trigger
:
"blur"
},
],
ydAddress
:
[
{
required
:
true
,
message
:
"药店地址不能为空"
,
trigger
:
"blur"
},
],
isCf
:
[
{
required
:
true
,
message
:
"是否处方药不能为空"
,
trigger
:
"change"
},
],
way
:
[
{
required
:
true
,
message
:
"取药方式不能为空"
,
trigger
:
"change"
},
],
recipient
:
[
{
required
:
true
,
message
:
"收件人不能为空"
,
trigger
:
"blur"
},
],
pzShPhone
:
[
{
required
:
true
,
message
:
"收件人手机号不能为空"
,
trigger
:
"blur"
},
{
required
:
true
,
trigger
:
"blur"
,
min
:
11
,
max
:
11
,
message
:
"长度不符合"
,
},
{
required
:
true
,
trigger
:
"blur"
,
validator
:
validatePhone
},
],
pzAddress
:
[
{
required
:
true
,
message
:
"收货地址不能为空"
,
trigger
:
"blur"
},
],
addressInfo
:
[
{
required
:
true
,
message
:
"详细地址不能为空"
,
trigger
:
"blur"
},
],
emId
:
[
{
required
:
true
,
message
:
"接单人不能为空"
,
trigger
:
[
"change"
,
"blur"
],
},
],
isRefrigerate
:
[
{
required
:
true
,
message
:
"是否需要冷藏不能为空"
,
trigger
:
"change"
,
},
],
prescriptionAttachment
:
[
{
required
:
true
,
message
:
"处方附件不能为空"
,
trigger
:
[
"change"
,
"blur"
],
},
],
},
VisitorData
:
{
name
:
""
,
sex
:
""
,
...
...
@@ -1150,16 +1275,143 @@ export default {
isAdult
:
""
,
voucher
:
""
,
},
queryParamsMin
:
{
pageNum
:
1
,
pageSize
:
10
,
},
queryParamsMin
:
{},
cityVoList
:
[],
employeesList
:
[],
employeesList_total
:
0
,
companyList
:
[],
};
},
created
()
{
this
.
getList
();
},
methods
:
{
handleClickCancell
(
row
)
{
let
self
=
this
;
self
.
$confirm
(
"是否确认取消此项?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
,
})
.
then
(
async
()
=>
{
const
{
code
}
=
await
totalOrderPUT
({
id
:
row
.
toOrderId
,
status
:
7
,
});
if
(
code
===
200
)
{
self
.
$modal
.
msgSuccess
(
"取消成功"
);
self
.
getList
();
}
})
.
catch
(()
=>
{
self
.
$message
({
type
:
"info"
,
message
:
"已取消删除"
,
});
});
},
clickClosepERSON
(
type
)
{
let
self
=
this
;
switch
(
type
)
{
case
1
:
let
row_data
=
self
.
employeesList
.
filter
((
item
)
=>
{
return
item
.
check_is
;
});
console
.
log
(
"row_data"
,
row_data
);
if
(
row_data
?.
length
)
{
self
.
$set
(
self
.
form
,
"emId"
,
row_data
[
0
].
id
);
self
.
$set
(
self
.
form
,
"emId_name"
,
row_data
[
0
].
name
);
}
break
;
case
2
:
self
.
queryParamsMin
=
{
pageNum
:
1
,
pageSize
:
10
,
phone
:
undefined
,
name
:
undefined
,
companyId
:
undefined
,
};
self
.
companyList
=
[];
self
.
employeesList
=
[];
break
;
}
self
.
openCheckPerson
=
false
;
},
clickOpenCheckPerson
()
{
this
.
queryParamsMin
=
{
pageNum
:
1
,
pageSize
:
10
,
phone
:
undefined
,
name
:
undefined
,
companyId
:
undefined
,
};
this
.
companyList
=
[];
this
.
employeesList
=
[];
this
.
openCheckPerson
=
true
;
this
.
employeesListAxios
();
this
.
companyListAxios
();
},
handleQueryMin
()
{
this
.
$set
(
this
.
queryParamsMin
,
"pageNum"
,
1
);
this
.
employeesListAxios
();
},
resetQueryMin
()
{
this
.
resetForm
(
"queryFormMin"
);
this
.
handleQueryMin
();
},
clickCheckEMply
(
row
,
index
)
{
let
self
=
this
;
self
.
employeesList
.
forEach
((
fk
,
fl
)
=>
{
self
.
$set
(
self
.
employeesList
,
fl
,
{
...
fk
,
check_is
:
false
,
});
});
self
.
$set
(
self
.
employeesList
,
index
,
{
...
row
,
check_is
:
!
row
.
check_is
,
});
},
async
employeesListAxios
()
{
let
self
=
this
;
const
{
code
,
rows
,
total
}
=
await
employeesListGET
(
this
.
queryParamsMin
);
console
.
log
(
"employeesListGET"
,
code
,
rows
);
if
(
code
===
200
)
{
self
.
employeesList
=
rows
||
[];
self
.
employeesList_total
=
total
;
if
(
rows
.
length
)
{
rows
.
forEach
(
async
(
item
,
index
)
=>
{
self
.
$set
(
self
.
employeesList
,
index
,
{
...
item
,
check_is
:
false
,
avatar_change_url
:
await
self
.
listByIdsAixos
(
item
.
avatar
?
item
.
avatar
:
103
),
});
});
}
}
},
listByIdsAixos
(
ids
)
{
return
new
Promise
(
async
(
resolve
,
reject
)
=>
{
const
res
=
await
listByIds
(
ids
);
if
(
res
.
code
===
200
&&
res
?.
data
?.
length
&&
res
.
data
[
0
])
{
resolve
(
res
.
data
[
0
].
url
);
}
else
{
resolve
(
""
);
}
});
},
async
companyListAxios
()
{
const
{
code
,
rows
}
=
await
companyListGET
({
pageNum
:
1
,
pageSize
:
9999999
,
});
if
(
code
===
200
)
{
this
.
companyList
=
rows
;
}
},
clickSeeROWrFK
(
value
,
title
,
type
=
"undefined"
)
{
this
.
vDataL
=
{
open
:
false
,
...
...
@@ -1189,11 +1441,14 @@ export default {
this
.
VisitorData
=
row
;
},
clickSeeROWrEM
(
text
,
title
)
{
this
.
openArticle
=
true
;
this
.
rowArticle
=
this
.
replaceSpecialChar
(
text
);
this
.
openArticleTitle
=
title
;
this
.
openArticle
=
true
;
},
replaceSpecialChar
(
detail
)
{
if
(
!
detail
)
{
return
""
;
}
var
content
=
detail
.
replaceAll
(
/<img
[^
>
]
*>/gi
,
function
(
match
,
capture
)
{
...
...
@@ -1240,30 +1495,47 @@ export default {
reset
()
{
this
.
form
=
{
id
:
undefined
,
orderId
:
undefined
,
businessId
:
5
,
orderType
:
undefined
,
userPhone
:
undefined
,
orderSn
:
undefined
,
cityId
:
undefined
,
payMoney
:
undefined
,
ypName
:
undefined
,
ydAddress
:
undefined
,
isCf
:
undefined
,
prescriptionAttachment
:
undefined
,
way
:
undefined
,
recipient
:
undefined
,
adress
:
undefined
,
pzShPhone
:
undefined
,
pzAddress
:
undefined
,
addressInfo
:
undefined
,
phone
:
undefined
,
emId
:
undefined
,
isRefrigerate
:
undefined
,
status
:
undefined
,
overTime
:
undefined
,
voucher
:
undefined
,
pzShr
:
undefined
,
pzAddress
:
undefined
,
pzShPhone
:
undefined
,
pzShRemake
:
undefined
,
delFlag
:
undefined
,
createBy
:
undefined
,
createTime
:
undefined
,
updateBy
:
undefined
,
updateTime
:
undefined
,
remark
:
undefined
,
prescriptionAttachment
:
undefined
,
// orderId: undefined,
// ypName: undefined,
// ydAddress: undefined,
// isCf: undefined,
// prescriptionAttachment: undefined,
// way: undefined,
// recipient: undefined,
// adress: undefined,
// addressInfo: undefined,
// phone: undefined,
// isRefrigerate: undefined,
// status: undefined,
// overTime: undefined,
// voucher: undefined,
// pzShr: undefined,
// pzAddress: undefined,
// pzShPhone: undefined,
// pzShRemake: undefined,
// delFlag: undefined,
// createBy: undefined,
// createTime: undefined,
// updateBy: undefined,
// updateTime: undefined,
// remark: undefined,
};
this
.
resetForm
(
"form"
);
},
...
...
@@ -1288,6 +1560,14 @@ export default {
this
.
reset
();
this
.
open
=
true
;
this
.
title
=
"新增订单"
;
this
.
cityVoListAxios
();
},
async
cityVoListAxios
()
{
const
{
code
,
data
}
=
await
cityVoListGET
();
console
.
log
(
"cityVoListGET"
,
code
,
data
);
if
(
code
===
200
)
{
this
.
cityVoList
=
data
;
}
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
...
...
@@ -1307,17 +1587,17 @@ export default {
if
(
valid
)
{
this
.
buttonLoading
=
true
;
if
(
this
.
form
.
id
!=
null
)
{
updateDbmyOrder
(
this
.
form
)
.
then
((
response
)
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
this
.
open
=
false
;
this
.
getList
();
})
.
finally
(()
=>
{
this
.
buttonLoading
=
false
;
});
//
updateDbmyOrder(this.form)
//
.then((response) => {
//
this.$modal.msgSuccess("修改成功");
//
this.open = false;
//
this.getList();
//
})
//
.finally(() => {
//
this.buttonLoading = false;
//
});
}
else
{
add
DbmyOrder
(
this
.
form
)
add
ThirdOrderPOST
(
this
.
form
)
.
then
((
response
)
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
open
=
false
;
...
...
src/views/orderManagement/zqghOrder/index.vue
View file @
b817b20b
...
...
@@ -16,33 +16,37 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"订单状态"
prop=
"orderSn"
>
<el-select
v-model=
"queryParams.value"
placeholder=
"全部"
clearable=
""
>
<el-form-item
label=
"当前状态"
prop=
"yStatus"
>
<el-select
v-model=
"queryParams.yStatus"
placeholder=
"全部"
clearable=
""
>
<el-option
v-for=
"item in [
{
label: '已发布',
value:
'0'
,
value:
0
,
},
{
label: '已接单',
value:
'1'
,
value:
1
,
},
{
label: '已完成',
value:
'2'
,
value:
2
,
},
{
label: '退款中',
value:
'3'
,
value:
3
,
},
{
label: '已退款',
value:
'4'
,
value:
4
,
},
{
label: '进行中',
value:
'6'
,
value:
6
,
},
]"
:key="item.value"
...
...
@@ -52,17 +56,21 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"订单类型"
prop=
"orderSn"
>
<el-select
v-model=
"queryParams.value"
placeholder=
"全部"
clearable=
""
>
<el-form-item
label=
"订单类型"
prop=
"orderType"
>
<el-select
v-model=
"queryParams.orderType"
placeholder=
"全部"
clearable=
""
>
<el-option
v-for=
"item in [
{
label: '小程序',
value:
'0'
,
value:
0
,
},
{
label: '美团',
value:
'1'
,
value:
1
,
},
]"
:key="item.value"
...
...
src/views/orderManagement/zyphOrder/index.vue
View file @
b817b20b
...
...
@@ -16,49 +16,53 @@
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"就诊人姓名"
prop=
"
orderSn
"
label-width=
"90px"
>
<el-form-item
label=
"就诊人姓名"
prop=
"
vistorName
"
label-width=
"90px"
>
<el-input
v-model=
"queryParams.
orderSn
"
v-model=
"queryParams.
vistorName
"
placeholder=
"请输入就诊人姓名"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"接单人"
prop=
"
orderSn
"
>
<el-form-item
label=
"接单人"
prop=
"
receiverName
"
>
<el-input
v-model=
"queryParams.
orderSn
"
v-model=
"queryParams.
receiverName
"
placeholder=
"请输入接单人"
clearable
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
<el-form-item
label=
"当前状态"
prop=
"orderSn"
>
<el-select
v-model=
"queryParams.value"
placeholder=
"全部"
clearable=
""
>
<el-form-item
label=
"当前状态"
prop=
"yStatus"
>
<el-select
v-model=
"queryParams.yStatus"
placeholder=
"全部"
clearable=
""
>
<el-option
v-for=
"item in [
{
label: '已发布',
value:
'0'
,
value:
0
,
},
{
label: '已接单',
value:
'1'
,
value:
1
,
},
{
label: '已完成',
value:
'2'
,
value:
2
,
},
{
label: '退款中',
value:
'3'
,
value:
3
,
},
{
label: '已退款',
value:
'4'
,
value:
4
,
},
{
label: '进行中',
value:
'6'
,
value:
6
,
},
]"
:key="item.value"
...
...
@@ -68,17 +72,21 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"订单类型"
prop=
"orderSn"
>
<el-select
v-model=
"queryParams.value"
placeholder=
"全部"
clearable=
""
>
<el-form-item
label=
"订单类型"
prop=
"orderType"
>
<el-select
v-model=
"queryParams.orderType"
placeholder=
"全部"
clearable=
""
>
<el-option
v-for=
"item in [
{
label: '小程序',
value:
'0'
,
value:
0
,
},
{
label: '美团',
value:
'1'
,
value:
1
,
},
]"
:key="item.value"
...
...
@@ -110,7 +118,8 @@
icon=
"el-icon-plus"
size=
"large"
@
click=
"handleAdd"
>
新增
</el-button>
>
新增
</el-button
>
</el-col>
<!--
<el-col
:span=
"1.5"
>
<el-button
...
...
@@ -266,7 +275,9 @@
<!--
{{
row
.
startDay
}}
-
{{
row
.
endDay
}}
-->
<el-button
type=
"primary"
@
click=
"clickSeeROWrEM(`$
{row.startDay}至${row.endDay}`, '期待陪护日期')"
@
click=
"
clickSeeROWrEM(`$
{row.startDay}至${row.endDay}`, '期待陪护日期')
"
>查看
</el-button
>
</
template
>
...
...
@@ -315,9 +326,14 @@
<el-table-column
label=
"订单类型"
align=
"center"
prop=
""
key=
""
></el-table-column>
prop=
"orderType"
key=
"orderType"
>
<
template
slot-scope=
"{ row }"
>
<span
v-if=
"row.orderType == 0"
>
小程序
</span>
<span
v-if=
"row.orderType == 1"
>
美团
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"是否好评"
align=
"center"
...
...
@@ -414,7 +430,13 @@
v-hasPermi=
"['system:zyphOrder:remove']"
>
删除
</el-button
>
-->
<el-button
size=
"large"
type=
"text"
>
取消
</el-button>
<el-button
size=
"large"
type=
"text"
@
click=
"handleClickCancell(scope.row)"
v-if=
"[1, '1'].includes(scope.row.tstatus)"
>
取消
</el-button
>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -428,13 +450,18 @@
/>
<!-- 添加或修改住院陪诊订单对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"1000px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"100px"
>
<el-dialog
:title=
"title"
:visible
.
sync=
"open"
width=
"1000px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"订单类型"
prop=
"order
Id
"
>
<el-form-item
label=
"订单类型"
prop=
"order
Type
"
>
<el-select
v-model=
"form.order
Id
"
v-model=
"form.order
Type
"
clearable
placeholder=
"请选择订单类型"
style=
"width: 270px"
...
...
@@ -443,11 +470,11 @@
v-for=
"item in [
{
label: '小程序',
value:
'0'
,
value:
0
,
},
{
label: '美团',
value:
'1'
,
value:
1
,
},
]"
:key=
"item.value"
...
...
@@ -459,9 +486,9 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"用户手机号"
prop=
"
orderId
"
>
<el-form-item
label=
"用户手机号"
prop=
"
userPhone
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
userPhone
"
placeholder=
"请输入用户手机号"
style=
"width: 270px"
maxlength=
"11"
...
...
@@ -471,28 +498,29 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"订单号"
prop=
"order
Id
"
>
<el-form-item
label=
"订单号"
prop=
"order
Sn
"
>
<el-input
v-model=
"form.order
Id
"
v-model=
"form.order
Sn
"
placeholder=
"请输入订单号"
style=
"width: 270px"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"城市"
prop=
"
order
Id"
>
<el-form-item
label=
"城市"
prop=
"
city
Id"
>
<el-select
v-model=
"form.
order
Id"
v-model=
"form.
city
Id"
clearable
placeholder=
"请选择城市"
filterable
style=
"width: 270px"
@
change=
"changeCityId"
>
<el-option
v-for=
"item in
[]
"
:key=
"item.
value
"
:label=
"item.
label
"
:value=
"item.
value
"
v-for=
"item in
cityVoList
"
:key=
"item.
id
"
:label=
"item.
name
"
:value=
"item.
id
"
>
</el-option>
</el-select>
...
...
@@ -501,28 +529,29 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"医院"
prop=
"
orderI
d"
>
<el-form-item
label=
"医院"
prop=
"
hi
d"
>
<el-select
v-model=
"form.
orderI
d"
v-model=
"form.
hi
d"
clearable
placeholder=
"请选择医院"
filterable
style=
"width: 270px"
:disabled=
"form.cityId ? false : true"
>
<el-option
v-for=
"item in
[]
"
:key=
"item.
value
"
:label=
"item.
label
"
:value=
"item.
value
"
v-for=
"item in
hospitalList
"
:key=
"item.
id
"
:label=
"item.
name
"
:value=
"item.
id
"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"科室"
prop=
"
orderId
"
>
<el-form-item
label=
"科室"
prop=
"
didName
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
didName
"
placeholder=
"请输入科室"
style=
"width: 270px"
/>
...
...
@@ -531,18 +560,29 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"服务"
prop=
"orderId"
>
<el-input
v-model=
"form.orderId"
placeholder=
"请输入服务"
<el-form-item
label=
"服务"
prop=
"serviceId"
>
<el-select
v-model=
"form.serviceId"
clearable
placeholder=
"请选择服务"
filterable
style=
"width: 270px"
/>
:disabled=
"form.cityId ? false : true"
>
<el-option
v-for=
"item in servicesList"
:key=
"item.id"
:label=
"item.name"
:value=
"item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"订单价"
prop=
"
orderId
"
>
<el-form-item
label=
"订单价"
prop=
"
payMoney
"
>
<el-input-number
v-model=
"form.
orderId
"
v-model=
"form.
payMoney
"
:min=
"0"
label=
"订单价"
:precision=
"2"
...
...
@@ -555,9 +595,9 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"就诊人姓名"
prop=
"
orderId
"
>
<el-form-item
label=
"就诊人姓名"
prop=
"
name
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
name
"
placeholder=
"请输入就诊人姓名"
maxlength=
"5"
style=
"width: 270px"
...
...
@@ -565,15 +605,24 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"就诊人性别"
prop=
"
orderId
"
>
<el-form-item
label=
"就诊人性别"
prop=
"
sex
"
>
<el-select
v-model=
"form.
orderId
"
v-model=
"form.
sex
"
clearable
placeholder=
"请选择就诊人性别"
style=
"width: 270px"
>
<el-option
v-for=
"item in []"
v-for=
"item in [
{
label: '女',
value: 0,
},
{
label: '男',
value: 1,
},
]"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
...
...
@@ -585,36 +634,36 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"身份证号"
prop=
"
orderI
d"
>
<el-form-item
label=
"身份证号"
prop=
"
idcar
d"
>
<el-input
v-model=
"form.
orderI
d"
v-model=
"form.
idcar
d"
placeholder=
"请输入身份证号"
style=
"width: 270px"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"就诊人手机号"
prop=
"orderId"
>
<el-input
v-model=
"form.orderId"
placeholder=
"请输入就诊人手机号"
style=
"width: 270px"
maxlength=
"11"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"是否成年"
prop=
"
orderId
"
>
<el-form-item
label=
"是否成年"
prop=
"
isAdult
"
>
<el-select
v-model=
"form.
orderId
"
v-model=
"form.
isAdult
"
clearable
placeholder=
"请选择是否成年"
style=
"width: 270px"
>
<el-option
v-for=
"item in []"
v-for=
"item in [
{
label: '成年',
value: 0,
},
{
label: '未成年',
value: 1,
},
]"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
...
...
@@ -624,10 +673,10 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"接单人"
prop=
"
order
Id"
>
<div
@
click=
"
openCheckPerson = true
"
>
<el-form-item
label=
"接单人"
prop=
"
em
Id"
>
<div
@
click=
"
clickOpenCheckPerson
"
>
<el-input
v-model=
"form.
orderId
"
v-model=
"form.
emId_name
"
placeholder=
"请选择接单人"
style=
"width: 270px"
readonly=
""
...
...
@@ -638,37 +687,29 @@
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"期待陪护日期"
prop=
"
orderId
"
>
<el-form-item
label=
"期待陪护日期"
prop=
"
visitTime
"
>
<el-date-picker
v-model=
"form.
orderId
"
v-model=
"form.
visitTime
"
type=
"datetime"
placeholder=
"请选择期待陪护日期"
style=
"width: 270px"
value-format=
"yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<!-- <el-form-item label="预约电话" prop="orderId">
<el-input
v-model="form.orderId"
placeholder="请输入预约电话"
style="width: 270px"
maxlength="11"
/>
</el-form-item> -->
</el-col>
<el-col
:span=
"12"
>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"备注"
prop=
"
orderId
"
>
<el-form-item
label=
"备注"
prop=
"
remark
"
>
<el-input
type=
"textarea"
:rows=
"2"
placeholder=
"请输入备注"
maxlength=
"100"
show-word-limit
v-model=
"form.
textarea
"
v-model=
"form.
remark
"
style=
"width: calc(100% - 100px)"
>
</el-input>
...
...
@@ -696,17 +737,17 @@
:inline=
"true"
label-width=
"100px"
>
<el-form-item
label=
"接单人姓名"
prop=
"
orderSn
"
>
<el-form-item
label=
"接单人姓名"
prop=
"
name
"
>
<el-input
v-model=
"queryParamsMin.
orderSn
"
v-model=
"queryParamsMin.
name
"
placeholder=
"请输入接单人姓名"
clearable
style=
"width: 200px"
/>
</el-form-item>
<el-form-item
label=
"接单人手机号"
prop=
"
orderSn
"
>
<el-form-item
label=
"接单人手机号"
prop=
"
phone
"
>
<el-input
v-model=
"queryParamsMin.
orderSn
"
v-model=
"queryParamsMin.
phone
"
placeholder=
"请输入接单人姓名"
clearable
maxlength=
"11"
...
...
@@ -714,10 +755,19 @@
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"large"
<el-button
type=
"primary"
icon=
"el-icon-search"
size=
"large"
@
click=
"handleQueryMin"
>
搜索
</el-button
>
<el-button
icon=
"el-icon-refresh"
size=
"large"
>
重置
</el-button>
<el-button
icon=
"el-icon-refresh"
size=
"large"
@
click=
"resetQueryMin"
>
重置
</el-button
>
</el-form-item>
<el-form-item
label=
"所属商户"
prop=
"orderSn"
>
<el-select
...
...
@@ -728,74 +778,50 @@
filterable=
""
>
<el-option
v-for=
"item in
[]
"
:key=
"item.
value
"
:label=
"item.
label
"
:value=
"item.
value
"
v-for=
"item in
companyList
"
:key=
"item.
id
"
:label=
"item.
name
"
:value=
"item.
id
"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div
class=
"popmodel-person"
>
<div
class=
"popmodel-person-item popmodel-person-itema"
>
<div
class=
"popmodel-person-item-top"
>
<img
src=
""
alt=
""
/>
<div>
<p>
张丹
</p>
<p>
12345678912
</p>
</div>
</div>
<p
class=
"popmodel-person-item-botm"
>
所属商户:Lorem ipsum dolor sit amet consectetur, adipisicing
elit. Officia animi optio delectus! In earum voluptate ipsa
tempora, incidunt beatae cupiditate, adipisci voluptatibus neque
dolor fugiat, quidem corporis exercitationem quo accusantium.
</p>
</div>
<div
class=
"popmodel-person-item"
>
<div
class=
"popmodel-person-item-top"
>
<img
src=
""
alt=
""
/>
<div>
<p>
张丹
</p>
<p>
12345678912
</p>
</div>
</div>
<p
class=
"popmodel-person-item-botm"
>
所属商户:Lorem ipsum dolor sit amet consectetur, adipisicing
elit. Officia animi optio delectus! In earum voluptate ipsa
tempora, incidunt beatae cupiditate, adipisci voluptatibus neque
dolor fugiat, quidem corporis exercitationem quo accusantium.
</p>
</div>
<div
class=
"popmodel-person-item"
>
<div
:class=
"
item.check_is
? 'popmodel-person-item popmodel-person-itema'
: 'popmodel-person-item'
"
v-for=
"(item, index) in employeesList"
:key=
"index"
@
click=
"clickCheckEMply(item, index)"
>
<div
class=
"popmodel-person-item-top"
>
<img
src=
"
"
alt=
""
/>
<img
:src=
"item.avatar_change_url
"
alt=
""
/>
<div>
<p>
张丹
</p>
<p>
12345678912
</p>
<p>
{{
item
.
name
}}
</p>
<p>
{{
item
.
phone
}}
</p>
</div>
</div>
<p
class=
"popmodel-person-item-botm"
>
所属商户:Lorem ipsum dolor sit amet consectetur, adipisicing
elit. Officia animi optio delectus! In earum voluptate ipsa
tempora, incidunt beatae cupiditate, adipisci voluptatibus neque
dolor fugiat, quidem corporis exercitationem quo accusantium.
所属商户:
{{
item
.
companyName
}}
</p>
</div>
</div>
<pagination
v-show=
"total > 0"
:total=
"total"
:page
.
sync=
"queryParams.pageNum"
:limit
.
sync=
"queryParams.pageSize"
@
pagination=
"
getList
"
v-show=
"
employeesList_
total > 0"
:total=
"
employeesList_
total"
:page
.
sync=
"queryParams
Min
.pageNum"
:limit
.
sync=
"queryParams
Min
.pageSize"
@
pagination=
"
employeesListAxios
"
/>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"
openCheckPerson = false
"
<el-button
type=
"primary"
@
click=
"
clickClosepERSON(1)
"
>
确 定
</el-button
>
<el-button
@
click=
"
openCheckPerson = false
"
>
取 消
</el-button>
<el-button
@
click=
"
clickClosepERSON(2)
"
>
取 消
</el-button>
</div>
</el-dialog>
</
template
>
...
...
@@ -893,6 +919,42 @@ import {
addZyphOrder
,
updateZyphOrder
,
}
from
"@/api/orderManagement/zyphOrder"
;
import
{
addThirdOrderPOST
,
cityVoListGET
,
hospitalListGET
,
servicesListGET
,
companyListGET
,
employeesListGET
,
totalOrderPUT
,
}
from
"@/api/addForm/index"
;
import
{
listByIds
}
from
"@/api/system/oss"
;
const
validatePhone
=
(
rule
,
value
,
callback
)
=>
{
if
(
!
value
)
{
callback
(
new
Error
(
"手机号不能为空"
));
}
//正则表达式进行验证手机号,从1开始,第二位是35789中的任意一位,以9数字结尾
if
(
!
/^1
[
35789
]\d{9}
$/
.
test
(
value
))
{
callback
(
new
Error
(
"手机号格式不正确"
));
}
callback
();
};
const
validateIsCardId
=
(
rule
,
value
,
callback
)
=>
{
if
(
!
value
)
{
return
new
Error
(
"请输入身份证号)"
);
}
else
{
const
reg
=
/^
\d{6}(
18|19|20
)?\d{2}(
0
[
1-9
]
|1
[
0-2
])(([
0-2
][
1-9
])
|10|20|30|31
)\d{3}(\d
|X|x
)
$/
;
const
card
=
reg
.
test
(
value
);
if
(
!
card
)
{
callback
(
new
Error
(
"身份证号格式有误!"
));
}
else
{
callback
();
}
}
};
export
default
{
name
:
"ZyphOrder"
,
...
...
@@ -930,6 +992,10 @@ export default {
pageNum
:
1
,
pageSize
:
10
,
orderSn
:
undefined
,
orderType
:
undefined
,
vistorName
:
undefined
,
receiverName
:
undefined
,
yStatus
:
undefined
,
// orderId: undefined,
// hid: undefined,
// did: undefined,
...
...
@@ -946,7 +1012,62 @@ export default {
form
:
{},
// 表单校验
rules
:
{
remark
:
[{
required
:
true
,
message
:
"备注不能为空"
,
trigger
:
"blur"
}],
//blur change
orderType
:
[
{
required
:
true
,
message
:
"订单类型不能为空"
,
trigger
:
"change"
},
],
userPhone
:
[
{
required
:
true
,
message
:
"用户手机号不能为空"
,
trigger
:
"blur"
},
{
required
:
true
,
trigger
:
"blur"
,
min
:
11
,
max
:
11
,
message
:
"长度不符合"
,
},
{
required
:
true
,
trigger
:
"blur"
,
validator
:
validatePhone
},
],
orderSn
:
[
{
required
:
true
,
message
:
"订单号不能为空"
,
trigger
:
"blur"
},
],
cityId
:
[
{
required
:
true
,
message
:
"城市不能为空"
,
trigger
:
"change"
},
],
hid
:
[{
required
:
true
,
message
:
"医院不能为空"
,
trigger
:
"change"
}],
didName
:
[{
required
:
true
,
message
:
"科室不能为空"
,
trigger
:
"blur"
}],
serviceId
:
[
{
required
:
true
,
message
:
"服务不能为空"
,
trigger
:
"change"
},
],
payMoney
:
[
{
required
:
true
,
message
:
"订单价不能为空"
,
trigger
:
"blur"
},
],
name
:
[
{
required
:
true
,
message
:
"就诊人姓名不能为空"
,
trigger
:
"blur"
},
],
sex
:
[
{
required
:
true
,
message
:
"就诊人性别不能为空"
,
trigger
:
"change"
},
],
idcard
:
[
{
required
:
true
,
message
:
"身份证号不能为空"
,
trigger
:
"blur"
},
{
required
:
true
,
trigger
:
"blur"
,
validator
:
validateIsCardId
},
],
isAdult
:
[
{
required
:
true
,
message
:
"是否成年不能为空"
,
trigger
:
"change"
},
],
emId
:
[
{
required
:
true
,
message
:
"接单人不能为空"
,
trigger
:
[
"change"
,
"blur"
],
},
],
visitTime
:
[
{
required
:
true
,
message
:
"期待陪护日期不能为空"
,
trigger
:
"change"
,
},
],
},
VisitorData
:
{
name
:
""
,
...
...
@@ -955,16 +1076,145 @@ export default {
isAdult
:
""
,
voucher
:
""
,
},
queryParamsMin
:
{
pageNum
:
1
,
pageSize
:
10
,
},
queryParamsMin
:
{},
cityVoList
:
[],
hospitalList
:
[],
servicesList
:
[],
employeesList
:
[],
employeesList_total
:
0
,
companyList
:
[],
};
},
created
()
{
this
.
getList
();
},
methods
:
{
handleClickCancell
(
row
)
{
let
self
=
this
;
self
.
$confirm
(
"是否确认取消此项?"
,
"提示"
,
{
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
,
})
.
then
(
async
()
=>
{
const
{
code
}
=
await
totalOrderPUT
({
id
:
row
.
toOrderId
,
status
:
7
,
});
if
(
code
===
200
)
{
self
.
$modal
.
msgSuccess
(
"取消成功"
);
self
.
getList
();
}
})
.
catch
(()
=>
{
self
.
$message
({
type
:
"info"
,
message
:
"已取消删除"
,
});
});
},
clickClosepERSON
(
type
)
{
let
self
=
this
;
switch
(
type
)
{
case
1
:
let
row_data
=
self
.
employeesList
.
filter
((
item
)
=>
{
return
item
.
check_is
;
});
console
.
log
(
"row_data"
,
row_data
);
if
(
row_data
?.
length
)
{
self
.
$set
(
self
.
form
,
"emId"
,
row_data
[
0
].
id
);
self
.
$set
(
self
.
form
,
"emId_name"
,
row_data
[
0
].
name
);
}
break
;
case
2
:
self
.
queryParamsMin
=
{
pageNum
:
1
,
pageSize
:
10
,
phone
:
undefined
,
name
:
undefined
,
companyId
:
undefined
,
};
self
.
companyList
=
[];
self
.
employeesList
=
[];
break
;
}
self
.
openCheckPerson
=
false
;
},
clickOpenCheckPerson
()
{
this
.
queryParamsMin
=
{
pageNum
:
1
,
pageSize
:
10
,
phone
:
undefined
,
name
:
undefined
,
companyId
:
undefined
,
};
this
.
companyList
=
[];
this
.
employeesList
=
[];
this
.
openCheckPerson
=
true
;
this
.
employeesListAxios
();
this
.
companyListAxios
();
},
handleQueryMin
()
{
this
.
$set
(
this
.
queryParamsMin
,
"pageNum"
,
1
);
this
.
employeesListAxios
();
},
resetQueryMin
()
{
this
.
resetForm
(
"queryFormMin"
);
this
.
handleQueryMin
();
},
clickCheckEMply
(
row
,
index
)
{
let
self
=
this
;
self
.
employeesList
.
forEach
((
fk
,
fl
)
=>
{
self
.
$set
(
self
.
employeesList
,
fl
,
{
...
fk
,
check_is
:
false
,
});
});
self
.
$set
(
self
.
employeesList
,
index
,
{
...
row
,
check_is
:
!
row
.
check_is
,
});
},
async
employeesListAxios
()
{
let
self
=
this
;
const
{
code
,
rows
,
total
}
=
await
employeesListGET
(
this
.
queryParamsMin
);
console
.
log
(
"employeesListGET"
,
code
,
rows
);
if
(
code
===
200
)
{
self
.
employeesList
=
rows
||
[];
self
.
employeesList_total
=
total
;
if
(
rows
.
length
)
{
rows
.
forEach
(
async
(
item
,
index
)
=>
{
self
.
$set
(
self
.
employeesList
,
index
,
{
...
item
,
check_is
:
false
,
avatar_change_url
:
await
self
.
listByIdsAixos
(
item
.
avatar
?
item
.
avatar
:
103
),
});
});
}
}
},
listByIdsAixos
(
ids
)
{
return
new
Promise
(
async
(
resolve
,
reject
)
=>
{
const
res
=
await
listByIds
(
ids
);
if
(
res
.
code
===
200
&&
res
?.
data
?.
length
&&
res
.
data
[
0
])
{
resolve
(
res
.
data
[
0
].
url
);
}
else
{
resolve
(
""
);
}
});
},
async
companyListAxios
()
{
const
{
code
,
rows
}
=
await
companyListGET
({
pageNum
:
1
,
pageSize
:
9999999
,
});
if
(
code
===
200
)
{
this
.
companyList
=
rows
;
}
},
clickSeeEM
(
row
)
{
this
.
openEMInfo
=
true
;
this
.
VisitorData
=
row
;
...
...
@@ -974,11 +1224,14 @@ export default {
this
.
VisitorData
=
row
;
},
clickSeeROWrEM
(
text
,
title
)
{
this
.
openArticle
=
true
;
this
.
rowArticle
=
this
.
replaceSpecialChar
(
text
);
this
.
openArticleTitle
=
title
;
this
.
openArticle
=
true
;
},
replaceSpecialChar
(
detail
)
{
if
(
!
detail
)
{
return
""
;
}
var
content
=
detail
.
replaceAll
(
/<img
[^
>
]
*>/gi
,
function
(
match
,
capture
)
{
...
...
@@ -1018,23 +1271,40 @@ export default {
reset
()
{
this
.
form
=
{
id
:
undefined
,
orderId
:
undefined
,
businessId
:
4
,
orderType
:
undefined
,
userPhone
:
undefined
,
orderSn
:
undefined
,
cityId
:
undefined
,
hid
:
undefined
,
did
:
undefined
,
visitor
:
undefined
,
startDay
:
undefined
,
endDay
:
undefined
,
startTime
:
undefined
,
endTime
:
undefined
,
status
:
undefined
,
overTime
:
undefined
,
voucher
:
undefined
,
delFlag
:
undefined
,
createBy
:
undefined
,
createTime
:
undefined
,
updateBy
:
undefined
,
updateTime
:
undefined
,
didName
:
undefined
,
serviceId
:
undefined
,
payMoney
:
undefined
,
sex
:
undefined
,
name
:
undefined
,
idcard
:
undefined
,
isAdult
:
undefined
,
emId
:
undefined
,
emId_name
:
undefined
,
visitTime
:
undefined
,
remark
:
undefined
,
// orderId: undefined,
// hid: undefined,
// did: undefined,
// visitor: undefined,
// startDay: undefined,
// endDay: undefined,
// startTime: undefined,
// endTime: undefined,
// status: undefined,
// overTime: undefined,
// voucher: undefined,
// delFlag: undefined,
// createBy: undefined,
// createTime: undefined,
// updateBy: undefined,
// updateTime: undefined,
// remark: undefined,
};
this
.
resetForm
(
"form"
);
},
...
...
@@ -1059,6 +1329,42 @@ export default {
this
.
reset
();
this
.
open
=
true
;
this
.
title
=
"新增订单"
;
this
.
cityVoListAxios
();
},
async
cityVoListAxios
()
{
const
{
code
,
data
}
=
await
cityVoListGET
();
console
.
log
(
"cityVoListGET"
,
code
,
data
);
if
(
code
===
200
)
{
this
.
cityVoList
=
data
;
}
},
changeCityId
(
e
)
{
console
.
log
(
"changeCityId"
,
e
);
this
.
$set
(
this
.
form
,
"hid"
,
undefined
);
this
.
$set
(
this
.
form
,
"serviceId"
,
undefined
);
this
.
hospitalListAxios
(
e
);
this
.
servicesListAxios
(
e
);
},
async
hospitalListAxios
(
cityId
)
{
const
{
code
,
data
}
=
await
hospitalListGET
({
cityId
,
});
console
.
log
(
"hospitalListGET"
,
code
,
data
);
if
(
code
===
200
)
{
this
.
hospitalList
=
data
;
}
},
async
servicesListAxios
(
cityId
)
{
const
{
code
,
rows
}
=
await
servicesListGET
({
pageSize
:
999999
,
pageNum
:
1
,
cityId
,
bid
:
this
.
form
.
businessId
,
});
console
.
log
(
"servicesListGET"
,
code
,
rows
);
if
(
code
===
200
)
{
this
.
servicesList
=
rows
;
}
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
...
...
@@ -1078,17 +1384,17 @@ export default {
if
(
valid
)
{
this
.
buttonLoading
=
true
;
if
(
this
.
form
.
id
!=
null
)
{
updateZyphOrder
(
this
.
form
)
.
then
((
response
)
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
this
.
open
=
false
;
this
.
getList
();
})
.
finally
(()
=>
{
this
.
buttonLoading
=
false
;
});
//
updateZyphOrder(this.form)
//
.then((response) => {
//
this.$modal.msgSuccess("修改成功");
//
this.open = false;
//
this.getList();
//
})
//
.finally(() => {
//
this.buttonLoading = false;
//
});
}
else
{
add
ZyphOrder
(
this
.
form
)
add
ThirdOrderPOST
(
this
.
form
)
.
then
((
response
)
=>
{
this
.
$modal
.
msgSuccess
(
"新增成功"
);
this
.
open
=
false
;
...
...
vue.config.js
View file @
b817b20b
...
...
@@ -36,8 +36,8 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[
process
.
env
.
VUE_APP_BASE_API
]:
{
// target: `http://localhost:8089`,
//
target: `https://peizheng.shanpeikj.com/api`,
target
:
`http://192.168.0.181:8089`
,
target
:
`https://peizheng.shanpeikj.com/api`
,
//
target: `http://192.168.0.181:8089`,
// target: `http://192.168.0.137:8089`,
// target: `http://192.168.0.199:8089`,
// target: `http://192.168.0.125:8089`,
...
...
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