Commit 455a0134 authored by youjie's avatar youjie

车行订单翻译

parent a144c31f
......@@ -37,7 +37,7 @@ export const OrderList = {
cancel: '已取消',
sun: '收损订单'
}
}
export const pub={
......@@ -397,7 +397,7 @@ export const admin={ //行政
table_operattime:'操作时间',
table_operat:'操作',
product_name:'产品名称',
product_type_name:'房间类型',
product_type_name:'房间类型',
table_hotelname:'酒店名称',
table_Address:'酒店地址',
table_areaDetail:'请输入详细地址',
......@@ -409,7 +409,7 @@ export const admin={ //行政
table_UseAmount:'使用数量',
table_CostPrice:'总成本',
table_TotalPrice:'交易总金额',
table_servers:'服务人数',
suplier_name:'供应商名称',
suplier_contact:'联系人',
......@@ -420,7 +420,7 @@ export const admin={ //行政
hotel_remain:'余',
hotel_remainList:'剩余',
hotel_roomTypeOne:'红色表示未还',
hotel_roomTypeTwo:'绿色表示已还',
hotel_roomTypeTwo:'绿色表示已还',
hotel_roomUsed:'已用',
hotel_room:'间',
hotel_OccupancyTime:'用房时间',
......@@ -531,7 +531,7 @@ export const admin={ //行政
res_SpringHotel:'温泉酒店',
res_package:'套餐',
res_packageName:'套餐名称',
res_package_type_Name:'套餐类型',
res_package_type_Name:'套餐类型',
res_suplierName:'供应商名称',
res_belongArea:'所在区域',
res_Number:'数量',
......@@ -742,11 +742,11 @@ export const visa = {
v_britishVisa:'英国签证',
v_EuropeanVisaName:'欧洲签证名称',
v_visaInformation:'签证资料',
}
export const advmanager = {
v_all:'全部',
......@@ -852,7 +852,7 @@ export const fnc = {
fnc_tfsrhj: '团费收入合计',
fnc_zksr: '直客收入',
fnc_thjksr: '同行交客收入',
fnc_plattev: '平台收入',
fnc_plattev: '平台收入',
acc: '账户',
accBming: '账户别名:',
accType: '账户类型:',
......@@ -1605,7 +1605,7 @@ export const rule = {
qsrzjine: '请输入总金额',
qxzrzshijian: '请选择入职时间!',
qsrzqdqq: '请输入正确的qq!',
EnterContratPerson:'请输入联系人',
EnterCustomer:'请输入客户名',
EnterPNum:'请输入联系电话',
......@@ -1680,7 +1680,7 @@ export const adm={
adm_Rolename:"角色名称",
adm_quanxian:"权限",
adm_qsrmiaoshu:"请输入描述",
adm_qxshezhi:"权限设置",
adm_qxshezhi:"权限设置",
adm_Bindingattendance:"绑定考勤",
adm_title:"标题",
adm_Publisher:"发布人",
......@@ -1695,7 +1695,7 @@ export const adm={
adm_roof:"置顶",
adm_exitroof:"取消置顶",
adm_shifouroof:"是否置顶?",
adm_chehui:"撤回",
adm_fujian:"附件",
adm_download:"下载",
......@@ -1734,7 +1734,7 @@ export const adm={
adm_Thursday:"星期四",
adm_Friday:"星期五",
adm_Saturday:"星期六",
}
export const visaT = {
cxjihua: '出行计划',
......@@ -1874,7 +1874,7 @@ export const MarketingActi={
commTypename:'商品类型名称',
typeNum:'类型编号',
notShow:'不显示',
commName:'商品名称',
commType:'商品类型',
commActivity:'商品活动',
......@@ -1886,13 +1886,13 @@ export const MarketingActi={
RestrictionNumber:'限购数',
DistributionInstructions:'配送说明',
ActivitiesInvolved:'所属活动',
commState:'商品状态',
ActivityNum:'活动编号',
ActivityName:'活动名称',
ActivityImg:'活动图片',
ActivityDes:'活动描述',
commActivityName:'商品活动名称',
ActivityPro:'活动介绍',
commState:'商品状态',
ActivityNum:'活动编号',
ActivityName:'活动名称',
ActivityImg:'活动图片',
ActivityDes:'活动描述',
commActivityName:'商品活动名称',
ActivityPro:'活动介绍',
CommActivitytubiao:'商品活动图标',
}
//销售模块
......@@ -2478,7 +2478,7 @@ export const sm={
person:'人',
zuoweishu:'座位数',
cantingbiangeng:'餐厅变更',
dingdanxinxi:'订单信息',
yitijiao:'已提交',
fangansheji:'方案设计',
......@@ -2530,7 +2530,7 @@ export const sm={
qrhOrderbhzdqx:'确认后,订单不会自动取消',
qxhddhzdqx:'取消后,订单会自动取消',
quxiaocg:'取消成功',
airbianma:'机票编码',
Date:'日期',
kerenshul:'客人数量',
......@@ -2664,5 +2664,7 @@ export const op={
import invoicesManager from './zhCN/invoicesManager'
import Ground from './zhCN/Ground'
import ObjFill from './zhCN/fill'
export const ios = invoicesManager
export const ground = Ground
\ No newline at end of file
export const ground = Ground
export const objFill = ObjFill
export const obj = {
//#region ending v1.0.0
orderid: '订单Id',
pickup: '接机',
send: '送机',
halfday: '半天',
allday: '全天',
oneclickfinish: '一键完结',
finished: '已完结',
uncompleted: '未完结',
copy: '复制',
copied: '已复制',
petition: '请求书',
guestinfor: '客人信息',
orderholder: '下单人',
driver: '司机',
assistantdriver: '副司机',
preparedocument: '制单',
collectiondocument: '收款单据',
nocollectiondocument: '暂无收款单据',
refundreceipt: '退款单据',
norefundreceipt: '暂无退款单据',
costdocument: '成本单据',
nocostdocument: '暂无成本单据',
invoicedocument: '发票单据',
noinvoicedocument: '暂无发票单据',
balanceout: '冲抵',
groundsforcancellation: '取消理由',
caravanshopcol: {
t1: '车/使用时间/天数',
t2: '用车详情',
t3: '总金额',
t4: '代收金额',
t5: '实收',
t6: '退款',
t7: '平台在途金额',
t8: '平台税金',
t9: '成本金额',
},
unit: {
day: '天',
thefirst: '第',
}
//#endregion
}
export default obj;
......@@ -512,7 +512,8 @@
<div>
<div style="text-align: right;position: fixed;top: 62px; right: 89px;">
<el-button class="hollowFixedBtn" v-if="pagesTitle=='OP'" @click="setCompleted" :loading="CompletedLoading">一键完结
<el-button class="hollowFixedBtn" v-if="pagesTitle=='OP'"
@click="setCompleted" :loading="CompletedLoading">{{$t('objFill.oneclickfinish')}}
</el-button>
</div>
<el-table ref="multipleTable" :data="OrderList" tooltip-effect="dark" style="width: 100%" row-key="OrderId"
......@@ -527,7 +528,7 @@
<!-- active activeNo -->
<div class="orderType cf fz12"
:class="[scope.row.IsFinish==1?'active':'']">
{{scope.row.IsFinish==1?'已完结':'未完结'}}
{{scope.row.IsFinish==1?$t('objFill.finished'):$t('objFill.uncompleted')}}
</div>
</div>
<div class="cblack fz14 mr" v-if="scope.row.IsFinish == 1">
......@@ -541,25 +542,27 @@
<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)">复制</span>
<span v-else class="copy c059FF6 bgD9F3FF cursor-pointer"><i class="el-icon-check mr"></i>已复制</span>
@click="CopyHandler(scope.row)">{{$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 class="cblack fz12 mr" v-if="false">
<span class="">
<span class="c9e">请求书</span>
<span class="c9e">{{$t('objFill.petition')}}</span>
<span class="text-grey-6">{{scope.row.PetitionId}}</span>
</span>
</div>
</div>
<div class="c9e fz12">
<span>客人信息{{scope.row.CustomerName}}
<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="row c9e fz12">
<span class="mr">下单人
<span class="mr">{{$t('objFill.orderholder')}}
{{scope.row.CreateByName}}/{{scope.row.CreateDateStr}}
</span>
<div class="">
......@@ -578,23 +581,23 @@
</div>
<div class="mb">
<el-table :data="[scope.row]" style="width:100%" border>
<el-table-column label="车/使用时间/天数)" min-width="100" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t1')" min-width="100" style="background:#EAEAEA">
<template slot-scope="scopes">
<div>{{scope.row.CarModel.CarName+'/'+scope.row.CarModel.CarNo }}</div>
<span style="color: #999999;">{{ scope.row.UseDate }}</span>
<span style="color: #999999;">{{ scope.row.UseDay }}</span>
</template>
</el-table-column>
<el-table-column label="用车详情" min-width="200" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t2')" min-width="200" style="background:#EAEAEA">
<template slot-scope="scope">
<div class="RoomList">
<div class="fz12 c9e" v-for="(x, i) in scope.row.NewOrderDetailList">
<span class="mr"
>{{x.Day}}</span
>{{$t('objFill.unit.thefirst')}} {{x.Day}} {{$t('objFill.unit.day')}}</span
>
<span class="ml mr">司机: {{x.DriverModel.DriverName}}/{{x.DriverModel.DriverTel}}</span>
<span class="ml mr" v-if="x.CopilotDriverModel">副司机{{x.CopilotDriverModel.DriverName}}/{{x.CopilotDriverModel.DriverTel}}</span>
<span class="ml mr">{{$t('objFill.driver')}}: {{x.DriverModel.DriverName}}/{{x.DriverModel.DriverTel}}</span>
<span class="ml mr" v-if="x.CopilotDriverModel">{{$t('objFill.assistantdriver')}}{{x.CopilotDriverModel.DriverName}}/{{x.CopilotDriverModel.DriverTel}}</span>
<span class="ml"
> {{ x.useTypeInfo.StatusName }} </span
>
......@@ -602,43 +605,43 @@
</div>
</template>
</el-table-column>
<el-table-column label="总金额" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t3')" style="background:#EAEAEA">
<template slot-scope="scope">
{{ scope.row.Money }}
</template>
</el-table-column>
<el-table-column label="代收金额" min-width="70" style="background:#EAEAEA">
<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="实收" min-width="70" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t5')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income }}</span>
</template>
</el-table-column>
<el-table-column label="退款" min-width="70" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t6')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Refund }}</span>
</template>
</el-table-column>
<el-table-column label="平台在途金额" min-width="70" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t7')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.PlatformMoney }}</span>
</template>
</el-table-column>
<el-table-column label="平台税金" min-width="70" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t8')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.PlatformTax }}</span>
</template>
</el-table-column>
<el-table-column label="成本金额" min-width="70" style="background:#EAEAEA">
<el-table-column :label="$t('objFill.caravanshopcol.t9')" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.CostMoney }}</span>
</template>
</el-table-column>
<template slot="append" v-if="scope.row.Remark||scope.row.isMore">
<div style="padding:10px;color:#f1416c">备注{{scope.row.Remark}}
<div style="padding:10px;color:#f1416c">{{$t('pub.pubRemark')}}{{scope.row.Remark}}
</div>
<div :style="{'height': scope.row.isMore?'20px':''}"></div>
<more v-if="scope.row.isMore" @change="ViewMore(scope.row,index)" :upIcon="scope.row.upIcon"></more>
......@@ -648,57 +651,57 @@
<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="column px15 bgf5 radius5 flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">收款单据</div>
<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"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="scope.row.IncomeList.length == 0" class="c9e fz12">
暂无收款单据
{{$t('objFill.nocollectiondocument')}}
</span>
</div>
<el-tooltip v-if="scope.row.OrderState == 1" class="item" effect="dark" content="制单" placement="top">
<el-tooltip v-if="scope.row.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>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">退款单据</div>
<div class="fz12">{{$t('objFill.refundreceipt')}}</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.RefundList"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="scope.row.RefundList.length == 0" class="c9e fz12">
暂无退款单据
{{$t('objFill.norefundreceipt')}}
</span>
</div>
<el-tooltip v-if="scope.row.OrderState == 1" class="item" effect="dark" content="制单" placement="top">
<el-tooltip v-if="scope.row.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>
</el-tooltip>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">成本单据</div>
<div class="fz12">{{$t('objFill.costdocument')}}</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.CostList"
@click="openDetails(x)">{{ x.FrID }}</span>
<span v-if="scope.row.CostList.length == 0" class="c9e fz12">
暂无成本单据
{{$t('objFill.nocostdocument')}}
</span>
</div>
<div class="item absolute right20 bottom20" v-if="scope.row.OrderState == 1 && pagesTitle != '销售'">
<el-tooltip class="" effect="dark" content="制单" placement="top">
<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>
</el-tooltip>
<el-tooltip v-if="scope.row.OrderState == 1" class="" effect="dark" content="冲抵" placement="top">
<el-tooltip v-if="scope.row.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>
</el-tooltip>
</div>
</div>
<div v-if="false" class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="fz12">发票单据</div>
<div class="fz12">{{$t('objFill.invoicedocument')}}</div>
<div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
......@@ -706,7 +709,7 @@
'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">
暂无发票单据
{{$t('objFill.noinvoicedocument')}}
</span>
</div>
</div>
......@@ -718,17 +721,17 @@
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>
<span class="cF1416C">取消订单</span>
<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>
<span class="c20C997">确认订单</span>
<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>
<span class="c20C997">收损</span>
<span class="c20C997">{{$t('fnc.shousun')}}</span>
</div>
<div v-if="scope.row.OrderState >1 && scope.row.OrderState != 3
&& scope.row.OrderState != 4
......@@ -744,7 +747,7 @@
</div>
</div>
<div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">
<div style="font-size:16px;font-weight:bold;font-family: pingfangR;">取消理由</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;">
{{ scope.row.CancelRemark }}
</div>
......
......@@ -162,7 +162,7 @@
</li>
<li>
<span><em>{{ $t('OrderList.search.orderId') }}</em>
<el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" />
<el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.v100.orderid')" />
</span>
</li>
<li>
......@@ -213,16 +213,16 @@ export default {
return {
useTypes: [
{
StatusName: '接機',StatusId: 1
StatusName: this.$t('objFill.v100.pickup'),StatusId: 1
},
{
StatusName: '送機',StatusId: 2
StatusName: this.$t('objFill.v100.send'),StatusId: 2
},
{
StatusName: '半天',StatusId: 3
StatusName: this.$t('objFill.v100.halfday'),StatusId: 3
},
{
StatusName: '全天', StatusId: 4
StatusName: this.$t('objFill.v100.allday'), StatusId: 4
}
],
userInfo: {},
......@@ -238,7 +238,7 @@ export default {
msg: {
pageIndex: 1,
pageSize: 5,
OrderId: 0,
OrderId: '0',
CustomerId: 0,
UseSTime: "",
UseETime: "",
......@@ -251,12 +251,6 @@ export default {
{ Name: this.$t('pub.normalSel'), ID: '1' },
{ Name: this.$t('OrderList.orderStatus.cancel'), ID: '2' },
],
MailingStateType: [
{ Name: '自行取票', ID: '1' },
{ Name: '邮寄票券', ID: '2' },
// {Name: '已邮寄票券',ID:'3'},
{Name: '电子券',ID:'4'},
],
orderType: [
{ Name: this.$t('OrderList.orderType.tour'), ID: '1' },
{ Name: this.$t('OrderList.orderType.guest'), ID: '2' },
......@@ -363,6 +357,7 @@ export default {
},
//获取酒店订单列表
GetList() {
if(this.msg.OrderId=='') this.msg.OrderId = 0
this.loading = true
let url
// 销售 OP
......
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