Skip to content

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

no message

parent 70c7e103
Show whitespace changes
Inline Side-by-side
Showing with 264 additions and 252 deletions
src/components/CarDealerOrder/components/OrderList.vue
View file @ 5476eb33
......@@ -511,33 +511,29 @@
<template>
<div>
<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 v-for="(child,indexs) in 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')}}
<div class="orderType cf fz12" :class="[child.IsFinish==1?'active':'']">
{{child.IsFinish==1?$t('objFill.finished'):$t('objFill.uncompleted')}}
</div>
</div>
<div class="cblack fz14 mr" v-if="scope.row.IsFinish == 1">
<div class="cblack fz14 mr" v-if="child.IsFinish == 1">
<span class="">
<span>{{scope.row.FinishEmpName}}/</span>
<span class="text-grey-6">{{scope.row.FinishTimeStr}}</span>
<span>{{child.FinishEmpName}}/</span>
<span class="text-grey-6">{{child.FinishTimeStr}}</span>
</span>
</div>
<div class="c9e fz12">
<!-- <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"
......@@ -553,37 +549,38 @@
<span class="c9e">{{$t('objFill.petition')}}：</span>
<span class="text-grey-6">{{scope.row.PetitionId}}</span>
</span>
</div> -->
</div>
</div>
<div class="c9e fz12">
<!-- <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>
</div>
</div> -->
<div class="row c9e fz12">
<span class="mr">{{$t('objFill.orderholder')}}：
{{scope.row.CreateByName}}/{{scope.row.CreateDateStr}}
{{child.CreateByName}}/{{child.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': child.OrderState == 1,
'el-icon-refresh cff9800': child.OrderState == 2,
}"></i>
<span class="fz12 cblack" :class="{
c20C997: scope.row.OrderState == 1,
cF1416C: scope.row.OrderState == 2,
c20C997: child.OrderState == 1,
cF1416C: child.OrderState == 2,
}">
{{ scope.row.typeInfo.Name }}
<!-- {{ child.typeInfo.Name }} -->
</span>
</div>
</div>
</div>
<div v-if="items in child.OrderList">
<div class="mb">
<el-table :data="[scope.row]" style="width:100%" border>
<el-table :data="[items]" style="width:100%" border>
<el-table-column :label="$t('objFill.caravanshopcol.t1')" min-width="100" style="background:#EAEAEA">
<template slot-scope="scopes">
<template slot-scope="scope">
<div v-if="scope.row.CarModel">
{{ scope.row.CarModel.CarName+'/'+scope.row.CarModel.CarNo }}
</div>
......@@ -641,33 +638,35 @@
<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}}
<!-- -->
<template slot="append" v-if="items.Remark||items.isMore">
<div style="padding:10px;color:#f1416c">{{$t('pub.pubRemark')}}：
<!-- {{items.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>
<!-- <div :style="{'height': items.isMore?'20px':''}"></div> -->
<!-- <more v-if="items.isMore" @change="ViewMore(items,scope.$index)" :upIcon="items.upIcon"></more> -->
</template>
</el-table>
</div>
<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 mb20"
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="fz12">{{$t('objFill.collectiondocument')}}</div>
<div class="row wrap orderNo fz12 py">
<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"
'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(item, 1)"></i>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
......@@ -675,16 +674,16 @@
<div class="row wrap orderNo fz12 py">
<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.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(item, 2)"></i>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
......@@ -692,19 +691,19 @@
<div class="row wrap orderNo fz12 py">
<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.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(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(item, 3)"></i>
</el-tooltip>
</div>
</div>
......@@ -716,58 +715,58 @@
'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>
<div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">
<div class="mt mb20 bgf5 pa15 row-c" v-if="child.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 }}
{{ child.CancelRemark }}
</div>
<div style="margin-left:12px;font-size:12px;font-family: microsoft yahei;">
{{ scope.row.CancelEmpName }} {{ scope.row.CancelTime }}
{{ child.CancelEmpName }} {{ child.CancelTime }}
</div>
</div>
</template>
</el-table-column>
</el-table>
</div>
<el-dialog custom-class="w600" title="取消订单" :visible.sync="cancelOrderDialog">
<div style="padding-bottom:20px">
......
src/components/CarDealerOrder/components/ReservationOrder.vue
View file @ 5476eb33
......@@ -362,27 +362,37 @@ export default {
let url
// 销售 OP
if (this.pagesTitle == '销售') {
url = "JapanCar_get_GetJapanOrderPageList"
url = "JapanCar_get_GetJapanOrderMainPageList"
} else {
url = "JapanCar_get_GetJapanOrderPageList"
url = "JapanCar_get_GetJapanOrderMainPageList"
}
this.apipost(url, this.msg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
let addLists = function(arr){
arr.forEach(x=>{
x.typeInfo = ''
})
}
let addList = function(arr){
arr.forEach(x=>{
x.typeInfo = ''
x.paymentInfo = {}
x.list = []
x.isMore = false
x.upIcon = false
x.NewOrderDetailList = []
})
}
addList(data)
data.forEach(item => {
item.typeInfo = this.OrderStatusType.find(y => y.ID == item.OrderState) ?? this.OrderStatusType[1]
item.paymentInfo = this.PaymentMethods.find(y => y.Id == item.PayWay) ?? this.PaymentMethods[1]
// addLists(data)
data.forEach(k => {
addList(k.OrderList)
// k.typeInfo = this.OrderStatusType.find(y => y.ID == k.OrderState) ?? this.OrderStatusType[1]
k.OrderList.forEach(item=>{
// item.typeInfo = this.OrderStatusType.find(y => y.ID == item.OrderState) ?? this.OrderStatusType[1]
// item.paymentInfo = this.PaymentMethods.find(y => y.Id == k.PayWay) ?? this.PaymentMethods[1]
if(item.OrderDetailList.length>2){
item.isMore = true
}
......@@ -396,7 +406,10 @@ export default {
item.NewOrderDetailList = JSON.parse(JSON.stringify(dataLists))
})
})
this.OrderList = data;
console.log(data,'--------------')
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
......
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