Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
fa93e2b1
Commit
fa93e2b1
authored
Jan 31, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'刘强东更新一下@@@'
parent
cc6e3d0b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+1
-0
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+3
-3
todayOrderTotal.vue
src/components/TravelManager/TravelList/todayOrderTotal.vue
+7
-2
No files found.
src/components/SalesModule/enrollTotal.vue
View file @
fa93e2b1
...
@@ -85,6 +85,7 @@
...
@@ -85,6 +85,7 @@
<span>
应收款:
{{
countData
.
PreferPrice
}}
;
</span>
<span>
应收款:
{{
countData
.
PreferPrice
}}
;
</span>
<span>
已收款:
{{
countData
.
Income
}}
;
</span>
<span>
已收款:
{{
countData
.
Income
}}
;
</span>
<span
:class=
"
{color_red_order:countData.DueinMoney!==countData.PreferPrice}">未收款:
{{
countData
.
DueinMoney
}}
;
</span>
<span
:class=
"
{color_red_order:countData.DueinMoney!==countData.PreferPrice}">未收款:
{{
countData
.
DueinMoney
}}
;
</span>
<span>
在途金额:
{{
countData
.
ZaiTu
}}
;
</span>
</p>
</p>
</div>
</div>
</el-col>
</el-col>
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
fa93e2b1
...
@@ -1433,7 +1433,7 @@
...
@@ -1433,7 +1433,7 @@
</td>
</td>
<td>
{{
item
.
Refund
}}
</td>
<td>
{{
item
.
Refund
}}
</td>
<td>
{{
item
.
PlatformTax
}}
</td>
<td>
{{
item
.
PlatformTax
}}
</td>
<td>
{{
item
.
z
aiTuMoney
}}
</td>
<td>
{{
item
.
Z
aiTuMoney
}}
</td>
<td><span
:class=
"
{color_red_order:item.DueInMoney!==item.PreferPrice}">
{{
item
.
DueInMoney
}}
</span></td>
<td><span
:class=
"
{color_red_order:item.DueInMoney!==item.PreferPrice}">
{{
item
.
DueInMoney
}}
</span></td>
<td
class=
"fz12"
><span
:class=
"
{'RL-redType':item.statsstr=='候补'}">
{{
item
.
statsstr
}}
</span></td>
<td
class=
"fz12"
><span
:class=
"
{'RL-redType':item.statsstr=='候补'}">
{{
item
.
statsstr
}}
</span></td>
<td>
<td>
...
@@ -1610,7 +1610,7 @@
...
@@ -1610,7 +1610,7 @@
</td>
</td>
<td>
{{
childItem
.
Refund
}}
</td>
<td>
{{
childItem
.
Refund
}}
</td>
<td>
{{
childItem
.
PlatformTax
}}
</td>
<td>
{{
childItem
.
PlatformTax
}}
</td>
<td>
{{
childItem
.
z
aiTuMoney
}}
</td>
<td>
{{
childItem
.
Z
aiTuMoney
}}
</td>
<td><span
:class=
"
{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">
{{
childItem
.
DueInMoney
}}
</span></td>
<td><span
:class=
"
{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">
{{
childItem
.
DueInMoney
}}
</span></td>
<td
class=
"fz12"
><span
:class=
"
{'RL-redType':childItem.statsstr=='候补'}">
{{
childItem
.
statsstr
}}
</span></td>
<td
class=
"fz12"
><span
:class=
"
{'RL-redType':childItem.statsstr=='候补'}">
{{
childItem
.
statsstr
}}
</span></td>
<td>
<td>
...
@@ -1825,7 +1825,7 @@
...
@@ -1825,7 +1825,7 @@
</td>
</td>
<td>
{{item.Refund}}
</td>
<td>
{{item.Refund}}
</td>
<td>
{{item.PlatformTax}}
</td>
<td>
{{item.PlatformTax}}
</td>
<td>
{{item.
z
aiTuMoney}}
</td>
<td>
{{item.
Z
aiTuMoney}}
</td>
<td><span
:class=
"{color_red_order:item.DueInMoney!==item.PreferPrice}"
>
{{item.DueInMoney}}
</span></td>
<td><span
:class=
"{color_red_order:item.DueInMoney!==item.PreferPrice}"
>
{{item.DueInMoney}}
</span></td>
<td
class=
"fz12"
>
<td
class=
"fz12"
>
<span
class=
"RL-redType"
>
{{item.statsstr}}
</span>
<span
class=
"RL-redType"
>
{{item.statsstr}}
</span>
...
...
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @
fa93e2b1
...
@@ -185,12 +185,13 @@
...
@@ -185,12 +185,13 @@
<th
width=
"80"
>
退款
</th>
<th
width=
"80"
>
退款
</th>
<th
width=
"80"
>
平台税金
</th>
<th
width=
"80"
>
平台税金
</th>
<th
width=
"80"
>
平台在途
</th>
<th
width=
"80"
>
平台在途
</th>
<th
width=
"80"
>
待收金额
</th>
<th
width=
"60"
>
状态
</th>
<th
width=
"60"
>
状态
</th>
<th
width=
"60"
>
客户信息
</th>
<th
width=
"60"
>
客户信息
</th>
<th
v-if=
"userId==1"
width=
"130"
>
操作
</th>
<th
v-if=
"userId==1"
width=
"130"
>
操作
</th>
</tr>
</tr>
<tr>
<tr>
<td
v-show=
"OrderList.length==0"
colspan=
"1
4
"
align=
"center"
>
暂无数据
</td>
<td
v-show=
"OrderList.length==0"
colspan=
"1
5
"
align=
"center"
>
暂无数据
</td>
</tr>
</tr>
<tbody
v-for=
"(item,index) in OrderList"
:key=
"index"
>
<tbody
v-for=
"(item,index) in OrderList"
:key=
"index"
>
<tr>
<tr>
...
@@ -243,6 +244,7 @@
...
@@ -243,6 +244,7 @@
<td>
{{
item
.
refund
}}
</td>
<td>
{{
item
.
refund
}}
</td>
<td>
{{
item
.
platformTax
}}
</td>
<td>
{{
item
.
platformTax
}}
</td>
<td>
{{
item
.
zaiTuMoney
}}
</td>
<td>
{{
item
.
zaiTuMoney
}}
</td>
<td><span
:class=
"
{color_red_order:item.dueInMoney!==item.preferPrice}">
{{
item
.
dueInMoney
}}
</span></td>
<td
class=
"fz12"
:style=
"item.orderState===3?'color: #e95252;':''"
>
{{
item
.
statsstr
}}
</td>
<td
class=
"fz12"
:style=
"item.orderState===3?'color: #e95252;':''"
>
{{
item
.
statsstr
}}
</td>
<td>
<td>
<p
<p
...
@@ -295,7 +297,7 @@
...
@@ -295,7 +297,7 @@
</div>
</div>
</div>
</div>
</td>
</td>
<td
colspan=
"
6
"
class=
"groupTourOrder_tickets"
style=
"height: 20px;cursor: pointer;"
@
click=
"goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"
>
<td
colspan=
"
7
"
class=
"groupTourOrder_tickets"
style=
"height: 20px;cursor: pointer;"
@
click=
"goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"
>
<div>
<div>
<div
style=
"white-space: nowrap"
>
收款单据:
<span
v-if=
"item.financeList.length===0"
style=
"cursor: default;"
>
暂无数据
</span>
<div
style=
"white-space: nowrap"
>
收款单据:
<span
v-if=
"item.financeList.length===0"
style=
"cursor: default;"
>
暂无数据
</span>
<span
v-for=
"(item2,index2) in item.financeList"
:key=
"index2"
>
<span
v-for=
"(item2,index2) in item.financeList"
:key=
"index2"
>
...
@@ -980,4 +982,7 @@ export default {
...
@@ -980,4 +982,7 @@ export default {
.groupTourOrderByTuan_ico
>
span
{
.groupTourOrderByTuan_ico
>
span
{
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
.color_red_order
{
color
:
#e95252
!important
;
}
</
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