Merge branch 'master' of http://git.echepei.com/caojunjie/digital_transformation_ui

src/lang/en.js

@@ -64,8 +64,8 @@ export default {
     data: 'data',
     error: 'error',
     test: 'test',
-    seExport: 'Export',
-    seImport: 'Import'
+    seExport:'Export',
+    seImport:'Import'
   },
   login: {
     title: 'Login ',
@@ -108,174 +108,174 @@ export default {
     closeOthers: 'Close Others',
     closeAll: 'Close All'
   },
-  sea118n: {
-    corpName: 'corpName',
-    branchName: 'branchName',
-    mblno: 'mblno',
-    hblno: 'hblno',
-    billType: 'billType',
-    localStatus: 'localStatus',
-    transferOrderStatus: 'transferOrderStatus',
-    billNo: 'billNo',
-    billDate: 'billDate',
-    vessel: 'vessel',
-    voy: 'voy',
-    op: 'op',
-    etd: 'etd',
-    eta: 'eta',
-    carrier: 'carrier',
-    pol: 'pol',
-    pod: 'pod',
-    placeDelivery: 'placeDelivery',
-    lane: 'lane',
-    CY: 'CY',
-    businessSource: 'businessSource',
-    businessName: 'businessName',
-    scndesc: 'scndesc',
-    feeStatus: 'feeStatus',
-    sourceBillNo: 'sourceBillNo',
-    debitStatus: 'debitStatus',
-    creditStatus: 'creditStatus',
-    createBy: 'createBy',
-    orderBy: 'orderBy',
-    processing: 'processing',
-    waitApply: 'waitApply',
-    completed: 'completed',
-    all: 'all',
-    entering: 'entering',
-    enteringStatus: 'enteringStatus',
-    officeApplyStatus: 'officeApplyStatus',
-    generateNo: 'generateNo',
-    onBoard: 'onBoard',
-    onArrival: 'onArrival',
-    masteNo: 'masteNo',
-    hblCount: 'hblCount',
-    customerService: 'customerService',
-    ctnrTypeQty: 'ctnrTypeQty',
-    cargoType: 'cargoType',
-    bookingAgent: 'bookingAgent',
-    marks: 'marks',
-    descOfGoods: 'goods',
-    QTY: 'QTY',
-    package: 'package',
-    GW: 'GW',
-    NETGW: 'NETGW',
-    CBM: 'CBM',
-    TEU: 'TEU',
-    hblTeu: 'hblTeu',
-    ttlDebit: 'ttlDebit',
-    applyStatus: 'applyStatus',
-    checkStatus: 'checkStatus',
-    debitStlStatus: 'debitStlStatus',
-    creditStlStatus: 'creditStlStatus',
-    invoiceStatus: 'invoiceStatus',
-    createTime: 'createTime',
-    billStatus: 'billStatus',
-    bookStatus: 'bookStatus',
-    financeStatus: 'financeStatus',
-    auditStatus: 'auditStatus',
-    remarks: 'remarks',
-    orderInfo: 'orderInfo',
-    info: 'Info',
-    billInfo: 'billInfo',
-    feeInfo: 'feeInfo',
-    docCenter: 'docCenter',
-    ctnrList: 'ctnrList',
-    masterBill: 'masterBill',
-    reportManage: 'reportManage',
-    fileCerter: 'fileCerter',
-    hblnolist: 'hblnolist',
-    shipper: 'shipper',
-    cnee: 'cnee',
-    notify: 'notify',
-    agent: 'agent',
-    issueDate: 'issueDate',
-    issueType: 'issueType',
-    issuePlace: 'issuePlace',
-    bookRemarks: 'bookRemarks',
-    siRemarks: 'siRemarks',
-    SOCORCOC: 'SOCORCOC',
-    ctnrType: 'ctnrType',
-    ctnrQty: 'ctnrQty',
-    payment: 'payment',
+    sea118n: {
+        corpName: 'corpName',
+        branchName: 'branchName',
+        mblno:'mblno',
+        hblno:'hblno',
+        billType:'billType',
+        localStatus:'localStatus',
+        transferOrderStatus:'transferOrderStatus',
+        billNo:'billNo',
+        billDate:'billDate',
+        vessel:'vessel',
+        voy:'voy',
+        op:'op',
+        etd:'etd',
+        eta:'eta',
+        carrier:'carrier',
+        pol:'pol',
+        pod:'pod',
+        placeDelivery:'placeDelivery',
+        lane:'lane',
+        CY:'CY',
+        businessSource:'businessSource',
+        businessName:'businessName',
+        scndesc:'scndesc',
+        feeStatus:'feeStatus',
+        sourceBillNo:'sourceBillNo',
+        debitStatus:'debitStatus',
+        creditStatus:'creditStatus',
+        createBy:'createBy',
+        orderBy:'orderBy',
+        processing:'processing',
+        waitApply:'waitApply',
+        completed:'completed',
+        all:'all',
+        entering:'entering',
+        enteringStatus:'enteringStatus',
+        officeApplyStatus:'officeApplyStatus',
+        generateNo :'generateNo',
+        onBoard:'onBoard',
+        onArrival:'onArrival',
+        masteNo:'masteNo',
+        hblCount:'hblCount',
+        customerService:'customerService',
+        ctnrTypeQty:'ctnrTypeQty',
+        cargoType:'cargoType',
+        bookingAgent:'bookingAgent',
+        marks:'marks',
+        descOfGoods:'goods',
+        QTY:'QTY',
+        package:'package',
+        GW:'GW',
+        NETGW:'NETGW',
+        CBM:'CBM',
+        TEU:'TEU',
+        hblTeu:'hblTeu',
+        ttlDebit:'ttlDebit',
+        auditStatus:'auditStatus',
+        applyStatus:'applyStatus',
+        checkStatus:'checkStatus',
+        debitStlStatus:'debitStlStatus',
+        creditStlStatus:'creditStlStatus',
+        invoiceStatus:'invoiceStatus',
+        createTime:'createTime',
+        billStatus:'billStatus',
+        bookStatus:'bookStatus',
+        financeStatus:'financeStatus',
+        remarks:'remarks',
+        orderInfo:'orderInfo',
+        info:'Info',
+        billInfo:'billInfo',
+        feeInfo:'feeInfo',
+        docCenter:'docCenter',
+        ctnrList:'ctnrList',
+        masterBill:'masterBill',
+        reportManage:'reportManage',
+        fileCerter:'fileCerter',
+        hblnolist:'hblnolist',
+        shipper:'shipper',
+        cnee:'cnee',
+        notify:'notify',
+        agent:'agent',
+        issueDate:'issueDate',
+        issueType:'issueType',
+        issuePlace:'issuePlace',
+        bookRemarks:'bookRemarks',
+        siRemarks:'siRemarks',
+        SOCORCOC:'SOCORCOC',
+        ctnrType:'ctnrType',
+        ctnrQty:'ctnrQty',
+        payment:'payment',
 
-    bookingDate: 'bookingDate',
-    polFreeTime: 'polFreeTime',
-    podTreeTime: 'podTreeTime',
-    noOfCopy: 'noOfCopy',
-    businessType: 'businessType',
-    limitWeight: 'limitWeight',
-    limitSpace: 'limitSpace',
-    shippingTerms: 'shippingTerms',
-    docCutofftime: 'docCutofftime',
-    portCutofftime: 'portCutofftime',
-    shippingAgent: 'shippingAgent',
-    spaceType: 'spaceType',
-    spaceQty: 'spaceQty',
-    bookCanceldate: 'bookCanceldate',
-    loadingType: 'V',
-    noOfForiginal: 'noOfForiginal',
-    hblPaymentPlace: 'hblPaymentPlace',
-    mblPaymentPlace: 'mblPaymentPlace',
-    modifier: 'modifier',
-    modifiedDate: 'modifiedDate',
-    debit: 'debit',
-    credit: 'credit',
-    corpType: 'corpType',
-    chargeCorp: 'chargeCorp',
-    payCorp: 'payCorp',
-    unitNo: 'unitNo',
-    currency: 'currency',
-    exrate: 'exrate',
-    price: 'price',
-    quantity: 'quantity',
-    localCurrency: 'localCurrency',
-    foreignCurrency: 'foreignCurrency',
-    reportNo: 'reportNo'
-  },
-  btn118n: {
-    newDD: 'newDD',
-    newMM: 'newMM',
-    newMH: 'newMH',
-    copy: 'copy',
-    new: 'new',
-    importTemplate: 'importTemplate',
-    preview: 'preview',
-    mdBillType: 'mdBillType',
-    mhAddmm: 'mhAddmm',
-    offLoad: 'offLoad',
-    cancelOffLoad: 'cancelOffLoad',
-    save: 'save',
-    deleted: 'deleted',
-    edit: 'edit',
-    toDebit: 'toDebit',
-    toCredit: 'toCredit',
-    exportData: 'exportData',
-    debitTemplate: 'debitTemplate',
-    creditTemplate: 'creditTemplate',
-    costTemplate: 'costTemplate',
-    submitDebit: 'submitDebit',
-    submitCredit: 'submitCredit',
-    toList: 'toList',
-    previous: 'previous',
-    next: 'next',
-    localApply: 'localApply',
-    unlocalApply: 'unlocalApply',
-    transferApply: 'transferApply',
-    unltransferApply: 'unltransferApply',
-    setInfoMMToMH: 'setInfoMMToMH',
-    getInfoMMToMH: 'getInfoMMToMH',
-    printBill: 'printBill',
-    apply: 'apply',
-    unapply: 'unapply',
-    checked: 'checked',
-    applyFee: 'applyFee',
-    unApplyFee: 'unApplyFee',
-    applyModify: 'applyModify',
-    applyDelete: 'applyDelete',
-    unAplly: 'unAplly',
-    applyInvoice: 'applyInvoice',
-    applyPay: 'applyPay',
-    SIInfoImport: 'SIInfoImport'
-  }
+        bookingDate:'bookingDate',
+        polFreeTime:'polFreeTime',
+        podTreeTime:'podTreeTime',
+        noOfCopy:'noOfCopy',
+        businessType:'businessType',
+        limitWeight:'limitWeight',
+        limitSpace:'limitSpace',
+        shippingTerms:'shippingTerms',
+        docCutofftime:'docCutofftime',
+        portCutofftime:'portCutofftime',
+        shippingAgent:'shippingAgent',
+        spaceType:'spaceType',
+        spaceQty:'spaceQty',
+        bookCanceldate:'bookCanceldate',
+        loadingType:'V',
+        noOfForiginal:'noOfForiginal',
+        hblPaymentPlace:'hblPaymentPlace',
+        mblPaymentPlace:'mblPaymentPlace',
+        modifier:'modifier',
+        modifiedDate:'modifiedDate',
+        debit:'debit',
+        credit:'credit',
+        corpType:'corpType',
+        chargeCorp:'chargeCorp',
+        payCorp:'payCorp',
+        unitNo:'unitNo',
+        currency:'currency',
+        exrate:'exrate',
+        price:'price',
+        quantity:'quantity',
+        localCurrency:'localCurrency',
+        foreignCurrency:'foreignCurrency',
+        reportNo:'reportNo'
+    },
+    btn118n: {
+        newDD:'newDD',
+        newMM:'newMM',
+        newMH:'newMH',
+        copy:'copy',
+        new:'new',
+        importTemplate:'importTemplate',
+        preview:'preview',
+        mdBillType:'mdBillType',
+        mhAddmm:'mhAddmm',
+        offLoad:'offLoad',
+        cancelOffLoad:'cancelOffLoad',
+        save:'save',
+        deleted:'deleted',
+        edit:'edit',
+        toDebit:'toDebit',
+        toCredit:'toCredit',
+        exportData:'exportData',
+        debitTemplate:'debitTemplate',
+        creditTemplate:'creditTemplate',
+        costTemplate:'costTemplate',
+        submitDebit:'submitDebit',
+        submitCredit:'submitCredit',
+        toList:'toList',
+        previous:'previous',
+        next:'next',
+        localApply:'localApply',
+        unlocalApply:'unlocalApply',
+        transferApply:'transferApply',
+        unltransferApply:'unltransferApply',
+        setInfoMMToMH:'setInfoMMToMH',
+        getInfoMMToMH:'getInfoMMToMH',
+        printBill:'printBill',
+        apply:'apply',
+        unapply:'unapply',
+        checked:'checked',
+        applyFee:'applyFee',
+        unApplyFee:'unApplyFee',
+        applyModify:'applyModify',
+        applyDelete:'applyDelete',
+        unAplly:'unAplly',
+        applyInvoice:'applyInvoice',
+        applyPay:'applyPay',
+        SIInfoImport:'SIInfoImport'
+    }
 }

src/lang/zh.js

@@ -162,6 +162,7 @@ export default {
     TEU:'TEU',
     hblTeu:'分单TEU',
     ttlDebit:'合计收',
+    auditStatus:'审核状态',
     applyStatus:'付费申请状态',
     checkStatus:'对账状态',
     debitStlStatus:'收费状态',
@@ -171,7 +172,6 @@ export default {
     billStatus:'业务状态',
     bookStatus:'订舱状态',
     financeStatus:'财务状态',
-    auditStatus:'审核状态',
     remarks:'备注',
     orderInfo:'委托信息',
     info:'信息',

src/views/iosBasicData/financialManagement/fininvoicesOutput/index.vue

@@ -406,6 +406,24 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "发票本币",
+                        prop: "amountCny",
+                        width: "140",
+                        overHidden: true,
+                    },
+                    {
+                        label: "发票外币",
+                        prop: "amountUsd",
+                        width: "100",
+                        overHidden: true,
+                    },
+                    {
+                        label: "合计本币",
+                        prop: "amountLoc",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "单据编号",
                         prop: "billNo",
                         search: true,
@@ -432,12 +450,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "合计本币",
-                        prop: "amountLoc",
-                        width: "120",
-                        overHidden: true,
-                    },
-                    {
                         label: "单据日期",
                         prop: "billDate",
                         overHidden: true,
@@ -591,7 +603,7 @@ export default {
                     //     width: "150",
                     //     overHidden: true,
                     // },
-                    {
+/*                    {
                         label: "开票单位税号",
                         prop: "invCorpTaxNo",
                         width: "140",
@@ -620,7 +632,7 @@ export default {
                         prop: "invCorpAccountNoUsd",
                         width: "160",
                         overHidden: true,
-                    },
+                    },*/
                     {
                         label: "船名/航次",
                         prop: "vesselVoyno",
@@ -658,11 +670,11 @@ export default {
                         prop: "curCode",
                         overHidden: true,
                     },
-                    {
+    /*                {
                         label: "原汇率",
                         prop: "exrate",
                         overHidden: true,
-                    },
+                    },*/
                     {
                         label: "是否转换为人民币",
                         prop: "isExchangeToCny",
@@ -693,11 +705,11 @@ export default {
                         width: "120",
                         overHidden: true,
                     },
-                    {
+  /*                  {
                         label: "订舱",
                         prop: "bookingNo",
                         overHidden: true,
-                    },
+                    },*/
                     // {
                     //     label: "中文船名",
                     //     prop: "vesselCnName",
@@ -735,7 +747,7 @@ export default {
                         prop: "approverName",
                         overHidden: true,
                     },
-                    {
+/*                    {
                         label: "是否代理发票",
                         prop: "isAgent",
                         width: "120",
@@ -747,7 +759,7 @@ export default {
                             value: 1
                         }],
                         overHidden: true,
-                    },
+                    },*/
                     {
                         label: "是否DK",
                         prop: "isDk",
@@ -760,7 +772,7 @@ export default {
                         }],
                         overHidden: true,
                     },
-                    {
+/*                    {
                         label: "是否RP",
                         prop: "isRp",
                         dicData: [{
@@ -776,7 +788,7 @@ export default {
                         label: "RP名称",
                         prop: "rpName",
                         overHidden: true,
-                    },
+                    },*/
                     {
                         label: "导出日期",
                         prop: "exportDate",
@@ -788,7 +800,7 @@ export default {
                         prop: "exportName",
                         overHidden: true,
                     },
-                    {
+/*                    {
                         label: "是否导出船名航次",
                         prop: "isExportVslvoy",
                         width: "140",
@@ -800,8 +812,8 @@ export default {
                             value: 1
                         }],
                         overHidden: true,
-                    },
-                    {
+                    },*/
+/*                    {
                         label: "是否导出主单号",
                         prop: "isExportMblno",
                         width: "140",
@@ -826,25 +838,14 @@ export default {
                             value: 1
                         }],
                         overHidden: true,
-                    },
-                    {
-                        label: "发票本币",
-                        prop: "amountCny",
-                        width: "140",
-                        overHidden: true,
-                    },
-                    {
-                        label: "发票外币",
-                        prop: "amountUsd",
-                        width: "100",
-                        overHidden: true,
-                    },
-                    {
+                    },*/
+
+/*                    {
                         label: "税额",
                         prop: "amountTax",
                         width: "100",
                         overHidden: true,
-                    },
+                    },*/
                     {
                         label: "全电发票备注",
                         prop: "elecRemarks",
@@ -857,7 +858,7 @@ export default {
                     //     width: "160",
                     //     overHidden: true,
                     // },
-                    {
+/*                    {
                         label: "银行进账单出票银行",
                         prop: "bankReceiptBankName",
                         width: "160",
@@ -868,14 +869,14 @@ export default {
                         prop: "bankReceiptAccountNo",
                         width: "160",
                         overHidden: true,
-                    },
+                    },*/
                     // {
                     //     label: "银行进账单票据种类",
                     //     prop: "bankReceiptBillType",
                     //     width: "160",
                     //     overHidden: true,
                     // },
-                    {
+/*                    {
                         label: "银行进账单票据张数",
                         prop: "bankReceiptBillCount",
                         width: "160",
@@ -886,7 +887,7 @@ export default {
                         prop: "bankReceiptIsIncome",
                         width: "180",
                         overHidden: true,
-                    },
+                    },*/
                     {
                         label: "备注",
                         prop: "remarks",