车行订单翻译

src/assets/common/lang/zh.js

@@ -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
+export const ground = Ground
\ No newline at end of file
+export const objFill = ObjFill

src/assets/common/lang/zhCN/fill.js

+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;

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -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