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
3cfde11e
Commit
3cfde11e
authored
Aug 09, 2024
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'carOrder'
parents
3eff1894
1c627f1a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
377 additions
and
170 deletions
+377
-170
fill.js
src/assets/common/lang/zhTW/fill.js
+1
-1
OrderList.vue
src/components/CarDealerOrder/components/OrderList.vue
+362
-165
ReservationOrder.vue
...components/CarDealerOrder/components/ReservationOrder.vue
+14
-4
No files found.
src/assets/common/lang/zhTW/fill.js
View file @
3cfde11e
...
...
@@ -1012,7 +1012,7 @@ export const obj = {
t1
:
'車/使用時間/天數'
,
t2
:
'用車詳情'
,
t3
:
'總金額'
,
t4
:
'
代
收金額'
,
t4
:
'
待
收金額'
,
t5
:
'實收'
,
t6
:
'退款'
,
t7
:
'平台在途金額'
,
...
...
src/components/CarDealerOrder/components/OrderList.vue
View file @
3cfde11e
<
style
scoped
>
/
deep
/
.orderlist-box
.el-table
.el-table__cell
{
padding
:
5px
0
;
}
/
deep
/
.orderlist-box
.el-table
th
{
background
:
#f4f4f4
;
color
:
rgb
(
153
,
153
,
153
)
!important
;
}
.row
{
display
:
flex
;
}
...
...
@@ -158,6 +165,9 @@
.mt20
{
margin-top
:
20px
;
}
.mb5
{
margin-bottom
:
5px
;
}
.mb
{
margin-bottom
:
10px
;
...
...
@@ -185,6 +195,9 @@
padding
:
15px
0
;
}
.pyt5
{
padding
:
5px
0
0
0
;
}
.py5
{
padding
:
5px
0
;
}
...
...
@@ -509,202 +522,382 @@
</
style
>
<
template
>
<div>
<div
class=
"orderlist-box"
>
<div
style=
"text-align: right;position: fixed;top: 62px; right: 89px;"
>
<
!--
<
div
style=
"text-align: right;position: fixed;top: 62px; right: 89px;"
>
<el-button
class=
"hollowFixedBtn"
v-if=
"pagesTitle=='OP'"
@
click=
"setCompleted"
:loading=
"CompletedLoading"
>
{{
$t
(
'objFill.oneclickfinish'
)
}}
</el-button>
</div>
<el-table
ref=
"multipleTable"
:data=
"OrderList"
tooltip-effect=
"dark"
style=
"width: 100%"
row-key=
"OrderId"
@
selection-change=
"handleSelectionChange"
>
<!--
<el-table-column
type=
"selection"
:selectable=
"selectable"
:reserve-selection=
"true"
v-if=
"pagesTitle=='OP'"
>
</el-table-column>
-->
<el-table-column
:label=
"pagesTitle=='OP'?'':''"
>
<template
slot-scope=
"scope"
>
</div>
-->
<div>
<div
v-for=
"(chind,indexs) in OrderList"
style=
"background: #fff;
padding: 0 10px 10px 10px;
margin-bottom: 10px;border-radius: 5px;"
>
<div
class=
"row-c justify-sb align-c py"
>
<div
class=
"row-c"
>
<div>
<div
class=
"orderType cf fz12"
:class=
"
{
active: chind.OrderType == 1,
activeB:chind.OrderType == 2,
}"
>
<template
v-if=
"chind.OrderType == 1"
>
常规
</
template
>
<
template
v-if=
"chind.OrderType == 2"
>
包车
</
template
>
</div>
</div>
<div
class=
"cblack fz14 mr"
v-if=
"chind.IsFinish == 1"
>
<span
class=
""
>
<span>
{{chind.FinishEmpName}}/
</span>
<span
class=
"text-grey-6"
>
{{chind.FinishTimeStr}}
</span>
</span>
</div>
<div
class=
"c9e fz12"
v-if=
"chind.OrderType==2"
>
<span>
主{{ $t('OrderList.search.orderId') }}:
</span>
<span>
{{ chind.MainId}}
</span>
<span
class=
"copy cblack cursor-pointer"
v-if=
"copyId != chind.MainId"
@
click=
"CopyHandler(chind.MainId)"
>
{{$t('objFill.copy')}}
</span>
<span
v-else
class=
"copy c059FF6 bgD9F3FF cursor-pointer"
>
<i
class=
"el-icon-check mr"
></i>
{{$t('objFill.copied')}}
</span>
</div>
<!-- <span class="cblack fz12 ml mr" v-if="scope.row.OrderTCNUM">
<span class="c9e">系统团号:</span>{{ scope.row.OrderTCNUM }} </span>
<div class="cblack fz12 mr" v-if="false">
<span class="">
<span class="c9e">{{$t('objFill.petition')}}:</span>
<span class="text-grey-6">{{scope.row.PetitionId}}</span>
</span>
</div> -->
</div>
<div
class=
"c9e fz12"
>
<!-- <span>{{$t('objFill.guestinfor')}}:{{chind.CustomerName}}
<span v-if="chind.CustomerTel">/ Tel:{{ chind.CustomerTel }} </span>
<span v-if="chind.CustomerMail">/ Email:
{{chind.CustomerMail}} </span>
</span> -->
</div>
<div
class=
"row c9e fz12"
>
<span
class=
"mr"
>
{{$t('objFill.orderholder')}}:
{{chind.CreateByName}}/{{chind.CreateDateStr}}
</span>
<!-- <div class="">
<i class="mx5" :class="{
'el-icon-alarm-clock c20C997': chind.OrderState == 1,
'el-icon-refresh cff9800': chind.OrderState == 2,
}"></i>
<span class="fz12 cblack" :class="{
c20C997: chind.OrderState == 1,
cF1416C: chind.OrderState == 2,
}">
{{ chind.typeInfo.Name }}
</span>
</div> -->
</div>
</div>
<el-table
v-if=
"chind.OrderType==2"
:data=
"[chind]"
style=
"width:100%;margin-bottom: 10px;"
border
>
<el-table-column
:label=
"$t('objFill.collectiondocument')"
style=
"background:#EAEAEA"
min-width=
"220"
>
<
template
slot-scope=
"scope"
>
<template
v-if=
"scope.row.IncomeList.length>0"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
:class=
"
{'bgD9F3FF':x.ColorState==1,'bg20c997':x.ColorState==2,'bgFAEAED':x.ColorState==3,'bjFFF3E0':x.ColorState==4,
'c3FC4FF':x.ColorState==1,'c20c997':x.ColorState==2,'cF1416C':x.ColorState==3,'cff9800':x.ColorState==4}" v-for="(x, i) in scope.row.IncomeList"
@click="openDetails(x)">
{{
x
.
FrID
}}
</span>
</
template
>
<el-tooltip
v-if=
"scope.row.OrderState == 1"
class=
"item"
effect=
"dark"
:content=
"$t('objFill.preparedocument')"
placement=
"top"
>
<i
class=
"el-icon-circle-plus cursor-pointer c059FF6"
@
click=
"makeAdocument(chind, scope.row, 1)"
></i>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
width=
"115"
label=
"包月时间"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
BCMonth
}}
/
{{
scope
.
row
.
BCDay
}}
天
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t3')"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Money
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t5')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Income
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t8')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
PlatformTax
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t6')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Refund
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t7')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
PlatformMoney
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
label=
"油费支出"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
OutOilFee
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
label=
"停车过路费收入"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
InPassByFee
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
label=
"停车过路费支出"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
OutPassByFee
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"'其他'+$t('objFill.caravanshopcol.t9')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
CostMoney
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t4')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
DueInMoney
}}
</span>
</
template
>
</el-table-column>
<
template
slot=
"append"
v-if=
"chind.Remark"
>
<div
style=
"padding:10px;color:#f1416c"
>
{{
$t
(
'pub.pubRemark'
)
}}
:
{{
chind
.
Remark
}}
</div>
</
template
>
</el-table>
<div
style=
"background: #E1F5FE;padding: 0 5px 5px 5px;margin-top: 10px;border-radius: 5px;"
:style=
"{'margin-top': index?'10px':'0px'}"
v-for=
"(item,index) in chind.OrderList"
>
<div
class=
"row-c justify-sb align-c py"
>
<div
class=
"row-c"
>
<div
v-if=
"false"
>
<!-- active activeNo -->
<div
class=
"orderType cf fz12"
:class=
"[scope.row.IsFinish==1?'active':'']"
>
{{
scope
.
row
.
IsFinish
==
1
?
$t
(
'objFill.finished'
):
$t
(
'objFill.uncompleted'
)
}}
<
template
v-if=
"false"
>
<div>
<!-- active activeNo -->
<div
class=
"orderType cf fz12"
:class=
"[item.IsFinish==1?'active':'']"
>
{{
item
.
IsFinish
==
1
?
$t
(
'objFill.finished'
):
$t
(
'objFill.uncompleted'
)
}}
</div>
</div>
</div
>
<div
class=
"cblack fz14 mr"
v-if=
"scope.row.IsFinish == 1
"
>
<span
class=
""
>
<span>
{{
scope
.
row
.
FinishEmpName
}}
/
</span>
<
span
class=
"text-grey-6"
>
{{
scope
.
row
.
FinishTimeStr
}}
<
/span>
</
span
>
</
div
>
<div
class=
"cblack fz14 mr"
v-if=
"item.IsFinish == 1"
>
<span
class=
"
"
>
<span>
{{
item
.
FinishEmpName
}}
/
</span
>
<span
class=
"text-grey-6"
>
{{
item
.
FinishTimeStr
}}
</span>
</span>
</
div
>
</
template
>
<div
class=
"c9e fz12"
>
<span>
{{ $t('OrderList.search.orderId') }}:
</span>
<span>
{{
scope
.
row
.
OrderId
}}
</span>
<span
class=
"copy cblack cursor-pointer"
v-if=
"copyId !=
scope.row
.OrderId"
@
click=
"CopyHandler(
scope.row
)"
>
{{
$t
(
'objFill.copy'
)
}}
</span>
<span>
{{
item
.OrderId}}
</span>
<span
class=
"copy cblack cursor-pointer"
v-if=
"copyId !=
item
.OrderId"
@
click=
"CopyHandler(
item.OrderId
)"
>
{{$t('objFill.copy')}}
</span>
<span
v-else
class=
"copy c059FF6 bgD9F3FF cursor-pointer"
>
<i
class=
"el-icon-check mr"
></i>
{{$t('objFill.copied')}}
</span>
</div>
<span
class=
"cblack fz12 ml mr"
v-if=
"scope.row.OrderTCNUM"
>
<span
class=
"c9e"
>
系统团号:
</span>
{{
scope
.
row
.
OrderTCNUM
}}
</span>
</div>
<div
class=
"c9e fz12"
>
<span
class=
"cblack fz12 ml mr"
v-if=
"item.OrderTCNUM"
>
<span
class=
"c9e"
>
系统团号:
</span>
{{ item.OrderTCNUM }}
</span>
<div
class=
"cblack fz12 mr"
v-if=
"false"
>
<span
class=
""
>
<span
class=
"c9e"
>
{{$t('objFill.petition')}}:
</span>
<span
class=
"text-grey-6"
>
{{
scope
.
row
.
PetitionId
}}
</span>
<span
class=
"text-grey-6"
>
{{
item
.PetitionId}}
</span>
</span>
</div>
</div>
<div
class=
"c9e fz12"
>
<span>
{{
$t
(
'objFill.guestinfor'
)
}}
:
{{
scope
.
row
.
CustomerName
}}
<span
v-if=
"scope.row.CustomerTel"
>
/ Tel:
{{
scope
.
row
.
CustomerTel
}}
</span>
<span
v-if=
"scope.row.CustomerMail"
>
/ Email:
{{
scope
.
row
.
CustomerMail
}}
</span>
<span
v-if=
"item.CustomerName||item.CustomerTel"
>
<
template
v-if=
"item.CustomerName"
>
{{
$t
(
'objFill.guestinfor'
)
}}
:
<span
class=
"cblack"
>
{{
item
.
CustomerName
}}
</span>
</
template
>
<span
v-if=
"item.CustomerTel"
>
/ Tel:
<span
class=
"cblack"
>
{{ item.CustomerTel }}
</span>
</span>
<!-- <span v-if="item.CustomerMail">/ Email:
<span class="cblack">{{chind.CustomerMail}}</span> </span> -->
</span>
</div>
<div
class=
"row c9e fz12"
>
<span
class=
"mr"
>
{{
$t
(
'objFill.orderholder'
)
}}
:
{{
scope
.
row
.
CreateByName
}}
/
{{
scope
.
row
.
CreateDateStr
}}
</span>
<div
class=
""
>
<i
class=
"mx5"
:class=
"{
'el-icon-alarm-clock c20C997':
scope.row
.OrderState == 1,
'el-icon-refresh cff9800':
scope.row
.OrderState == 2,
'el-icon-alarm-clock c20C997':
item
.OrderState == 1,
'el-icon-refresh cff9800':
item
.OrderState == 2,
}"
></i>
<span
class=
"fz12 cblack"
:class=
"{
c20C997:
scope.row
.OrderState == 1,
cF1416C:
scope.row
.OrderState == 2,
c20C997:
item
.OrderState == 1,
cF1416C:
item
.OrderState == 2,
}"
>
{{
scope
.
row
.
typeInfo
.
Name
}}
{{
item
.typeInfo.Name }}
</span>
</div>
</div>
</div>
<div
class=
"mb"
>
<el-table
:data=
"[scope.row]"
style=
"width:100%"
border
>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t1')"
min-width=
"100"
style=
"background:#EAEAEA"
>
<template
slot-scope=
"scopes"
>
<div
v-if=
"scope.row.CarModel"
>
{{
scope
.
row
.
CarModel
.
CarName
+
'/'
+
scope
.
row
.
CarModel
.
CarNo
}}
</div>
<span
style=
"color: #999999;"
>
{{
scope
.
row
.
UseDateStr
}}
</span>
<span
style=
"color: #999999;"
>
/
{{
scope
.
row
.
UseDay
}}
天
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t2')"
min-width=
"200"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<div
class=
"RoomList"
>
<div
class=
"fz12 c9e"
v-for=
"(x, i) in scope.row.NewOrderDetailList"
>
<span
class=
"mr"
>
{{
$t
(
'objFill.unit.thefirst'
)
}}
{{
x
.
Day
}}
{{
$t
(
'objFill.unit.day'
)
}}
</span>
<span
class=
"ml mr"
v-if=
"x.DriverModel"
>
{{
$t
(
'objFill.driver'
)
}}
:
{{
x
.
DriverModel
.
DriverName
}}
/
{{
x
.
DriverModel
.
DriverTel
}}
</span>
<span
class=
"ml mr"
v-if=
"x.CopilotDriverModel"
>
{{
$t
(
'objFill.assistantdriver'
)
}}
:
{{
x
.
CopilotDriverModel
.
DriverName
}}
/
{{
x
.
CopilotDriverModel
.
DriverTel
}}
</span>
<span
class=
"ml"
>
{{
x
.
useTypeInfo
.
StatusName
}}
</span>
</div>
<el-table
:data=
"[item]"
style=
"width:100%"
border
>
<el-table-column
label=
"司机"
min-width=
"220"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.DriverModel"
>
{{
scope
.
row
.
DriverModel
.
DriverName
}}
/
{{
scope
.
row
.
DriverModel
.
DriverTel
}}
</div>
<span
v-if=
"scope.row.CopilotDriverModel"
>
{{
$t
(
'objFill.assistantdriver'
)
}}
:
{{
scope
.
row
.
CopilotDriverModel
.
DriverName
}}
/
{{
scope
.
row
.
CopilotDriverModel
.
DriverTel
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t1')"
min-width=
"180"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.CarModel"
>
{{
scope
.
row
.
CarModel
.
CarName
+
'/'
+
scope
.
row
.
CarModel
.
CarNo
}}
</div>
<span
style=
"color: #999999;"
>
{{
scope
.
row
.
UseDate
}}
</span>
<span
style=
"color: #999999;"
>
/
{{
scope
.
row
.
UseDay
}}
天
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t2')"
min-width=
"160"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<div
class=
"RoomList text-center"
>
<div
class=
"fz12 c9e"
v-for=
"(x, i) in scope.row.NewOrderDetailList"
>
<span
class=
"mr"
>
{{
x
.
useDate
}}
</span>
<!--
<span
class=
"mr"
v-if=
"x.CopilotDriverModel"
>
{{
$t
(
'objFill.assistantdriver'
)
}}
:
{{
x
.
CopilotDriverModel
.
DriverName
}}
/
{{
x
.
CopilotDriverModel
.
DriverTel
}}
</span>
-->
<span
class=
"ml"
>
{{
x
.
useTypeInfo
.
StatusName
}}
</span>
</div>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t3')"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
Money
}}
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t4')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
DueInMoney
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t5')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Income
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t6')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Refund
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t7')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
PlatformMoney
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t8')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
PlatformTax
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('objFill.caravanshopcol.t9')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
CostMoney
}}
</span>
</
template
>
</el-table-column>
<
template
slot=
"append"
v-if=
"scope.row.Remark||scope.row.isMore"
>
<div
style=
"padding:10px;color:#f1416c"
>
{{
$t
(
'pub.pubRemark'
)
}}
:
{{
scope
.
row
.
Remark
}}
</div>
<div
:style=
"
{'height': scope.row.isMore?'20px':''}">
</div>
<more
v-if=
"scope.row.isMore"
@
change=
"ViewMore(scope.row,scope.$index)"
:upIcon=
"scope.row.upIcon"
></more>
</
template
>
</el-table>
</div>
</el-table-column>
<el-table-column
v-if=
"chind.OrderType==1"
width=
"115"
:label=
"$t('objFill.caravanshopcol.t3')"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Money
}}
</span>
</
template
>
</el-table-column>
<el-table-column
v-if=
"chind.OrderType==1"
width=
"115"
:label=
"$t('objFill.caravanshopcol.t4')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
DueInMoney
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t5')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Income
}}
</span>
</
template
>
</el-table-column>
<el-table-column
v-if=
"chind.OrderType==1"
width=
"115"
:label=
"$t('objFill.caravanshopcol.t8')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
PlatformTax
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t6')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
Refund
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"$t('objFill.caravanshopcol.t7')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
PlatformMoney
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
label=
"油费支出"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
OutOilFee
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
label=
"停车过路费收入"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
InPassByFee
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
label=
"停车过路费支出"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
OutPassByFee
}}
</span>
</
template
>
</el-table-column>
<el-table-column
width=
"115"
:label=
"'其他'+$t('objFill.caravanshopcol.t9')"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
CostMoney
}}
</span>
</
template
>
</el-table-column>
<!-- <el-table-column width="115" :label="$t('objFill.caravanshopcol.t4')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DueInMoney }}</span>
</template>
</el-table-column> -->
<el-table-column
width=
"115"
label=
"支付方式"
min-width=
"70"
style=
"background:#EAEAEA"
>
<
template
slot-scope=
"scope"
>
<span
class=
"fz15 fbold"
>
{{
scope
.
row
.
paymentInfo
.
Name
}}
</span>
</
template
>
</el-table-column>
<
template
slot=
"append"
v-if=
"item.Remark||item.isMore"
>
<div
style=
"padding:10px;color:#f1416c"
>
{{
$t
(
'pub.pubRemark'
)
}}
:
{{
item
.
Remark
}}
</div>
<div
:style=
"
{'height': item.isMore?'20px':''}">
</div>
<more
v-if=
"item.isMore"
@
change=
"ViewMore(item,index)"
:upIcon=
"item.upIcon"
></more>
</
template
>
</el-table>
<div
class=
"row justify-sb mt mb20"
v-if=
"scope.row.IncomeList.length>0||scope.row.RefundList.length>0||scope.row.CostList.length>0"
>
<div
class=
"row justify-sb mt"
v-if=
"chind.OrderState!=2"
>
<div
class=
"column px15 bgf5 radius5 flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
{{$t('objFill.collectiondocument')}}
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
<div
class=
"row wrap orderNo fz12 py
t5
"
>
<span
class=
"cursor-pointer radius5 mr mb
5
px5"
:class=
"{'bgD9F3FF':x.ColorState==1,'bg20c997':x.ColorState==2,'bgFAEAED':x.ColorState==3,'bjFFF3E0':x.ColorState==4,
'c3FC4FF':x.ColorState==1,'c20c997':x.ColorState==2,'cF1416C':x.ColorState==3,'cff9800':x.ColorState==4}"
v-for=
"(x, i) in
scope.row
.IncomeList"
'c3FC4FF':x.ColorState==1,'c20c997':x.ColorState==2,'cF1416C':x.ColorState==3,'cff9800':x.ColorState==4}"
v-for=
"(x, i) in
item
.IncomeList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span>
<span
v-if=
"
scope.row
.IncomeList.length == 0"
class=
"c9e fz12"
>
<span
v-if=
"
item
.IncomeList.length == 0"
class=
"c9e fz12"
>
{{$t('objFill.nocollectiondocument')}}
</span>
</div>
<el-tooltip
v-if=
"
scope.row
.OrderState == 1"
class=
"item"
effect=
"dark"
<el-tooltip
v-if=
"
item
.OrderState == 1"
class=
"item"
effect=
"dark"
:content=
"$t('objFill.preparedocument')"
placement=
"top"
>
<i
class=
"absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@
click=
"makeAdocument(
scope.row
, 1)"
></i>
@
click=
"makeAdocument(
chind, item
, 1)"
></i>
</el-tooltip>
</div>
<div
class=
"column px15 bgf5 radius5 ml flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
{{$t('objFill.refundreceipt')}}
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
<div
class=
"row wrap orderNo fz12 py
t5
"
>
<span
class=
"cursor-pointer radius5 mr mb
5
px5"
:class=
"{'bgD9F3FF':x.ColorState==1,'bg20c997':x.ColorState==2,'bgFAEAED':x.ColorState==3,'bjFFF3E0':x.ColorState==4,
'c3FC4FF':x.ColorState==1,'c20c997':x.ColorState==2,'cF1416C':x.ColorState==3,'cff9800':x.ColorState==4}"
v-for=
"(x, i) in
scope.row
.RefundList"
'c3FC4FF':x.ColorState==1,'c20c997':x.ColorState==2,'cF1416C':x.ColorState==3,'cff9800':x.ColorState==4}"
v-for=
"(x, i) in
item
.RefundList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span>
<span
v-if=
"
scope.row
.RefundList.length == 0"
class=
"c9e fz12"
>
<span
v-if=
"
item
.RefundList.length == 0"
class=
"c9e fz12"
>
{{$t('objFill.norefundreceipt')}}
</span>
</div>
<el-tooltip
v-if=
"
scope.row
.OrderState == 1"
class=
"item"
effect=
"dark"
<el-tooltip
v-if=
"
item
.OrderState == 1"
class=
"item"
effect=
"dark"
:content=
"$t('objFill.preparedocument')"
placement=
"top"
>
<i
class=
"absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@
click=
"makeAdocument(
scope.row
, 2)"
></i>
@
click=
"makeAdocument(
chind, item
, 2)"
></i>
</el-tooltip>
</div>
<div
class=
"column px15 bgf5 radius5 ml flex-g pa relative"
style=
"min-width: 150px;max-width:400px"
>
<div
class=
"fz12"
>
{{$t('objFill.costdocument')}}
</div>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
<div
class=
"row wrap orderNo fz12 py
t5
"
>
<span
class=
"cursor-pointer radius5 mr mb
5
px5"
:class=
"{'bgD9F3FF':x.ColorState==1,'bg20c997':x.ColorState==2,'bgFAEAED':x.ColorState==3,'bjFFF3E0':x.ColorState==4,
'c3FC4FF':x.ColorState==1,'c20c997':x.ColorState==2,'cF1416C':x.ColorState==3,'cff9800':x.ColorState==4}"
v-for=
"(x, i) in
scope.row
.CostList"
'c3FC4FF':x.ColorState==1,'c20c997':x.ColorState==2,'cF1416C':x.ColorState==3,'cff9800':x.ColorState==4}"
v-for=
"(x, i) in
item
.CostList"
@
click=
"openDetails(x)"
>
{{ x.FrID }}
</span>
<span
v-if=
"
scope.row
.CostList.length == 0"
class=
"c9e fz12"
>
<span
v-if=
"
item
.CostList.length == 0"
class=
"c9e fz12"
>
{{$t('objFill.nocostdocument')}}
</span>
</div>
<div
class=
"item absolute right20 bottom20"
v-if=
"
scope.row
.OrderState == 1 && pagesTitle != '销售'"
>
<div
class=
"item absolute right20 bottom20"
v-if=
"
item
.OrderState == 1 && pagesTitle != '销售'"
>
<el-tooltip
class=
""
effect=
"dark"
:content=
"$t('objFill.preparedocument')"
placement=
"top"
>
<i
class=
"el-icon-circle-plus cursor-pointer c059FF6"
@
click=
"makeAdocument(
scope.row
, 3)"
></i>
<i
class=
"el-icon-circle-plus cursor-pointer c059FF6"
@
click=
"makeAdocument(
chind, item
, 3)"
></i>
</el-tooltip>
<el-tooltip
v-if=
"
scope.row
.OrderState == 1"
class=
""
effect=
"dark"
:content=
"$t('objFill.balanceout')"
<el-tooltip
v-if=
"
item
.OrderState == 1"
class=
""
effect=
"dark"
:content=
"$t('objFill.balanceout')"
placement=
"top"
>
<i
class=
"el-icon-circle-plus cursor-pointer c3FC4FF"
@
click=
"isOffset(
scope.row
, 3)"
></i>
<i
class=
"el-icon-circle-plus cursor-pointer c3FC4FF"
@
click=
"isOffset(
chind, item
, 3)"
></i>
</el-tooltip>
</div>
</div>
...
...
@@ -716,59 +909,61 @@
'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
v-for=
"(x, i) in
scope.row.InvoiceApplyList"
@
click=
"openDetails(x,scope.row
)"
>
{{ x.ID }}
</span>
<span
v-if=
"
scope.row.InvoiceApplyList&&scope.row
.InvoiceApplyList.length == 0"
class=
"c9e fz12"
>
v-for=
"(x, i) in
item.InvoiceApplyList"
@
click=
"openDetails(x,item
)"
>
{{ x.ID }}
</span>
<span
v-if=
"
item.InvoiceApplyList&&item
.InvoiceApplyList.length == 0"
class=
"c9e fz12"
>
{{$t('objFill.noinvoicedocument')}}
</span>
</div>
</div>
<div
v-if=
"false"
class=
"row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s"
>
<div
v-if=
"
scope.row
.OrderState == 1 &&
scope.row
.IncomeList.length == 0 &&
scope.row
.RefundList.length == 0 &&
scope.row.CostList.length == 0 && scope.row
.OrderSource!=1
"
class=
"row-c cursor-pointer radius5 cancel py5"
@
click=
"clickRightButtom(
scope.row
, 0)"
>
<i
v-loading=
"msg.OrderId ==
scope.row
.OrderId && loading0"
></i>
item
.OrderState == 1 &&
item
.IncomeList.length == 0 &&
item
.RefundList.length == 0 &&
item.CostList.length == 0 && item
.OrderSource!=1
"
class=
"row-c cursor-pointer radius5 cancel py5"
@
click=
"clickRightButtom(
item
, 0)"
>
<i
v-loading=
"msg.OrderId ==
item
.OrderId && loading0"
></i>
<span
class=
"cF1416C"
>
{{$t('sm.exitOrder')}}
</span>
</div>
<div
v-if=
"
scope.row.OrderState == 1 && pagesTitle != '销售' && scope.row
.OrderSource!=1"
class=
"row-c cursor-pointer radius5 confirm py5"
@
click=
"clickRightButtom(
scope.row
, 1)"
>
<i
v-loading=
"msg.OrderId ==
scope.row
.OrderId && loading1"
></i>
<div
v-if=
"
item.OrderState == 1 && pagesTitle != '销售' && item
.OrderSource!=1"
class=
"row-c cursor-pointer radius5 confirm py5"
@
click=
"clickRightButtom(
item
, 1)"
>
<i
v-loading=
"msg.OrderId ==
item
.OrderId && loading1"
></i>
<span
class=
"c20C997"
>
{{$t('ground.qrendindan')}}
</span>
</div>
<div
v-if=
"
scope.row
.OrderState > 1"
class=
"row-c cursor-pointer radius5 change1 py5"
@
click=
"clickRightButtom(
scope.row
, 4)"
>
<i
v-loading=
"msg.OrderId ==
scope.row
.OrderId && loading2"
></i>
<div
v-if=
"
item
.OrderState > 1"
class=
"row-c cursor-pointer radius5 change1 py5"
@
click=
"clickRightButtom(
item
, 4)"
>
<i
v-loading=
"msg.OrderId ==
item
.OrderId && loading2"
></i>
<span
class=
"c20C997"
>
{{$t('fnc.shousun')}}
</span>
</div>
<div
v-if=
"
scope.row.OrderState >1 && scope.row
.OrderState != 3
&&
scope.row
.OrderState != 4
<div
v-if=
"
item.OrderState >1 && item
.OrderState != 3
&&
item
.OrderState != 4
&&pagesTitle=='OP'&&is_correlationOP"
class=
"row-c cursor-pointer radius5 change py5"
@
click=
"clickCorrelation(
scope.row
,1)"
>
@
click=
"clickCorrelation(
item
,1)"
>
<span
class=
"c059FF6"
>
编辑关联OP
</span>
</div>
<div
v-if=
"
scope.row
.OrderState != 3
&&pagesTitle=='OP'"
class=
"row-c cursor-pointer radius5 change py5"
@
click=
"clickCorrelation(
scope.row
,2)"
>
<div
v-if=
"
item
.OrderState != 3
&&pagesTitle=='OP'"
class=
"row-c cursor-pointer radius5 change py5"
@
click=
"clickCorrelation(
item
,2)"
>
<span
class=
"c059FF6"
>
编辑总金额
</span>
</div>
<ApplyFoInvoice
v-if=
"userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==
scope.row.EnterID"
:obj=
"scope.row
"
:type=
"7"
></ApplyFoInvoice>
<ApplyFoInvoice
v-if=
"userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==
item.EnterID"
:obj=
"item
"
:type=
"7"
></ApplyFoInvoice>
</div>
</div>
<div
class=
"mt mb20 bgf5 pa15 row-c"
v-if=
"
scope.row
.CancelRemark"
>
<div
class=
"mt mb20 bgf5 pa15 row-c"
v-if=
"
item
.CancelRemark"
>
<div
style=
"font-size:16px;font-weight:bold;font-family: pingfangR;"
>
{{$t('objFill.groundsforcancellation')}}:
</div>
<div
style=
"margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;"
>
{{
scope.row
.CancelRemark }}
{{
item
.CancelRemark }}
</div>
<div
style=
"margin-left:12px;font-size:12px;font-family: microsoft yahei;"
>
{{
scope.row.CancelEmpName }} {{ scope.row
.CancelTime }}
{{
item.CancelEmpName }} {{ item
.CancelTime }}
</div>
</div>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
<el-dialog
custom-class=
"w600"
title=
"取消订单"
:visible
.
sync=
"cancelOrderDialog"
>
<div
style=
"padding-bottom:20px"
>
<el-input
type=
"textarea"
autofocus
rows=
"5"
placeholder=
"请填写取消订单的缘由"
clear=
"w300"
v-model=
"cancelRemark"
>
...
...
@@ -1087,8 +1282,8 @@
this
.
queryObj
=
query
this
.
cdState
=
true
},
isOffset
(
row
,
num
)
{
this
.
makeAdocument
(
row
,
num
,
'Offset'
)
isOffset
(
chind
,
row
,
num
)
{
this
.
makeAdocument
(
chind
,
row
,
num
,
'Offset'
)
},
editRemark
(
item
)
{
this
.
postMsg
.
OrderId
=
item
.
OrderId
...
...
@@ -1311,8 +1506,9 @@
}
},
// 制作单据
makeAdocument
(
row
,
num
,
Offset
)
{
if
((
num
==
2
||
num
==
3
)
&&
(
row
.
Income
+
row
.
PlatformMoney
)
<=
0
)
{
makeAdocument
(
chind
,
row
,
num
,
Offset
)
{
if
((
num
==
2
||
num
==
3
)
&&
chind
&&
((
chind
.
OrderType
==
1
&&
row
.
Income
+
row
.
PlatformMoney
)
||
(
chind
.
OrderType
==
2
&&
chind
.
Income
+
chind
.
PlatformMoney
))
<=
0
)
{
this
.
Info
(
'请先制收款单据,再制成本或退款单据!'
)
return
}
...
...
@@ -1325,9 +1521,10 @@
}
else
{
type
=
num
}
this
.
BillMakingMsg
.
ReFinanceId
=
row
.
OrderId
;
this
.
BillMakingMsg
.
ReFinanceId
=
row
.
OrderId
?
row
.
OrderId
:
row
.
MainId
;
this
.
BillMakingMsg
.
ReFinanceId2
=
num
;
this
.
BillMakingMsg
.
OtherType
=
80
;
if
(
row
.
MainId
&&
row
.
MainId
>
0
)
this
.
BillMakingMsg
.
OtherType
=
83
;
else
this
.
BillMakingMsg
.
OtherType
=
80
;
if
(
type
==
1
)
this
.
BillMakingMsg
.
CostType
=
77
let
text
=
""
;
let
query
=
{};
...
...
@@ -1349,11 +1546,11 @@
};
// 检索财务流程
if
(
num
==
1
)
{
query
.
searchTitle
=
row
.
PayWay
==
1
?
'车行
月结收入'
:
'收款
'
query
.
searchTitle
=
row
.
PayWay
==
1
?
'车行
'
:
'车行
'
}
else
if
(
num
==
2
)
{
query
.
searchTitle
=
'溢收团费退款'
}
else
if
(
num
==
3
)
{
query
.
searchTitle
=
row
.
PayWay
==
1
?
'车行
成本月结'
:
'车行车资付款
'
query
.
searchTitle
=
row
.
PayWay
==
1
?
'车行
'
:
'车行
'
if
(
this
.
cdState
==
false
)
query
.
portTypeId
=
6
;
}
...
...
@@ -1559,9 +1756,9 @@
});
},
//复制信息
CopyHandler
(
item
)
{
this
.
copyId
=
item
.
OrderId
;
let
copyText
=
item
.
OrderId
;
CopyHandler
(
OrderId
)
{
this
.
copyId
=
OrderId
;
let
copyText
=
OrderId
;
const
save
=
function
(
e
)
{
e
.
clipboardData
.
setData
(
'text/plain'
,
copyText
)
e
.
preventDefault
()
// 阻止默认行为
...
...
src/components/CarDealerOrder/components/ReservationOrder.vue
View file @
3cfde11e
...
...
@@ -160,12 +160,21 @@
</el-select>
</span>
</li>
<!--
<li>
<li>
<span>
<em>
订单类型
</em>
<el-select
v-model=
"msg.OrderType"
@
change=
"handleCurrentChange(1)"
>
<el-option
:key=
"0"
:value=
"0"
label=
"不限"
></el-option>
<el-option
v-for=
"item in orderType"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
</el-select>
</span>
</li>
<li>
<span><em>
主
{{
$t
(
'OrderList.search.orderId'
)
}}
</em>
<el-input
clearable
type=
"Number"
v-model=
"msg.MainId"
:placeholder=
"$t('objFill.orderid')"
@
keyup
.
native=
"handleCurrentChange(1)"
/>
</span>
</li>
-->
</li>
<li>
<span><em>
{{
$t
(
'OrderList.search.orderId'
)
}}
</em>
<el-input
clearable
type=
"Number"
v-model=
"msg.OrderId"
:placeholder=
"$t('objFill.orderid')"
...
...
@@ -252,6 +261,7 @@ export default {
IsFinish
:
-
1
,
Sort
:
1
,
OrderId
:
null
,
OrderType
:
0
,
MainId
:
null
,
OrderTCNUM
:
''
,
},
...
...
@@ -262,8 +272,8 @@ export default {
{
Name
:
this
.
$t
(
'OrderList.orderStatus.cancel'
),
ID
:
'2'
},
],
orderType
:
[
{
Name
:
this
.
$t
(
'OrderList.orderType.tour'
)
,
ID
:
'1'
},
{
Name
:
this
.
$t
(
'OrderList.orderType.guest'
)
,
ID
:
'2'
},
{
Name
:
'常规'
,
ID
:
'1'
},
{
Name
:
'包车'
,
ID
:
'2'
},
],
Datelist
:
''
,
DatelistUse
:
''
,
...
...
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