Skip to content

S
SuperMan
Commit a594deb9 authored by youjie's avatar youjie
Browse files
Options

no message

parent 6623b672
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 49 deletions
src/components/CarDealerOrder/components/OrderList.vue
View file @ a594deb9
...@@ -165,6 +165,9 @@ ...@@ -165,6 +165,9 @@
.mt20 { .mt20 {
margin-top: 20px; margin-top: 20px;
} }
.mb5 {
margin-bottom: 5px;
}
.mb { .mb {
margin-bottom: 10px; margin-bottom: 10px;
...@@ -192,6 +195,9 @@ ...@@ -192,6 +195,9 @@
padding: 15px 0; padding: 15px 0;
} }
.pyt5 {
padding: 5px 0 0 0;
}
.py5 { .py5 {
padding: 5px 0; padding: 5px 0;
} }
...@@ -518,11 +524,11 @@ ...@@ -518,11 +524,11 @@
<template> <template>
<div class="orderlist-box"> <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"> <el-button class="hollowFixedBtn" v-if="pagesTitle=='OP'" @click="setCompleted" :loading="CompletedLoading">
{{$t('objFill.oneclickfinish')}} {{$t('objFill.oneclickfinish')}}
</el-button> </el-button>
</div> </div> -->
<div> <div>
<div v-for="(chind,indexs) in OrderList" <div v-for="(chind,indexs) in OrderList"
style="background: #fff; style="background: #fff;
...@@ -578,7 +584,7 @@ ...@@ -578,7 +584,7 @@
<span class="mr">{{$t('objFill.orderholder')}}： <span class="mr">{{$t('objFill.orderholder')}}：
{{chind.CreateByName}}/{{chind.CreateDateStr}} {{chind.CreateByName}}/{{chind.CreateDateStr}}
</span> </span>
<div class=""> <!-- <div class="">
<i class="mx5" :class="{ <i class="mx5" :class="{
'el-icon-alarm-clock c20C997': chind.OrderState == 1, 'el-icon-alarm-clock c20C997': chind.OrderState == 1,
'el-icon-refresh cff9800': chind.OrderState == 2, 'el-icon-refresh cff9800': chind.OrderState == 2,
...@@ -589,7 +595,7 @@ ...@@ -589,7 +595,7 @@
}"> }">
{{ chind.typeInfo.Name }} {{ chind.typeInfo.Name }}
</span> </span>
</div> </div> -->
</div> </div>
</div> </div>
<el-table v-if="chind.OrderType==2" :data="[chind]" style="width:100%;margin-bottom: 10px;" border> <el-table v-if="chind.OrderType==2" :data="[chind]" style="width:100%;margin-bottom: 10px;" border>
...@@ -605,61 +611,62 @@ ...@@ -605,61 +611,62 @@
<el-tooltip v-if="scope.row.OrderState == 1" class="item" effect="dark" <el-tooltip v-if="scope.row.OrderState == 1" class="item" effect="dark"
:content="$t('objFill.preparedocument')" placement="top"> :content="$t('objFill.preparedocument')" placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" <i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(child, scope.row, 1)"></i> @click="makeAdocument(chind, scope.row, 1)"></i>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="包月时间" style="background:#EAEAEA"> <el-table-column width="115" label="包月时间" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.BCMonth }}/{{ scope.row.BCDay }} 天 {{ scope.row.BCMonth }}/{{ scope.row.BCDay }} 天
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t3')" style="background:#EAEAEA"> <el-table-column width="115" :label="$t('objFill.caravanshopcol.t3')" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Money }}</span> <span class="fz15 fbold">{{ scope.row.Money }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t5')" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" :label="$t('objFill.caravanshopcol.t5')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income }}</span> <span class="fz15 fbold">{{ scope.row.Income }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t6')" min-width="70" style="background:#EAEAEA"> <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"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Refund }}</span> <span class="fz15 fbold">{{ scope.row.Refund }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t7')" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" :label="$t('objFill.caravanshopcol.t7')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.PlatformMoney }}</span> <span class="fz15 fbold">{{ scope.row.PlatformMoney }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="油费支出" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" label="油费支出" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutOilFee }}</span> <span class="fz15 fbold">{{ scope.row.OutOilFee }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="停车过路费收入" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" label="停车过路费收入" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InPassByFee }}</span> <span class="fz15 fbold">{{ scope.row.InPassByFee }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t8')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <el-table-column width="115" label="停车过路费支出" min-width="70" style="background:#EAEAEA">
<span class="fz15 fbold">{{ scope.row.PlatformTax }}</span>
</template>
</el-table-column>
<el-table-column width="150" label="停车过路费支出" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutPassByFee }}</span> <span class="fz15 fbold">{{ scope.row.OutPassByFee }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="'其他'+$t('objFill.caravanshopcol.t9')" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" :label="'其他'+$t('objFill.caravanshopcol.t9')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.CostMoney }}</span> <span class="fz15 fbold">{{ scope.row.CostMoney }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t4')" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" :label="$t('objFill.caravanshopcol.t4')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DueInMoney }}</span> <span class="fz15 fbold">{{ scope.row.DueInMoney }}</span>
</template> </template>
...@@ -762,57 +769,62 @@ ...@@ -762,57 +769,62 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="chind.OrderType==1" width="150" :label="$t('objFill.caravanshopcol.t3')" style="background:#EAEAEA"> <el-table-column v-if="chind.OrderType==1" width="115" :label="$t('objFill.caravanshopcol.t3')" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Money }}</span> <span class="fz15 fbold">{{ scope.row.Money }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="chind.OrderType==1" width="150" :label="$t('objFill.caravanshopcol.t5')" min-width="70" style="background:#EAEAEA"> <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"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income }}</span> <span class="fz15 fbold">{{ scope.row.Income }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t6')" min-width="70" style="background:#EAEAEA"> <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"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Refund }}</span> <span class="fz15 fbold">{{ scope.row.Refund }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t7')" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" :label="$t('objFill.caravanshopcol.t7')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.PlatformMoney }}</span> <span class="fz15 fbold">{{ scope.row.PlatformMoney }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="油费支出" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" label="油费支出" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutOilFee }}</span> <span class="fz15 fbold">{{ scope.row.OutOilFee }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" label="停车过路费收入" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" label="停车过路费收入" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InPassByFee }}</span> <span class="fz15 fbold">{{ scope.row.InPassByFee }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="$t('objFill.caravanshopcol.t8')" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" label="停车过路费支出" 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="150" label="停车过路费支出" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutPassByFee }}</span> <span class="fz15 fbold">{{ scope.row.OutPassByFee }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" :label="'其他'+$t('objFill.caravanshopcol.t9')" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" :label="'其他'+$t('objFill.caravanshopcol.t9')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.CostMoney }}</span> <span class="fz15 fbold">{{ scope.row.CostMoney }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column width="150" :label="$t('objFill.caravanshopcol.t4')" min-width="70" style="background:#EAEAEA"> <!-- <el-table-column width="115" :label="$t('objFill.caravanshopcol.t4')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DueInMoney }}</span> <span class="fz15 fbold">{{ scope.row.DueInMoney }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column width="150" label="支付方式" min-width="70" style="background:#EAEAEA"> <el-table-column width="115" label="支付方式" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.paymentInfo.Name }}</span> <span class="fz15 fbold">{{ scope.row.paymentInfo.Name }}</span>
</template> </template>
...@@ -825,12 +837,11 @@ ...@@ -825,12 +837,11 @@
</template> </template>
</el-table> </el-table>
<div class="row justify-sb mt mb20" <div class="row justify-sb mt" v-if="chind.OrderState!=2">
v-if="item.IncomeList.length>0||item.RefundList.length>0||item.CostList.length>0">
<div class="column px15 bgf5 radius5 flex-g pa relative" style="min-width: 150px;max-width:400px"> <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="fz12">{{$t('objFill.collectiondocument')}}</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 pyt5">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb5 px5"
:class="{'bgD9F3FF':x.ColorState==1,'bg20c997':x.ColorState==2,'bgFAEAED':x.ColorState==3,'bjFFF3E0':x.ColorState==4, :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 item.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> @click="openDetails(x)">{{ x.FrID }}</span>
...@@ -847,8 +858,8 @@ ...@@ -847,8 +858,8 @@
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px"> <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="fz12">{{$t('objFill.refundreceipt')}}</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 pyt5">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb5 px5"
:class="{'bgD9F3FF':x.ColorState==1,'bg20c997':x.ColorState==2,'bgFAEAED':x.ColorState==3,'bjFFF3E0':x.ColorState==4, :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 item.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> @click="openDetails(x)">{{ x.FrID }}</span>
...@@ -864,8 +875,8 @@ ...@@ -864,8 +875,8 @@
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px"> <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="fz12">{{$t('objFill.costdocument')}}</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 pyt5">
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb5 px5"
:class="{'bgD9F3FF':x.ColorState==1,'bg20c997':x.ColorState==2,'bgFAEAED':x.ColorState==3,'bjFFF3E0':x.ColorState==4, :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 item.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> @click="openDetails(x)">{{ x.FrID }}</span>
...@@ -1264,8 +1275,8 @@ ...@@ -1264,8 +1275,8 @@
this.queryObj = query this.queryObj = query
this.cdState = true this.cdState = true
}, },
isOffset(child, row, num) { isOffset(chind, row, num) {
this.makeAdocument(child, row, num, 'Offset') this.makeAdocument(chind, row, num, 'Offset')
}, },
editRemark(item) { editRemark(item) {
this.postMsg.OrderId = item.OrderId this.postMsg.OrderId = item.OrderId
...@@ -1489,8 +1500,8 @@ ...@@ -1489,8 +1500,8 @@
}, },
// 制作单据 // 制作单据
makeAdocument(chind, row, num, Offset) { makeAdocument(chind, row, num, Offset) {
if ((num == 2 || num == 3) && child && ((child.OrderType==1&&row.Income + row.PlatformMoney)|| if ((num == 2 || num == 3) && chind && ((chind.OrderType==1&&row.Income + row.PlatformMoney)||
(child.OrderType==2&&chind.Income + chind.PlatformMoney)) <= 0) { (chind.OrderType==2&&chind.Income + chind.PlatformMoney)) <= 0) {
this.Info('请先制收款单据，再制成本或退款单据！') this.Info('请先制收款单据，再制成本或退款单据！')
return return
} }
...@@ -1528,11 +1539,11 @@ ...@@ -1528,11 +1539,11 @@
}; };
// 检索财务流程 // 检索财务流程
if (num == 1) { if (num == 1) {
query.searchTitle = row.PayWay == 1 ? '车行月结收入' : '收款' query.searchTitle = row.PayWay == 1 ? '车行' : '车行'
} else if (num == 2) { } else if (num == 2) {
query.searchTitle = '溢收团费退款' query.searchTitle = '溢收团费退款'
} else if (num == 3) { } else if (num == 3) {
query.searchTitle = row.PayWay == 1 ? '车行成本月结' : '车行车资付款' query.searchTitle = row.PayWay == 1 ? '车行' : '车行'
if (this.cdState == false) query.portTypeId = 6; if (this.cdState == false) query.portTypeId = 6;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment