Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
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
罗超
confucius
Commits
f3f85e5f
Commit
f3f85e5f
authored
Dec 14, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
4db18192
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
136 additions
and
6 deletions
+136
-6
orderlist.vue
src/components/sale/orderlist.vue
+27
-6
transOrder-form.vue
src/components/sale/transOrder-form.vue
+109
-0
No files found.
src/components/sale/orderlist.vue
View file @
f3f85e5f
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
</q-item-section>
</q-item-section>
</q-item>
</q-item>
<q-item
clickable
v-close-popup
>
<q-item
clickable
v-close-popup
>
<q-item-section
@
click=
"transfer(item)"
>
<q-item-section
@
click=
"transfer
Order
(item)"
>
<q-item-label>
转交订单
</q-item-label>
<q-item-label>
转交订单
</q-item-label>
</q-item-section>
</q-item-section>
</q-item>
</q-item>
...
@@ -251,7 +251,7 @@
...
@@ -251,7 +251,7 @@
</q-item-section>
</q-item-section>
</q-item>
</q-item>
<q-item
clickable
v-close-popup
>
<q-item
clickable
v-close-popup
>
<q-item-section
@
click=
"transfer(item)"
>
<q-item-section
@
click=
"transfer
Order
(item)"
>
<q-item-label>
转交订单
</q-item-label>
<q-item-label>
转交订单
</q-item-label>
</q-item-section>
</q-item-section>
</q-item>
</q-item>
...
@@ -416,20 +416,25 @@
...
@@ -416,20 +416,25 @@
<!--修改订单备注-->
<!--修改订单备注-->
<orderremark-form
v-if=
"isShowRemarkOrderForm"
:save-obj=
"orderObj"
:remarkType=
"remarkType"
<orderremark-form
v-if=
"isShowRemarkOrderForm"
:save-obj=
"orderObj"
:remarkType=
"remarkType"
@
close=
"closeRemarkForm"
@
success=
"refreshClassOrder"
></orderremark-form>
@
close=
"closeRemarkForm"
@
success=
"refreshClassOrder"
></orderremark-form>
<!--转交订单-->
<transOrder-form
v-if=
"isShowTransOrderForm"
:save-obj=
"orderObj"
@
close=
"closeTransOrderForm"
@
success=
"refreshClassOrder"
></transOrder-form>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
editorderForm
from
'../sale/editorder-form'
//修改订单
import
editorderForm
from
'../sale/editorder-form'
//修改订单
import
orderremarkForm
from
'../sale/orderremark-form'
//订单备注
import
orderremarkForm
from
'../sale/orderremark-form'
//订单备注
import
transOrderForm
from
'../sale/transOrder-form'
//转交订单
import
{
import
{
cancelClassOrder
,
//取消订单
cancelClassOrder
,
//取消订单
}
from
'../../api/sale/sale'
}
from
'../../api/sale/sale'
export
default
{
export
default
{
components
:
{
components
:
{
editorderForm
,
editorderForm
,
orderremarkForm
orderremarkForm
,
transOrderForm
},
},
props
:
{
props
:
{
//正常订单
//正常订单
...
@@ -447,6 +452,7 @@
...
@@ -447,6 +452,7 @@
return
{
return
{
isShowEditOrderForm
:
false
,
//是否显示订单修改
isShowEditOrderForm
:
false
,
//是否显示订单修改
isShowRemarkOrderForm
:
false
,
//是否线下修改订单备注
isShowRemarkOrderForm
:
false
,
//是否线下修改订单备注
isShowTransOrderForm
:
false
,
//是否显示转交订单
orderObj
:
{},
//订单信息
orderObj
:
{},
//订单信息
isShowCancel
:
false
,
//是否显示取消订单
isShowCancel
:
false
,
//是否显示取消订单
remarkType
:
0
,
//备注类型
remarkType
:
0
,
//备注类型
...
@@ -459,6 +465,22 @@
...
@@ -459,6 +465,22 @@
},
},
methods
:
{
methods
:
{
//订单转交
transferOrder
(
item
)
{
this
.
orderObj
=
item
;
this
.
isShowTransOrderForm
=
true
;
},
//关闭转订单弹窗
closeTransOrderForm
()
{
this
.
isShowTransOrderForm
=
false
;
},
//跳转到学生名单
gostudent
(
item
)
{
var
tempStr
=
'/sale/studentList?OrderId='
+
item
.
OrderId
+
'&ClassId='
+
item
.
ClassId
;
this
.
$router
.
push
({
path
:
tempStr
});
},
//修改订单备注
//修改订单备注
editOrderRemark
(
item
,
Type
)
{
editOrderRemark
(
item
,
Type
)
{
this
.
orderObj
=
item
;
this
.
orderObj
=
item
;
...
@@ -517,5 +539,4 @@
...
@@ -517,5 +539,4 @@
},
},
}
}
}
}
</
script
>
</
script
>
\ No newline at end of file
src/components/sale/transOrder-form.vue
0 → 100644
View file @
f3f85e5f
<!--转交订单-->
<
template
>
<q-dialog
v-model=
"IsShowTransOrderDialog"
content-class=
"bg-grey-1"
persistent
transition-show=
"scale"
transition-hide=
"scale"
>
<q-card
style=
"width: 400px;max-width:500px;"
>
<q-card-section>
<div
class=
"text-h6"
>
转交订单
</div>
</q-card-section>
<q-card-section>
<div
class=
"col row"
style=
"justify-content: center;width: 100%"
>
<q-select
class=
""
filled
label=
"转交人"
v-model=
"TransOrderMsg.model"
use-input
hide-selected
fill-input
option-value=
"Id"
option-label=
"EmployeeName"
:options=
"EmployeeList"
@
filter=
"filterFn"
style=
"width: 250px; padding-bottom: 32px"
>
<template
v-slot:no-option
>
<q-item>
<q-item-section
class=
"text-grey"
>
未查询到相关数据
</q-item-section>
</q-item>
</
template
>
</q-select>
</div>
</q-card-section>
<q-card-actions
align=
"right"
class=
"bg-white"
>
<q-btn
label=
"取消"
flat
color=
"grey-10"
style=
"font-weight:400 !important"
@
click=
"closeTransOrderForm"
/>
<q-btn
label=
"保存"
color=
"accent q-px-md"
style=
"font-weight:400 !important"
@
click=
"saveTransOrder()"
/>
</q-card-actions>
</q-card>
</q-dialog>
</template>
<
script
>
import
{
setClassOrderCareOf
,
//转交订单
}
from
'../../api/sale/sale'
import
{
queryEmployee
//员工列表
}
from
'../../api/users/user'
export
default
{
name
:
"transOrder-form"
,
props
:
{
saveObj
:
{
type
:
Object
,
default
:
null
,
},
},
data
()
{
return
{
IsShowTransOrderDialog
:
true
,
TransOrderMsg
:
{
model
:
''
,
OrderId
:
0
,
},
EmployeeList
:
[],
//员工列表
}
},
created
()
{
this
.
initData
();
},
methods
:
{
//筛选员工
filterFn
(
val
,
update
)
{
var
qMsg
=
{
EmployeeName
:
val
}
update
(()
=>
{
queryEmployee
(
qMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
this
.
EmployeeList
=
res
.
Data
;
}
}).
catch
(()
=>
{
})
})
},
//关闭弹窗
closeTransOrderForm
()
{
this
.
IsShowTransOrderDialog
=
false
;
this
.
$emit
(
'close'
);
},
//初始化数据
initData
()
{
this
.
TransOrderMsg
.
OrderId
=
this
.
saveObj
.
OrderId
;
this
.
IsShowTransOrderDialog
=
true
;
},
//保存订单转交
saveTransOrder
()
{
let
transMsg
=
{
OrderId
:
this
.
TransOrderMsg
.
OrderId
,
CareOfPeople
:
this
.
TransOrderMsg
.
model
.
Id
}
setClassOrderCareOf
(
transMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
this
.
$q
.
notify
({
icon
:
'iconfont icon-chenggong'
,
color
:
'accent'
,
timeout
:
2000
,
message
:
'修改成功!'
,
position
:
'top'
})
//调用父页面成功方法
this
.
$emit
(
'success'
);
this
.
IsShowTransOrderDialog
=
false
}
})
}
}
}
</
script
>
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