Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_web
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pseer
gxpt_web
Commits
fcb4250e
Commit
fcb4250e
authored
Mar 20, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单显示
parent
3e593dcf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
index.vue
src/views/system/order/index.vue
+2
-2
roomOrderIndex.vue
src/views/system/order/roomOrderIndex.vue
+3
-3
index.vue
src/views/system/room/index.vue
+0
-1
No files found.
src/views/system/order/index.vue
View file @
fcb4250e
...
@@ -268,7 +268,7 @@
...
@@ -268,7 +268,7 @@
<
dict
-
tag
:
options
=
"dict.type.order_status_admin"
:
value
=
"scope.row.status"
/>
<
dict
-
tag
:
options
=
"dict.type.order_status_admin"
:
value
=
"scope.row.status"
/>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
v
-
if
=
"columns[23].visible"
align
=
"center"
label
=
"
订
单时间"
prop
=
"createTime"
width
=
"100"
>
<
el
-
table
-
column
v
-
if
=
"columns[23].visible"
align
=
"center"
label
=
"
下
单时间"
prop
=
"createTime"
width
=
"100"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
createTime
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
:{s
}
'
)
}}
<
/span
>
<
span
>
{{
parseTime
(
scope
.
row
.
createTime
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
:{s
}
'
)
}}
<
/span
>
<
/template
>
<
/template
>
...
@@ -435,7 +435,7 @@
...
@@ -435,7 +435,7 @@
<
el
-
form
ref
=
"changeForm"
:
model
=
"changeForm"
:
rules
=
"changeRules"
label
-
width
=
"150px"
>
<
el
-
form
ref
=
"changeForm"
:
model
=
"changeForm"
:
rules
=
"changeRules"
label
-
width
=
"150px"
>
<
el
-
row
:
gutter
=
"20"
>
<
el
-
row
:
gutter
=
"20"
>
<
el
-
col
:
span
=
"12"
>
<
el
-
col
:
span
=
"12"
>
<
el
-
form
-
item
label
=
"订单号"
prop
=
"orderNo"
>
<
el
-
form
-
item
label
=
"订单
编
号"
prop
=
"orderNo"
>
<
el
-
input
v
-
model
=
"changeForm.orderNo"
:
readonly
=
"true"
/>
<
el
-
input
v
-
model
=
"changeForm.orderNo"
:
readonly
=
"true"
/>
<
/el-form-item
>
<
/el-form-item
>
<
/el-col
>
<
/el-col
>
...
...
src/views/system/order/roomOrderIndex.vue
View file @
fcb4250e
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<el-table-column
align=
"center"
label=
"订单编号"
prop=
"orderNo"
width=
"250"
/>
<el-table-column
align=
"center"
label=
"订单编号"
prop=
"orderNo"
width=
"250"
/>
<el-table-column
align=
"center"
label=
"门店名称"
prop=
"storeName"
/>
<el-table-column
align=
"center"
label=
"门店名称"
prop=
"storeName"
/>
<el-table-column
align=
"center"
label=
"房间名称"
prop=
"roomName"
/>
<el-table-column
align=
"center"
label=
"房间名称"
prop=
"roomName"
/>
<el-table-column
align=
"center"
label=
"手机号"
prop=
"consumerPhone"
/>
<el-table-column
align=
"center"
label=
"
会员
手机号"
prop=
"consumerPhone"
/>
<el-table-column
align=
"center"
label=
"会员昵称"
prop=
"consumerName"
/>
<el-table-column
align=
"center"
label=
"会员昵称"
prop=
"consumerName"
/>
<el-table-column
align=
"center"
label=
"预约开始时间"
prop=
"preStartDate"
>
<el-table-column
align=
"center"
label=
"预约开始时间"
prop=
"preStartDate"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
...
@@ -29,12 +29,12 @@
...
@@ -29,12 +29,12 @@
<
span
>
{{
parseTime
(
scope
.
row
.
preEndDate
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
'
)
}}
<
/span
>
<
span
>
{{
parseTime
(
scope
.
row
.
preEndDate
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
'
)
}}
<
/span
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"center"
label
=
"开始时间"
prop
=
"startDate"
>
<
el
-
table
-
column
align
=
"center"
label
=
"
实际
开始时间"
prop
=
"startDate"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
startDate
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
'
)
}}
<
/span
>
<
span
>
{{
parseTime
(
scope
.
row
.
startDate
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
'
)
}}
<
/span
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
align
=
"center"
label
=
"结束时间"
prop
=
"endDate"
>
<
el
-
table
-
column
align
=
"center"
label
=
"
实际
结束时间"
prop
=
"endDate"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
span
>
{{
parseTime
(
scope
.
row
.
endDate
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
'
)
}}
<
/span
>
<
span
>
{{
parseTime
(
scope
.
row
.
endDate
,
'{y
}
-{m
}
-{d
}
{h
}
:{i
}
'
)
}}
<
/span
>
<
/template
>
<
/template
>
...
...
src/views/system/room/index.vue
View file @
fcb4250e
...
@@ -167,7 +167,6 @@
...
@@ -167,7 +167,6 @@
<el-button
<el-button
size=
"mini"
size=
"mini"
type=
"text"
type=
"text"
icon=
"el-icon-user"
@
click=
"handleOrder(scope.row)"
@
click=
"handleOrder(scope.row)"
v-hasPermi=
"['system:store:edit']"
v-hasPermi=
"['system:store:edit']"
>
查看订单
>
查看订单
...
...
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