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
9fded566
Commit
9fded566
authored
Dec 14, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
066cb77d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
130 additions
and
16 deletions
+130
-16
editOrder-form.vue
src/components/sale/editOrder-form.vue
+115
-13
orderlist.vue
src/components/sale/orderlist.vue
+8
-1
classorder.vue
src/pages/course/classorder.vue
+7
-2
No files found.
src/components/sale/editOrder-form.vue
View file @
9fded566
<
template
>
<
template
>
<q-dialog
v-model=
"
dialog
"
maximized
full-height
seamless
position=
"right"
>
<q-dialog
v-model=
"
IsShowEditOrder
"
maximized
full-height
seamless
position=
"right"
>
<q-card
style=
"margin-top:61px;width:500px"
class=
"no-border-radius classinfo_Dialog"
>
<q-card
style=
"margin-top:61px;width:500px"
class=
"no-border-radius classinfo_Dialog"
>
<div
class=
"drawerTop"
>
<div
class=
"drawerTop"
>
<div
style=
"display:flex;align-items:center;margin:20px 0 0 20px;"
>
<div
style=
"display:flex;align-items:center;margin:20px 0 0 20px;"
>
...
@@ -11,18 +11,18 @@
...
@@ -11,18 +11,18 @@
@
input=
"peopleNumber"
class=
"col-12"
label=
"人数"
:rules=
"[val => !!val || '请填写人数']"
/>
@
input=
"peopleNumber"
class=
"col-12"
label=
"人数"
:rules=
"[val => !!val || '请填写人数']"
/>
<q-input
filled
stack-label
:dense=
"false"
v-model=
"OrderMsg.Unit_Price"
:disable=
"UPrice==true?false:true"
<q-input
filled
stack-label
:dense=
"false"
v-model=
"OrderMsg.Unit_Price"
:disable=
"UPrice==true?false:true"
@
blur=
"priceNumber"
class=
"col-12"
label=
"成交单价"
:rules=
"[val => !!val || '请填成交单价']"
/>
@
blur=
"priceNumber"
class=
"col-12"
label=
"成交单价"
:rules=
"[val => !!val || '请填成交单价']"
/>
<q-toggle
v-model=
"UPrice"
label=
"高于定价收生"
class=
"q-mb-md"
@
change=
"resetSearch"
/
>
<q-toggle
v-model=
"UPrice"
label=
"高于定价收生"
class=
"q-mb-md"
/>
<!-- @change="resetSearch"--
>
<q-select
standout=
"bg-primary text-white"
option-value=
"Id"
option-label=
"Name"
v-model=
"OrderMsg.OrderSource"
<q-select
standout=
"bg-primary text-white"
option-value=
"Id"
option-label=
"Name"
v-model=
"OrderMsg.OrderSource"
:options=
"SourceEnumList"
emit-value
map-options
label=
"客人来源"
/>
:options=
"SourceEnumList"
emit-value
map-options
label=
"客人来源"
/>
<q-input
filled
stack-label
:dense=
"false"
v-model=
"OrderMsg.SaleRemark"
style=
"margin-top: 20px"
<q-input
filled
stack-label
:dense=
"false"
v-model=
"OrderMsg.SaleRemark"
style=
"margin-top: 20px"
type=
"textarea"
class=
"col-12"
label=
"备注"
/>
type=
"textarea"
class=
"col-12"
label=
"备注"
/>
<div
style=
"margin:30px 10px 0 0;"
>
<div
style=
"margin:30px 10px 0 0;"
>
<q-btn
class=
"q-mr-md"
label=
"取消"
@
click=
"
dialog=false
"
/>
<q-btn
class=
"q-mr-md"
label=
"取消"
@
click=
"
closeEditOrder
"
/>
<q-btn
color=
"accent"
class=
"q-mr-md"
label=
"保存"
@
click=
"save
SatMsg
()"
/>
<q-btn
color=
"accent"
class=
"q-mr-md"
label=
"保存"
@
click=
"save
OrderInfo
()"
/>
</div>
</div>
</div>
</div>
</q-card>
</q-card>
<div
class=
"dialog-out-close"
@
click=
"
dialog=false
"
<div
class=
"dialog-out-close"
@
click=
"
closeEditOrder
"
style=
"height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;"
>
style=
"height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;"
>
<q-icon
name=
"iconfont icon-jujue1"
size=
"26px"
/>
<q-icon
name=
"iconfont icon-jujue1"
size=
"26px"
/>
</div>
</div>
...
@@ -31,9 +31,11 @@
...
@@ -31,9 +31,11 @@
<
script
>
<
script
>
import
{
import
{
getClassOrderInfo
,
//获取订单操作日志列表
getClassOrderInfo
,
//获取订单操作日志列表
getOrderSourceEnumList
,
//获取订单来源 枚举
setClassOrder
,
//修改订单
}
from
'../../api/sale/sale'
}
from
'../../api/sale/sale'
export
default
{
export
default
{
name
:
"edit
o
rder-form"
,
name
:
"edit
O
rder-form"
,
props
:
{
props
:
{
saveObj
:
{
saveObj
:
{
type
:
Object
,
type
:
Object
,
...
@@ -42,8 +44,7 @@
...
@@ -42,8 +44,7 @@
},
},
data
()
{
data
()
{
return
{
return
{
dialog
:
true
,
IsShowEditOrder
:
true
,
tab
:
'1'
,
OrderMsg
:
{
OrderMsg
:
{
ClassId
:
0
,
//班级编号
ClassId
:
0
,
//班级编号
GuestNum
:
0
,
//人数
GuestNum
:
0
,
//人数
...
@@ -53,18 +54,38 @@
...
@@ -53,18 +54,38 @@
SaleRemark
:
""
,
SaleRemark
:
""
,
Class_Price
:
0
,
Class_Price
:
0
,
},
},
UPrice
:
false
,
StepPriceList
:
[],
StepPriceList
:
[],
UnitPrice
:
0
,
UnitPrice
:
0
,
SourceEnumList
:
[],
//订单来源
}
}
},
},
created
()
{
created
()
{
this
.
getOrderSEList
();
},
mounted
()
{
this
.
getOrderInfo
();
},
},
methods
:
{
methods
:
{
//关闭弹窗
closeEditOrder
()
{
this
.
IsShowEditOrder
=
false
;
this
.
$emit
(
'close'
)
},
//获取订单来源
getOrderSEList
()
{
getOrderSourceEnumList
({}).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
var
tempArray
=
res
.
Data
;
this
.
SourceEnumList
=
tempArray
;
this
.
OrderMsg
.
OrderSource
=
tempArray
[
0
].
Id
;
}
})
},
//获取订单信息
//获取订单信息
getOrderInfo
()
{
getOrderInfo
()
{
getClassOrderInfo
({
getClassOrderInfo
({
OrderId
:
saveObj
.
OrderId
OrderId
:
this
.
saveObj
.
OrderId
}).
then
(
res
=>
{
}).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
this
.
OrderMsg
.
ClassId
=
res
.
Data
.
OrderInfo
.
ClassId
;
this
.
OrderMsg
.
ClassId
=
res
.
Data
.
OrderInfo
.
ClassId
;
...
@@ -74,12 +95,93 @@
...
@@ -74,12 +95,93 @@
this
.
OrderMsg
.
OrderSource
=
res
.
Data
.
OrderInfo
.
OrderSource
;
this
.
OrderMsg
.
OrderSource
=
res
.
Data
.
OrderInfo
.
OrderSource
;
this
.
OrderMsg
.
SaleRemark
=
res
.
Data
.
OrderInfo
.
SaleRemark
;
this
.
OrderMsg
.
SaleRemark
=
res
.
Data
.
OrderInfo
.
SaleRemark
;
this
.
OrderMsg
.
Class_Price
=
res
.
Data
.
OrderInfo
.
Class_Price
;
this
.
OrderMsg
.
Class_Price
=
res
.
Data
.
OrderInfo
.
Class_Price
;
this
.
UnitPrice
=
this
.
OrderMsg
.
Unit_Price
this
.
UnitPrice
=
this
.
OrderMsg
.
Unit_Price
;
this
.
StepPriceList
=
res
.
Data
.
StepPriceList
;
this
.
StepPriceList
=
res
.
Data
.
StepPriceList
;
this
.
dialog
=
true
this
.
IsShowEditOrder
=
true
;
}
}
})
})
}
},
//人数改变
peopleNumber
(
val
)
{
if
(
val
==
''
)
{
this
.
OrderMsg
.
GuestNum
=
1
}
this
.
OrderMsg
.
Unit_Price
=
this
.
countPrice
(
this
.
OrderMsg
.
GuestNum
)
this
.
$forceUpdate
()
this
.
UnitPrice
=
this
.
OrderMsg
.
Unit_Price
},
priceNumber
(
val
)
{
//大于的时候赋值
if
(
this
.
OrderMsg
.
Unit_Price
<
this
.
UnitPrice
)
{
this
.
OrderMsg
.
Unit_Price
=
this
.
UnitPrice
}
},
//计算价格
countPrice
(
num
)
{
let
array
=
[];
if
(
this
.
StepPriceList
&&
this
.
StepPriceList
.
length
)
{
this
.
StepPriceList
.
forEach
(
x
=>
{
let
obj
=
{
PersionNum
:
x
.
PersionNum
,
PersionPrice
:
x
.
PersionPrice
,
}
array
.
push
(
obj
)
})
let
fz
=
false
let
a
=
0
;
array
.
forEach
(
x
=>
{
if
(
x
.
PersionNum
==
num
)
{
fz
=
true
;
a
=
x
.
PersionPrice
}
})
if
(
fz
==
false
)
{
array
.
push
({
PersionNum
:
num
})
array
.
sort
(
this
.
getSortFun
(
'asc'
,
'PersionNum'
));
//升序排序
var
idx
;
for
(
var
i
=
0
;
i
<
array
.
length
;
i
++
)
{
if
(
array
[
i
].
PersionNum
==
num
)
{
idx
=
i
;
}
}
idx
=
Math
.
max
(
0
,
idx
-
1
);
if
(
array
[
idx
].
PersionPrice
)
{
return
array
[
idx
].
PersionPrice
;
}
else
{
return
this
.
OrderMsg
.
Class_Price
;
}
}
else
{
return
a
;
}
}
else
{
return
this
.
OrderMsg
.
Class_Price
;
}
},
//修改订单
saveOrderInfo
()
{
this
.
OrderMsg
.
PreferPrice
=
this
.
OrderMsg
.
GuestNum
*
this
.
OrderMsg
.
Unit_Price
setClassOrder
(
this
.
OrderMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
this
.
$q
.
notify
({
icon
:
'iconfont icon-chenggong'
,
color
:
'accent'
,
timeout
:
2000
,
message
:
'修改成功!'
,
position
:
'top'
})
//调用父页面成功方法
this
.
$emit
(
'success'
);
this
.
IsShowEditOrder
=
false
}
else
{
this
.
$q
.
notify
({
type
:
'negative'
,
position
:
"top"
,
message
:
res
.
Message
})
}
}).
catch
(()
=>
{})
},
}
}
}
}
...
...
src/components/sale/orderlist.vue
View file @
9fded566
...
@@ -214,7 +214,8 @@
...
@@ -214,7 +214,8 @@
<!--取消订单-->
<!--取消订单-->
</table>
</table>
<!--修改订单-->
<!--修改订单-->
<editorder-form
v-if=
"isShowEditOrderForm"
:save-obj=
"orderObj"
@
close=
"closeMOSaveForm"
></editorder-form>
<editorder-form
v-if=
"isShowEditOrderForm"
:save-obj=
"orderObj"
@
close=
"closeMOSaveForm"
@
success=
"refreshClassOrder"
></editorder-form>
</div>
</div>
</
template
>
</
template
>
...
@@ -258,6 +259,12 @@
...
@@ -258,6 +259,12 @@
editOrder
(
item
)
{
editOrder
(
item
)
{
this
.
orderObj
=
item
;
this
.
orderObj
=
item
;
this
.
isShowEditOrderForm
=
true
;
this
.
isShowEditOrderForm
=
true
;
},
//刷新页面
refreshClassOrder
()
{
this
.
isShowEditOrderForm
=
false
;
//调用父页面成功方法
this
.
$emit
(
'success'
);
}
}
}
}
}
}
...
...
src/pages/course/classorder.vue
View file @
9fded566
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
</div>
</div>
</div>
</div>
<div
class=
"page-content"
>
<div
class=
"page-content"
>
<orderlist
:dataList=
"dataList"
:cancelList=
"CancelList"
></orderlist>
<orderlist
:dataList=
"dataList"
:cancelList=
"CancelList"
@
success=
"refreshClassOrder"
></orderlist>
</div>
</div>
</div>
</div>
</template>
</template>
...
@@ -80,9 +80,14 @@
...
@@ -80,9 +80,14 @@
this
.
loading
=
false
this
.
loading
=
false
})
})
},
},
//刷新页面
refreshClassOrder
()
{
this
.
getList
();
}
}
}
}
}
</
script
>
</
script
>
<
style
>
<
style
>
</
style
>
</
style
>
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