Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
html
/
small-program-web
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d33ec7e4
authored
Jul 18, 2019
by
duanguohui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取消订单
parent
e2abf7f0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
12 deletions
+33
-12
src/views/flowerManage/flowerAdd.vue
+2
-0
src/views/flowerManage/flowerDetail.vue
+1
-0
src/views/orderList/OrderList.vue
+30
-12
No files found.
src/views/flowerManage/flowerAdd.vue
View file @
d33ec7e4
...
@@ -83,7 +83,9 @@ export default {
...
@@ -83,7 +83,9 @@ export default {
}
}
},
},
created
(){
created
(){
this
.
$route
.
params
.
item
.
description
=
this
.
$route
.
params
.
item
.
description
.
replace
(
/
\$\{\(
domainUrlUtil.EJS_IMAGE_RESOURCES
\)\!\}
/g
,
'https://www.i-sirius.com/ejsimage'
)
this
.
addForm
=
this
.
$route
.
params
.
item
this
.
addForm
=
this
.
$route
.
params
.
item
console
.
log
(
this
.
$route
.
params
.
item
.
description
)
this
.
imageUrl
=
this
.
$route
.
params
.
item
.
masterImg
this
.
imageUrl
=
this
.
$route
.
params
.
item
.
masterImg
},
},
components
:
{
components
:
{
...
...
src/views/flowerManage/flowerDetail.vue
View file @
d33ec7e4
...
@@ -79,6 +79,7 @@ export default {
...
@@ -79,6 +79,7 @@ export default {
}
}
},
},
created
(){
created
(){
this
.
$route
.
params
.
item
.
description
=
this
.
$route
.
params
.
item
.
description
.
replace
(
/'${
(
domainUrlUtil.EJS_IMAGE_RESOURCES
)
!}'/gi
,
'https://www.i-sirius.com/ejsimage'
)
this
.
addForm
=
this
.
$route
.
params
.
item
this
.
addForm
=
this
.
$route
.
params
.
item
this
.
imageUrl
=
this
.
$route
.
params
.
item
.
masterImg
this
.
imageUrl
=
this
.
$route
.
params
.
item
.
masterImg
},
},
...
...
src/views/orderList/OrderList.vue
View file @
d33ec7e4
...
@@ -117,18 +117,23 @@
...
@@ -117,18 +117,23 @@
width=
"120"
width=
"120"
align=
"center"
align=
"center"
label=
"操作"
>
label=
"操作"
>
<
template
slot-scope=
"scope"
v-if=
"scope.row.type == 'WM'"
>
<
template
slot-scope=
"scope"
>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'DQR'"
@
click=
"orderConfirm(scope.row.id, $event)"
class=
"btn_edit"
>
确认订单
</a>
<div
v-if=
"scope.row.type == 'WM'"
>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'YQR'"
@
click=
"orderComplete(scope.row.id, $event)"
class=
"btn_delete"
>
完成
</a>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'DQR'"
@
click=
"orderConfirm(scope.row.id, $event)"
class=
"btn_edit"
>
确认订单
</a>
</
template
>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'YQR'"
@
click=
"orderComplete(scope.row.id, $event)"
class=
"btn_edit"
>
完成
</a>
<
template
slot-scope=
"scope"
v-if=
"scope.row.type == 'CS'"
>
<a
href=
"javascript:;"
@
click=
"orderCancle(scope.row.id, $event)"
class=
"btn_delete"
>
取消
</a>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'DQR'"
@
click=
"orderConfirm(scope.row.id, $event)"
class=
"btn_edit"
>
确认订单
</a>
</div>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'YQR'"
@
click=
"orderFH(scope.row.id, $event)"
class=
"btn_delete"
>
发货
</a>
<div
v-if=
"scope.row.type == 'CS'"
>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'FH'"
@
click=
"orderComplete(scope.row.id, $event)"
class=
"btn_delete"
>
完成
</a>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'DQR'"
@
click=
"orderConfirm(scope.row.id, $event)"
class=
"btn_edit"
>
确认订单
</a>
</
template
>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'YQR'"
@
click=
"orderFH(scope.row.id, $event)"
class=
"btn_edit"
>
发货
</a>
<
template
slot-scope=
"scope"
v-if=
"scope.row.type == 'WX' || scope.row.type == 'BJ' || scope.row.type == 'CSSM'"
>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'FH'"
@
click=
"orderComplete(scope.row.id, $event)"
class=
"btn_edit"
>
完成
</a>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'DQR'"
@
click=
"orderConfirm(scope.row.id, $event)"
class=
"btn_edit"
>
确认订单
</a>
<a
href=
"javascript:;"
@
click=
"orderCancle(scope.row.id, $event)"
class=
"btn_delete"
>
取消
</a>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'YQR'"
@
click=
"orderComplete(scope.row.id, $event)"
class=
"btn_delete"
>
完成
</a>
</div>
<div
v-if=
"scope.row.type == 'WX' || scope.row.type == 'BJ' || scope.row.type == 'CSSM'"
>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'DQR'"
@
click=
"orderConfirm(scope.row.id, $event)"
class=
"btn_edit"
>
确认订单
</a>
<a
href=
"javascript:;"
v-if=
"scope.row.status == 'YQR'"
@
click=
"orderComplete(scope.row.id, $event)"
class=
"btn_edit"
>
完成
</a>
<a
href=
"javascript:;"
@
click=
"orderCancle(scope.row.id, $event)"
class=
"btn_delete"
>
取消
</a>
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -261,6 +266,19 @@ export default {
...
@@ -261,6 +266,19 @@ export default {
this
.
getOrderList
()
this
.
getOrderList
()
},
},
methods
:
{
methods
:
{
orderCancle
(
id
,
e
)
{
e
.
stopPropagation
()
this
.
$axios
({
method
:
'post'
,
url
:
'/pc/trade/update/yqx'
,
data
:
{
id
:
id
,
userName
:
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'userInfo'
)).
data
.
userResponse
.
userName
}
}).
then
((
res
)
=>
{
this
.
getOrderList
()
})
},
orderConfirm
(
id
,
e
)
{
// 确认
orderConfirm
(
id
,
e
)
{
// 确认
e
.
stopPropagation
()
e
.
stopPropagation
()
this
.
$axios
({
this
.
$axios
({
...
...
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