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
9e81ad8f
Commit
9e81ad8f
authored
Jun 08, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
f1126477
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
173 additions
and
107 deletions
+173
-107
orderlist.vue
src/components/sale/orderlist.vue
+169
-106
order.vue
src/components/sale/peerInfo/order.vue
+2
-1
studyOrder.vue
src/pages/sale/studyOrder.vue
+1
-0
studyOrderStatistics.vue
src/pages/sale/studyOrderStatistics.vue
+1
-0
No files found.
src/components/sale/orderlist.vue
View file @
9e81ad8f
...
@@ -5,33 +5,39 @@
...
@@ -5,33 +5,39 @@
<table
class=
"enrollTotalSearchTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
class=
"enrollTotalSearchTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<colgroup>
<colgroup>
<col
width=
"12%"
/>
<col
width=
"12%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<template
v-if=
"AuthorityObj.isShowStudyRebate"
>
<col
width=
"6%"
/>
</
template
>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
/>
<col
/>
</colgroup>
</colgroup>
<thead>
<thead>
<tr
class=
"fix_th"
>
<tr
class=
"fix_th"
>
<th
width=
"12%"
>
单号
</th>
<th
width=
"12%"
>
单号
</th>
<th
width=
"
7
%"
>
人数
</th>
<th
width=
"
6
%"
>
人数
</th>
<th
width=
"
7
%"
>
单价
</th>
<th
width=
"
6
%"
>
单价
</th>
<th
width=
"
7
%"
>
成交
</th>
<th
width=
"
6
%"
>
成交
</th>
<th
width=
"
7
%"
>
应收总额
</th>
<th
width=
"
6
%"
>
应收总额
</th>
<th
width=
"
7
%"
>
实收
</th>
<th
width=
"
6
%"
>
实收
</th>
<th
width=
"
7
%"
>
优惠
</th>
<th
width=
"
6
%"
>
优惠
</th>
<th
width=
"6%"
>
少价金额
</th>
<th
width=
"6%"
>
少价金额
</th>
<th
width=
"7%"
>
退款
</th>
<th
width=
"6%"
>
退款
</th>
<th
width=
"7%"
>
平台税金
</th>
<th
width=
"6%"
>
平台税金
</th>
<th
width=
"7%"
>
待收金额
</th>
<th
width=
"6%"
>
待收金额
</th>
<th
width=
"7%"
>
状态
</th>
<
template
v-if=
"AuthorityObj.isShowStudyRebate"
>
<th
width=
"6%"
>
留学订单返佣
</th>
</
template
>
<th
width=
"6%"
>
状态
</th>
<th
v-if=
"viewType == 0"
>
操作
</th>
<th
v-if=
"viewType == 0"
>
操作
</th>
</tr>
</tr>
</thead>
</thead>
...
@@ -41,17 +47,20 @@
...
@@ -41,17 +47,20 @@
<table
class=
"enrollTotalSearchTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
class=
"enrollTotalSearchTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<colgroup>
<colgroup>
<col
width=
"12%"
/>
<col
width=
"12%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"7%"
/>
<col
width=
"6%"
/>
<col
width=
"7%"
v-if=
"viewType == 0"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<col
width=
"6%"
/>
<
template
v-if=
"AuthorityObj.isShowStudyRebate"
>
<col
width=
"6%"
/>
</
template
>
<col
width=
"6%"
/>
<col
width=
"6%"
v-if=
"viewType == 0"
/>
<col
/>
<col
/>
</colgroup>
</colgroup>
<tr>
<tr>
...
@@ -66,16 +75,7 @@
...
@@ -66,16 +75,7 @@
<span
@
click=
"goOrderdetails(item, 1)"
class=
"order_OfferId"
>
{{
<span
@
click=
"goOrderdetails(item, 1)"
class=
"order_OfferId"
>
{{
item.OrderId
item.OrderId
}}
</span>
}}
</span>
<!--
<q-chip
color=
"blue"
text-color=
"white"
size=
"sm"
v-if=
"item.ClassScrollType==1"
>
跟班
</q-chip>
<q-chip
color=
"green"
text-color=
"white"
size=
"sm"
v-if=
"item.ClassScrollType==2"
>
约课
</q-chip>
-->
<q-badge
v-if=
"item.JoinType == 3"
color=
"red"
label=
"续费订单"
style=
"margin-left:5px;"
class=
"q-mr-xs"
/>
<q-badge
v-if=
"item.JoinType == 3"
color=
"red"
label=
"续费订单"
style=
"margin-left:5px;"
class=
"q-mr-xs"
/>
<!--
<q-badge
v-if=
"item.JoinType !== 3"
color=
"green"
label=
"新订单"
style=
"margin-left:5px;"
class=
"q-mr-xs"
/>
-->
<q-badge
v-if=
"item.OrderType == 2 && item.LXConfirmState == 1"
color=
"primary"
label=
"已确认"
<q-badge
v-if=
"item.OrderType == 2 && item.LXConfirmState == 1"
color=
"primary"
label=
"已确认"
style=
"margin-left:5px;"
class=
"q-mr-xs"
/>
style=
"margin-left:5px;"
class=
"q-mr-xs"
/>
...
@@ -220,13 +220,13 @@
...
@@ -220,13 +220,13 @@
</div>
</div>
</
template
>
</
template
>
</td>
</td>
<td
style=
"border:none;width:
7
%"
>
{{ item.GuestNum }}人
</td>
<td
style=
"border:none;width:
6
%"
>
{{ item.GuestNum }}人
</td>
<td
style=
"border:none;width:
7
%"
>
<td
style=
"border:none;width:
6
%"
>
<
template
v-if=
"item.Class_Price >= 0"
>
<
template
v-if=
"item.Class_Price >= 0"
>
{{
item
.
Class_Price
.
toFixed
(
2
)
}}
{{
item
.
Class_Price
.
toFixed
(
2
)
}}
</
template
>
</
template
>
</td>
</td>
<td
style=
"width:
7
%"
:style=
"{
<td
style=
"width:
6
%"
:style=
"{
color:
color:
item.Class_Price != item.Unit_Price
item.Class_Price != item.Unit_Price
? 'var(--q-color-negative)'
? 'var(--q-color-negative)'
...
@@ -240,7 +240,7 @@
...
@@ -240,7 +240,7 @@
<span
class=
"redstyle"
>
{{
item
.
Unit_Price
.
toFixed
(
2
)
}}
</span>
<span
class=
"redstyle"
>
{{
item
.
Unit_Price
.
toFixed
(
2
)
}}
</span>
</
template
>
</
template
>
</td>
</td>
<td
style=
"border:none;width:
7
%"
>
<td
style=
"border:none;width:
6
%"
>
<
template
v-if=
"item.PreferPrice >= 0"
>
<
template
v-if=
"item.PreferPrice >= 0"
>
{{
item
.
PreferPrice
.
toFixed
(
2
)
}}
{{
item
.
PreferPrice
.
toFixed
(
2
)
}}
</
template
>
</
template
>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
<span
class=
"redstyle"
>
{{
item
.
PreferPrice
.
toFixed
(
2
)
}}
</span>
<span
class=
"redstyle"
>
{{
item
.
PreferPrice
.
toFixed
(
2
)
}}
</span>
</
template
>
</
template
>
</td>
</td>
<td
style=
"border:none;width:
7
%"
>
<td
style=
"border:none;width:
6
%"
>
<
template
v-if=
"item.Income >= 0"
>
<
template
v-if=
"item.Income >= 0"
>
{{
item
.
Income
.
toFixed
(
2
)
}}
{{
item
.
Income
.
toFixed
(
2
)
}}
</
template
>
</
template
>
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
<span
class=
"redstyle"
>
{{
item
.
Income
.
toFixed
(
2
)
}}
</span>
<span
class=
"redstyle"
>
{{
item
.
Income
.
toFixed
(
2
)
}}
</span>
</
template
>
</
template
>
</td>
</td>
<td
style=
"color:var(--q-color-negative);border:none;width:
7
%"
>
<td
style=
"color:var(--q-color-negative);border:none;width:
6
%"
>
<
template
v-if=
"item.DiscountMoney >= 0"
>
<
template
v-if=
"item.DiscountMoney >= 0"
>
{{
item
.
DiscountMoney
.
toFixed
(
2
)
}}
{{
item
.
DiscountMoney
.
toFixed
(
2
)
}}
</
template
>
</
template
>
...
@@ -274,7 +274,7 @@
...
@@ -274,7 +274,7 @@
<span
class=
"redstyle"
>
{{
item
.
LessPrice
.
toFixed
(
2
)
}}
</span>
<span
class=
"redstyle"
>
{{
item
.
LessPrice
.
toFixed
(
2
)
}}
</span>
</
template
>
</
template
>
</td>
</td>
<td
style=
"border:none;width:
7
%"
>
<td
style=
"border:none;width:
6
%"
>
<
template
v-if=
"item.Refund >= 0"
>
<
template
v-if=
"item.Refund >= 0"
>
{{
item
.
Refund
.
toFixed
(
2
)
}}
{{
item
.
Refund
.
toFixed
(
2
)
}}
</
template
>
</
template
>
...
@@ -282,7 +282,7 @@
...
@@ -282,7 +282,7 @@
<span
class=
"redstyle"
>
{{
item
.
Refund
.
toFixed
(
2
)
}}
</span>
<span
class=
"redstyle"
>
{{
item
.
Refund
.
toFixed
(
2
)
}}
</span>
</
template
>
</
template
>
</td>
</td>
<td
style=
"border:none;width:
7
%"
>
<td
style=
"border:none;width:
6
%"
>
<
template
v-if=
"item.PlatformTax >= 0"
>
<
template
v-if=
"item.PlatformTax >= 0"
>
{{
item
.
PlatformTax
.
toFixed
(
2
)
}}
{{
item
.
PlatformTax
.
toFixed
(
2
)
}}
</
template
>
</
template
>
...
@@ -290,7 +290,7 @@
...
@@ -290,7 +290,7 @@
<span
class=
"redstyle"
>
{{
item
.
PlatformTax
.
toFixed
(
2
)
}}
</span>
<span
class=
"redstyle"
>
{{
item
.
PlatformTax
.
toFixed
(
2
)
}}
</span>
</
template
>
</
template
>
</td>
</td>
<td
style=
"color:#2961FE;border:none;width:
7
%"
>
<td
style=
"color:#2961FE;border:none;width:
6
%"
>
<
template
v-if=
"item.DueInMoney >= 0"
>
<
template
v-if=
"item.DueInMoney >= 0"
>
{{
item
.
DueInMoney
.
toFixed
(
2
)
}}
{{
item
.
DueInMoney
.
toFixed
(
2
)
}}
</
template
>
</
template
>
...
@@ -298,6 +298,14 @@
...
@@ -298,6 +298,14 @@
<span
class=
"redstyle"
>
{{
item
.
DueInMoney
.
toFixed
(
2
)
}}
</span>
<span
class=
"redstyle"
>
{{
item
.
DueInMoney
.
toFixed
(
2
)
}}
</span>
</
template
>
</
template
>
</td>
</td>
<td
style=
"color:#2961FE;border:none;width:6%"
v-if=
"AuthorityObj.isShowStudyRebate"
>
<
template
v-if=
"item.StudyBroadRebateMoney >= 0"
>
{{
item
.
StudyBroadRebateMoney
.
toFixed
(
2
)
}}
</
template
>
<
template
v-else
>
<span
class=
"redstyle"
>
{{
item
.
StudyBroadRebateMoney
.
toFixed
(
2
)
}}
</span>
</
template
>
</td>
<td
style=
"border:none;width:7%"
>
<td
style=
"border:none;width:7%"
>
<div
style=
"background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center"
>
<div
style=
"background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center"
>
<span
style=
"color: #02C499"
>
{{ item.OrderStateName }}
</span>
<span
style=
"color: #02C499"
>
{{ item.OrderStateName }}
</span>
...
@@ -457,7 +465,7 @@
...
@@ -457,7 +465,7 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
:colspan=
"1
2
"
style=
"text-align: left"
>
<td
:colspan=
"1
3
"
style=
"text-align: left"
>
<div
class=
"row"
v-if=
"item.GuestList && item.GuestList.length > 0"
>
<div
class=
"row"
v-if=
"item.GuestList && item.GuestList.length > 0"
>
学生名单:
学生名单:
<
template
v-for=
"(x, j) in item.GuestList"
:index=
"j"
>
<
template
v-for=
"(x, j) in item.GuestList"
:index=
"j"
>
...
@@ -529,7 +537,7 @@
...
@@ -529,7 +537,7 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
:colspan=
"1
2
"
style=
"height: 168px;text-align: left"
>
<td
:colspan=
"1
3
"
style=
"height: 168px;text-align: left"
>
<div
class=
"col row remarks q-gutter-x-md"
>
<div
class=
"col row remarks q-gutter-x-md"
>
<div
class=
"col"
>
<div
class=
"col"
>
<div>
销售备注:
</div>
<div>
销售备注:
</div>
...
@@ -764,8 +772,8 @@
...
@@ -764,8 +772,8 @@
</
template
>
</
template
>
</div>
</div>
<div
class=
"row wrap"
>
<div
class=
"row wrap"
>
<div
class=
"finance row"
v-for=
"(x, j) in item.RefundFinanceList"
v-if=
"x.OtherType != 45&&x.OtherType != 33"
:key=
"j"
<div
class=
"finance row"
v-for=
"(x, j) in item.RefundFinanceList"
:style=
"{
v-if=
"x.OtherType != 45&&x.OtherType != 33"
:key=
"j"
:style=
"{
background:
background:
x.ColorState == 1
x.ColorState == 1
? 'rgba(41, 97, 254, 0.2)'
? 'rgba(41, 97, 254, 0.2)'
...
@@ -786,7 +794,8 @@
...
@@ -786,7 +794,8 @@
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item, 4)"
>
{{ x.FrID }}
</span>
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item, 4)"
>
{{ x.FrID }}
</span>
</div>
</div>
</div>
</div>
<div
class=
"row"
style=
"justify-content: space-between"
v-if=
"item.OrderType == 2 || item.ClassScrollType == 2"
>
<div
class=
"row"
style=
"justify-content: space-between"
v-if=
"item.OrderType == 2 || item.ClassScrollType == 2"
>
<span>
成本单据:
</span>
<span>
成本单据:
</span>
<q-btn
flat
size=
"xs"
icon=
"edit"
v-if=
"
<q-btn
flat
size=
"xs"
icon=
"edit"
v-if=
"
AuthorityObj.isShowFinanceBtn &&
AuthorityObj.isShowFinanceBtn &&
...
@@ -827,8 +836,40 @@
...
@@ -827,8 +836,40 @@
</
template
>
</
template
>
</div>
</div>
<div
class=
"row wrap"
v-if=
"item.OrderType == 2 || item.ClassScrollType == 2"
>
<div
class=
"row wrap"
v-if=
"item.OrderType == 2 || item.ClassScrollType == 2"
>
<div
class=
"finance row"
v-for=
"(x, j) in item.RefundFinanceList"
v-if=
"x.OtherType == 45||x.OtherType == 33"
:key=
"j"
<div
class=
"finance row"
v-for=
"(x, j) in item.RefundFinanceList"
:style=
"{
v-if=
"x.OtherType == 45||x.OtherType == 33"
:key=
"j"
:style=
"{
background:
x.ColorState == 1
? 'rgba(41, 97, 254, 0.2)'
: x.ColorState == 2
? 'rgba(2, 196, 153, 0.2)'
: x.ColorState == 3
? 'rgba(242, 140, 29, 0.2)'
: 'rgba(63, 196, 255, 0.2)',
color:
x.ColorState == 1
? '#2961FE'
: x.ColorState == 2
? '#02C499'
: x.ColorState == 3
? '#F28C1D'
: '#3FC4FF'
}"
>
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item, 4)"
>
{{ x.FrID }}
</span>
</div>
</div>
<div
class=
"row"
style=
"justify-content: space-between"
v-if=
"item.OrderType == 2 || item.ClassScrollType == 2"
>
<span>
返佣单据:
</span>
<q-btn
flat
size=
"xs"
icon=
"edit"
v-if=
"
AuthorityObj.isShowFinanceBtn &&
AuthorityObj.isShowEdit &&
item.OrderType == 2
"
style=
"font-weight:400;color: #02C499"
label=
"修改"
@
click=
"chanceType(item, 4)"
/>
</div>
<div
class=
"row wrap"
v-if=
"item.OrderType == 2 || item.ClassScrollType == 2"
>
<div
class=
"finance row"
v-for=
"(x, j) in item.StudyFinaceList"
:key=
"j"
:style=
"{
background:
background:
x.ColorState == 1
x.ColorState == 1
? 'rgba(41, 97, 254, 0.2)'
? 'rgba(41, 97, 254, 0.2)'
...
@@ -928,6 +969,11 @@
...
@@ -928,6 +969,11 @@
{{
item
.
DueInMoney
.
toFixed
(
2
)
}}
{{
item
.
DueInMoney
.
toFixed
(
2
)
}}
</
template
>
</
template
>
</td>
</td>
<td
style=
"color:#2961FE;border:none;"
v-if=
"AuthorityObj.isShowStudyRebate"
>
<
template
v-if=
"item.StudyBroadRebateMoney >= 0"
>
{{
item
.
StudyBroadRebateMoney
.
toFixed
(
2
)
}}
</
template
>
</td>
<td
style=
"border:none"
>
<td
style=
"border:none"
>
<div
style=
"background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center"
>
<div
style=
"background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center"
>
<span
style=
"color: #02C499"
>
{{ item.OrderStateName }}
</span>
<span
style=
"color: #02C499"
>
{{ item.OrderStateName }}
</span>
...
@@ -948,7 +994,7 @@
...
@@ -948,7 +994,7 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
:colspan=
"1
2
"
style=
"text-align: left"
>
<td
:colspan=
"1
3
"
style=
"text-align: left"
>
<div
class=
"row"
v-if=
"item.GuestList && item.GuestList.length > 0"
>
<div
class=
"row"
v-if=
"item.GuestList && item.GuestList.length > 0"
>
学生名单:
学生名单:
<
template
v-for=
"(x, j) in item.GuestList"
>
<
template
v-for=
"(x, j) in item.GuestList"
>
...
@@ -972,7 +1018,7 @@
...
@@ -972,7 +1018,7 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
:colspan=
"1
2
"
style=
"height: 168px;text-align: left"
>
<td
:colspan=
"1
3
"
style=
"height: 168px;text-align: left"
>
<div
class=
"col row remarks q-gutter-x-md"
>
<div
class=
"col row remarks q-gutter-x-md"
>
<div
class=
"col"
>
<div
class=
"col"
>
<div>
销售备注:
</div>
<div>
销售备注:
</div>
...
@@ -1306,7 +1352,8 @@
...
@@ -1306,7 +1352,8 @@
isShowEdit
:
true
,
//是否显示修改订单按钮
isShowEdit
:
true
,
//是否显示修改订单按钮
isShowTransClassOrder
:
false
,
//是否显示转班按钮
isShowTransClassOrder
:
false
,
//是否显示转班按钮
isShowSeparater
:
false
,
//是否显示分拆
isShowSeparater
:
false
,
//是否显示分拆
isshoworderconfirm
:
false
//留学的订单确认按钮
isshoworderconfirm
:
false
,
//留学的订单确认按钮
isShowStudyRebate
:
false
,
//是否显示留学订单返佣
},
},
isShowEduForm
:
false
,
//是否显示新增修改合同弹窗
isShowEduForm
:
false
,
//是否显示新增修改合同弹窗
...
@@ -1487,6 +1534,11 @@
...
@@ -1487,6 +1534,11 @@
)
{
)
{
this
.
AuthorityObj
.
isshoworderconfirm
=
this
.
authObj
.
isshoworderconfirm
;
this
.
AuthorityObj
.
isshoworderconfirm
=
this
.
authObj
.
isshoworderconfirm
;
}
}
if
(
this
.
authObj
.
isShowStudyRebate
!=
null
&&
this
.
authObj
.
isShowStudyRebate
)
{
this
.
AuthorityObj
.
isShowStudyRebate
=
this
.
authObj
.
isShowStudyRebate
;
}
}
}
},
},
//回归原班
//回归原班
...
@@ -1609,7 +1661,18 @@
...
@@ -1609,7 +1661,18 @@
this
.
dataList
.
forEach
(
x
=>
{
this
.
dataList
.
forEach
(
x
=>
{
data
.
forEach
(
j
=>
{
data
.
forEach
(
j
=>
{
if
(
x
.
OrderId
==
j
.
OrderId
)
{
if
(
x
.
OrderId
==
j
.
OrderId
)
{
x
.
FinanceList
=
j
.
FinanceList
;
x
.
FinanceList
=
[];
x
.
StudyFinaceList
=
[];
//留学订单返佣
if
(
j
.
FinanceList
&&
j
.
FinanceList
.
length
>
0
)
{
j
.
FinanceList
.
forEach
(
item
=>
{
//留学订单返佣单据
if
(
item
.
OtherType
==
59
)
{
x
.
StudyFinaceList
.
push
(
item
);
}
else
{
x
.
FinanceList
.
push
(
item
);
}
});
}
x
.
RefundFinanceList
=
j
.
RefundFinanceList
;
x
.
RefundFinanceList
=
j
.
RefundFinanceList
;
}
}
});
});
...
@@ -1757,21 +1820,14 @@
...
@@ -1757,21 +1820,14 @@
SourceID
:
0
,
SourceID
:
0
,
TCIDList
:
TCIDARR
TCIDList
:
TCIDARR
};
};
//是否关联报价单
if
(
obj
.
OfferId
>
0
)
{
if
(
obj
.
OfferId
>
0
)
{
orderObj
.
OtherType
=
29
;
orderObj
.
OtherType
=
29
;
orderObj
.
ReFinanceId
=
obj
.
OfferId
;
orderObj
.
ReFinanceId
=
obj
.
OfferId
;
}
}
if
(
obj
.
OrderType
==
1
&&
this
.
chooseStudent
==
""
)
{
//班课、滚动开班订单验证
this
.
$q
.
notify
({
if
(
obj
.
OrderType
==
1
)
{
icon
:
"close"
,
if
(
this
.
chooseStudent
==
""
)
{
color
:
"accent"
,
timeout
:
2000
,
message
:
"请选择学生"
,
position
:
"top"
});
return
;
}
if
(
obj
.
OrderType
==
1
&&
this
.
chooseStudent
==
""
)
{
this
.
$q
.
notify
({
this
.
$q
.
notify
({
icon
:
"close"
,
icon
:
"close"
,
color
:
"accent"
,
color
:
"accent"
,
...
@@ -1789,7 +1845,7 @@
...
@@ -1789,7 +1845,7 @@
}
}
});
});
}
}
if
(
obj
.
OrderType
==
1
&&
ContractNo
==
""
)
{
if
(
ContractNo
==
""
)
{
this
.
$q
.
notify
({
this
.
$q
.
notify
({
icon
:
"close"
,
icon
:
"close"
,
color
:
"accent"
,
color
:
"accent"
,
...
@@ -1799,6 +1855,7 @@
...
@@ -1799,6 +1855,7 @@
});
});
return
;
return
;
}
}
}
//留学就业订单
//留学就业订单
if
(
obj
&&
obj
.
OrderType
==
2
)
{
if
(
obj
&&
obj
.
OrderType
==
2
)
{
//财务单据类型【教育留学】
//财务单据类型【教育留学】
...
@@ -1808,13 +1865,19 @@
...
@@ -1808,13 +1865,19 @@
if
(
this
.
chooseStudent
!=
""
)
{
if
(
this
.
chooseStudent
!=
""
)
{
guestId
=
this
.
chooseStudent
;
guestId
=
this
.
chooseStudent
;
}
}
if
(
obj
&&
obj
.
OrderType
==
2
&&
obj
.
GuestList
.
length
>
0
&&
guestId
==
0
)
{
if
(
obj
&&
obj
.
OrderType
==
2
&&
obj
.
GuestList
.
length
>
0
&&
guestId
==
0
)
{
//默认取第一个人的 (现基本都是单人订单 如果有多人订单 需调整)
//默认取第一个人的 (现基本都是单人订单 如果有多人订单 需调整)
guestId
=
obj
.
GuestList
[
0
].
Id
;
guestId
=
obj
.
GuestList
[
0
].
Id
;
}
}
if
(
obj
&&
obj
.
OrderType
==
1
&&
obj
.
ClassScrollType
==
2
&&
type
==
3
)
{
if
(
obj
&&
obj
.
OrderType
==
1
&&
obj
.
ClassScrollType
==
2
&&
type
==
3
)
{
orderObj
.
OtherType
=
45
;
//成本单据 (约课的订单上做成本单据)
orderObj
.
OtherType
=
45
;
//成本单据 (约课的订单上做成本单据)
type
=
2
;
//付款单据
type
=
2
;
//付款单据
}
//留学订单返佣单据
if
(
obj
&&
obj
.
OrderType
==
2
&&
type
==
4
)
{
//收款单
type
=
1
;
orderObj
.
OtherType
=
59
;
//59 教育 留学订单返佣 收入 2022-06-08 hk
}
}
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/financial/financalDocument/ChoiceAddFinancialDocuments"
,
path
:
"/financial/financalDocument/ChoiceAddFinancialDocuments"
,
...
@@ -1865,7 +1928,7 @@
...
@@ -1865,7 +1928,7 @@
if
(
this
.
chooseStudent
!=
""
)
{
if
(
this
.
chooseStudent
!=
""
)
{
guestId
=
this
.
chooseStudent
;
guestId
=
this
.
chooseStudent
;
}
}
if
(
obj
&&
obj
.
OrderType
==
2
&&
obj
.
GuestList
.
length
>
0
&&
guestId
==
0
)
{
if
(
obj
&&
obj
.
OrderType
==
2
&&
obj
.
GuestList
.
length
>
0
&&
guestId
==
0
)
{
//默认取第一个人的 (现基本都是单人订单 如果有多人订单 需调整)
//默认取第一个人的 (现基本都是单人订单 如果有多人订单 需调整)
guestId
=
obj
.
GuestList
[
0
].
Id
;
guestId
=
obj
.
GuestList
[
0
].
Id
;
}
}
...
@@ -1946,21 +2009,21 @@
...
@@ -1946,21 +2009,21 @@
},
},
gourltx
(
obj
)
{
gourltx
(
obj
)
{
if
(
obj
.
OrderType
==
1
)
{
if
(
obj
.
OrderType
==
1
)
{
if
(
obj
.
IsAchievements
==
1
)
{
if
(
obj
.
IsAchievements
==
1
)
{
this
.
OpenNewUrl
(
"/financial/market/AchievementsForOrderList"
,
{
this
.
OpenNewUrl
(
"/financial/market/AchievementsForOrderList"
,
{
OrderId
:
obj
.
OrderId
OrderId
:
obj
.
OrderId
});
});
}
else
{
}
else
{
this
.
OpenNewUrl
(
"/financial/cycleOrderList"
,
{
this
.
OpenNewUrl
(
"/financial/cycleOrderList"
,
{
OrderId
:
obj
.
OrderId
OrderId
:
obj
.
OrderId
});
});
}
}
}
else
{
}
else
{
if
(
obj
.
OrderId
>=
1165
)
{
if
(
obj
.
OrderId
>=
1165
)
{
this
.
OpenNewUrl
(
"/financial/market/AchievementsForOrderList"
,
{
this
.
OpenNewUrl
(
"/financial/market/AchievementsForOrderList"
,
{
OrderId
:
obj
.
OrderId
OrderId
:
obj
.
OrderId
});
});
}
else
{
}
else
{
this
.
OpenNewUrl
(
"/financial/studyabroad/ordercommission"
,
{
this
.
OpenNewUrl
(
"/financial/studyabroad/ordercommission"
,
{
OrderId
:
obj
.
OrderId
OrderId
:
obj
.
OrderId
});
});
...
...
src/components/sale/peerInfo/order.vue
View file @
9e81ad8f
...
@@ -119,7 +119,8 @@
...
@@ -119,7 +119,8 @@
isShowRenewClass
:
false
,
//显示续课按钮
isShowRenewClass
:
false
,
//显示续课按钮
isShowEdit
:
false
,
//不显示修改按钮
isShowEdit
:
false
,
//不显示修改按钮
isShowBackClass
:
false
,
//不显示退课
isShowBackClass
:
false
,
//不显示退课
isShowRenewClass
:
false
//不显示续课
isShowRenewClass
:
false
,
//不显示续课
isShowStudyRebate
:
false
,
//是否显示留学订单返佣
},
},
};
};
},
},
...
...
src/pages/sale/studyOrder.vue
View file @
9e81ad8f
...
@@ -156,6 +156,7 @@
...
@@ -156,6 +156,7 @@
isShowFinanceBtn
:
true
,
//显示财务单据按钮
isShowFinanceBtn
:
true
,
//显示财务单据按钮
isShowTransOrder
:
true
,
//显示转交订单按钮
isShowTransOrder
:
true
,
//显示转交订单按钮
isShowSaleRemark
:
true
,
//显示修改销售备注
isShowSaleRemark
:
true
,
//显示修改销售备注
isShowStudyRebate
:
true
,
//显示留学订单返佣
}
}
}
}
},
},
...
...
src/pages/sale/studyOrderStatistics.vue
View file @
9e81ad8f
...
@@ -177,6 +177,7 @@
...
@@ -177,6 +177,7 @@
isShowBackClass
:
false
,
//不显示退课
isShowBackClass
:
false
,
//不显示退课
isShowRenewClass
:
false
,
//不显示续课
isShowRenewClass
:
false
,
//不显示续课
isshoworderconfirm
:
false
,
//订单确认按钮
isshoworderconfirm
:
false
,
//订单确认按钮
isShowStudyRebate
:
true
,
//显示留学订单返佣
},
},
EmployeeList
:
[],
//业务员
EmployeeList
:
[],
//业务员
...
...
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