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
2b1f2ebe
Commit
2b1f2ebe
authored
Feb 05, 2024
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
应收总额详情
parent
c0293224
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
18 deletions
+28
-18
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+6
-1
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+9
-4
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+6
-3
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+2
-5
PriceDetail.vue
src/components/orderCommon/PriceDetail.vue
+5
-5
No files found.
src/components/SalesModule/enrollTotal.vue
View file @
2b1f2ebe
...
@@ -431,7 +431,10 @@
...
@@ -431,7 +431,10 @@
<td
style=
"color: #ff9c00"
>
{{ item.tC_Price }}
</td>
<td
style=
"color: #ff9c00"
>
{{ item.tC_Price }}
</td>
<td
style=
"color: #ff9c00"
>
¥{{ item.unit_Price }}
</td>
<td
style=
"color: #ff9c00"
>
¥{{ item.unit_Price }}
</td>
<td>
<td>
<p
style=
"color: #ff9c00"
>
¥{{ item.preferPrice }}
</p>
<p
style=
"color: #ff9c00"
>
<!-- ¥{{ item.preferPrice }} -->
<PriceDetail
:OrderId=
"item.orderId"
:PreferPrice=
"item.preferPrice"
></PriceDetail>
</p>
</td>
</td>
<td>
<td>
...
@@ -739,10 +742,12 @@
...
@@ -739,10 +742,12 @@
import
Treeselect
from
"@riophae/vue-treeselect"
;
import
Treeselect
from
"@riophae/vue-treeselect"
;
import
updateSalesMan
from
"../commonPage/updateSalesMan.vue"
;
import
updateSalesMan
from
"../commonPage/updateSalesMan.vue"
;
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
import
PriceDetail
from
'../orderCommon/PriceDetail.vue'
;
export
default
{
export
default
{
components
:
{
components
:
{
Treeselect
,
Treeselect
,
updateSalesMan
,
updateSalesMan
,
PriceDetail
,
},
},
data
()
{
data
()
{
return
{
return
{
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
2b1f2ebe
...
@@ -1793,7 +1793,10 @@
...
@@ -1793,7 +1793,10 @@
<td
style=
"color: #ff9c00"
>
{{
item
.
unit_Price
}}
</td>
<td
style=
"color: #ff9c00"
>
{{
item
.
unit_Price
}}
</td>
<td>
<td>
<p
style=
"color: #ff9c00"
>
{{
item
.
preferPrice
}}
</p>
<p
style=
"color: #ff9c00"
>
<!--
{{
item
.
preferPrice
}}
-->
<PriceDetail
:OrderId=
"item.orderId"
:PreferPrice=
"item.preferPrice"
></PriceDetail>
</p>
</td>
</td>
<td>
<td>
<el-popover
style=
"padding: 0"
width=
"370"
trigger=
"click"
>
<el-popover
style=
"padding: 0"
width=
"370"
trigger=
"click"
>
...
@@ -2476,6 +2479,7 @@
...
@@ -2476,6 +2479,7 @@
import
updateSalesMan
from
"../commonPage/updateSalesMan.vue"
;
import
updateSalesMan
from
"../commonPage/updateSalesMan.vue"
;
import
commissionDialog
from
"../FinancialModule/TradeCommission/commissionDialog"
import
commissionDialog
from
"../FinancialModule/TradeCommission/commissionDialog"
import
orderRemark
from
"../orderCommon/order-remark.vue"
;
//订单备注
import
orderRemark
from
"../orderCommon/order-remark.vue"
;
//订单备注
import
PriceDetail
from
'../orderCommon/PriceDetail.vue'
;
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
...
@@ -2799,6 +2803,7 @@
...
@@ -2799,6 +2803,7 @@
updateSalesMan
:
updateSalesMan
,
updateSalesMan
:
updateSalesMan
,
commissionDialog
,
commissionDialog
,
orderRemark
:
orderRemark
,
orderRemark
:
orderRemark
,
PriceDetail
,
},
},
filters
:
{
filters
:
{
priceFormat
(
value
)
{
priceFormat
(
value
)
{
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
2b1f2ebe
...
@@ -1939,13 +1939,14 @@
...
@@ -1939,13 +1939,14 @@
</td>
</td>
<td>
<td>
<p
style=
"color: #ff9c00"
>
<p
style=
"color: #ff9c00"
>
<span
v-if=
"
<PriceDetail
:OrderId=
"item.OrderId"
:PreferPrice=
"item.preferPrice"
></PriceDetail>
<!-- <span v-if="
item.isOwn == 1 ||
item.isOwn == 1 ||
IsSupperOrderEdit ||
IsSupperOrderEdit ||
IsLookOrder ||
IsLookOrder ||
isUpdateOrder
isUpdateOrder
">{{ item.preferPrice }}</span>
">{{ item.preferPrice }}</span>
<span
v-else
>
*****
</span>
<span v-else>*****</span>
-->
</p>
</p>
</td>
</td>
<td>
<td>
...
@@ -3229,6 +3230,7 @@
...
@@ -3229,6 +3230,7 @@
import
updateSalesMan
from
"../commonPage/updateSalesMan.vue"
;
import
updateSalesMan
from
"../commonPage/updateSalesMan.vue"
;
import
EditTip
from
"./Common/EditTip.vue"
;
import
EditTip
from
"./Common/EditTip.vue"
;
import
orderRemark
from
"../orderCommon/order-remark.vue"
;
//订单备注
import
orderRemark
from
"../orderCommon/order-remark.vue"
;
//订单备注
import
PriceDetail
from
'../orderCommon/PriceDetail.vue'
;
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
...
@@ -3622,6 +3624,7 @@
...
@@ -3622,6 +3624,7 @@
tripDownLoadCommon
:
tripDownLoadCommon
,
tripDownLoadCommon
:
tripDownLoadCommon
,
updateSalesMan
:
updateSalesMan
,
updateSalesMan
:
updateSalesMan
,
orderRemark
:
orderRemark
,
orderRemark
:
orderRemark
,
PriceDetail
,
},
},
watch
:
{
watch
:
{
fullHeight
(
val
)
{
fullHeight
(
val
)
{
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
2b1f2ebe
...
@@ -2394,8 +2394,8 @@
...
@@ -2394,8 +2394,8 @@
</td>
</td>
<td>
{{
childItem
.
Unit_Price
}}
</td>
<td>
{{
childItem
.
Unit_Price
}}
</td>
<td
class=
"nowrap"
>
<td
class=
"nowrap"
>
<p
style=
"text-decoration: underline;cursor: pointer;"
@
click=
"SellPrice(childItem)"
>
<p
style=
"text-decoration: underline;cursor: pointer;"
>
<PriceDetail
:OrderId=
"childItem.OrderId"
:
obj=
"childItem
"
></PriceDetail>
<PriceDetail
:OrderId=
"childItem.OrderId"
:
PreferPrice=
"childItem.PreferPrice
"
></PriceDetail>
<!--
<el-popover
width=
"630"
trigger=
"click"
>
-->
<!--
<el-popover
width=
"630"
trigger=
"click"
>
-->
<!--
{{
childItem
.
PreferPrice
}}
-->
<!--
{{
childItem
.
PreferPrice
}}
-->
...
@@ -6062,9 +6062,6 @@
...
@@ -6062,9 +6062,6 @@
},
},
(
err
)
=>
{}
(
err
)
=>
{}
);
);
},
SellPrice
(
obj
)
{
},
},
getList
()
{
getList
()
{
this
.
showID
=
-
1
;
this
.
showID
=
-
1
;
...
...
src/components/orderCommon/PriceDetail.vue
View file @
2b1f2ebe
...
@@ -186,7 +186,7 @@
...
@@ -186,7 +186,7 @@
<td>
{{
OrderPrice
.
TipAmount
?
OrderPrice
.
TipAmount
:
"0.00"
}}
</td>
<td>
{{
OrderPrice
.
TipAmount
?
OrderPrice
.
TipAmount
:
"0.00"
}}
</td>
</tr>
</tr>
</table>
</table>
<span
slot=
"reference"
class=
"price"
@
click=
"CalculationDetails"
>
{{
obj
.
PreferPrice
}}
</span>
<span
slot=
"reference"
class=
"price"
@
click=
"CalculationDetails"
>
{{
PreferPrice
}}
</span>
</el-popover>
</el-popover>
</div>
</div>
...
@@ -195,14 +195,14 @@
...
@@ -195,14 +195,14 @@
export
default
{
export
default
{
//订单信息
//订单信息
props
:
[
props
:
[
"OrderId"
,
"
obj
"
"OrderId"
,
"
PreferPrice
"
],
],
filters
:
{
filters
:
{
priceFormat
(
value
)
{
priceFormat
(
value
)
{
if
(
value
==
null
)
{
if
(
value
==
null
)
{
return
0.0
;
return
0.0
;
}
}
console
.
log
(
"value"
,
value
);
//
console.log("value",value);
let
nStr
=
value
.
toFixed
(
2
);
let
nStr
=
value
.
toFixed
(
2
);
let
x
=
nStr
.
split
(
"."
);
let
x
=
nStr
.
split
(
"."
);
let
x1
=
x
[
0
];
let
x1
=
x
[
0
];
...
@@ -372,9 +372,9 @@
...
@@ -372,9 +372,9 @@
},
},
watch
:
{
watch
:
{
obj
:
{
PreferPrice
:
{
handler
(
newVal
)
{
handler
(
newVal
)
{
console
.
log
(
this
.
obj
.
PreferPrice
,
'======'
)
console
.
log
(
this
.
PreferPrice
,
'======'
)
},
},
deep
:
true
,
deep
:
true
,
immediate
:
true
,
immediate
:
true
,
...
...
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