Skip to content

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

no message

parent 5476eb33
Show whitespace changes
Inline Side-by-side
Showing with 404 additions and 212 deletions
src/assets/common/lang/zhTW/fill.js
View file @ 6623b672
......@@ -1012,7 +1012,7 @@ export const obj = {
t1: '車/使用時間/天數',
t2: '用車詳情',
t3: '總金額',
t4: '代收金額',
t4: '待收金額',
t5: '實收',
t6: '退款',
t7: '平台在途金額',
......
src/components/CarDealerOrder/components/OrderList.vue
View file @ 6623b672
<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;
}
......@@ -509,40 +516,49 @@
</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> -->
<div v-for="(child,indexs) in OrderList">
</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 v-if="false">
<!-- active activeNo -->
<div class="orderType cf fz12" :class="[child.IsFinish==1?'active':'']">
{{child.IsFinish==1?$t('objFill.finished'):$t('objFill.uncompleted')}}
<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="child.IsFinish == 1">
<div class="cblack fz14 mr" v-if="chind.IsFinish == 1">
<span class="">
<span>{{child.FinishEmpName}}/</span>
<span class="text-grey-6">{{child.FinishTimeStr}}</span>
<span>{{chind.FinishEmpName}}/</span>
<span class="text-grey-6">{{chind.FinishTimeStr}}</span>
</span>
</div>
<!-- <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>
<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="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="">
......@@ -551,105 +567,265 @@
</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>
</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')}}：
{{child.CreateByName}}/{{child.CreateDateStr}}
{{chind.CreateByName}}/{{chind.CreateDateStr}}
</span>
<div class="">
<i class="mx5" :class="{
'el-icon-alarm-clock c20C997': child.OrderState == 1,
'el-icon-refresh cff9800': child.OrderState == 2,
'el-icon-alarm-clock c20C997': chind.OrderState == 1,
'el-icon-refresh cff9800': chind.OrderState == 2,
}"></i>
<span class="fz12 cblack" :class="{
c20C997: child.OrderState == 1,
cF1416C: child.OrderState == 2,
c20C997: chind.OrderState == 1,
cF1416C: chind.OrderState == 2,
}">
<!-- {{ child.typeInfo.Name }} -->
{{ chind.typeInfo.Name }}
</span>
</div>
</div>
</div>
<div v-if="items in child.OrderList">
<div class="mb">
<el-table :data="[items]" style="width:100%" border>
<el-table-column :label="$t('objFill.caravanshopcol.t1')" min-width="100" style="background:#EAEAEA">
<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(child, scope.row, 1)"></i>
</el-tooltip>
</template>
</el-table-column>
<el-table-column width="150" label="包月时间" style="background:#EAEAEA">
<template slot-scope="scope">
{{ scope.row.BCMonth }}/{{ scope.row.BCDay }} 天
</template>
</el-table-column>
<el-table-column width="150" :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="150" :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="150" :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="150" :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="150" 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="150" 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="150" :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="150" 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="150" :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="150" :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">
<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 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>{{ 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>
</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">{{item.PetitionId}}</span>
</span>
</div>
<span> {{$t('objFill.guestinfor')}}：<span class="cblack">{{item.CustomerName}}</span>
<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">
<div class="">
<i class="mx5" :class="{
'el-icon-alarm-clock c20C997': item.OrderState == 1,
'el-icon-refresh cff9800': item.OrderState == 2,
}"></i>
<span class="fz12 cblack" :class="{
c20C997: item.OrderState == 1,
cF1416C: item.OrderState == 2,
}">
{{ item.typeInfo.Name }}
</span>
</div>
</div>
</div>
<el-table :data="[item]" style="width:100%" border>
<el-table-column label="司机" min-width="180" style="background:#EAEAEA">
<template slot-scope="scope">
<div v-if="scope.row.DriverModel">
{{ scope.row.DriverModel.DriverName }}/{{ scope.row.DriverModel.DriverTel }}
</div>
</template>
</el-table-column>
<el-table-column :label="$t('objFill.caravanshopcol.t1')" min-width="150" 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.UseDateStr }}</span>
<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="200" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t2')" min-width="160" style="background:#EAEAEA">
<template slot-scope="scope">
<div class="RoomList">
<div class="RoomList text-center">
<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"
<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>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('objFill.caravanshopcol.t3')" style="background:#EAEAEA">
<el-table-column v-if="chind.OrderType==1" width="150" :label="$t('objFill.caravanshopcol.t3')" style="background:#EAEAEA">
<template slot-scope="scope">
{{ scope.row.Money }}
<span class="fz15 fbold">{{ scope.row.Money }}</span>
</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">
<el-table-column v-if="chind.OrderType==1" width="150" :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">
<el-table-column width="150" :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">
<el-table-column width="150" :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">
<el-table-column width="150" 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="150" 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="150" :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">
<el-table-column width="150" 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="150" :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="items.Remark||items.isMore">
<div style="padding:10px;color:#f1416c">{{$t('pub.pubRemark')}}：
<!-- {{items.Remark}} -->
<!-- <el-table-column width="150" :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="150" 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': items.isMore?'20px':''}"></div> -->
<!-- <more v-if="items.isMore" @change="ViewMore(items,scope.$index)" :upIcon="items.upIcon"></more> -->
<div :style="{'height': item.isMore?'20px':''}"></div>
<more v-if="item.isMore" @change="ViewMore(item,index)" :upIcon="item.upIcon"></more>
</template>
</el-table>
</div>
<!-- <div class="row justify-sb mt mb20"
<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>
......@@ -666,7 +842,7 @@
<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(item, 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">
......@@ -683,7 +859,7 @@
<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(item, 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">
......@@ -699,11 +875,11 @@
</div>
<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(item, 3)"></i>
<i class="el-icon-circle-plus cursor-pointer c059FF6" @click="makeAdocument(chind, item, 3)"></i>
</el-tooltip>
<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(item, 3)"></i>
<i class="el-icon-circle-plus cursor-pointer c3FC4FF" @click="isOffset(chind, item, 3)"></i>
</el-tooltip>
</div>
</div>
......@@ -753,21 +929,23 @@
</div>
<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="child.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;">
{{ child.CancelRemark }}
{{ item.CancelRemark }}
</div>
<div style="margin-left:12px;font-size:12px;font-family: microsoft yahei;">
{{ child.CancelEmpName }} {{ child.CancelTime }}
{{ item.CancelEmpName }} {{ item.CancelTime }}
</div>
</div>
</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">
......@@ -1086,8 +1264,8 @@
this.queryObj = query
this.cdState = true
},
isOffset(row, num) {
this.makeAdocument(row, num, 'Offset')
isOffset(child, row, num) {
this.makeAdocument(child, row, num, 'Offset')
},
editRemark(item) {
this.postMsg.OrderId = item.OrderId
......@@ -1310,8 +1488,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) && child && ((child.OrderType==1&&row.Income + row.PlatformMoney)||
(child.OrderType==2&&chind.Income + chind.PlatformMoney)) <= 0) {
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
......@@ -1324,9 +1503,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 = {};
......@@ -1558,9 +1738,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 @ 6623b672
......@@ -160,9 +160,14 @@
</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')" />
</span>
</li>
<li>
<span><em>{{ $t('OrderList.search.orderId') }}</em>
<el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.v100.orderid')" />
<el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.orderid')" />
</span>
</li>
<li>
......@@ -238,12 +243,15 @@ export default {
msg: {
pageIndex: 1,
pageSize: 5,
OrderId: '0',
CustomerId: 0,
UseSTime: "",
UseETime: "",
OrderState: 0,
IsFinish: -1,
Sort: 1,
OrderId: null,
MainId: null,
OrderTCNUM: '',
},
total: 0,
currentPage: 1,
......@@ -357,7 +365,7 @@ export default {
},
//获取酒店订单列表
GetList() {
if(this.msg.OrderId=='') this.msg.OrderId = 0
// if(this.msg.OrderId=='') this.msg.OrderId = 0
this.loading = true
let url
// 销售 OP
......@@ -373,7 +381,8 @@ export default {
let data = res.data.data.pageData
let addLists = function(arr){
arr.forEach(x=>{
x.typeInfo = ''
x.typeInfo = {}
x.paymentInfo = {}
})
}
let addList = function(arr){
......@@ -389,10 +398,11 @@ export default {
// addLists(data)
data.forEach(k => {
addList(k.OrderList)
// k.typeInfo = this.OrderStatusType.find(y => y.ID == k.OrderState) ?? this.OrderStatusType[1]
k.typeInfo = this.OrderStatusType.find(y => y.ID == k.OrderState) ?? this.OrderStatusType[1]
k.paymentInfo = this.PaymentMethods.find(y => y.Id == k.PayWay) ?? this.PaymentMethods[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]
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
}
......@@ -409,7 +419,6 @@ export default {
})
this.OrderList = data;
console.log(data,'--------------')
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
......@@ -443,6 +452,9 @@ export default {
if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId
}
if (this.$route.query.MainId) {
this.msg.MainId = this.$route.query.MainId
}
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
......
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