Merge remote-tracking branch 'origin/dev' into dev

src/api/iosBasicData/reports.js

@@ -82,3 +82,26 @@ export const generateMailFile = (row) => {
         data: row
     })
 }
+
+export const getDocumentTypesList = (current, size, params) => {
+    return request({
+        url: '/api/blade-los/bdocumenttypes/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
+}
+
+export const getDocumentTypesListAll = (params) => {
+    return request({
+        url: '/api/blade-los/bdocumenttypes/listAll',
+        method: 'get',
+        params: {
+            ...params,
+        }
+    })
+}
+

src/api/system/menu.js

@@ -97,10 +97,8 @@ export const getTopMenu = () => request({
   method: 'get'
 });
 
-export const getRoutes = (topMenuId) => request({
+export const getRoutes = (data) => request({
   url: '/api/blade-system/menu/routes',
   method: 'get',
-  params: {
-    topMenuId,
-  }
+  params:data
 });

src/lang/en.js

@@ -64,7 +64,7 @@ export default {
     data: 'data',
     error: 'error',
     test: 'test',
-    saleOrderL:'saleOrder(L)'
+    saleOrderL: 'saleOrder(L)'
   },
   login: {
     title: 'Login ',
@@ -106,5 +106,257 @@ export default {
     clearCache: 'Clear Cache',
     closeOthers: 'Close Others',
     closeAll: 'Close All'
+  },
+  land118n: {
+    corpName: '客户',
+    branchName: '所属公司',
+    mblno: '提单号',
+    shippingCost: '运费',
+    freightReceivable: '应收运费',
+    extraAmountD: '应收杂费',
+    extraAmountC: '应付杂费',
+    hblno: 'HB/L NO ',
+    billType: '单据类型',
+    localStatus: '物流状态',
+    logisticsTransportation: '物流运输',
+    transportationScheduling: '运输调度',
+    caseNumber: '箱号',
+    sealNumber: '铅封号',
+    freightLocation: '货运地点',
+    pickupDate: '提箱日期',
+    contact: '联系人',
+    transferOrderStatus: '转单状态',
+    billNo: '单据编号',
+    salesperson: '业务员',
+    billDate: '委托日期',
+    documentNumber: '票据号',
+    contactNumber: '联系电话',
+    vessel: '船名',
+    voy: '航次',
+    address: '地址',
+    status: '状态',
+    operation: '操作',
+    op: '操作员',
+    etd: '开船日期',
+    eta: '到港日期',
+    carrier: '承运人',
+    pol: '起运港',
+    pod: '目的港',
+    acceptDate: '受理日期',
+    arrivalTime: '实际到厂时间',
+    motorcade: '车队',
+    vehicleNumber: '车号',
+    driver: '司机',
+    goods: '货物',
+    loadingAndUnloading: '装卸货',
+    bicycleFreight: '单车运费',
+    placeDelivery: '交货地',
+    lane: '航线',
+    CY: '场站',
+    businessSource: '业务来源',
+    businessName: '来源明细',
+    scndesc: '收发通人',
+    feeStatus: '费用状态',
+    cost: '费用',
+    sourceBillNo: '来源单号',
+    debitStatus: '收费状态',
+    creditStatus: '付费状态',
+    createBy: '创建人',
+    orderBy: '排序方式',
+    processing: '待处理',
+    waitApply: '待请核',
+    completed: '已完成',
+    all: '全部',
+    enteringStatus: '接单状态',
+    entering: '接单',
+    generateNo: '出号',
+    onBoard: '开船',
+    onArrival: '到港',
+    masteNo: '主编号',
+    hblCount: '分单数',
+    customerService: '客服',
+    ctnrTypeQty: '箱型箱量',
+    boxType: '箱型',
+    payableLandFreight: '应付陆运费',
+    completionDate: '完工日期',
+    singleContainerFreight: '单柜运费',
+    cargoType: '货物类别',
+    bookingAgent: '订舱代理',
+    freightDate: '货运日期',
+    marks: '唛头',
+    descOfGoods: '货描',
+    QTY: '件数',
+    package: '包装',
+    GW: '毛重',
+    NETGW: '净重',
+    CBM: '体积',
+    TEU: 'TEU',
+    hblTeu: '分单TEU',
+    ttlDebit: '合计收',
+    auditStatus: '审核状态',
+    applyStatus: '付费申请状态',
+    checkStatus: '对账状态',
+    debitStlStatus: '收费状态',
+    creditStlStatus: '付费状态',
+    invoiceStatus: '发票状态',
+    createTime: '创建时间',
+    billStatus: '业务状态',
+    bookStatus: '订舱状态',
+    financeStatus: '财务状态',
+    remarks: '备注',
+    orderInfo: '委托信息',
+    otherInformation: '其它信息',
+    boxInformation: '箱信息',
+    addressInformation: '地址信息',
+    vehicleInformation: '车辆信息',
+    incidentalExpenses: '杂费',
+    receivableCharges: '应收',
+    accruedExpenses: '应付费用',
+    uploadAttachment: '上传附件',
+    info: '信息',
+    billInfo: '提单信息',
+    feeInfo: '费用信息',
+    docCenter: '单证中心',
+    ctnrList: '配箱信息',
+    masterBill: 'MB/L',
+    reportManage: '报表管理',
+    fileCerter: '文件中心',
+    fileName: '文件名称',
+    filePath: '文件地址',
+    fileProperties: '文件属性',
+    hblnolist: '分单列表',
+    shipper: '发货人',
+    cnee: '收货人',
+    notify: '通知人',
+    agent: '国外代理',
+    issueDate: '签单日期',
+    issueType: '签单方式',
+    issuePlace: '签单地点',
+    bookRemarks: '订舱备注',
+    siRemarks: 'SI备注',
+    SOCORCOC: '箱属',
+    ctnrType: '箱型',
+    ctnrQty: '箱量',
+    bookingDate: '订舱日期',
+    polFreeTime: 'POL免箱使天数',
+    podTreeTime: 'POD免箱使天数',
+    noOfCopy: '副本份数',
+    businessType: '业务类型',
+    transportationMode: '运输方式',
+    limitWeight: '限制重量',
+    limitSpace: '限制舱位',
+    shippingTerms: '服务方式',
+    payment: '付款方式',
+    docCutofftime: '截单时间',
+    portCutofftime: '截港时间',
+    shippingAgent: '船代',
+    spaceType: '舱位类型',
+    spaceQty: '舱位数量',
+    bookCanceldate: '退舱日期',
+    loadingType: '装箱方式',
+    noOfForiginal: '正本份数',
+    hblPaymentPlace: 'HBL付款地点',
+    mblPaymentPlace: 'MBL付款地点',
+    modifier: '修改人',
+    modifiedDate: '修改日期',
+    debit: '收费',
+    credit: '付费',
+    amount: '金额',
+    settlementAmount: '结算金额',
+    settlementTime: '结算时间',
+    entrustmentRemarks: '委托备注',
+    fleetRemarks: '车队备注',
+    sRemarks: '司机备注',
+    taxRate: '税率',
+    corpType: '客户类别',
+    chargeCorp: '收费对象',
+    payCorp: '付费对象',
+    unitNo: '计价单位',
+    currency: '币别',
+    exrate: '汇率',
+    price: '单价',
+    quantity: '数量',
+    localCurrency: '本币',
+    foreignCurrency: '外币',
+    reportNo: '报表编码',
+    ctnDetail: '计划箱量',
+    dispatchCtnDetail: '已派箱量',
+    sendCtnDetail: '受理箱量',
+    corpShortName: '公司名称',
+    orderNo: '订单号',
+    factory: '船名航次',
+    size: '尺码',
+    landWeight: '重量(吨)',
+    tel: '电话',
+    datetime: '提箱时间',
+    plateNo: '车牌号',
+    ctnOne: '箱号一',
+    ctnTwo: '箱号二',
+    fleetVolum: '车型',
+    addressDetail: '装货地点',
+    unloadingPlace: '卸货地点',
+    dispatchNumber: '派车单号',
+    freightPay: '应付运费',
+    freightCollect: '应收运费',
+  },
+  landbtn118n: {
+    newDD: '创建直单',
+    newMM: '创建主单',
+    newMH: '创建分单',
+    copy: '复制',
+    new: '新建',
+    importTemplate: '导入模版',
+    preview: '预览',
+    save: '保存',
+    mdBillType: '修改类型',
+    mhAddmm: '分单->主单',
+    offLoad: '退舱',
+    cancelOffLoad: '撤销退舱',
+    deleted: '删除',
+    edit: '编辑',
+    toDebit: '生成应收',
+    toCredit: '生成应付',
+    exportData: '导出数据',
+    debitTemplate: '收费模版',
+    creditTemplate: '付费模版',
+    costTemplate: '成本模版',
+    submitDebit: '提交收费',
+    submitCredit: '提交付费',
+    printBill: '打印账单',
+    toList: '返回列表',
+    previous: '上一票',
+    next: '下一票',
+    localApply: '物流提交',
+    unlocalApply: '撤销物流提交',
+    transferApply: '转单',
+    unltransferApply: '撤销转单',
+    setInfoMMToMH: '同步主单到分单',
+    getInfoMMToMH: '同步分单到主单',
+    apply: '请求锁单',
+    unapply: '撤销锁定',
+    checked: '审核',
+    applyFee: '请核费用',
+    unApplyFee: '撤销请核',
+    applyModify: '申请修改',
+    applyDelete: '申请删除',
+    unAplly: '取消申请',
+    applyInvoice: '申请发票',
+    applyPay: '申请付费',
+    SIInfoImport: 'SI导入',
+    allShort: 'A',
+    all: '全部',
+    submitShort: 'S',
+    notSubmitted: '未提交',
+    scheduledShort: 'S',
+    noScheduled: '未调度',
+    noDispatched: '未派车',
+    dispatchedShort: 'D',
+    noAcceptanced: '未受理',
+    acceptanceShort: 'A',
+    noCompleted: '未完工',
+    completedShort: 'C',
+    closed: '已关闭',
+    closedShort: 'C',
+    completed: '已完工',
   }
 }

src/lang/zh.js

@@ -105,6 +105,257 @@ export default {
     clearCache: '清除缓存',
     closeOthers: '关闭其它',
     closeAll: '关闭所有'
+  },
+  land118n: {
+    corpName: '客户',
+    branchName: '所属公司',
+    mblno: '提单号',
+    shippingCost: '运费',
+    freightReceivable: '应收运费',
+    extraAmountD: '应收杂费',
+    extraAmountC: '应付杂费',
+    hblno: 'HB/L NO ',
+    billType: '单据类型',
+    localStatus: '物流状态',
+    logisticsTransportation: '物流运输',
+    transportationScheduling: '运输调度',
+    caseNumber: '箱号',
+    sealNumber: '铅封号',
+    freightLocation: '货运地点',
+    pickupDate: '提箱日期',
+    contact: '联系人',
+    transferOrderStatus: '转单状态',
+    billNo: '单据编号',
+    salesperson: '业务员',
+    billDate: '委托日期',
+    documentNumber: '票据号',
+    contactNumber: '联系电话',
+    vessel: '船名',
+    voy: '航次',
+    address: '地址',
+    status: '状态',
+    operation: '操作',
+    op: '操作员',
+    etd: '开船日期',
+    eta: '到港日期',
+    carrier: '承运人',
+    pol: '起运港',
+    pod: '目的港',
+    acceptDate: '受理日期',
+    arrivalTime: '实际到厂时间',
+    motorcade: '车队',
+    vehicleNumber: '车号',
+    driver: '司机',
+    goods: '货物',
+    loadingAndUnloading: '装卸货',
+    bicycleFreight: '单车运费',
+    placeDelivery: '交货地',
+    lane: '航线',
+    CY: '场站',
+    businessSource: '业务来源',
+    businessName: '来源明细',
+    scndesc: '收发通人',
+    feeStatus: '费用状态',
+    cost: '费用',
+    sourceBillNo: '来源单号',
+    debitStatus: '收费状态',
+    creditStatus: '付费状态',
+    createBy: '创建人',
+    orderBy: '排序方式',
+    processing: '待处理',
+    waitApply: '待请核',
+    completed: '已完成',
+    all: '全部',
+    enteringStatus: '接单状态',
+    entering: '接单',
+    generateNo: '出号',
+    onBoard: '开船',
+    onArrival: '到港',
+    masteNo: '主编号',
+    hblCount: '分单数',
+    customerService: '客服',
+    ctnrTypeQty: '箱型箱量',
+    boxType: '箱型',
+    payableLandFreight: '应付陆运费',
+    completionDate: '完工日期',
+    singleContainerFreight: '单柜运费',
+    cargoType: '货物类别',
+    bookingAgent: '订舱代理',
+    freightDate: '货运日期',
+    marks: '唛头',
+    descOfGoods: '货描',
+    QTY: '件数',
+    package: '包装',
+    GW: '毛重',
+    NETGW: '净重',
+    CBM: '体积',
+    TEU: 'TEU',
+    hblTeu: '分单TEU',
+    ttlDebit: '合计收',
+    auditStatus: '审核状态',
+    applyStatus: '付费申请状态',
+    checkStatus: '对账状态',
+    debitStlStatus: '收费状态',
+    creditStlStatus: '付费状态',
+    invoiceStatus: '发票状态',
+    createTime: '创建时间',
+    billStatus: '业务状态',
+    bookStatus: '订舱状态',
+    financeStatus: '财务状态',
+    remarks: '备注',
+    orderInfo: '委托信息',
+    otherInformation: '其它信息',
+    boxInformation: '箱信息',
+    addressInformation: '地址信息',
+    vehicleInformation: '车辆信息',
+    incidentalExpenses: '杂费',
+    receivableCharges: '应收',
+    accruedExpenses: '应付费用',
+    uploadAttachment: '上传附件',
+    info: '信息',
+    billInfo: '提单信息',
+    feeInfo: '费用信息',
+    docCenter: '单证中心',
+    ctnrList: '配箱信息',
+    masterBill: 'MB/L',
+    reportManage: '报表管理',
+    fileCerter: '文件中心',
+    fileName: '文件名称',
+    filePath: '文件地址',
+    fileProperties: '文件属性',
+    hblnolist: '分单列表',
+    shipper: '发货人',
+    cnee: '收货人',
+    notify: '通知人',
+    agent: '国外代理',
+    issueDate: '签单日期',
+    issueType: '签单方式',
+    issuePlace: '签单地点',
+    bookRemarks: '订舱备注',
+    siRemarks: 'SI备注',
+    SOCORCOC: '箱属',
+    ctnrType: '箱型',
+    ctnrQty: '箱量',
+    bookingDate: '订舱日期',
+    polFreeTime: 'POL免箱使天数',
+    podTreeTime: 'POD免箱使天数',
+    noOfCopy: '副本份数',
+    businessType: '业务类型',
+    transportationMode: '运输方式',
+    limitWeight: '限制重量',
+    limitSpace: '限制舱位',
+    shippingTerms: '服务方式',
+    payment: '付款方式',
+    docCutofftime: '截单时间',
+    portCutofftime: '截港时间',
+    shippingAgent: '船代',
+    spaceType: '舱位类型',
+    spaceQty: '舱位数量',
+    bookCanceldate: '退舱日期',
+    loadingType: '装箱方式',
+    noOfForiginal: '正本份数',
+    hblPaymentPlace: 'HBL付款地点',
+    mblPaymentPlace: 'MBL付款地点',
+    modifier: '修改人',
+    modifiedDate: '修改日期',
+    debit: '收费',
+    credit: '付费',
+    amount: '金额',
+    settlementAmount: '结算金额',
+    settlementTime: '结算时间',
+    entrustmentRemarks: '委托备注',
+    fleetRemarks: '车队备注',
+    sRemarks: '司机备注',
+    taxRate: '税率',
+    corpType: '客户类别',
+    chargeCorp: '收费对象',
+    payCorp: '付费对象',
+    unitNo: '计价单位',
+    currency: '币别',
+    exrate: '汇率',
+    price: '单价',
+    quantity: '数量',
+    localCurrency: '本币',
+    foreignCurrency: '外币',
+    reportNo: '报表编码',
+    ctnDetail: '计划箱量',
+    dispatchCtnDetail: '已派箱量',
+    sendCtnDetail: '受理箱量',
+    corpShortName: '公司名称',
+    orderNo: '订单号',
+    factory:'船名航次',
+    size:'尺码',
+    landWeight:'重量(吨)',
+    tel:'电话',
+    datetime:'提箱时间',
+    plateNo:'车牌号',
+    ctnOne:'箱号一',
+    ctnTwo:'箱号二',
+    fleetVolum:'车型',
+    addressDetail:'装货地点',
+    unloadingPlace:'卸货地点',
+    dispatchNumber:'派车单号',
+    freightPay:'应付运费',
+    freightCollect:'应收运费',
+  },
+  landbtn118n: {
+    newDD: '创建直单',
+    newMM: '创建主单',
+    newMH: '创建分单',
+    copy: '复制',
+    new: '新建',
+    importTemplate: '导入模版',
+    preview: '预览',
+    save: '保存',
+    mdBillType: '修改类型',
+    mhAddmm: '分单->主单',
+    offLoad: '退舱',
+    cancelOffLoad: '撤销退舱',
+    deleted: '删除',
+    edit: '编辑',
+    toDebit: '生成应收',
+    toCredit: '生成应付',
+    exportData: '导出数据',
+    debitTemplate: '收费模版',
+    creditTemplate: '付费模版',
+    costTemplate: '成本模版',
+    submitDebit: '提交收费',
+    submitCredit: '提交付费',
+    printBill: '打印账单',
+    toList: '返回列表',
+    previous: '上一票',
+    next: '下一票',
+    localApply: '物流提交',
+    unlocalApply: '撤销物流提交',
+    transferApply: '转单',
+    unltransferApply: '撤销转单',
+    setInfoMMToMH: '同步主单到分单',
+    getInfoMMToMH: '同步分单到主单',
+    apply: '请求锁单',
+    unapply: '撤销锁定',
+    checked: '审核',
+    applyFee: '请核费用',
+    unApplyFee: '撤销请核',
+    applyModify: '申请修改',
+    applyDelete: '申请删除',
+    unAplly: '取消申请',
+    applyInvoice: '申请发票',
+    applyPay: '申请付费',
+    SIInfoImport: 'SI导入',
+    allShort: '全',
+    all: '全部',
+    submitShort: '提',
+    notSubmitted: '未提交',
+    scheduledShort: '调',
+    noScheduled: '未调度',
+    noDispatched: '未派车',
+    dispatchedShort: '派',
+    noAcceptanced: '未受理',
+    acceptanceShort: '受',
+    noCompleted: '未完工',
+    completedShort: '完',
+    closed: '已关闭',
+    closedShort: '关',
+    completed: '已完工',
   }
-
 }

src/store/modules/user.js

@@ -232,7 +232,11 @@ const user = {
       dispatch
     }, topMenuId) {
       return new Promise(resolve => {
-        getRoutes(topMenuId).then((res) => {
+        const obj = {
+          topMenuId: topMenuId,
+          type: getStore({ name: 'language' })
+        }
+        getRoutes(obj).then((res) => {
           const data = res.data.data
           let menu = deepClone(data);
           menu.forEach(ele => {
@@ -273,7 +277,7 @@ const user = {
     SET_MENU_ALL: (state, menuAll) => {
       let menu = state.menuAll;
       menuAll.forEach(ele => {
-        ele.children.forEach(i=>{
+        ele.children.forEach(i => {
           delete i.source
         })
         if (!menu.find(item => item.label === ele.label && item.path === ele.path)) {

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -1808,6 +1808,7 @@ export default {
                 // 查第一条的明细
                 losbfeestemplateDetail(this.templateData[0].id).then(res => {
                     this.templateRightData = res.data.data.feesTemplateItemsList
+                    this.$refs.templateRef.$refs.table.toggleAllSelection()
                 })
             })
         },
@@ -1816,6 +1817,7 @@ export default {
             this.lefttemplate = e
             losbfeestemplateDetail(e.id).then(res => {
                 this.templateRightData = res.data.data.feesTemplateItemsList
+                this.$refs.templateRef.$refs.table.toggleAllSelection()
             })
         },
         // 右侧选择回调

src/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue

@@ -82,7 +82,7 @@
                 @refresh-change="PreviewRefreshChange">
                 <template slot-scope="scope" slot="menu">
                     <el-link type="primary" :disabled="scope.row.status == 1"
-                        @click="handleReportPreview(scope.row.url, documentForm)">预览报表</el-link>
+                        @click="handleReportPreview(scope.row, scope.row.url, documentForm)">预览报表</el-link>
                 </template>
             </avue-crud>
         </el-dialog>
@@ -95,7 +95,9 @@ import {
     reportsGetReportData,
     reportsDetail,
     reportsRemove,
-    getList
+    getList,
+    getDocumentTypesList,
+    getDocumentTypesListAll,
 } from "@/api/iosBasicData/reports";
 import { reportslogList, reportslogSubmit } from "@/api/iosBasicData/bills";
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
@@ -229,7 +231,7 @@ export default {
             reportTypeData: [
                 {
                     label: '入货通知',
-                    cnName: '入货通知',
+                    // cnName: '入货通知',
                     classifyCode: '单证',
                     groupCode: '入货通知',
                     reportsType: 'RHTZ',
@@ -238,7 +240,7 @@ export default {
                 },
                 {
                     label: '派车通知单',
-                    cnName: '派车通知单',
+                    // cnName: '派车通知单',
                     classifyCode: '单证',
                     groupCode: '派车通知单',
                     reportsType: 'PCTZD',
@@ -247,25 +249,43 @@ export default {
                 },
                 {
                     label: 'HBL BOOKING SHEET',
-                    cnName: '提单详情(H)',
+                    // cnName: '提单详情(H)',
                     classifyCode: '单证',
                     groupCode: '提单详情(H)',
                     reportsType: 'TDXQ',
                     businessType: 'HYCK',
-                    params: "",
+                    params: {
+                        marks:{
+                            lineLength: 22,
+                            lineCount: 18,
+                        },
+                        commodityDescr:{
+                            lineLength: 18,
+                            lineCount: 18,
+                        },
+                    },
                 },
                 {
                     label: 'MBL BOOKING SHEET',
-                    cnName: '提单详情(M)',
+                    // cnName: '提单详情(M)',
                     classifyCode: '单证',
                     groupCode: '提单详情(M)',
                     reportsType: 'MBL BOOKING SHEET',
                     businessType: 'HYCK',
-                    params: "",
+                    params: {
+                        marks:{
+                            lineLength: 22,
+                            lineCount: 18,
+                        },
+                        commodityDescr:{
+                            lineLength: 18,
+                            lineCount: 18,
+                        },
+                    },
                 },
                 {
                     label: 'JMS 提单',
-                    cnName: 'JMS 提单',
+                    // cnName: 'JMS 提单',
                     classifyCode: '单证',
                     groupCode: 'JMS提单',
                     reportsType: 'JMS-BILL',
@@ -279,11 +299,19 @@ export default {
                         marksAddCntrNoSealNoList: true,
                         // 唛头是否添加箱号件重尺
                         marksAddCntrPGVList: true,
+                        marks:{
+                            lineLength: 22,
+                            lineCount: 18,
+                        },
+                        commodityDescr:{
+                            lineLength: 18,
+                            lineCount: 18,
+                        },
                     },
                 },
                 {
                     label: 'CTO',
-                    cnName: 'CTO',
+                    // cnName: 'CTO',
                     classifyCode: '单证',
                     groupCode: 'CTO',
                     reportsType: 'CTO',
@@ -297,11 +325,19 @@ export default {
                         marksAddCntrNoSealNoList: true,
                         // 唛头是否添加箱号件重尺
                         marksAddCntrPGVList: true,
+                        marks:{
+                            lineLength: 22,
+                            lineCount: 18,
+                        },
+                        commodityDescr:{
+                            lineLength: 18,
+                            lineCount: 18,
+                        },
                     },
                 },
                 {
                     label: '订舱委托书',
-                    cnName: '订舱委托书',
+                    // cnName: '订舱委托书',
                     classifyCode: '单证',
                     groupCode: '提单详情',
                     reportsType: 'DCWTS',
@@ -310,7 +346,7 @@ export default {
                 },
                 {
                     label: '运费证明',
-                    cnName: 'FREIGHT NOTE',
+                    // cnName: 'FREIGHT NOTE',
                     classifyCode: '单证',
                     groupCode: 'FREIGHT NOTE',
                     reportsType: 'FREIGHT NOTE',
@@ -395,7 +431,7 @@ export default {
                 this.textareaNumber = res.data.data
             }
         })
-        // this.reportsListfun()
+        this.reportsListfun()
     },
     methods: {
         // 打印预览按钮
@@ -412,7 +448,7 @@ export default {
             });
             this.$nextTick(() => {
                 if (data.length == 1) {
-                    this.handleReportPreview(data[0].url, this.documentForm)
+                    this.handleReportPreview(data[0], data[0].url, this.documentForm)
                 } else {
                     this.previewDialog = true
                     this.documentVisible = false
@@ -512,7 +548,7 @@ export default {
                 this.$message.warning("请先保存数据");
                 return;
             }
-            if (!this.businesstypeData.cnName) {
+            if (!this.businesstypeData.label) {
                 this.$message.warning("请先选择报表类型");
                 return
             }
@@ -539,7 +575,7 @@ export default {
         },
         // 编辑
         printEditing(row) {
-            if (!this.businesstypeData.cnName) {
+            if (!this.businesstypeData.label) {
                 this.$message.warning("请先选择报表类型");
                 return
             }
@@ -649,7 +685,7 @@ export default {
                         }).then(_ => {
                             // 成功操作。。。。
                             this.documenturl = documentaa
-                            this.handleReportPreview(this.documenturl, this.documentForm)
+                            this.handleReportPreview(obj, this.documenturl, this.documentForm)
                             this.reportslogListfun(this.documentPage, { ...this.query, reportsCode: res.data.data.reportsCode });
                             this.editData = {}
                             this.documentForm = {}
@@ -685,16 +721,42 @@ export default {
             this.reportslogListfun(this.documentPage, { reportsType: data.reportsType });
         },
         // 左侧数据获取
-        // reportsListfun(){
-        //     reportsList(1,20,{
-        //         businessType:'HYCK',
-        //         classifyCode:'单证',
-        //         groupCode:'派车通知单,入货通知，提单详情',
-        //         code:'BZRHTZ,TDXQ,PCTZD,'
-        //     }).then(res=>{
-        //         this.reportTypeData = res.data.data.records
-        //     })
-        // },
+        reportsListfun(){
+            // reportsList(1,20,{
+            //     businessType:'HYCK',
+            //     classifyCode:'单证',
+            //     groupCode:'派车通知单,入货通知，提单详情',
+            //     code:'BZRHTZ,TDXQ,PCTZD,'
+            // }).then(res=>{
+            //     this.reportTypeData = res.data.data.records
+            // })
+            /*
+            getDocumentTypesList(1, 100,{
+                businessType:'HYCK',
+            }).then(res=>{
+                console.log("bdocumentTypes.list", res.data.data.records)
+                // this.reportTypeData = res.data.data.records
+            })
+             */
+            getDocumentTypesListAll({
+                businessType:'HYCK',
+            }).then(res=>{
+                res.data.data.forEach(r=>{
+                    r.label = r.typeName
+                    r.cnName = r.typeName
+                    if(r.params){
+                        try {
+                            r.params = JSON.parse(r.params);
+                        }catch (e){
+                            r.params = "";
+                        }
+                    }else
+                        r.params = "";
+                })
+                // console.log("bdocumentTypes.listAll", res.data.data)
+                this.reportTypeData = res.data.data
+            })
+        },
         // 类别弹窗关闭
         corpTypeClose(done) {
             console.log(1111)
@@ -743,9 +805,93 @@ export default {
             })
         },
         // 预览报表
-        handleReportPreview(url, data) {
-            console.log(url, 1670)
-            console.log(data, 1671)
+        //去除首尾空格
+        removeHeadTailSpace(txt) {
+            if(typeof txt=="string"){
+                return txt.replace(/^\s*|\s*$/g, "")
+            }else{
+                return ''
+            }
+        },
+        formatBLText (s, lineLen){
+            let reg = /^[A-Za-z0-9]$/g
+            let lines=[]
+            if(s){
+                // this.removeHeadTailSpace(s)
+                var lns1=s.split(/\r\n|\r|\n/), lns=[]
+                lns1.forEach(ln=>{
+                    // this.removeHeadTailSpace(ln)
+                    var line=ln
+                    // if(line){
+                    lns.push(line)
+                    // }
+                })
+
+                while(lns.length>0){
+                    let ln=lns[0]
+                    let lnLen=ln.length
+
+                    if (lnLen <= lineLen) {
+                        lines.push(ln)
+                        lns.splice(0, 1)
+                    } else {
+                        reg.lastIndex=0
+                        if (reg.test(ln.charAt(lineLen - 1))) {
+                            // 字母和数字，不截断单词
+                            //倒序查
+                            let pos1 = lineLen - 2
+                            let isWord = true
+                            while (pos1 >= 0) {
+                                reg.lastIndex=0
+                                if (reg.test(ln.charAt(pos1))) {
+                                    pos1 -= 1
+                                    continue
+                                } else {
+                                    isWord = false
+                                    break
+                                }
+                            }
+
+                            //不是单词断开了
+                            if (!isWord) {
+                                lines.push(ln.substr(0, pos1 + 1))
+                                ln = ln.substr(pos1 + 1, lnLen - (pos1 + 1))
+                                lnLen = ln.length
+                            }
+                            //最后一直是则直接截取
+                            else {
+                                lines.push(ln.substr(0, lineLen))
+                                ln = ln.substr(lineLen, lnLen - lineLen)
+                                lnLen = ln.length
+                            }
+                        } else {
+                            // 不是字母和数字，直接截取
+                            lines.push(ln.substr(0, lineLen))
+                            ln = ln.substr(lineLen, lnLen - lineLen)
+                            lnLen = ln.length
+                        }
+
+                        if (lnLen > 0) {
+                            if (lns.length > 1) {
+                                // lns[1] = ln + ' ' + lns[1]
+                                // lns.unshift(ln)
+                                lns[0] = ln
+                            } else {
+                                lns.push(ln)
+                                lns.splice(0, 1)
+                            }
+                        }
+                    }
+                }
+            }
+
+            return lines
+        },
+        handleReportPreview(row, url, data) {
+            let rptType = this.reportTypeData.find(r=>r.groupCode == row.groupCode)
+            console.log('rptType', rptType)
+            // console.log(url, 1670)
+            // console.log(data, 1671)
             // 处理时间
             data.end = data.end ? data.end.slice(0, 10) : ''
             data.goodsTime = data.goodsTime ? data.goodsTime.slice(0, 10) : ''
@@ -869,6 +1015,7 @@ export default {
             //     data.numberOfObl += ' (' + data.numberOfOblDigit + ')'
             // }
 
+            /*
             if (data.commodityDescr) {
                 var descriptionIndex2 = data.commodityDescr.indexOf('\n')
                 for (let i = 0; i < 19; i++) {
@@ -883,6 +1030,44 @@ export default {
                     data.extraLongText = extraLongText
                 }
             }
+            */
+            console.log('rptType.params', rptType.params)
+            if(rptType && rptType.params){
+                let m = rptType.params.marks
+                if(m){
+                    console.log('rptType.params.marks', m)
+                    if(m.lineLength && m.lineLength>0){
+                        data.marks = this.formatBLText(data.marks, m.lineLength).join('\n')
+                        console.log('data.marks', data.marks)
+                    }
+                    if(m.lineCount && m.lineCount>0){
+                        var lns1=data.marks.split(/\r\n|\r|\n/)
+                        if(lns1.length>m.lineCount){
+                            data.hasLargeMarks = true
+                            data.largeMarks = data.marks
+                            data.marks = " SEE ATTACHED PAPER"
+                        }
+                        console.log('data.marks.lns1', lns1.Count)
+                    }
+                }
+                m = rptType.params.commodityDescr
+                if(m){
+                    console.log('rptType.params.commodityDescr', m)
+                    if(m.lineLength && m.lineLength>0){
+                        data.commodityDescr = this.formatBLText(data.commodityDescr, m.lineLength).join('\n')
+                        console.log('data.commodityDescr', data.marks)
+                    }
+                    if(m.lineCount && m.lineCount>0){
+                        var lns1=data.commodityDescr.split(/\r\n|\r|\n/)
+                        if(lns1.length>m.lineCount){
+                            data.hasLargeCommodityDescr = true
+                            data.largeCommodityDescr = data.commodityDescr
+                            data.commodityDescr = " SEE ATTACHED PAPER"
+                        }
+                        console.log('data.commodityDescr.lns1', lns1.Count)
+                    }
+                }
+            }
 
             // console.log(data.hshipperDetails, 'hshipperDetails2')
 

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -2001,6 +2001,7 @@ export default {
                 // 查第一条的明细
                 losbfeestemplateDetail(this.templateData[0].id).then(res => {
                     this.templateRightData = res.data.data.feesTemplateItemsList
+                    this.$refs.templateRef.$refs.table.toggleAllSelection()
                 })
             })
         },
@@ -2009,6 +2010,7 @@ export default {
             this.lefttemplate = e
             losbfeestemplateDetail(e.id).then(res => {
                 this.templateRightData = res.data.data.feesTemplateItemsList
+                this.$refs.templateRef.$refs.table.toggleAllSelection()
             })
         },
         // 右侧选择回调
@@ -3025,11 +3027,11 @@ export default {
             if (this.business == 1) {
                 let similarDataD = similarValues(this.assemblyForm.feeCenterListD, 'feeCnName', 'curCode')
                 if (similarDataD) {
-                    return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
+                    // return this.$message.error(`应收费用简称:${similarDataD.feeCnName}的币别不一致,请重新选择`);
                 }
                 let similarDataC = similarValues(this.assemblyForm.feeCenterListC, 'feeCnName', 'curCode')
                 if (similarDataC) {
-                    return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
+                    // return this.$message.error(`应付费用简称:${similarDataC.feeCnName}的币别不一致,请重新选择`);
                 }
             }
             // 判断必填项

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -7,7 +7,8 @@
           <el-scrollbar>
             <basic-container>
               <avue-tree :option="treeOption" :data="feesTypeData" @node-click="nodeClick">
-                <template slot="addBtn">
+<!--                  不需要 -->
+                <template v-if="false" slot="addBtn">
                   <el-tooltip class="item" effect="dark" content="新建分类" placement="top">
                     <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
                       @click="corpTypeVisible = true"></i>

src/views/landTransportation/antiepidemic/index.vue

@@ -115,21 +115,24 @@ export default {
         align: 'center',
         height: "auto",
         column: [{
-          label: '车牌号',
+          // label: '车牌号',
+          label: this.$t("land118n.plateNo"),
           prop: 'plateNo',
           overHidden: true,
           index: 1,
           width: 150,
           search: true,
         },{
-          label: '电话',
+          // label: '电话',
+          label: this.$t("land118n.tel"),
           prop: 'tel',
           overHidden: true,
           index: 2,
           width: 200,
           search: true,
         },{
-          label: '制单日期',
+          // label: '制单日期',
+          label: this.$t("land118n.createTime"),
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
@@ -142,14 +145,16 @@ export default {
           index: 3,
           width: 150
         },{
-          label: '箱号一',
+          // label: '箱号一',
+          label: this.$t("land118n.ctnOne"),
           prop: 'ctnOne',
           overHidden: true,
           index: 4,
           search: true,
           width: 150
         },{
-          label: '箱号二',
+          // label: '箱号二',
+          label: this.$t("land118n.ctnTwo"),
           prop: 'ctnTwo',
           overHidden: true,
           index: 5,

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -7,7 +7,7 @@
             style="border: none;background: none;color: red"
             icon="el-icon-arrow-left"
             @click="backToList(0)"
-        >返回列表
+        >{{$t("landbtn118n.toList")}}
         </el-button>
       </div>
       <div class="customer-back" v-else>
@@ -16,7 +16,7 @@
             style="border: none;background: none;color: red"
             icon="el-icon-arrow-left"
             @click="backToList(1)"
-        >返回列表
+        >{{$t("landbtn118n.toList")}}
         </el-button>
         <el-button
             type="danger"
@@ -130,7 +130,7 @@
               :loading="type"
               v-if="!typeTwo"
               @click="editCustomer"
-          >保存
+          >{{$t("landbtn118n.save")}}
           </el-button>
           <el-button
               type="primary"

src/views/landTransportation/bulkCargo/index.vue

@@ -9,12 +9,13 @@
               <div class="card">
                 <div class="card-title card-title1">
                   <span>
-                    全
+                    {{ $t("landbtn118n.allShort") }}
                   </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="!activeName ? 'selected' : ''">{{ totalData.all }}</span>
-                  <span class="card-content-text" :class="!activeName ? 'selected' : ''">全部</span>
+                  <span class="card-content-text" :class="!activeName ? 'selected' : ''">{{ $t("landbtn118n.all")
+                    }}</span>
                 </div>
               </div>
             </div>
@@ -23,12 +24,14 @@
               <div class="card">
                 <div class="card-title card-title7">
                   <span>
-                    提
+                    {{ $t("landbtn118n.submitShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '0' ? 'selected' : ''">{{ totalData.last }}</span>
-                  <span class="card-content-text" :class="activeName === '0' ? 'selected' : ''">未提交</span>
+                  <span class="card-content-num" :class="activeName === '0' ? 'selected' : ''">{{ totalData.last
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '0' ? 'selected' : ''">{{
+                    $t("landbtn118n.notSubmitted") }}</span>
                 </div>
               </div>
             </div>
@@ -37,12 +40,14 @@
               <div class="card">
                 <div class="card-title card-title2">
                   <span>
-                    调
+                    {{ $t("landbtn118n.scheduledShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '1' ? 'selected' : ''">{{ totalData.zero }}</span>
-                  <span class="card-content-text" :class="activeName === '1' ? 'selected' : ''">未调度</span>
+                  <span class="card-content-num" :class="activeName === '1' ? 'selected' : ''">{{ totalData.zero
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '1' ? 'selected' : ''">{{
+                    $t("landbtn118n.noScheduled") }}</span>
                 </div>
               </div>
             </div>
@@ -51,12 +56,14 @@
               <div class="card">
                 <div class="card-title card-title3">
                   <span>
-                    派
+                    {{ $t("landbtn118n.dispatchedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '2' ? 'selected' : ''">{{ totalData.one }}</span>
-                  <span class="card-content-text" :class="activeName === '2' ? 'selected' : ''">未派车</span>
+                  <span class="card-content-num" :class="activeName === '2' ? 'selected' : ''">{{ totalData.one
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '2' ? 'selected' : ''">{{
+                    $t("landbtn118n.noDispatched") }}</span>
                 </div>
               </div>
             </div>
@@ -65,12 +72,14 @@
               <div class="card">
                 <div class="card-title card-title4">
                   <span>
-                    受
+                    {{ $t("landbtn118n.acceptanceShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '3' ? 'selected' : ''">{{ totalData.two }}</span>
-                  <span class="card-content-text" :class="activeName === '3' ? 'selected' : ''">未受理</span>
+                  <span class="card-content-num" :class="activeName === '3' ? 'selected' : ''">{{ totalData.two
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '3' ? 'selected' : ''">{{
+                    $t("landbtn118n.noAcceptanced") }}</span>
                 </div>
               </div>
             </div>
@@ -79,14 +88,15 @@
               <div class="card">
                 <div class="card-title card-title5">
                   <span>
-                    完
+                    {{ $t("landbtn118n.completedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="activeName === '4,6' ? 'selected' : ''">{{
                     totalData.three
                   }}</span>
-                  <span class="card-content-text" :class="activeName === '4,6' ? 'selected' : ''">未完工</span>
+                  <span class="card-content-text" :class="activeName === '4,6' ? 'selected' : ''">{{
+                    $t("landbtn118n.noCompleted") }}</span>
                 </div>
               </div>
             </div>
@@ -95,12 +105,14 @@
               <div class="card">
                 <div class="card-title card-title6">
                   <span>
-                    工
+                    {{ $t("landbtn118n.closedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '5' ? 'selected' : ''">{{ totalData.four }}</span>
-                  <span class="card-content-text" :class="activeName === '5' ? 'selected' : ''">已关闭</span>
+                  <span class="card-content-num" :class="activeName === '5' ? 'selected' : ''">{{ totalData.four
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '5' ? 'selected' : ''">{{
+                    $t("landbtn118n.closed") }}</span>
                 </div>
               </div>
             </div>
@@ -114,12 +126,13 @@
               <div class="card">
                 <div class="card-title card-title1">
                   <span>
-                    全
+                    {{ $t("landbtn118n.allShort") }}
                   </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="!activeName ? 'selected' : ''">{{ totalData.all }}</span>
-                  <span class="card-content-text" :class="!activeName ? 'selected' : ''">全部</span>
+                  <span class="card-content-text" :class="!activeName ? 'selected' : ''">{{ $t("landbtn118n.all")
+                    }}</span>
                 </div>
               </div>
             </div>
@@ -128,12 +141,14 @@
               <div class="card">
                 <div class="card-title card-title3">
                   <span>
-                    派
+                    {{ $t("landbtn118n.dispatchedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '2' ? 'selected' : ''">{{ totalData.one }}</span>
-                  <span class="card-content-text" :class="activeName === '2' ? 'selected' : ''">未派车</span>
+                  <span class="card-content-num" :class="activeName === '2' ? 'selected' : ''">{{ totalData.one
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '2' ? 'selected' : ''">{{
+                    $t("landbtn118n.noDispatched") }}</span>
                 </div>
               </div>
             </div>
@@ -142,12 +157,14 @@
               <div class="card">
                 <div class="card-title card-title4">
                   <span>
-                    受
+                    {{ $t("landbtn118n.acceptanceShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '3' ? 'selected' : ''">{{ totalData.two }}</span>
-                  <span class="card-content-text" :class="activeName === '3' ? 'selected' : ''">未受理</span>
+                  <span class="card-content-num" :class="activeName === '3' ? 'selected' : ''">{{ totalData.two
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '3' ? 'selected' : ''">{{
+                    $t("landbtn118n.noAcceptanced") }}</span>
                 </div>
               </div>
             </div>
@@ -156,14 +173,15 @@
               <div class="card">
                 <div class="card-title card-title5">
                   <span>
-                    完
+                    {{ $t("landbtn118n.completedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="activeName === '4,6' ? 'selected' : ''">{{
                     totalData.three
                   }}</span>
-                  <span class="card-content-text" :class="activeName === '4,6' ? 'selected' : ''">未完工</span>
+                  <span class="card-content-text" :class="activeName === '4,6' ? 'selected' : ''">{{
+                    $t("landbtn118n.noCompleted") }}</span>
                 </div>
               </div>
             </div>
@@ -172,12 +190,14 @@
               <div class="card">
                 <div class="card-title card-title6">
                   <span>
-                    工
+                    {{ $t("landbtn118n.closedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '5' ? 'selected' : ''">{{ totalData.four }}</span>
-                  <span class="card-content-text" :class="activeName === '5' ? 'selected' : ''">已关闭</span>
+                  <span class="card-content-num" :class="activeName === '5' ? 'selected' : ''">{{ totalData.four
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '5' ? 'selected' : ''">{{
+                    $t("landbtn118n.closed") }}</span>
                 </div>
               </div>
             </div>
@@ -191,12 +211,13 @@
               <div class="card">
                 <div class="card-title card-title1">
                   <span>
-                    全
+                    {{ $t("landbtn118n.allShort") }}
                   </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="!activeName ? 'selected' : ''">{{ totalData.all }}</span>
-                  <span class="card-content-text" :class="!activeName ? 'selected' : ''">全部</span>
+                  <span class="card-content-text" :class="!activeName ? 'selected' : ''">{{ $t("landbtn118n.all")
+                    }}</span>
                 </div>
               </div>
             </div>
@@ -205,12 +226,14 @@
               <div class="card">
                 <div class="card-title card-title4">
                   <span>
-                    受
+                    {{ $t("landbtn118n.acceptanceShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '3' ? 'selected' : ''">{{ totalData.two }}</span>
-                  <span class="card-content-text" :class="activeName === '3' ? 'selected' : ''">未受理</span>
+                  <span class="card-content-num" :class="activeName === '3' ? 'selected' : ''">{{ totalData.two
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '3' ? 'selected' : ''">{{
+                    $t("landbtn118n.noAcceptanced") }}</span>
                 </div>
               </div>
             </div>
@@ -219,14 +242,15 @@
               <div class="card">
                 <div class="card-title card-title5">
                   <span>
-                    完
+                    {{ $t("landbtn118n.completedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="activeName === '4,6' ? 'selected' : ''">{{
                     totalData.three
                   }}</span>
-                  <span class="card-content-text" :class="activeName === '4,6' ? 'selected' : ''">未完工</span>
+                  <span class="card-content-text" :class="activeName === '4,6' ? 'selected' : ''">{{
+                    $t("landbtn118n.noCompleted") }}</span>
                 </div>
               </div>
             </div>
@@ -235,12 +259,14 @@
               <div class="card">
                 <div class="card-title card-title6">
                   <span>
-                    工
+                    {{ $t("landbtn118n.closedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '5' ? 'selected' : ''">{{ totalData.four }}</span>
-                  <span class="card-content-text" :class="activeName === '5' ? 'selected' : ''">已关闭</span>
+                  <span class="card-content-num" :class="activeName === '5' ? 'selected' : ''">{{ totalData.four
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '5' ? 'selected' : ''">{{
+                    $t("landbtn118n.closed") }}</span>
                 </div>
               </div>
             </div>
@@ -255,8 +281,10 @@
         @search-criteria-switch="searchCriteriaSwitch" @search-change="searchChange">
         <template slot="menuLeft" slot-scope="{size}"
           v-if="roleName.indexOf('客户') !== -1 || roleName.indexOf('分管调度') !== -1 || roleName.indexOf('administrator') !== -1 || roleName.indexOf('admin') !== -1 || roleName.indexOf('演示账号') !== -1">
-          <el-button type="primary" icon="el-icon-plus" :size="size" @click="rowSave">创建单据</el-button>
-          <el-button type="success" :size="size" :disabled="selectionList.length !== 1" @click="copyDocument">复制单据
+          <el-button type="primary" icon="el-icon-plus" :size="size" @click="rowSave">{{ $t("landbtn118n.new")
+            }}</el-button>
+          <el-button type="success" :size="size" :disabled="selectionList.length !== 1" @click="copyDocument">{{
+            $t("landbtn118n.copy") }}
           </el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
         </template>
@@ -293,15 +321,15 @@
         </template>
         <template slot="corpShortName" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.corpShortName
-            }}</span>
+          }}</span>
         </template>
         <template slot="dispatchNumber" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.dispatchNumber
-            }}</span>
+          }}</span>
         </template>
         <template slot="orderNo" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.orderNo
-            }}</span>
+          }}</span>
         </template>
         <template slot="contractNo" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{
@@ -404,7 +432,8 @@ export default {
         }],
         column: [
           {
-            label: '货运日期',
+            // label: '货运日期',
+            label: this.$t("land118n.freightDate"),
             prop: 'arrivalTime',
             overHidden: true,
             type: "date",
@@ -416,7 +445,8 @@ export default {
             width: 126,
             search: true,
           }, {
-            label: '业务员',
+            // label: '业务员',
+            label: this.$t("land118n.salesperson"),
             index: 2,
             width: 70,
             prop: 'salesmanName',
@@ -431,7 +461,8 @@ export default {
               value: "id"
             }
           }, {
-            label: '物流运输',
+            // label: '物流运输',
+            label: this.$t("land118n.logisticsTransportation"),
             prop: 'dispatchDeptName',
             searchProp: 'dispatchDept',
             search: true,
@@ -446,32 +477,37 @@ export default {
             index: 3,
             width: 80
           }, {
-            label: '运输调度',
+            // label: '运输调度',
+            label: this.$t("land118n.transportationScheduling"),
             prop: 'dispatcherName',
             overHidden: true,
             index: 4,
             width: 70,
           }, {
-            label: '派车单号',
+            // label: '派车单号',
+            label: this.$t("land118n.dispatchNumber"),
             width: 80,
             index: 5,
             prop: 'dispatchNumber',
             overHidden: true,
             search: true,
           }, {
-            label: '装货地点',
+            // label: '装货地点',
+            label: this.$t("land118n.addressDetail"),
             prop: 'addressDetail',
             index: 6,
             width: 132,
             search: true,
           }, {
-            label: '卸货地点',
+            // label: '卸货地点',
+            label: this.$t("land118n.unloadingPlace"),
             prop: 'unloadingPlace',
             index: 7,
             width: 132,
             search: true,
           }, {
-            label: '车队',
+            // label: '车队',
+            label: this.$t("land118n.motorcade"),
             width: 90,
             index: 8,
             overHidden: true,
@@ -486,17 +522,20 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '车型',
+            // label: '车型',
+            label: this.$t("land118n.fleetVolum"),
             width: 90,
             index: 9,
             prop: 'fleetVolum'
           }, {
-            label: '运费',
+            // label: '运费',
+            label: this.$t("land118n.shippingCost"),
             index: 11,
             width: 100,
             prop: 'freightCollect'
           }, {
-            label: '状态',
+            // label: '状态',
+            label: this.$t("land118n.status"),
             prop: 'status',
             index: 12,
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status_two",
@@ -510,26 +549,30 @@ export default {
             search: true,
             width: 90
           }, {
-            label: '备注',
+            // label: '备注',
+            label: this.$t("land118n.remarks"),
             index: 13,
             overHidden: true,
             width: 130,
             prop: 'remarks',
           }, {
-            label: '公司名称',
+            // label: '公司名称',
+            label: this.$t("land118n.corpShortName"),
             prop: 'corpShortName',
             overHidden: true,
             index: 14,
             width: 120,
             search: true,
           }, {
-            label: '制单人',
+            // label: '制单人',
+            label: this.$t("land118n.createBy"),
             prop: 'createUserName',
             overHidden: true,
             index: 15,
             width: 60,
           }, {
-            label: '制单日期',
+            // label: '制单日期',
+            label: this.$t("land118n.createTime"),
             overHidden: true,
             prop: 'createTime',
             type: "date",
@@ -542,7 +585,8 @@ export default {
             search: true,
           },
           {
-            label: '平台号',
+            // label: '平台号',
+            label: this.$t("land118n.orderNo"),
             width: 70,
             index: 9,
             prop: 'orderNo',
@@ -550,13 +594,13 @@ export default {
             filterable: true,
             search: true,
             hide: true,
-          }, 
+          },
           {
             label: '结算金额(收)',
             width: 100,
             index: 18,
             prop: 'settlementAmountD'
-          }, 
+          },
           {
             label: '结算时间(收)',
             width: 100,
@@ -565,13 +609,13 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
-          }, 
+          },
           {
             label: '结算金额(付)',
             width: 100,
             index: 20,
             prop: 'settlementAmountC'
-          }, 
+          },
           {
             label: '结算时间(付)',
             width: 100,
@@ -580,13 +624,13 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
-          }, 
+          },
           {
             label: '对账金额(收)',
             width: 100,
             index: 22,
             prop: 'reconciliationAmountD'
-          }, 
+          },
           {
             label: '对账时间(收)',
             width: 100,
@@ -595,13 +639,13 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
-          }, 
+          },
           {
             label: '对账金额(付)',
             width: 100,
             index: 24,
             prop: 'reconciliationAmountC'
-          }, 
+          },
           {
             label: '对账时间(付)',
             width: 100,
@@ -642,7 +686,8 @@ export default {
         }],
         column: [
           {
-            label: '货运日期',
+            // label: '货运日期',
+            label: this.$t("land118n.freightDate"),
             prop: 'arrivalTime',
             overHidden: true,
             type: "date",
@@ -654,7 +699,8 @@ export default {
             width: 126,
             search: true,
           }, {
-            label: '业务员',
+            // label: '业务员',
+            label: this.$t("land118n.salesperson"),
             index: 2,
             width: 70,
             prop: 'salesmanName',
@@ -669,32 +715,37 @@ export default {
               value: "id"
             }
           }, {
-            label: '运输调度',
+            // label: '运输调度',
+            label: this.$t("land118n.transportationScheduling"),
             prop: 'dispatcherName',
             overHidden: true,
             index: 3,
             width: 70,
           }, {
-            label: '派车单号',
+            // label: '派车单号',
+            label: this.$t("land118n.dispatchNumber"),
             width: 80,
             index: 4,
             prop: 'dispatchNumber',
             overHidden: true,
             search: true,
           }, {
-            label: '装货地点',
+            // label: '装货地点',
+            label: this.$t("land118n.addressDetail"),
             prop: 'addressDetail',
             index: 5,
             width: 132,
             search: true,
           }, {
-            label: '卸货地点',
+            // label: '卸货地点',
+            label: this.$t("land118n.unloadingPlace"),
             prop: 'unloadingPlace',
             index: 6,
             width: 132,
             search: true,
           }, {
-            label: '车队',
+            // label: '车队',
+            label: this.$t("land118n.motorcade"),
             width: 90,
             index: 7,
             overHidden: true,
@@ -710,22 +761,26 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '车号',
+            // label: '车号',
+            label: this.$t("land118n.vehicleNumber"),
             width: 90,
             index: 8,
             prop: 'plateNo'
           }, {
-            label: '车型',
+            // label: '车型',
+            label: this.$t("land118n.fleetVolum"),
             width: 90,
             index: 9,
             prop: 'fleetVolum'
           }, {
-            label: '应收运费',
+            // label: '应收运费',
+            label: this.$t("land118n.freightCollect"),
             index: 11,
             width: 100,
             prop: 'freightCollect'
           }, {
-            label: '状态',
+            // label: '状态',
+            label: this.$t("land118n.status"),
             prop: 'status',
             index: 12,
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status_two",
@@ -739,32 +794,37 @@ export default {
             search: true,
             width: 90
           }, {
-            label: '应付运费',
+            // label: '应付运费',
+            label: this.$t("land118n.freightPay"),
             prop: 'freightPay',
             overHidden: true,
             width: 100,
             index: 13,
           }, {
-            label: '备注',
+            // label: '备注',
+            label: this.$t("land118n.remarks"),
             index: 14,
             overHidden: true,
             width: 130,
             prop: 'remarks',
           }, {
-            label: '公司名称',
+            // label: '公司名称',
+            label: this.$t("land118n.corpShortName"),
             prop: 'corpShortName',
             overHidden: true,
             index: 15,
             width: 120,
             search: true,
           }, {
-            label: '制单人',
+            // label: '制单人',
+            label: this.$t("land118n.createBy"),
             prop: 'createUserName',
             overHidden: true,
             index: 16,
             width: 60,
           }, {
-            label: '制单日期',
+            // label: '制单日期',
+            label: this.$t("land118n.createTime"),
             overHidden: true,
             prop: 'createTime',
             type: "date",
@@ -806,7 +866,8 @@ export default {
         }],
         column: [
           {
-            label: '货运日期',
+            // label: '货运日期',
+            label: this.$t("land118n.freightDate"),
             prop: 'arrivalTime',
             overHidden: true,
             type: "date",
@@ -818,7 +879,8 @@ export default {
             width: 126,
             search: true,
           }, {
-            label: '物流运输',
+            // label: '物流运输',
+            label: this.$t("land118n.logisticsTransportation"),
             prop: 'dispatchDeptName',
             searchProp: 'dispatchDept',
             search: true,
@@ -833,32 +895,37 @@ export default {
             index: 2,
             width: 80
           }, {
-            label: '运输调度',
+            // label: '运输调度',
+            label: this.$t("land118n.transportationScheduling"),
             prop: 'dispatcherName',
             overHidden: true,
             index: 3,
             width: 70,
           }, {
-            label: '派车单号',
+            // label: '派车单号',
+            label: this.$t("land118n.dispatchNumber"),
             width: 80,
             index: 4,
             prop: 'dispatchNumber',
             overHidden: true,
             search: true,
           }, {
-            label: '装货地点',
+            // label: '装货地点',
+            label: this.$t("land118n.addressDetail"),
             prop: 'addressDetail',
             index: 5,
             width: 132,
             search: true,
           }, {
-            label: '卸货地点',
+            // label: '卸货地点',
+            label: this.$t("land118n.unloadingPlace"),
             prop: 'unloadingPlace',
             index: 6,
             width: 132,
             search: true,
           }, {
-            label: '车队',
+            // label: '车队',
+            label: this.$t("land118n.motorcade"),
             width: 90,
             index: 7,
             overHidden: true,
@@ -873,7 +940,8 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '车号',
+            // label: '车号',
+            label: this.$t("land118n.vehicleNumber"),
             width: 90,
             index: 8,
             prop: 'plateNo',
@@ -887,7 +955,8 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '司机',
+            // label: '司机',
+            label: this.$t("land118n.driver"),
             width: 70,
             index: 9,
             prop: 'driverName',
@@ -901,12 +970,14 @@ export default {
             },
             search: true,
           }, {
-            label: '电话',
+            // label: '电话',
+            label: this.$t("land118n.tel"),
             width: 120,
             index: 10,
             prop: 'driverTel'
           }, {
-            label: '车型',
+            // label: '车型',
+            label: this.$t("land118n.fleetVolum"),
             width: 90,
             index: 11,
             prop: 'fleetVolum'
@@ -927,13 +998,15 @@ export default {
           //   width: 140
           // },
           {
-            label: '应付运费',
+            // label: '应付运费',
+            label: this.$t("land118n.freightPay"),
             prop: 'freightPay',
             overHidden: true,
             width: 100,
             index: 13,
           }, {
-            label: '备注',
+            // label: '备注',
+            label: this.$t("land118n.remarks"),
             index: 14,
             overHidden: true,
             width: 130,
@@ -968,7 +1041,8 @@ export default {
         }],
         column: [
           {
-            label: '货运日期',
+            // label: '货运日期',
+            label: this.$t("land118n.freightDate"),
             prop: 'arrivalTime',
             overHidden: true,
             type: "date",
@@ -980,7 +1054,8 @@ export default {
             width: 126,
             search: true,
           }, {
-            label: '物流运输',
+            // label: '物流运输',
+            label: this.$t("land118n.logisticsTransportation"),
             prop: 'dispatchDeptName',
             searchProp: 'dispatchDept',
             search: true,
@@ -995,32 +1070,37 @@ export default {
             index: 2,
             width: 80
           }, {
-            label: '运输调度',
+            // label: '运输调度',
+            label: this.$t("land118n.transportationScheduling"),
             prop: 'dispatcherName',
             overHidden: true,
             index: 3,
             width: 70,
           }, {
-            label: '派车单号',
+            // label: '派车单号',
+            label: this.$t("land118n.dispatchNumber"),
             width: 80,
             index: 4,
             prop: 'dispatchNumber',
             overHidden: true,
             search: true,
           }, {
-            label: '装货地点',
+            // label: '装货地点',
+            label: this.$t("land118n.addressDetail"),
             prop: 'addressDetail',
             index: 5,
             width: 132,
             search: true,
           }, {
-            label: '卸货地点',
+            // label: '卸货地点',
+            label: this.$t("land118n.unloadingPlace"),
             prop: 'unloadingPlace',
             index: 6,
             width: 132,
             search: true,
           }, {
-            label: '车队',
+            // label: '车队',
+            label: this.$t("land118n.motorcade"),
             width: 90,
             index: 7,
             overHidden: true,
@@ -1035,7 +1115,8 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '车号',
+            // label: '车号',
+            label: this.$t("land118n.vehicleNumber"),
             width: 90,
             index: 8,
             prop: 'plateNo',
@@ -1049,7 +1130,8 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '司机',
+            // label: '司机',
+            label: this.$t("land118n.driver"),
             width: 70,
             index: 9,
             prop: 'driverName',
@@ -1063,12 +1145,14 @@ export default {
             },
             search: true,
           }, {
-            label: '电话',
+            // label: '电话',
+            label: this.$t("land118n.tel"),
             width: 120,
             index: 10,
             prop: 'driverTel'
           }, {
-            label: '车型',
+            // label: '车型',
+            label: this.$t("land118n.fleetVolum"),
             width: 90,
             index: 11,
             prop: 'fleetVolum'
@@ -1089,7 +1173,8 @@ export default {
           //   width: 140
           // },
           {
-            label: '备注',
+            // label: '备注',
+            label: this.$t("land118n.remarks"),
             index: 14,
             overHidden: true,
             width: 130,
@@ -1108,8 +1193,8 @@ export default {
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
       this.home = true
     }
-    if (this.$route.query.params){
-      this.rowCell({id:this.$route.query.params},0)
+    if (this.$route.query.params) {
+      this.rowCell({ id: this.$route.query.params }, 0)
     }
   },
   async created() {

src/views/landTransportation/dispatchingCars/index.vue

@@ -8,12 +8,12 @@
               <div class="card">
                 <div class="card-title card-title1">
                 <span>
-                  全
+                  {{$t("landbtn118n.allShort")}}
                 </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="!activeName?'selected':''">{{ totalData.all }}</span>
-                  <span class="card-content-text" :class="!activeName?'selected':''">全部</span>
+                  <span class="card-content-text" :class="!activeName?'selected':''">{{$t("landbtn118n.all")}}</span>
                 </div>
               </div>
             </div>
@@ -22,12 +22,12 @@
               <div class="card">
                 <div class="card-title card-title2">
                 <span>
-                  未
+                  {{$t("landbtn118n.scheduledShort")}}
                 </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="activeName === '0'?'selected':''">{{ totalData.zero }}</span>
-                  <span class="card-content-text" :class="activeName === '0'?'selected':''">未调度</span>
+                  <span class="card-content-text" :class="activeName === '0'?'selected':''">{{$t("landbtn118n.noScheduled")}}</span>
                 </div>
               </div>
             </div>
@@ -36,12 +36,12 @@
               <div class="card">
                 <div class="card-title card-title3">
                 <span>
-                  派
+                  {{$t("landbtn118n.dispatchedShort")}}
                 </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="activeName === '1'?'selected':''">{{ totalData.one }}</span>
-                  <span class="card-content-text" :class="activeName === '1'?'selected':''">未派车</span>
+                  <span class="card-content-text" :class="activeName === '1'?'selected':''">{{$t("landbtn118n.noDispatched")}}</span>
                 </div>
               </div>
             </div>
@@ -159,7 +159,8 @@ export default {
         searchIcon: true,
         column: [
           {
-            label: '货运日期',
+            // label: '货运日期',
+            label:this.$t("land118n.freightDate"),
             prop: 'arrivalTime',
             overHidden: true,
             type: "date",
@@ -171,7 +172,8 @@ export default {
             width: 134,
             search: true,
           }, {
-            label: '业务员',
+            // label: '业务员',
+            label:this.$t("land118n.salesperson"),
             index: 2,
             width: 74,
             prop: 'salesman',
@@ -184,75 +186,87 @@ export default {
               value: "id"
             }
           }, {
-            label: '运输调度',
+            // label: '运输调度',
+            label:this.$t("land118n.transportationScheduling"),
             prop: 'dispatcherName',
             overHidden: true,
             index: 2,
             width: 76,
           }, {
-            label: '货运地点',
+            // label: '货运地点',
+            label:this.$t("land118n.freightLocation"),
             prop: 'addressDetail',
             index: 3,
             width: 122,
             search: true,
           }, {
-            label: '提单号',
+            // label: '提单号',
+            label:this.$t("land118n.mblno"),
             prop: 'billNo',
             index: 4,
             overHidden: true,
             width: 140,
             search: true,
           }, {
-            label: '场站',
+            // label: '场站',
+            label:this.$t("land118n.CY"),
             prop: 'station',
             overHidden: true,
             index: 5,
             width: 70,
             search: true,
           }, {
-            label: '计划箱量',
+            // label: '计划箱量',
+            label:this.$t("land118n.ctnDetail"),
             prop: 'ctnDetail',
             overHidden: true,
             index: 6,
             width: 84
           }, {
-            label: '已派箱量',
+            // label: '已派箱量',
+            label:this.$t("land118n.dispatchCtnDetail"),
             prop: 'dispatchCtnDetail',
             overHidden: true,
             index: 7,
             width: 84
           }, {
-            label: '受理箱量',
+            // label: '受理箱量',
+            label:this.$t("land118n.sendCtnDetail"),
             prop: 'sendCtnDetail',
             overHidden: true,
             index: 8,
             width: 94
           }, {
-            label: '车队',
+            // label: '车队',
+            label:this.$t("land118n.motorcade"),
             index: 9,
             width: 92,
             overHidden: true,
             prop: 'fleetNameDetail'
           }, {
-            label: '运费',
+            // label: '运费',
+            label:this.$t("land118n.shippingCost"),
             index: 10,
             width: 98,
             prop: 'freight'
           }, {
-            label: '状态',
+            // label: '状态',
+            label:this.$t("land118n.status"),
             prop: 'itemStatusDetail',
             index: 11,
             overHidden: true,
             width: 140
           }, {
-            label: '公司名称',
+            // label: '公司名称',
+            label:this.$t("land118n.corpShortName"),
             prop: 'corpShortName',
             overHidden: true,
             index: 12,
             width: 112,
             search: true,
           }, {
-            label: '订单号',
+            // label: '订单号',
+            label:this.$t("land118n.orderNo"),
             prop: 'orderNo',
             index: 13,
             overHidden: true,
@@ -285,7 +299,8 @@ export default {
           // }
           ,
           {
-            label: '制单日期',
+            // label: '制单日期',
+            label:this.$t("land118n.createTime"),
             overHidden: true,
             prop: 'createTime',
             type: "date",

src/views/landTransportation/driver/index.vue

@@ -8,12 +8,12 @@
               <div class="card">
                 <div class="card-title card-title1">
                 <span>
-                  全
+                  {{$t("landbtn118n.allShort")}}
                 </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="!activeName?'selected':''">{{ totalData.all }}</span>
-                  <span class="card-content-text" :class="!activeName?'selected':''">全部</span>
+                  <span class="card-content-text" :class="!activeName?'selected':''">{{$t("landbtn118n.all")}}</span>
                 </div>
               </div>
             </div>
@@ -22,12 +22,12 @@
               <div class="card">
                 <div class="card-title card-title4">
                 <span>
-                  受
+                  {{$t("landbtn118n.acceptanceShort")}}
                 </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="activeName === '2'?'selected':''">{{ totalData.two }}</span>
-                  <span class="card-content-text" :class="activeName === '2'?'selected':''">未受理</span>
+                  <span class="card-content-text" :class="activeName === '2'?'selected':''">{{$t("landbtn118n.noAcceptanced")}}</span>
                 </div>
               </div>
             </div>
@@ -36,12 +36,12 @@
               <div class="card">
                 <div class="card-title card-title5">
                 <span>
-                  未
+                  {{$t("landbtn118n.completedShort")}}
                 </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="activeName === '3'?'selected':''">{{ totalData.three }}</span>
-                  <span class="card-content-text" :class="activeName === '3'?'selected':''">未完工</span>
+                  <span class="card-content-text" :class="activeName === '3'?'selected':''">{{$t("landbtn118n.noCompleted")}}</span>
                 </div>
               </div>
             </div>
@@ -50,12 +50,12 @@
               <div class="card">
                 <div class="card-title card-title6">
                     <span>
-                      已
+                      {{$t("landbtn118n.completedShort")}}
                     </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="activeName === '4'?'selected':''">{{ totalData.four }}</span>
-                  <span class="card-content-text" :class="activeName === '4'?'selected':''">已完工</span>
+                  <span class="card-content-text" :class="activeName === '4'?'selected':''">{{$t("landbtn118n.completed")}}</span>
                 </div>
               </div>
             </div>
@@ -257,7 +257,8 @@ export default {
             decimals: 2
           }],
         column: [{
-          label: '货运日期',
+          // label: '货运日期',
+          label: this.$t("land118n.freightDate"),
           prop: 'arrivalTime',
           overHidden: true,
           type: "date",
@@ -269,39 +270,45 @@ export default {
           width: 119,
           search: true,
         }, {
-          label: '物流运输',
+          // label: '物流运输',
+          label: this.$t("land118n.logisticsTransportation"),
           prop: 'dispatchDeptName',
           overHidden: true,
           index: 1,
           width: 82,
         }, {
-          label: '运输调度',
+          // label: '运输调度',
+          label: this.$t("land118n.transportationScheduling"),
           prop: 'dispatcherName',
           overHidden: true,
           index: 1,
           width: 70,
         },{
-          label: '货运地点',
+          // label: '货运地点',
+          label: this.$t("land118n.freightLocation"),
           index: 2,
           width: 138,
           search: true,
           prop: 'addressDetail'
         },{
-          label: '提单号',
+          // label: '提单号',
+          label: this.$t("land118n.mblno"),
           width: 140,
           index:3,
           search: true,
           overHidden: true,
           prop: 'billNo'
         }, {
-          label: '场站',
+          // label: '场站',
+          label: this.$t("land118n.CY"),
           prop: 'station',
           overHidden: true,
           index: 4,
           width: 68,
           search: true,
         },{
-          label: '箱型',
+          // label: '箱型',
+          label: this.$t("land118n.ctnrType"),
           width: 68,
           search: true,
           index: 5,
@@ -314,12 +321,14 @@ export default {
             value: "dictValue"
           },
         }, {
-          label: '箱量',
+          // label: '箱量',
+          label: this.$t("land118n.ctnrQty"),
           width: 58,
           index: 6,
           prop: 'ctnQuantity'
         },  {
-          label: '车队',
+          // label: '车队',
+          label: this.$t("land118n.motorcade"),
           width: 90,
           search: true,
           index:7,
@@ -335,7 +344,8 @@ export default {
             value: "id"
           }
         },{
-          label: '车号',
+          // label: '车号',
+          label: this.$t("land118n.vehicleNumber"),
           width: 82,
           prop: 'plateNo',
           filterable: true,
@@ -349,7 +359,8 @@ export default {
             value: "plateNo"
           }
         }, {
-          label: '司机',
+          // label: '司机',
+          label: this.$t("land118n.driver"),
           width: 77,
           index:9,
           search: true,
@@ -363,21 +374,24 @@ export default {
             value: "id"
           },
         }, {
-          label: '电话',
+          // label: '电话',
+          label: this.$t("land118n.tel"),
           width: 124,
           index:10,
           overHidden: true,
           search: true,
           prop: 'tel'
         }, {
-          label: '平台号',
+          // label: '平台号',
+          label: this.$t("land118n.orderNo"),
           width: 100,
           index: 11,
           search: true,
           overHidden: true,
           prop: 'orderNo'
         }, {
-          label: '箱号',
+          // label: '箱号',
+          label: this.$t("land118n.caseNumber"),
           cell: true,
           width: 140,
           index: 12,
@@ -385,7 +399,8 @@ export default {
           search: true,
           prop: 'ctnNo'
         },{
-          label: '实际到厂时间',
+          // label: '实际到厂时间',
+          label: this.$t("land118n.arrivalTime"),
           prop: 'realArrivalTime',
           overHidden: true,
           type: "date",
@@ -396,7 +411,8 @@ export default {
           index: 14,
           width: 132
         },{
-          label: '受理日期',
+          // label: '受理日期',
+          label: this.$t("land118n.acceptDate"),
           type: "datetime",
           format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -404,7 +420,8 @@ export default {
           index: 13,
           prop: 'acceptTime'
         },{
-          label: '提箱时间',
+          // label: '提箱时间',
+          label: this.$t("land118n.datetime"),
           type: "datetime",
           format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -412,7 +429,8 @@ export default {
           index: 13,
           prop: 'borrowTime'
         },{
-          label: '完工日期',
+          // label: '完工日期',
+          label: this.$t("land118n.completionDate"),
           prop: 'finishedTime',
           overHidden: true,
           type: "date",
@@ -424,14 +442,16 @@ export default {
           width: 132,
           // search: true,
         },{
-          label: '货物名称',
+          // label: '货物名称',
+          label: this.$t("land118n.goods"),
           overHidden: true,
           width: 100,
           search: true,
           index: 17,
           prop: 'goods'
         }, {
-          label: '件数',
+          // label: '件数',
+          label: this.$t("land118n.QTY"),
           width: 75,
           search: true,
           index: 18,
@@ -442,7 +462,8 @@ export default {
           type: 'number',
           precision:0
         }, {
-          label: '重量(吨)',
+          // label: '重量(吨)',
+          label: this.$t("land118n.landWeight"),
           width: 75,
           prop: 'landWeight',
           controls: false,
@@ -451,7 +472,8 @@ export default {
           precision: 2,
           type: 'number'
         },{
-          label: '尺码',
+          // label: '尺码',
+          label: this.$t("land118n.size"),
           width: 75,
           // search: true,
           index:20,
@@ -459,25 +481,29 @@ export default {
           cell: true,
           prop: 'size',
         }, {
-          label: '应付陆运费',
+          // label: '应付陆运费',
+          label: this.$t("land118n.payableLandFreight"),
           overHidden: true,
           index: 21,
-          width: 68,
+          width: 100,
           prop: 'landAmountC'
         }, {
-          label: '委托备注',
+          // label: '委托备注',
+          label: this.$t("land118n.entrustmentRemarks"),
           overHidden: true,
           width: 238,
           index: 22,
           prop: 'remarks'
         }, {
-          label: '车队备注',
+          // label: '车队备注',
+          label: this.$t("land118n.fleetRemarks"),
           overHidden: true,
           width: 238,
           index: 23,
           prop: 'fleetRemarks'
         }, {
-          label: '司机备注',
+          // label: '司机备注',
+          label: this.$t("land118n.sRemarks"),
           overHidden: true,
           cell: true,
           width: 238,
@@ -537,7 +563,8 @@ export default {
         //   prop: 'feeRemarksC'
         // },
           {
-          label: '制单日期',
+          // label: '制单日期',
+          label: this.$t("land118n.createTime"),
           overHidden: true,
           prop: 'createTime',
           type: "date",
@@ -550,13 +577,15 @@ export default {
           search: true,
         },{
           label: '船名航次',
+          // label: this.$t("land118n.sRemarks"),
           prop: 'factory',
           overHidden: true,
           index: 32,
           width: 120,
           search: true,
         },{
-          label: '状态',
+          // label: '状态',
+          label: this.$t("land118n.status"),
           width: 100,
           type: 'select',
           index:33,

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -3,12 +3,12 @@
     <div class="customer-head">
       <div class="customer-back" v-if="!home">
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-          @click="backToList(0)">返回列表
+          @click="backToList(0)">{{$t("landbtn118n.toList")}}
         </el-button>
       </div>
       <div class="customer-back" v-else>
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
-          @click="backToList(1)">返回列表
+          @click="backToList(1)">{{$t("landbtn118n.toList")}}
         </el-button>
         <el-button type="danger" v-if="returnButton" style="border: none;background: none;color: red"
           icon="el-icon-arrow-left" @click="backToList(2)">返回首页
@@ -33,7 +33,7 @@
           <el-button type="success" v-if="goodsForm.status === 1" size="small" @click="submit(false)">取消提交
           </el-button>
           <el-button type="primary" :disabled="goodsForm.status >= 1" size="small" :loading="type" v-if="!typeTwo"
-            @click="editCustomer">保存
+            @click="editCustomer">{{$t("landbtn118n.save")}}
           </el-button>
           <el-button type="primary" :disabled="goodsForm.status === 1" size="small" v-else :loading="type"
             @click="changeSaving">变更保存

src/views/landTransportation/placeAnOrder/index.vue

@@ -8,12 +8,13 @@
               <div class="card">
                 <div class="card-title card-title1">
                   <span>
-                    全
+                    {{ $t("landbtn118n.allShort") }}
                   </span>
                 </div>
                 <div class="card-content">
                   <span class="card-content-num" :class="!activeName ? 'selected' : ''">{{ totalData.all }}</span>
-                  <span class="card-content-text" :class="!activeName ? 'selected' : ''">全部</span>
+                  <span class="card-content-text" :class="!activeName ? 'selected' : ''">{{ $t("landbtn118n.all")
+                    }}</span>
                 </div>
               </div>
             </div>
@@ -22,12 +23,14 @@
               <div class="card">
                 <div class="card-title card-title7">
                   <span>
-                    提
+                    {{ $t("landbtn118n.submitShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '999' ? 'selected' : ''">{{ totalData.last }}</span>
-                  <span class="card-content-text" :class="activeName === '999' ? 'selected' : ''">未提交</span>
+                  <span class="card-content-num" :class="activeName === '999' ? 'selected' : ''">{{ totalData.last
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '999' ? 'selected' : ''">{{
+                    $t("landbtn118n.notSubmitted") }}</span>
                 </div>
               </div>
             </div>
@@ -36,12 +39,14 @@
               <div class="card">
                 <div class="card-title card-title2">
                   <span>
-                    调
+                    {{ $t("landbtn118n.scheduledShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '0' ? 'selected' : ''">{{ totalData.zero }}</span>
-                  <span class="card-content-text" :class="activeName === '0' ? 'selected' : ''">未调度</span>
+                  <span class="card-content-num" :class="activeName === '0' ? 'selected' : ''">{{ totalData.zero
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '0' ? 'selected' : ''">{{
+                    $t("landbtn118n.noScheduled") }}</span>
                 </div>
               </div>
             </div>
@@ -50,12 +55,14 @@
               <div class="card">
                 <div class="card-title card-title3">
                   <span>
-                    派
+                    {{ $t("landbtn118n.dispatchedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '1' ? 'selected' : ''">{{ totalData.one }}</span>
-                  <span class="card-content-text" :class="activeName === '1' ? 'selected' : ''">未派车</span>
+                  <span class="card-content-num" :class="activeName === '1' ? 'selected' : ''">{{ totalData.one
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '1' ? 'selected' : ''">{{
+                    $t("landbtn118n.noDispatched") }}</span>
                 </div>
               </div>
             </div>
@@ -64,12 +71,14 @@
               <div class="card">
                 <div class="card-title card-title4">
                   <span>
-                    受
+                    {{ $t("landbtn118n.acceptanceShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '2' ? 'selected' : ''">{{ totalData.two }}</span>
-                  <span class="card-content-text" :class="activeName === '2' ? 'selected' : ''">未受理</span>
+                  <span class="card-content-num" :class="activeName === '2' ? 'selected' : ''">{{ totalData.two
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '2' ? 'selected' : ''">{{
+                    $t("landbtn118n.noAcceptanced") }}</span>
                 </div>
               </div>
             </div>
@@ -78,12 +87,14 @@
               <div class="card">
                 <div class="card-title card-title5">
                   <span>
-                    完
+                    {{ $t("landbtn118n.completedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '3' ? 'selected' : ''">{{ totalData.three }}</span>
-                  <span class="card-content-text" :class="activeName === '3' ? 'selected' : ''">未完工</span>
+                  <span class="card-content-num" :class="activeName === '3' ? 'selected' : ''">{{ totalData.three
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '3' ? 'selected' : ''">{{
+                    $t("landbtn118n.noCompleted") }}</span>
                 </div>
               </div>
             </div>
@@ -92,12 +103,14 @@
               <div class="card">
                 <div class="card-title card-title6">
                   <span>
-                    工
+                    {{ $t("landbtn118n.closedShort") }}
                   </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num" :class="activeName === '4' ? 'selected' : ''">{{ totalData.four }}</span>
-                  <span class="card-content-text" :class="activeName === '4' ? 'selected' : ''">已关闭</span>
+                  <span class="card-content-num" :class="activeName === '4' ? 'selected' : ''">{{ totalData.four
+                  }}</span>
+                  <span class="card-content-text" :class="activeName === '4' ? 'selected' : ''">{{
+                    $t("landbtn118n.closed") }}</span>
                 </div>
               </div>
             </div>
@@ -106,13 +119,15 @@
       </div>
     </basic-container>
     <basic-container v-show="show">
-      <avue-crud v-if="key > 0" :table-loading="loading" :page.sync="page" :data="dataList" ref="crud" :search.sync="query"
-        :option="option" @on-load="onLoad" @row-del="rowDel" @search-reset="query = {}; activeName = ''"
-        @selection-change="selectionChange" @resetColumn="resetColumn" @saveColumn="saveColumn"
-        @search-criteria-switch="searchCriteriaSwitch" @search-change="searchChange">
+      <avue-crud v-if="key > 0" :table-loading="loading" :page.sync="page" :data="dataList" ref="crud"
+        :search.sync="query" :option="option" @on-load="onLoad" @row-del="rowDel"
+        @search-reset="query = {}; activeName = ''" @selection-change="selectionChange" @resetColumn="resetColumn"
+        @saveColumn="saveColumn" @search-criteria-switch="searchCriteriaSwitch" @search-change="searchChange">
         <template slot="menuLeft" slot-scope="{size}">
-          <el-button type="primary" icon="el-icon-plus" :size="size" @click="rowSave" v-if="roleName != '平台,调度派单'">创建单据</el-button>
-          <el-button type="success" :size="size" :disabled="selectionList.length !== 1" @click="copyDocument">复制单据
+          <el-button type="primary" icon="el-icon-plus" :size="size" @click="rowSave" v-if="roleName != '平台,调度派单'">{{
+            $t("landbtn118n.new") }}</el-button>
+          <el-button type="success" :size="size" :disabled="selectionList.length !== 1" @click="copyDocument">{{
+            $t("landbtn118n.copy")}}
           </el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
         </template>
@@ -135,17 +150,20 @@
           <!--                     @click.stop="rowCell(row,index)">编辑-->
           <!--          </el-button>-->
           <el-button type="text" icon="el-icon-delete" size="small" v-if="row.status < 1"
-            @click.stop="$refs.crud.rowDel(row, index)">删除
+            @click.stop="$refs.crud.rowDel(row, index)">{{ $t("landbtn118n.deleted") }}
           </el-button>
         </template>
         <template slot="corpName" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.corpName }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.corpName
+          }}</span>
         </template>
         <template slot="orderNo" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.orderNo }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.orderNo
+          }}</span>
         </template>
         <template slot="billNo" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.billNo }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.billNo
+          }}</span>
         </template>
         <template slot="fleetNameDetail" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row, index)">{{ row.fleetNameDetail
@@ -219,7 +237,7 @@ export default {
         highlightCurrentRow: true,
         column: [
           {
-            label: '货运日期',
+            label: this.$t("land118n.freightDate"),
             prop: 'arrivalTime',
             overHidden: true,
             type: "date",
@@ -231,7 +249,7 @@ export default {
             width: 126,
             search: true,
           }, {
-            label: '业务员',
+            label: this.$t("land118n.salesperson"),
             index: 2,
             width: 76,
             prop: 'salesman',
@@ -244,7 +262,7 @@ export default {
               value: "id"
             }
           }, {
-            label: '物流运输',
+            label: this.$t("land118n.logisticsTransportation"),
             prop: 'dispatchDept',
             search: true,
             dicUrl: "/api/blade-system/dept/top-list?deptCategory=1",
@@ -257,68 +275,71 @@ export default {
             index: 2,
             width: 94
           }, {
-            label: '货运地点',
+            label: this.$t("land118n.freightLocation"),
             prop: 'addressDetail',
             index: 3,
             width: 132,
             search: true,
           }, {
-            label: '提单号',
+            label: this.$t("land118n.mblno"),
             prop: 'billNo',
             index: 4,
             overHidden: true,
             width: 140,
             search: true,
           }, {
-            label: '场站',
+            label: this.$t("land118n.CY"),
             prop: 'station',
             overHidden: true,
             index: 5,
             width: 70,
             search: true,
           }, {
-            label: '计划箱量',
+            label: this.$t("land118n.ctnDetail"),
             prop: 'ctnDetail',
             overHidden: true,
             index: 6,
             width: 78
           }, {
-            label: '已派箱量',
+            label: this.$t("land118n.dispatchCtnDetail"),
             prop: 'dispatchCtnDetail',
             overHidden: true,
             index: 7,
             width: 82
           }, {
-            label: '受理箱量',
+            label: this.$t("land118n.sendCtnDetail"),
             prop: 'sendCtnDetail',
             overHidden: true,
             index: 8,
             width: 80
           }, {
-            label: '车队',
+            label: this.$t("land118n.motorcade"),
             width: 78,
             index: 8,
             prop: 'fleetNameDetail'
           }, {
-            label: '运费',
+            label: this.$t("land118n.shippingCost"),
             index: 9,
             width: 86,
             prop: 'freight'
           }, {
-            label: '状态',
+             // label: '状态',
+            label: this.$t("land118n.status"),
             prop: 'itemStatusDetail',
             index: 11,
             overHidden: true,
             width: 140
           }, {
-            label: '公司名称',
+             // label: '公司名称',
+            label: this.$t("land118n.corpShortName"),
             prop: 'corpShortName',
             overHidden: true,
             index: 12,
             width: 112,
             search: true,
           }, {
-            label: '订单号',
+            // label: '订单号',
+            label: this.$t("land118n.orderNo"),
             prop: 'orderNo',
             index: 13,
             overHidden: true,
@@ -349,13 +370,15 @@ export default {
           //   search: true,
           // }
           , {
-            label: '制单人',
+            //label: '制单人',
+            label: this.$t("land118n.createBy"),
             prop: 'createUserName',
             overHidden: true,
             index: 14,
             width: 80,
           }, {
-            label: '制单日期',
+            //label: '制单日期',
+            label: this.$t("land118n.createTime"),
             overHidden: true,
             prop: 'createTime',
             type: "date",

vue.config.js

@@ -50,7 +50,8 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
-        // target: 'http://192.168.8.104:1080',
+        // target: 'http://192.168.8.101:1080',
+        // target: 'http://192.168.8.114:1080',
         // target: 'http://127.0.0.1:1080',
         // 打包地址
         target: 'http://121.37.83.47:10004',//服务器ip