Skip to content

S
SuperMan
Commit 12c43f80 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent d992c93b
Show whitespace changes
Inline Side-by-side
Showing with 1165 additions and 1130 deletions
src/assets/common/lang/EN/fill.js
View file @ 12c43f80
......@@ -3630,6 +3630,7 @@ export const obj = {
qingxzjsyf: 'Please select end month ',
shifouwj: 'Is it over?',
dinchegs: 'Car booking company ',
dingcheren:"Booking person",
tuantimc: 'Group Name ',
querenren: 'Confirm person ',
querensj: 'true time ',
......@@ -3659,6 +3660,7 @@ export const obj = {
tingcheglfsr: 'Parking Toll Revenue ',
tingcheglfzc: 'Parking toll Expenditure ',
xitongtuanh: 'System regiment number ',
surveyInfo:"Vehicle satisfaction survey",
bianjiglop: 'Edit association OP',
},
champion: {
......
src/assets/common/lang/zhCN/fill.js
View file @ 12c43f80
......@@ -3631,6 +3631,7 @@ export const obj = {
qingxzjsyf: '请选择结束月份',
shifouwj: '是否完结',
dinchegs: '订车公司',
dingcheren:"订车人",
tuantimc: '团体名称',
querenren: '确认人',
querensj: '确实时间',
......@@ -3660,6 +3661,7 @@ export const obj = {
tingcheglfsr: '停车过路费收入',
tingcheglfzc: '停车过路费支出',
xitongtuanh: '系统团号',
surveyInfo:"车辆满意度调查",
bianjiglop: '编辑关联OP',
},
champion: {
......
src/assets/common/lang/zhTW/fill.js
View file @ 12c43f80
......@@ -3631,6 +3631,7 @@ export const obj = {
qingxzjsyf: '请选择结束月份',
shifouwj: '是否完结',
dinchegs: '订车公司',
dingcheren:"订车人",
tuantimc: '团体名称',
querenren: '确认人',
querensj: '确实时间',
......@@ -3660,6 +3661,7 @@ export const obj = {
tingcheglfsr: '停车过路费收入',
tingcheglfzc: '停车过路费支出',
xitongtuanh: '系统团号',
surveyInfo:"车辆满意度调查",
bianjiglop: '编辑关联OP',
},
champion: {
......
src/components/CarDealerOrder/components/OrderList.vue
View file @ 12c43f80
<style scoped>
/deep/.orderlist-box .el-table .el-table__cell{
/deep/.orderlist-box .el-table .el-table__cell {
padding: 5px 0;
}
/deep/.orderlist-box .el-table th{
/deep/.orderlist-box .el-table th {
background: #f4f4f4;
color: rgb(153, 153, 153) !important;
}
.row {
display: flex;
}
......@@ -165,6 +167,7 @@
.mt20 {
margin-top: 20px;
}
.mb5 {
margin-bottom: 5px;
}
......@@ -198,6 +201,7 @@
.pyt5 {
padding: 5px 0 0 0;
}
.py5 {
padding: 5px 0;
}
......@@ -530,20 +534,16 @@
</el-button>
</div> -->
<div>
<div v-for="(chind,indexs) in OrderList"
style="background: #fff;
<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="{
<div class="orderType cf fz12" :class="{
active: chind.OrderType == 1,
activeB:chind.OrderType == 2,
}"
>
}">
<template v-if="chind.OrderType == 1">{{$t('objFill.changgui')}}</template>
<template v-if="chind.OrderType == 2">{{$t('objFill.baoche')}}</template>
</div>
......@@ -599,19 +599,16 @@
</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">
<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>
<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>
<i class="el-icon-circle-plus cursor-pointer c059FF6" @click="makeAdocument(chind, scope.row, 1)"></i>
</el-tooltip>
</template>
</el-table-column>
......@@ -625,43 +622,51 @@
<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">
<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">
<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">
<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">
<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="$t('objFill.v101.CarDealerOrder.xingshigl')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.xingshigl')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15">{{ scope.row.RunKM }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.youfeizhic')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.youfeizhic')" 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="$t('objFill.v101.CarDealerOrder.tingcheglfsr')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.tingcheglfsr')" 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="$t('objFill.v101.CarDealerOrder.tingcheglfzc')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.tingcheglfzc')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutPassByFee }}</span>
</template>
......@@ -671,37 +676,44 @@
<span class="fz15 fbold">{{ scope.row.OtherIncome }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.busManagement.sijizhusf')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.busManagement.sijizhusf')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DriverRoomFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.Contract.tincrzf')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.tincrzf')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InParkingFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.Contract.tinczcf')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.tinczcf')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutParkingFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdsr')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdsr')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InTeaFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdzc')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdzc')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutTeaFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('active.cl_qita')+$t('objFill.caravanshopcol.t9')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('active.cl_qita')+$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">
<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>
......@@ -713,8 +725,7 @@
</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">
: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">
......@@ -747,6 +758,9 @@
<span class="c9e">{{$t('objFill.v101.CarDealerOrder.xitongtuanh')}}：</span>{{ item.OrderTCNUM }} </span>
<span class="cblack fz12 ml mr" v-if="item.TCNUM">
<span class="c9e">{{$t('objFill.zhutuanhao')}}：</span>{{ item.TCNUM }} </span>
<span class="cblack fz12 ml mr" v-if="item.SurveyUrl&&item.SurveyUrl!=''">
<a target="_blank" :href="item.SurveyUrl" style="color:blue;text-decoration: underline;">{{$t('objFill.v101.CarDealerOrder.surveyInfo')}}</a>
</span>
<div class="cblack fz12 mr" v-if="false">
<span class="">
<span class="c9e">{{$t('objFill.petition')}}：</span>
......@@ -784,8 +798,7 @@
<div v-if="scope.row.DriverModel">
{{ scope.row.DriverModel.DriverName }}/{{ scope.row.DriverModel.DriverTel }}
</div>
<span
v-if="scope.row.CopilotDriverModel">
<span v-if="scope.row.CopilotDriverModel">
{{$t('objFill.assistantdriver')}}：{{scope.row.CopilotDriverModel.DriverName}}/{{scope.row.CopilotDriverModel.DriverTel}}
</span>
</template>
......@@ -813,52 +826,62 @@
</div>
</template>
</el-table-column>
<el-table-column v-if="chind.OrderType==1" width="115" :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">
<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">
<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">
<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">
<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">
<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">
<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="$t('objFill.v101.CarDealerOrder.xingshigl')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.xingshigl')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15">{{ scope.row.RunKM }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.youfeizhic')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.youfeizhic')" 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="$t('objFill.v101.CarDealerOrder.tingcheglfsr')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.tingcheglfsr')" 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="$t('objFill.v101.CarDealerOrder.tingcheglfzc')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.CarDealerOrder.tingcheglfzc')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutPassByFee }}</span>
</template>
......@@ -868,32 +891,38 @@
<span class="fz15 fbold">{{ scope.row.OtherIncome }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.busManagement.sijizhusf')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.busManagement.sijizhusf')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DriverRoomFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.Contract.tincrzf')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.tincrzf')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InParkingFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.Contract.tinczcf')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.tinczcf')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutParkingFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdsr')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdsr')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.InTeaFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdzc')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('objFill.v101.Contract.sijicdzc')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.OutTeaFee }}</span>
</template>
</el-table-column>
<el-table-column width="115" :label="$t('active.cl_qita')+$t('objFill.caravanshopcol.t9')" min-width="70" style="background:#EAEAEA">
<el-table-column width="115" :label="$t('active.cl_qita')+$t('objFill.caravanshopcol.t9')" min-width="70"
style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.CostMoney }}</span>
</template>
......@@ -1017,7 +1046,8 @@
&&pagesTitle=='OP'" class="row-c cursor-pointer radius5 change py5" @click="clickCorrelation(item,2)">
<span class="c059FF6">{{$t('objFill.bianjizje')}}</span>
</div>
<ApplyFoInvoice v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==item.EnterID" :obj="item" :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="item.CancelRemark">
......@@ -1038,18 +1068,21 @@
</div>
<el-dialog custom-class="w600" :title="$t('sm.exitOrder')" :visible.sync="cancelOrderDialog">
<div style="padding-bottom:20px">
<el-input type="textarea" autofocus rows="5" :placeholder="$t('objFill.quxiaodindanyy')" clear="w300" v-model="cancelRemark">
<el-input type="textarea" autofocus rows="5" :placeholder="$t('objFill.quxiaodindanyy')" clear="w300"
v-model="cancelRemark">
</el-input>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<input type="button" class="normalBtn" :value="$t('sm.exitOrder')" @click="cancelOrderHandler" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.closeSel')" @click="cancelOrderDialog = false" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.closeSel')"
@click="cancelOrderDialog = false" />
</el-col>
</el-row>
</div>
</el-dialog>
<!-- 变更订单 -->
<el-dialog custom-class="w800" :title="pagesTitle=='销售'?$t('objFill.biangendindan'):$t('objFill.bianjiqupiaofs')" :visible.sync="ChangeOrderDialog">
<el-dialog custom-class="w800" :title="pagesTitle=='销售'?$t('objFill.biangendindan'):$t('objFill.bianjiqupiaofs')"
:visible.sync="ChangeOrderDialog">
<div style="padding-bottom:20px">
<div class="flexOne-form-bj">
<h3>{{$t('objFill.qupiaofanshi')}}</h3>
......@@ -1117,15 +1150,16 @@
</div>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="ChangeOrderDialog = false" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')"
@click="ChangeOrderDialog = false" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="submit2" />
</el-col>
</el-row>
</div>
</el-dialog>
<!-- op备注 -->
<el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?$t('objFill.bianjikehubz'):$t('objFill.bianjiopbz')" :visible.sync="isShowRemark" center
width="400px">
<el-dialog custom-class='addCompany' :title="pagesTitle=='销售'?$t('objFill.bianjikehubz'):$t('objFill.bianjiopbz')"
:visible.sync="isShowRemark" center width="400px">
<el-row class="flex" style="margin-top: 10px;">
<el-col>
<span style="display: block;margin-bottom: 10px;">{{$t('pub.pubRemark')}}：</span>
......@@ -1503,11 +1537,15 @@
res => {
this.loading3 = false
if (res.data.resultCode == 1) {
this.Success(`${this.pagesTitle=='销售'?this.$t('objFill.biangendindan'):this.$t('objFill.bianjiqupiaofs')}${this.$t('objFill.chenggong')}`);
this.Success(
`${this.pagesTitle=='销售'?this.$t('objFill.biangendindan'):this.$t('objFill.bianjiqupiaofs')}${this.$t('objFill.chenggong')}`
);
this.$emit('success')
this.ChangeOrderDialog = false
} else {
this.Error(`${this.pagesTitle=='销售'?this.$t('objFill.biangendindan'):this.$t('objFill.bianjiqupiaofs')}${this.$t('objFill.shibai')}`)
this.Error(
`${this.pagesTitle=='销售'?this.$t('objFill.biangendindan'):this.$t('objFill.bianjiqupiaofs')}${this.$t('objFill.shibai')}`
)
}
},
err => {
......@@ -1579,8 +1617,8 @@
},
// 制作单据
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) {
if ((num == 2 || num == 3) && chind && ((chind.OrderType == 1 && row.Income + row.PlatformMoney) ||
(chind.OrderType == 2 && chind.Income + chind.PlatformMoney)) <= 0) {
this.Info(this.$t('objFill.v101.busManagement.qingxzskdzzcbtk'))
return
}
......@@ -1593,9 +1631,9 @@
} else {
type = num
}
this.BillMakingMsg.ReFinanceId = row.OrderId?row.OrderId:row.MainId;
this.BillMakingMsg.ReFinanceId = row.OrderId ? row.OrderId : row.MainId;
this.BillMakingMsg.ReFinanceId2 = num;
if(row.MainId&&row.MainId>0) this.BillMakingMsg.OtherType = 83;
if (row.MainId && row.MainId > 0) this.BillMakingMsg.OtherType = 83;
else this.BillMakingMsg.OtherType = 80;
if (type == 1) this.BillMakingMsg.CostType = 77
let text = "";
......
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ 12c43f80
......@@ -2,363 +2,453 @@
.row {
display: flex;
}
.row-c {
display: flex;
align-items: center;
}
.column {
display: flex;
flex-direction: column;
}
.column-jac {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.column-ac {
display: flex;
flex-direction: column;
align-items: center;
}
.wrap {
flex-wrap: wrap;
}
.justify-sb {
justify-content: space-between;
}
.justify-c {
justify-content: center;
}
.justify-e {
justify-content: flex-end;
align-items: flex-end;
}
.flex-g {
flex-grow: 1;
}
.flex-s {
flex-shrink: 0;
}
.align-c {
align-items: center;
}
.cblack {
color: black;
}
.cf {
color: #ffffff;
}
.c9e {
color: #9e9e9e;
}
.c20C997 {
color: #20c997;
}
.c02C854 {
color: #02c854;
}
.cff9800 {
color: #ff9800;
}
.cF1416C {
color: #f1416c;
}
.cF57A98 {
color: #f57a98;
}
.c04C8C8 {
color: #04c8c8;
}
.c059FF6 {
color: #059ff6;
}
.c3FC4FF {
color: #3fc4ff;
}
.fz10 {
font-size: 10px;
}
.fz11 {
font-size: 11px;
}
.fz12 {
font-size: 12px;
}
.fz13 {
font-size: 13px;
}
.fz14 {
font-size: 14px;
}
.fz15 {
font-size: 15px;
}
.fz16 {
font-size: 16px;
}
.fz17 {
font-size: 17px;
}
.fz18 {
font-size: 18px;
}
.fbold {
font-weight: bold;
}
.ml {
margin-left: 10px;
}
.mr {
margin-right: 10px;
}
.mt {
margin-top: 10px;
}
.mt20 {
margin-top: 20px;
}
.mb {
margin-bottom: 10px;
}
.mb20 {
margin-bottom: 20px;
}
.mx {
margin-left: 10px;
margin-right: 10px;
}
.mx5 {
margin-left: 5px;
margin-right: 5px;
}
.mb5 {
margin-bottom: 5px;
}
.py {
padding: 15px 0;
}
.py5 {
padding: 5px 0;
}
.px5 {
padding: 0 5px;
}
.px15 {
padding: 0 15px;
}
.pa15 {
padding: 15px;
}
.py20 {
padding: 20px 0;
}
.pb5 {
padding: 0 0 5px 0;
}
.pa {
padding: 10px 20px;
}
.pa20 {
padding: 20px;
}
.pt20 {
padding: 20px 0;
}
.borderD {
border-bottom: 1px dashed #dddddd;
}
.bgf {
background: #ffffff;
}
.bgf5 {
background: #f5f5f5;
}
.bgE8F5E9 {
background: #e8f5e9;
}
.bgD9F3FF {
background: #d9f3ff;
}
.bgFAEAED {
background: #faeaed;
}
.bj {
background: #ffffff;
}
.radius5 {
border-radius: 5px;
}
.cursor-pointer {
cursor: pointer;
}
.relative {
position: relative;
}
.absolute {
position: absolute;
}
.left0 {
left: 0;
}
.right0 {
right: 0;
}
.top0 {
top: 0;
}
.bottom0 {
bottom: 0;
}
.left20 {
left: 020px;
}
.right20 {
right: 20px;
}
.top20 {
top: 20px;
}
.bottom20 {
bottom: 20px;
}
.text-center {
text-align: center;
}
.orderType {
padding: 3px 15px;
border-radius: 3px;
background: #f57a98;
margin-right: 15px;
}
.orderType.active {
background: #4dd0e1;
}
.copy {
display: inline-block;
padding: 3px 15px;
border-radius: 3px;
margin-left: 20px;
}
.copy:hover {
background: #f5f5f5;
}
.see-rec div {
padding: 1px 5px;
border-radius: 3px;
}
.see {
border: 1px solid #04c8c8;
}
.seeLK {
border: 1px solid #059ff6;
}
.see:hover {
background-color: rgba(4, 200, 200, 0.1);
}
.rec {
border: 1px solid #04c8c8;
background-color: rgba(4, 200, 200, 1);
}
.rec:hover {
border: 1px solid rgba(4, 200, 200, 0.9);
background-color: rgba(4, 200, 200, 0.9);
}
.cancel:hover {
background-color: #f3dce2;
}
.confirm:hover {
background-color: #dcedc8;
}
.change:hover {
background-color: #d7e9f3;
}
.change1:hover {
background-color: #dcedc8;
}
.orderop {
text-align: center;
}
.orderop div {
width: 100px;
height: 50%;
display: flex;
justify-content: center;
}
.RoomList div {
border-bottom: 1px solid #e7e7e7;
}
.RoomList div:last-child {
border: 0;
}
.el-table {
font-size: 13px;
}
.shezhifrom {
position: relative;
}
.shebox {
position: absolute;
top: 0;
left: -100px;
display: none;
}
.shezhifrom:hover .shebox {
display: block;
}
/deep/.content-Car .el-input-number .el-input__inner{
/deep/.content-Car .el-input-number .el-input__inner {
height: 30px;
}
/deep/.content-Car .el-input-number{
/deep/.content-Car .el-input-number {
width: 100%;
line-height: 30px;
}
/deep/.content-Car .el-input-number__increase{
/deep/.content-Car .el-input-number__increase {
width: 25px !important;
height: 28px !important;
}
/deep/.content-Car .el-input-number__decrease{
/deep/.content-Car .el-input-number__decrease {
width: 25px !important;
height: 28px !important;
}
/deep/.content-Car .el-input-number .el-input__inner{
/deep/.content-Car .el-input-number .el-input__inner {
padding-left: 20px;
padding-right: 20px;
}
.total{
.total {
display: flex;
justify-content: space-between;
margin-top: 15px;
}
</style>
<template>
</style>
<template>
<div v-if="OrderList.length>0" class="content-Car">
<div
v-for="(item, index) in OrderList"
class="column bgf radius5 px15 mb20"
>
<div v-for="(item, index) in OrderList" class="column bgf radius5 px15 mb20">
<div class="row-c justify-sb align-c py">
<div class="row-c">
<div>
<div
class="orderType cf fz12 activeB"
>
<div class="orderType cf fz12 activeB">
{{$t('objFill.v101.busManagement.xingcheyongc')}}
</div>
</div>
<div class="c9e fz12">
<span>{{$t('fnc.ddbianhao')}}：</span>
<span>{{ item.OrderNo }}({{ item.Id}})</span>
<span
class="copy cblack cursor-pointer"
v-if="copyId != item.Id"
@click="CopyHandler(item)"
>{{$t('objFill.copy')}}</span
>
<span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else
><i class="el-icon-check mr"></i>{{$t('objFill.copied')}}</span
>
<span class="copy cblack cursor-pointer" v-if="copyId != item.Id"
@click="CopyHandler(item)">{{$t('objFill.copy')}}</span>
<span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i
class="el-icon-check mr"></i>{{$t('objFill.copied')}}</span>
</div>
</div>
<div class="c9e fz12">
......@@ -371,7 +461,8 @@
</template>
<span v-if="item.CustomerTel">/{{item.CustomerTel}}</span> </span>
<span v-if="pagesTitle!='销售'">
<template v-if="item.UseCompName||item.CustomerName"> /</template>{{$t('salesModule.Laiyuan')}}<template v-if="!item.OrderSource&&!item.CustomerId">{{$t('visaT.sale')}}</template>
<template v-if="item.UseCompName||item.CustomerName"> /</template>{{$t('salesModule.Laiyuan')}}<template
v-if="!item.OrderSource&&!item.CustomerId">{{$t('visaT.sale')}}</template>
<template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
<template v-if="item.OrderSource==1">B2C</template>
</span>
......@@ -394,24 +485,18 @@
<span>{{$t('restaurant.res_oderTime')}}：</span>
<span class="mr">{{ item.CreateDate }}</span>
<div class="">
<i
class="mx5"
:class="{
<i class="mx5" :class="{
'el-icon-alarm-clock c20C997': item.OfferState == 1,
'el-icon-check cblack': item.OfferState == 2,
'el-icon-warning cff9800': item.OfferState == 3,
'el-icon-refresh cF1416C': item.OfferState == 4,
}"
></i>
<span
class="fz12 cblack"
:class="{
}"></i>
<span class="fz12 cblack" :class="{
c20C997: item.OfferState == 1,
cblack: item.OfferState == 2,
cff9800: item.OfferState == 3,
cF1416C: item.OfferState == 4,
}"
>
}">
{{ item.OfferStateName }}
</span>
</div>
......@@ -419,11 +504,7 @@
</div>
<div class="mb">
<el-table :data="[item]" style="width:100%" border>
<el-table-column
:label="$t('OrderList.star')"
width="100"
style="background:#EAEAEA"
>
<el-table-column :label="$t('OrderList.star')" width="100" style="background:#EAEAEA">
<template slot-scope="scope">
<template>
<div>{{ item.StartDate }}</div>
......@@ -434,7 +515,8 @@
<el-table-column :label="$t('objFill.jiejixx')" style="background:#EAEAEA">
<template slot-scope="scope">
<div><span class="c9e">{{$t('salesModule.GoFlight')}}：</span> {{item.GoFlightInfo}}</div>
<div class="text-grey-9 q-pt-xs"><span class="c9e">{{$t('objFill.huichenghb')}}：</span>{{item.BackFlightInfo}}</div>
<div class="text-grey-9 q-pt-xs"><span
class="c9e">{{$t('objFill.huichenghb')}}：</span>{{item.BackFlightInfo}}</div>
<div class="text-grey-6 q-pt-xs">
<span class="c9e">{{$t('objFill.jiejixx')}}：</span>{{item.PickUpInfo}}
</div>
......@@ -445,27 +527,25 @@
{{item.UseDayNum}}
</template>
</el-table-column>
<el-table-column min-width="350" :label="$t('objFill.xiingchengxx')" style="background:#EAEAEA;" >
<el-table-column min-width="350" :label="$t('objFill.xiingchengxx')" style="background:#EAEAEA;">
<template slot-scope="scope">
<div class="RoomList">
<div class="fz12 c9e" v-for="(x, i) in item.NewDetailList">
<span class="mr"
>{{ x.UseDate }}</span
>
<span class="mr">{{ x.UseDate }}</span>
<span class="ml mr">{{$t('tips.di')}}{{ x.DayNum }} {{$t('hotel.hotel_day')}}</span>
<span class="ml mr">{{ x.UseTypeName }}</span>
<span class="ml mr">{{$t('objFill.xiingchengxx')}}：{{ x.TripInfo }}</span>
<span class="ml mr" v-if="x.UnitPrice>0">{{$t('objFill.jiage')}}：{{ x.UnitPrice }}</span>
<span class="ml mr" v-if="x.StopBusPrice>0">{{$t('objFill.tingchefei')}}：{{ x.StopBusPrice }}</span>
<span class="ml mr" v-if="x.RoomPrice>0">{{$t('objFill.v101.busManagement.shijizsf')}}：{{ x.RoomPrice }}</span>
<span class="ml"
>{{$t('ground.xiaoji')}}：{{ x.Money }} {{ item.CurrencyName }}</span
>
<span class="ml mr"
v-if="x.RoomPrice>0">{{$t('objFill.v101.busManagement.shijizsf')}}：{{ x.RoomPrice }}</span>
<span class="ml">{{$t('ground.xiaoji')}}：{{ x.Money }} {{ item.CurrencyName }}</span>
</div>
</div>
</template>
</el-table-column>
<el-table-column min-width="120" :label="$t('objFill.v101.BasicDocuments.chelianxx')" style="background:#EAEAEA">
<el-table-column min-width="120" :label="$t('objFill.v101.BasicDocuments.chelianxx')"
style="background:#EAEAEA">
<template slot-scope="scope">
<div><span class="c9e">{{$t('objFill.yongcheleix')}}：</span> {{ item.BusTypeName }}</div>
<template v-if="item.DriverInfo">
......@@ -484,30 +564,24 @@
{{ item.TeamName }}
</template>
</el-table-column>
<el-table-column
:label="$t('ground.xiaoji')"
min-width="70"
style="background:#EAEAEA"
>
<el-table-column :label="$t('ground.xiaoji')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ item.Money?item.Money.toFixed(2):0.00 }}</span>
</template>
</el-table-column>
<el-table-column
:label="$t('objFill.handpartscharge')"
min-width="70"
style="background:#EAEAEA"
>
<el-table-column :label="$t('objFill.handpartscharge')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ item.ShouPeiFee }}</span>
</template>
</el-table-column>
<template slot="append">
<div v-if="item.CreateRemark" style="padding:10px;color:#f1416c">{{$t('objFill.v101.busManagement.kehubeiz')}}：{{item.CreateRemark}}</div>
<div v-if="item.CreateRemark" style="padding:10px;color:#f1416c">
{{$t('objFill.v101.busManagement.kehubeiz')}}：{{item.CreateRemark}}</div>
<div v-if="item.Remark||pagesTitle=='OP'" style="padding:10px;color:#f1416c"
:style="{'padding':!item.CreateRemark&&item.isMore?'10px 10px 30px 10px':item.CreateRemark&&(item.isMore||!item.isMore)?'0 10px 30px 10px':'10px'}">
OP{{$t('pub.pubRemark')}}：{{item.Remark}}
<i v-if="item.OfferState!=1&&item.OfferState!=3&&pagesTitle=='OP'" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
<i v-if="item.OfferState!=1&&item.OfferState!=3&&pagesTitle=='OP'"
class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
</div>
<more v-if="item.isMore" @change="ViewMore(item,index)" :upIcon="item.upIcon"></more>
</template>
......@@ -538,7 +612,8 @@
</el-table-column>
<el-table-column :label="$t('restaurant.res_profit')" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
<span
class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
</el-table>
......@@ -546,83 +621,51 @@
<div class="column px15 bgf5 radius5 flex-g pa relative">
<div class="fz12">{{$t('objFill.collectiondocument')}}</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.IncomeList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.IncomeList"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="item.IncomeList.length == 0" class="c9e fz12">
{{$t('objFill.nocollectiondocument')}}
</span>
</div>
<el-tooltip
v-if="item.OfferState == 2"
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, index, 1)"
></i>
<el-tooltip v-if="item.OfferState == 2" 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, index, 1)"></i>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">{{$t('objFill.refundreceipt')}}</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.RefundList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundList"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="item.RefundList.length == 0" class="c9e fz12">
{{$t('objFill.norefundreceipt')}}
</span>
</div>
<el-tooltip
v-if="item.OfferState == 2"
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, index, 2)"
></i>
<el-tooltip v-if="item.OfferState == 2" 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, index, 2)"></i>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
<div class="fz12">{{$t('objFill.costdocument')}}</div>
<div class="row wrap orderNo fz12 py">
<span
class="cursor-pointer radius5 mr px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
v-for="(x, i) in item.CostList"
@click="openDetails(x)"
>{{ x.FrID }}</span
>
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostList"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="item.CostList.length == 0" class="c9e fz12">
{{$t('objFill.nocostdocument')}}
</span>
</div>
<div class="item absolute right20 bottom20" v-if="item.OfferState == 2 && pagesTitle != '销售'">
<el-tooltip class="" effect="dark" :content="$t('objFill.preparedocument')"
placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 3)"></i>
<el-tooltip class="" effect="dark" :content="$t('objFill.preparedocument')" placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" @click="makeAdocument(item, index, 3)"></i>
</el-tooltip>
<el-tooltip class="" effect="dark" :content="$t('objFill.balanceout')" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, index, 3)"></i>
<i class="el-icon-circle-plus cursor-pointer c3FC4FF" @click="isOffset(item, index, 3)"></i>
</el-tooltip>
</div>
</div>
......@@ -637,10 +680,7 @@
</span>
</div>
</div>
<div
class="row-c justify-sb py5"
v-if="item.DiscountsMoney>0"
>
<div class="row-c justify-sb py5" v-if="item.DiscountsMoney>0">
<span class="fz12 c9e">{{$t('sm.youhuijine')}}</span>
<div class="ml">
<span class="fz14">{{ item.DiscountsMoney.toFixed(2) }}</span>
......@@ -648,146 +688,87 @@
</div>
</div>
</div>
<div
v-if="item.OfferState!=3"
class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"
>
<div
v-if="
<div v-if="item.OfferState!=3" class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s">
<div v-if="
item.OfferState == 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)"
>
" class="row-c cursor-pointer radius5 cancel py5" @click="clickRightButtom(item, 0)">
<i v-loading="msg.Id==item.Id&&loading0"></i>
<span class="cF1416C">{{$t('sm.exitOrder')}}</span>
</div>
<div
v-if="item.OfferState == 1&&pagesTitle!='销售'&&item.OrderSource!=1"
class="row-c cursor-pointer radius5 confirm py5"
@click="clickRightButtom(item, 1)"
>
<div v-if="item.OfferState == 1&&pagesTitle!='销售'&&item.OrderSource!=1"
class="row-c cursor-pointer radius5 confirm py5" @click="clickRightButtom(item, 1)">
<i v-loading="msg.Id==item.Id&&loading1"></i>
<span class="c20C997">{{$t('ground.qrendindan')}}</span>
</div>
<div
v-if="pagesTitle!='销售'"
class="row-c cursor-pointer radius5 change py5"
@click="driver(item)"
>
<div v-if="pagesTitle!='销售'" class="row-c cursor-pointer radius5 change py5" @click="driver(item)">
<i v-loading="msg.Id==item.Id&&loading2"></i>
<span class="c059FF6">{{item.DriverInfo?$t('pub.edit'):$t('fnc.tianjia')}}{{$t('objFill.driver')}}/{{$t('objFill.chepaihao')}}</span>
<span
class="c059FF6">{{item.DriverInfo?$t('pub.edit'):$t('fnc.tianjia')}}{{$t('objFill.driver')}}/{{$t('objFill.chepaihao')}}</span>
</div>
<div
v-if="item.OfferState == 2"
class="row-c cursor-pointer radius5 confirm py5"
@click="clickSee(item)"
>
<div v-if="item.OfferState == 2" class="row-c cursor-pointer radius5 confirm py5" @click="clickSee(item)">
<span class="c20C997">{{$t('objFill.chakanbaojia')}}</span>
</div>
<div
v-if="item.OfferState == 1&&pagesTitle=='销售'"
class="row-c cursor-pointer radius5 change py5"
@click="goRoomDetails(item, '编辑团订')"
>
<div v-if="item.OfferState == 1&&pagesTitle=='销售'" class="row-c cursor-pointer radius5 change py5"
@click="goRoomDetails(item, '编辑团订')">
<span class="c059FF6">{{$t('objFill.dindanbiangeng')}}</span>
</div>
<div
v-if="item.OfferState > 3"
class="row-c cursor-pointer radius5 change1 py5"
@click="clickRightButtom(item, 2)"
>
<div v-if="item.OfferState > 3" class="row-c cursor-pointer radius5 change1 py5"
@click="clickRightButtom(item, 2)">
<i v-loading="msg.Id==item.Id&&loading2"></i>
<span class="c20C997">{{$t('fnc.shousun')}}</span>
</div>
</div>
</div>
<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;">{{item.CancelRemark}}</div>
<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;">{{item.CancelRemark}}
</div>
<div style="margin-left:12px;font-size:12px;font-family: microsoft yahei;">
{{item.CancelEmpName}} {{item.CancelTime}}
</div>
</div>
</div>
<!-- 设置收损 -->
<el-dialog
custom-class="w400"
:title="$t('objFill.shezhishoushunje')"
:visible.sync="outerVisible"
>
<el-dialog custom-class="w400" :title="$t('objFill.shezhishoushunje')" :visible.sync="outerVisible">
<div>
<el-form label-width="80px" :model="msg" :rules="rules" ref="msg">
<el-row :gutter="20">
<el-col :span="20">
<el-form-item :label="$t('salesModule.SSJE')" prop="LossMoney">
<el-input-number
class="w200"
v-model="msg.LossMoney"
:min="0"
:max="10000000"
></el-input-number>
<el-input-number class="w200" v-model="msg.LossMoney" :min="0" :max="10000000"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: 20px;margin-bottom: 20px;">
<el-col :span="24" style="text-align: right;">
<input
type="button"
class="normalBtn"
:value="$t('pub.saveBtn')"
@click="submitForm('msg')"
/>
<input
type="button"
class="hollowFixedBtn"
:value="$t('pub.cancelBtn')"
@click="(outerVisible = false), $refs['msg'].resetFields()"
/>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm('msg')" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')"
@click="(outerVisible = false), $refs['msg'].resetFields()" />
</el-col>
</el-row>
</el-form>
</div>
</el-dialog>
<!-- 取消订单 -->
<el-dialog
custom-class="w600"
:title="$t('sm.exitOrder')"
:visible.sync="cancelOrderDialog"
>
<el-dialog custom-class="w600" :title="$t('sm.exitOrder')" :visible.sync="cancelOrderDialog">
<div style="padding-bottom:20px">
<el-input
type="textarea"
autofocus
rows="5"
:placeholder="$t('objFill.quxiaodindanyy')"
clear="w300"
v-model="cancelRemark"
></el-input>
<el-input type="textarea" autofocus rows="5" :placeholder="$t('objFill.quxiaodindanyy')" clear="w300"
v-model="cancelRemark"></el-input>
<el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;">
<input
type="button"
class="normalBtn"
:value="$t('sm.exitOrder')"
@click="cancelOrderHandler"
/>
<input
type="button"
class="hollowFixedBtn"
:value="$t('pub.closeSel')"
@click="cancelOrderDialog = false"
/>
<input type="button" class="normalBtn" :value="$t('sm.exitOrder')" @click="cancelOrderHandler" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.closeSel')"
@click="cancelOrderDialog = false" />
</el-col>
</el-row>
</div>
</el-dialog>
<!-- 报价 -->
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="isShowPrice"
center min-width="1000px">
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="isShowPrice" center min-width="1000px">
<span style="font-weight: bold;font-size: 16px;
display: inline-block;
margin-bottom: 20px;">
......@@ -795,9 +776,9 @@
</span>
<!-- 表格 -->
<div v-if="postMsg.details && postMsg.details.length > 0">
<el-table :data="postMsg.details" max-height="300px" :summary-method="getSummaries"
show-summary :sum-text="$t('ground.xiaoji')"
:header-cell-style="{ background: '#eef1f6', color: '#606266' }" style="width: 100%" align='center'>
<el-table :data="postMsg.details" max-height="300px" :summary-method="getSummaries" show-summary
:sum-text="$t('ground.xiaoji')" :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
style="width: 100%" align='center'>
<el-table-column prop="UseDate" :label="$t('pub.date')" width="100">
</el-table-column>
<el-table-column prop="" :label="$t('objFill.v101.busManagement.dijitian')" width="80">
......@@ -816,8 +797,8 @@
</el-table-column>
<el-table-column prop="UnitPrice" :label="$t('objFill.jiage')" min-width="150">
<template slot-scope="scope">
<el-input-number v-if="priceType == 1" v-model="scope.row.UnitPrice" @change="calcPrice()"
:min="0" style="width:auto;"></el-input-number>
<el-input-number v-if="priceType == 1" v-model="scope.row.UnitPrice" @change="calcPrice()" :min="0"
style="width:auto;"></el-input-number>
<span v-if="priceType != 1">
{{ scope.row.UnitPrice }}
</span>
......@@ -825,7 +806,8 @@
</el-table-column>
<el-table-column prop="StopBusPrice" :label="$t('objFill.tingchefei')" min-width="150">
<template slot-scope="scope">
<el-input-number v-if="priceType == 1" v-model="scope.row.StopBusPrice" @change="calcPrice()" :min="0" style="width:auto;"></el-input-number>
<el-input-number v-if="priceType == 1" v-model="scope.row.StopBusPrice" @change="calcPrice()" :min="0"
style="width:auto;"></el-input-number>
<span v-if="priceType != 1">
{{ scope.row.StopBusPrice }}
</span>
......@@ -833,8 +815,8 @@
</el-table-column>
<el-table-column prop="RoomPrice" :label="$t('objFill.v101.busManagement.sijizhusf')" min-width="150">
<template slot-scope="scope">
<el-input-number v-if="priceType == 1" v-model="scope.row.RoomPrice" @change="calcPrice()"
:min="0" style="width:auto;"></el-input-number>
<el-input-number v-if="priceType == 1" v-model="scope.row.RoomPrice" @change="calcPrice()" :min="0"
style="width:auto;"></el-input-number>
<span v-if="priceType != 1">
{{ scope.row.RoomPrice }}
</span>
......@@ -853,13 +835,10 @@
{{$t('hotel.hotel_Currency')}}：
<span>
<template v-if="priceType == 1">
<el-select filterable v-model='postMsg.CurrencyId'
:placeholder="$t('rule.qxzbzhong')" class=" _border_b_1 w150">
<el-select filterable v-model='postMsg.CurrencyId' :placeholder="$t('rule.qxzbzhong')"
class=" _border_b_1 w150">
<!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> -->
<el-option v-for='item in coinGetList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
<el-option v-for='item in coinGetList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</template>
......@@ -872,8 +851,7 @@
{{$t('objFill.handpartscharge')}}：
<span class="c3FC4FF fz16">
<template v-if="priceType == 1">
<el-input-number v-model="postMsg.ShouPeiFee" :min="0"
@input="calcPrice()" style="width:120px;">
<el-input-number v-model="postMsg.ShouPeiFee" :min="0" @input="calcPrice()" style="width:120px;">
</el-input-number>
</template>
<template v-else>
......@@ -916,13 +894,16 @@
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<button v-if="priceType == 1" class="hollowFixedBtn" @click="confirmFun(1)">{{$t('objFill.v101.busManagement.zancunbaoj')}}</button>
<button v-if="priceType == 1" class="hollowFixedBtn"
@click="confirmFun(1)">{{$t('objFill.v101.busManagement.zancunbaoj')}}</button>
<button v-else class="hollowFixedBtn" @click="isShowPrice = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button v-if="priceType == 1" class="normalBtn" type="primary" @click="confirmFun(2)">{{$t('objFill.v101.busManagement.baocunbqd')}}</button>
<button v-if="priceType == 1" class="normalBtn" type="primary"
@click="confirmFun(2)">{{$t('objFill.v101.busManagement.baocunbqd')}}</button>
</div>
</el-dialog>
<!-- op备注 -->
<el-dialog custom-class='addCompany' :title="$t('objFill.bianjiopbz')" :visible.sync="isShowRemark" center width="400px">
<el-dialog custom-class='addCompany' :title="$t('objFill.bianjiopbz')" :visible.sync="isShowRemark" center
width="400px">
<el-row class="flex" style="margin-top: 10px;">
<el-col>
<span style="display: block;margin-bottom: 10px;">{{$t('pub.pubRemark')}}:</span>
......@@ -938,7 +919,8 @@
</div>
</el-dialog>
<!-- 添加司机车辆弹窗 -->
<el-dialog :title="$t('ground.cheliangxinxi')" :visible.sync="dialogVisible" width="400px" :before-close="handleClose">
<el-dialog :title="$t('ground.cheliangxinxi')" :visible.sync="dialogVisible" width="400px"
:before-close="handleClose">
<el-form label-width="80px" :model="drivermsg" :rules="rules" ref="drivermsg" style="width: 100%;">
<el-row>
<el-col>
......@@ -960,8 +942,8 @@
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
</div>
</template>
<script>
</template>
<script>
import offset from '../../../public/offset.vue';
import more from '../../../public/more.vue';
export default {
......@@ -969,10 +951,10 @@
offset,
more
},
props: ["OrderList","pagesTitle"],
props: ["OrderList", "pagesTitle"],
data() {
return {
queryObj:null,
queryObj: null,
cdState: false,
isShowRemark: false,
drivermsg: {
......@@ -981,7 +963,7 @@
BusNo: ""
},
dialogVisible: false,
coinGetList: [],//币种
coinGetList: [], //币种
labelPosition: 'right',
priceType: 1,
dialogTitle: this.$t('objFill.v101.busManagement.shezhibaoj'),
......@@ -1039,46 +1021,51 @@
msg: {
Id: "",
LossMoney: 0,
State: '',//状态 1确认 2已邮寄 3设置自提 4收损
State: '', //状态 1确认 2已邮寄 3设置自提 4收损
SelffetchAddress: ''
},
outerVisible: false,
rules: {
State: [
{
State: [{
required: true,
message: this.$t('objFill.qinxuanzhedindanzt'),
trigger: "change"
}
],
DriverInfo: [
{
}],
DriverInfo: [{
required: true,
message: this.$t('objFill.v101.busManagement.qingshursjmc'),
trigger: "blur"
}
],
BusNo: [
{
}],
BusNo: [{
required: true,
message: this.$t('objFill.qingshurucph'),
trigger: "blur"
}
]
}]
},
cancelOrderDialog: false,
cancelRemark: "",
cancelOrderId:0,
cancelOrderId: 0,
uploadOrderId: 0,
loading: false,
fileList:[],
fileList: [],
GuestFile: '',
ChangeOrderDialog: false,
OrderStatusType:[
{Name: this.$t('OrderList.orderStatus.apply'),ID:'1'},
{Name: this.$t('OrderList.orderStatus.check'),ID:'2'},
{Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'},
{Name: this.$t('OrderList.orderStatus.sun'),ID:'4'},
OrderStatusType: [{
Name: this.$t('OrderList.orderStatus.apply'),
ID: '1'
},
{
Name: this.$t('OrderList.orderStatus.check'),
ID: '2'
},
{
Name: this.$t('OrderList.orderStatus.cancel'),
ID: '3'
},
{
Name: this.$t('OrderList.orderStatus.sun'),
ID: '4'
},
],
items: null,
typeState: '',
......@@ -1087,40 +1074,40 @@
};
},
watch: {
pagesTitle(val,oldval){
pagesTitle(val, oldval) {
this.Title = val
},
OrderList:{
handler(val, oldVal){
OrderList: {
handler(val, oldVal) {
}
}
},
methods: {
ViewMore(x,index){
ViewMore(x, index) {
x.upIcon = !x.upIcon
if(x.upIcon){
if (x.upIcon) {
x.NewDetailList = JSON.parse(JSON.stringify(x.DetailList))
}else{
} else {
x.NewDetailList = []
x.DetailList.forEach((y,index)=>{
if(index<2){
x.DetailList.forEach((y, index) => {
if (index < 2) {
x.NewDetailList.push(y)
}
})
}
},
isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset')
isOffset(row, index, num) {
this.makeAdocument(row, index, num, 'Offset')
},
editRemark(item){
editRemark(item) {
this.postMsg.Id = item.Id
this.postMsg.Remark = item.Remark
this.isShowRemark = true
},
submitEditRemark(){
if(!this.postMsg.Remark){
submitEditRemark() {
if (!this.postMsg.Remark) {
this.$message.error(this.$t('objFill.v101.busManagement.opbeizhubnwk'));
return
}
......@@ -1180,9 +1167,11 @@
this.dialogVisible = true
},
//获取币种
financeinfo_post_GetList(){
this.apipost('financeinfo_post_GetList',{Name:''}, res => {
if(res.data.resultCode == 1) {
financeinfo_post_GetList() {
this.apipost('financeinfo_post_GetList', {
Name: ''
}, res => {
if (res.data.resultCode == 1) {
this.coinGetList = res.data.data;
}
}, err => {})
......@@ -1200,17 +1189,17 @@
},
// 制作单据
makeAdocument(row, index, num, Offset) {
if((num==2||num==3)&&row.Income<=0){
if ((num == 2 || num == 3) && row.Income <= 0) {
this.Info(this.$t('objFill.v101.busManagement.qingxzskdzzcbtk'))
return
}
if(Offset){
if (Offset) {
this.cdState = true
}
let type = 0
if(num==3){
if (num == 3) {
type = 2
}else{
} else {
type = num
}
this.BillMakingMsg.ReFinanceId = row.Id;
......@@ -1232,7 +1221,7 @@
tradeObj: JSON.stringify(this.BillMakingMsg)
};
this.queryObj = query
if(!Offset){
if (!Offset) {
this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
......@@ -1252,7 +1241,7 @@
}
});
},
clickSee(item){
clickSee(item) {
this.SetTripBusPrice(item)
},
clickRightButtom(item, type) {
......@@ -1265,9 +1254,9 @@
if (!this.loading0) {
this.cancelOrderId = item.Id
// 销售 OP
if(this.Title!='销售'){
if (this.Title != '销售') {
this.cancelOrderDialog = true;
}else{
} else {
let that = this
that.$confirm(this.$t('objFill.shifouquxiaodd'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
......@@ -1275,8 +1264,8 @@
type: 'warning'
}).then(() => {
this.cancelOrderHandler()
}).catch(err=>{
this.loading0= false
}).catch(err => {
this.loading0 = false
})
}
}
......@@ -1285,7 +1274,7 @@
// if (!this.loading1) {
// this.confirmFun(item, type);
// }
}else if (type == 2) {
} else if (type == 2) {
if (!this.loading2) {
this.outerVisible = true;
this.msg.LossMoney = item.LossMoney ? item.LossMoney : 0;
......@@ -1320,8 +1309,8 @@
this.postMsg.GuideInfo = tempData.GuideInfo;
this.postMsg.DriverInfo = tempData.DriverInfo;
this.postMsg.BusNo = tempData.BusNo;
this.postMsg.Remark = tempData.Remark?tempData.Remark:'';
this.postMsg.AttentionInfo = tempData.AttentionInfo?tempData.AttentionInfo:'';
this.postMsg.Remark = tempData.Remark ? tempData.Remark : '';
this.postMsg.AttentionInfo = tempData.AttentionInfo ? tempData.AttentionInfo : '';
this.postMsg.PayType = tempData.PayType;
this.postMsg.IsSure = tempData.IsSure;
this.postMsg.TeamName = tempData.TeamName;
......@@ -1353,11 +1342,11 @@
var tempStopBusPrice = 0;
var tempRoomPrice = 0;
var tempTotalPrice = 0;
this.postMsg.details&&this.postMsg.details.forEach(item=>{
this.postMsg.details && this.postMsg.details.forEach(item => {
// if(!item.UnitPrice){
// item.UnitPrice = 1
// }
item.Money = item.UnitPrice+item.StopBusPrice+item.RoomPrice
item.Money = item.UnitPrice + item.StopBusPrice + item.RoomPrice
if (item.UnitPrice) {
tempUnitPrice += Number(item.UnitPrice);
tempTotalPrice += Number(item.UnitPrice);
......@@ -1382,7 +1371,10 @@
},
// 合计列
getSummaries(param) {
const { columns, data } = param;
const {
columns,
data
} = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
......@@ -1393,7 +1385,7 @@
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)&&index==7) {
if (!isNaN(value) && index == 7) {
return prev + curr;
} else {
return '';
......@@ -1433,21 +1425,21 @@
this.loading0 = true
this.apipost("ticket_post_CancelSaleTicketOrder", {
Id: this.cancelOrderId,
IsOPCancel: this.Title!='销售'?1:0,
IsOPCancel: this.Title != '销售' ? 1 : 0,
CancelRemark: this.cancelRemark
},
res => {
this.loading0= false
this.loading0 = false
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$emit("success");
} else {
this.Error(res.data.message);
}
}).catch(err=>{
this.loading0= false
}).catch(err => {
this.loading0 = false
})
}).catch(()=>{
}).catch(() => {
this.loading0 = false
})
},
......@@ -1466,24 +1458,23 @@
});
},
cancelOrderHandler() {
if (this.cancelRemark == ""&&this.Title!='销售') {
if (this.cancelRemark == "" && this.Title != '销售') {
this.Error(this.$t('objFill.quxiaodindanyy'));
return;
}
if (this.loading0) return;
this.loading0 = true
this.apipost('tripbus_CancelSellBusTrip',
{
this.apipost('tripbus_CancelSellBusTrip', {
Id: this.cancelOrderId,
IsOP: this.Title!='销售'?1:0,
Remark: this.Title!='销售'?this.cancelRemark:''
IsOP: this.Title != '销售' ? 1 : 0,
Remark: this.Title != '销售' ? this.cancelRemark : ''
},
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.cancelOrderDialog=false
this.cancelOrderId=0
this.cancelRemark=''
this.cancelOrderDialog = false
this.cancelOrderId = 0
this.cancelRemark = ''
this.$emit("success");
} else {
this.Error(res.data.message);
......@@ -1507,8 +1498,7 @@
.then(() => {
this.loading2 = true;
this.apipost(
"CarSingle_post_SetAdminCarOrderState",
{
"CarSingle_post_SetAdminCarOrderState", {
Id: this.msg.Id,
State: this.typeState,
LossMoney: this.msg.LossMoney,
......@@ -1531,15 +1521,15 @@
.catch(() => {});
},
confirmFun(type) {
if(!this.postMsg.CurrencyId){
if (!this.postMsg.CurrencyId) {
this.Error(this.$t('rule.qxzbzhong'));
return
}
this.postMsg.OfferState = type
let text
if(type==1){
if (type == 1) {
text = this.$t('objFill.v101.busManagement.shifzcgbj')
}else{
} else {
text = this.$t('objFill.v101.busManagement.shifbcbjbqr')
}
this.$confirm(text, this.$t('tips.tips'), {
......@@ -1559,7 +1549,7 @@
CopyHandler(item) {
this.copyId = item.Id;
let copyText = item.Id;
const save = function(e) {
const save = function (e) {
e.clipboardData.setData('text/plain', copyText)
e.preventDefault() // 阻止默认行为
}
......@@ -1604,4 +1594,5 @@
};
}
};
</script>
</script>
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