解决代码冲突

src/lang/en.js

@@ -132,7 +132,7 @@ export default {
         businessSource:'businessSource',
         businessName:'businessName',
         scndesc:'scndesc',
-        auditStatus:'auditStatus',
+        feeStatus:'feeStatus',
         sourceBillNo:'sourceBillNo',
         debitStatus:'debitStatus',
         creditStatus:'creditStatus',
@@ -217,9 +217,20 @@ export default {
         hblPaymentPlace:'hblPaymentPlace',
         mblPaymentPlace:'mblPaymentPlace',
         modifier:'modifier',
-        modifiedDate:'modifiedDate'
-
-
+        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',
@@ -229,12 +240,15 @@ export default {
         new:'new',
         importTemplate:'importTemplate',
         preview:'preview',
-        save:'save',
         mdBillType:'mdBillType',
         mhAddmm:'mhAddmm',
         offLoad:'offLoad',
         cancelOffLoad:'cancelOffLoad',
+        save:'save',
         deleted:'deleted',
+        edit:'edit',
+        toDebit:'toDebit',
+        toCredit:'toCredit',
         exportData:'exportData',
         debitTemplate:'debitTemplate',
         creditTemplate:'creditTemplate',
@@ -250,9 +264,17 @@ export default {
         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

@@ -131,7 +131,7 @@ export default {
     businessSource:'业务来源',
     businessName:'来源明细',
     scndesc:'收发通人',
-    auditStatus:'审核状态',
+    feeStatus:'费用状态',
     sourceBillNo:'来源单号',
     debitStatus:'收费状态',
     creditStatus:'付费状态',
@@ -214,7 +214,21 @@ export default {
     hblPaymentPlace:'HBL付款地点',
     mblPaymentPlace:'MBL付款地点',
     modifier:'修改人',
-    modifiedDate:'修改日期'
+    modifiedDate:'修改日期',
+    debit:'收费',
+    credit:'付费',
+    corpType:'客户类别',
+    chargeCorp:'收费对象',
+    payCorp:'付费对象',
+    unitNo:'计价单位',
+    currency:'币别',
+    exrate:'汇率',
+    price:'单价',
+    quantity:'数量',
+    localCurrency:'本币',
+    foreignCurrency:'外币',
+    reportNo:'报表编码'
+
   },
   btn118n: {
     newDD:'创建直单',
@@ -230,12 +244,16 @@ export default {
     offLoad:'退舱',
     cancelOffLoad:'撤销退舱',
     deleted:'删除',
+    edit:'编辑',
+    toDebit:'生成应收',
+    toCredit:'生成应付',
     exportData:'导出数据',
     debitTemplate:'收费模版',
     creditTemplate:'付费模版',
     costTemplate:'成本模版',
     submitDebit:'提交收费',
     submitCredit:'提交付费',
+    printBill:'打印账单',
     toList:'返回列表',
     previous:'上一票',
     next:'下一票',
@@ -248,6 +266,13 @@ export default {
     apply:'请求锁单',
     unapply:'撤销锁定',
     checked:'审核',
+    applyFee:'请核费用',
+    unApplyFee:'撤销请核',
+    applyModify:'申请修改',
+    applyDelete:'申请删除',
+    unAplly:'取消申请',
+    applyInvoice:'申请发票',
+    applyPay:'申请付费',
     SIInfoImport:'SI导入'
 
   }

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

@@ -5,7 +5,7 @@
                 <el-col :span="6">
                     <el-form-item label="客户名称" prop="corpCnName">
                         <span slot="label">
-                            <span style="color: #1e9fff">客户名称</span>
+                            <span style="color: #1e9fff">{{$t("sea118n.corpName")}}</span>
                         </span>
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpCnName" size="small"
                             autocomplete="off" disabled clearable placeholder="客户名称"></el-input>
@@ -14,7 +14,7 @@
                 <el-col :span="6">
                     <el-form-item label="提单号" prop="mblno">
                         <span slot="label">
-                            <span style="color: #1e9fff">提单号</span>
+                            <span style="color: #1e9fff">{{$t("sea118n.mblno")}}</span>
                         </span>
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.mblno" size="small"
                             autocomplete="off" disabled clearable placeholder="提单号"></el-input>
@@ -23,7 +23,7 @@
                 <el-col :span="6">
                     <el-form-item label="箱型箱量" prop="containers">
                         <span slot="label">
-                            <span style="color: #1e9fff">箱型箱量</span>
+                            <span style="color: #1e9fff">{{$t("sea118n.ctnrTypeQty")}}</span>
                         </span>
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr" size="small"
                             autocomplete="off" disabled clearable placeholder="箱型箱量"></el-input>
@@ -32,7 +32,7 @@
                 <el-col :span="6">
                     <el-form-item label="HB/L NO" prop="hblno">
                         <span slot="label">
-                            <span style="color: #1e9fff">HB/L NO</span>
+                            <span style="color: #1e9fff">{{$t("sea118n.hblno")}}</span>
                         </span>
                         <el-input type="age" style="width: 100%;" v-model="assemblyForm.hblno" size="small"
                             autocomplete="off" disabled clearable placeholder="HB/L NO"></el-input>
@@ -303,22 +303,22 @@ export default {
                 menuWidth: '160',
                 column: [
                     {
-                        label: "报表编码",
+                        label: this.$t("sea118n.reportNo"),
                         prop: "reportsCode",
                         overHidden: true,
                     },
                     {
-                        label: "单据类型",
+                        label: this.$t("sea118n.billType"),
                         prop: "groupCode",
                         overHidden: true,
                     },
                     {
-                        label: "创建人",
+                        label: this.$t("sea118n.createBy"),
                         prop: "createUserName",
                         overHidden: true,
                     },
                     {
-                        label: "创建时间",
+                        label: this.$t("sea118n.createTime"),
                         prop: "createTime",
                         overHidden: true,
                     },

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

@@ -7,7 +7,7 @@
                     <el-col :span="6">
                         <el-form-item label="客户名称" prop="corpCnName">
                             <span slot="label">
-                                <span style="color: #1e9fff">客户名称</span>
+                                <span style="color: #1e9fff">{{$t("sea118n.corpName")}}</span>
                             </span>
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.corpCnName" size="small"
                                 autocomplete="off" disabled clearable placeholder="客户名称"></el-input>
@@ -16,7 +16,7 @@
                     <el-col :span="6">
                         <el-form-item label="提单号" prop="mblno">
                             <span slot="label">
-                                <span style="color: #1e9fff">提单号</span>
+                                <span style="color: #1e9fff">{{$t("sea118n.mblno")}}</span>
                             </span>
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.mblno" size="small"
                                 autocomplete="off" disabled clearable placeholder="提单号"></el-input>
@@ -25,7 +25,7 @@
                     <el-col :span="6">
                         <el-form-item label="箱型箱量" prop="containers">
                             <span slot="label">
-                                <span style="color: #1e9fff">箱型箱量</span>
+                                <span style="color: #1e9fff">{{$t("sea118n.ctnrTypeQty")}}</span>
                             </span>
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr"
                                 size="small" autocomplete="off" disabled clearable placeholder="箱型箱量"></el-input>
@@ -34,7 +34,7 @@
                     <el-col :span="6">
                         <el-form-item label="HB/L NO" prop="hblno">
                             <span slot="label">
-                                <span style="color: #1e9fff">HB/L NO</span>
+                                <span style="color: #1e9fff">{{$t("sea118n.hblno")}}</span>
                             </span>
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.hblno" size="small"
                                 autocomplete="off" disabled clearable placeholder="HB/L NO"></el-input>
@@ -53,10 +53,11 @@
                 <template slot="menuLeft">
                     <div style="display: inline-block;margin-right: 20px" class="disabledBox fontSize">
                         <i class="el-icon-coin"></i>
-                        <span>应收费用</span>
+                        <span>{{$t("sea118n.debit")}}</span>
                     </div>
                     <el-button v-if="isFeeEditD" type="danger" plain size="small"
-                        :disabled="!selectionDList.length || disabled" @click="batchDelete('D')">一键删除
+                        :disabled="!selectionDList.length || disabled"
+                        @click="batchDelete('D')">{{$t("btn118n.deleted")}}
                     </el-button>
                     <!-- <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
@@ -66,29 +67,29 @@
                         :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
                     </el-button> -->
-                    <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
+                    <el-button type="primary" plain size="small" @click="printingCostsfun('D')">{{$t("btn118n.printBill")}}</el-button>
                     <el-button v-if="isFeeEditD" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
-                        @click="templateClick('D')">应收模板</el-button>
+                        @click="templateClick('D')">{{$t("btn118n.debitTemplate")}}</el-button>
                     <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled"
-                        @click="feecenterSubmitListfun">一键保存</el-button>
+                        @click="feecenterSubmitListfun">{{$t("btn118n.save")}}</el-button>
                     <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled"
-                        @click="feecenterEditfun('D')">一键编辑
+                        @click="feecenterEditfun('D')">{{$t("btn118n.edit")}}
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
-                        :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
+                        :disabled="disabled || pleasereviewType" @click="copyfun('D')">{{$t("btn118n.toCredit")}}</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
-                        @click="allClick('发票申请', 'D')">发票申请</el-button>
+                         @click="allClick('发票申请', 'D')">{{$t("btn118n.applyInvoice")}}</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
-                        @click="allClick('D费用申请')">请核费用</el-button>
+                        @click="allClick('D费用申请')">{{$t("btn118n.applyFee")}}</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
-                        @click="allClick('D撤销请核')">撤销请核</el-button>
-                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1 || showLock"
-                        @click="allClick('D申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1 || showLock"
-                        @click="allClick('D申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1 || showLock"
-                        @click="allClick('D取消申请')">取消申请</el-button>
+                        @click="allClick('D撤销请核')">{{$t("btn118n.unApplyFee")}}</el-button>
+                    <el-button type="primary" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                        @click="allClick('D申请修改')">{{$t("btn118n.applyModify")}}</el-button>
+                    <el-button type="success" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                        @click="allClick('D申请删除')">{{$t("btn118n.applyDelete")}}</el-button>
+                    <el-button type="danger" plain size="small" :disabled="selectionDList.length != 1||showLock"
+                        @click="allClick('D取消申请')">{{$t("btn118n.unAplly")}}</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditD" type="primary" size="small" icon="el-icon-plus" circle
@@ -214,10 +215,11 @@
                 <template slot="menuLeft">
                     <div style="display: inline-block;margin-right: 20px" class="disabledBox meetSize">
                         <i class="el-icon-coin"></i>
-                        <span>应付费用</span>
+                        <span>{{$t("sea118n.credit")}}</span>
                     </div>
                     <el-button v-if="isFeeEditC" type="danger" plain size="small"
-                        :disabled="!selectionCList.length || disabled" @click="batchDelete('C')">一键删除
+                        :disabled="!selectionCList.length || disabled"
+                        @click="batchDelete('C')">{{$t("btn118n.deleted")}}
                     </el-button>
                     <!-- <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
@@ -227,33 +229,34 @@
                         :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('C')">撤销账单
                     </el-button> -->
-                    <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
+                    <el-button type="primary" plain size="small" @click="printingCostsfun('C')">{{$t("btn118n.printBill")}}</el-button>
                     <el-button v-if="isFeeEditC" type="success" plain size="small"
                         :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
-                        @click="templateClick('C')">应付模板
+                        @click="templateClick('C')">{{$t("btn118n.creditTemplate")}}
                     </el-button>
                     <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled"
-                        @click="feecenterSubmitListfun">一键保存
+                        @click="feecenterSubmitListfun">{{$t("btn118n.save")}}
                     </el-button>
                     <el-button v-if="isFeeEditC" type="info" plain size="small" :disabled="disabled"
-                        @click="feecenterEditfun('C')">一键编辑
+                        @click="feecenterEditfun('C')">{{$t("btn118n.edit")}}
                     </el-button>
                     <el-button v-if="isFeeEditC" type="primary" plain size="small"
-                        :disabled="disabled || pleasereviewType" @click="copyfun('C')">生成应收
+                        :disabled="disabled || pleasereviewType" @click="copyfun('C')">{{$t("btn118n.applyPay")}}
                     </el-button>
-                    <el-button type="info" plain size="small" @click="allClick('付费申请', 'C')">付费申请</el-button>
+                    <el-button type="info" plain size="small"
+                        @click="allClick('付费申请', 'C')">{{$t("btn118n.applyPay")}}</el-button>
                     <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
-                        @click="allClick('C费用申请')">请核费用</el-button>
+                        @click="allClick('C费用申请')">{{$t("btn118n.applyFee")}}</el-button>
                     <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
-                        @click="allClick('C撤销请核')">撤销请核</el-button>
+                        @click="allClick('C撤销请核')">{{$t("btn118n.unApplyFee")}}</el-button>
                     <!-- <el-button type="success" plain size="small" :disabled="disabled"
                         @click="allClick('提取成本')">提取成本</el-button> -->
-                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1 || showLock"
-                        @click="allClick('C申请修改')">申请修改</el-button>
-                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1 || showLock"
-                        @click="allClick('C申请删除')">申请删除</el-button>
-                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1 || showLock"
-                        @click="allClick('C取消申请')">取消申请</el-button>
+                    <el-button type="primary" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                        @click="allClick('C申请修改')">{{$t("btn118n.applyModify")}}</el-button>
+                    <el-button type="success" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                        @click="allClick('C申请删除')">{{$t("btn118n.applyDelete")}}</el-button>
+                    <el-button type="danger" plain size="small" :disabled="selectionCList.length != 1||showLock"
+                        @click="allClick('C取消申请')">{{$t("btn118n.unAplly")}}</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="isFeeEditC" type="primary" size="small" icon="el-icon-plus" circle
@@ -1037,7 +1040,7 @@ export default {
                     //     overHidden: true,
                     // },
                     {
-                        label: this.$t("sea.auditStatus"),
+                        label: this.$t("sea118n.feeStatus"),
                         prop: 'auditStatus',
                         overHidden: true,
                         width: 80,
@@ -1063,13 +1066,13 @@ export default {
                         }],
                     },
                     {
-                        label: "类别",
+                        label: this.$t("sea118n.corpType"),
                         prop: "corpType",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "结算单位",
+                        label: this.$t("sea118n.chargeCorp"),
                         prop: "corpCnName",
                         width: "120",
                         overHidden: true,
@@ -1081,55 +1084,55 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "费用简称",
+                        label: this.$t("sea118n.feeInfo"),
                         prop: "feeCnName",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "预付/到付",
+                        label: "PP/CC",
                         prop: "paymode",
                         width: "90",
                         overHidden: true,
                     },
                     {
-                        label: "计量单位",
+                        label: this.$t("sea118n.unitNo"),
                         prop: "unitNo",
                         width: "90",
                         overHidden: true,
                     },
                     {
-                        label: "币种",
+                        label: this.$t("sea118n.currency"),
                         prop: "curCode",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "汇率",
+                        label: this.$t("sea118n.exrate"),
                         prop: "exrate",
                         width: "60",
                         overHidden: true,
                     },
                     {
-                        label: "单价",
+                        label: this.$t("sea118n.price"),
                         prop: "price",
                         width: "80",
                         overHidden: true,
                     },
                     {
-                        label: "数量",
+                        label: this.$t("sea118n.quantity"),
                         prop: "quantity",
                         width: "80",
                         overHidden: true,
                     },
                     {
-                        label: "本币",
+                        label:this.$t("sea118n.localCurrency"),
                         prop: "rmbAmount",
                         width: "80",
                         overHidden: true,
                     },
                     {
-                        label: "外币",
+                        label: this.$t("sea118n.foreignCurrency"),
                         prop: "usdAmount",
                         width: "80",
                         overHidden: true,
@@ -1241,7 +1244,7 @@ export default {
                     //     overHidden: true,
                     // },
                     {
-                        label: '审核状态',
+                        label: this.$t("sea118n.feeStatus"),
                         prop: 'auditStatus',
                         overHidden: true,
                         width: 80,
@@ -1267,67 +1270,67 @@ export default {
                         }],
                     },
                     {
-                        label: "类别",
+                        label:this.$t("sea118n.corpType"),
                         prop: "corpType",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "结算单位",
+                        label:  this.$t("sea118n.payCorp"),
                         prop: "corpCnName",
                         width: "120",
                         overHidden: true,
                     },
                     {
-                        label: "费用简称",
+                        label: this.$t("sea118n.feeInfo"),
                         prop: "feeCnName",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "预付/到付",
+                        label: "PP/CC",
                         prop: "paymode",
                         width: "90",
                         overHidden: true,
                     },
                     {
-                        label: "计量单位",
+                        label: this.$t("sea118n.unitNo"),
                         prop: "unitNo",
                         width: "90",
                         overHidden: true,
                     },
                     {
-                        label: "币种",
+                        label: this.$t("sea118n.currency"),
                         prop: "curCode",
                         width: "100",
                         overHidden: true,
                     },
                     {
-                        label: "汇率",
+                        label: this.$t("sea118n.exrate"),
                         prop: "exrate",
                         width: "60",
                         overHidden: true,
                     },
                     {
-                        label: "单价",
+                        label: this.$t("sea118n.price"),
                         prop: "price",
                         width: "80",
                         overHidden: true,
                     },
                     {
-                        label: "数量",
+                        label: this.$t("sea118n.quantity"),
                         prop: "quantity",
                         width: "80",
                         overHidden: true,
                     },
                     {
-                        label: "本币",
+                        label:  this.$t("sea118n.localCurrency"),
                         prop: "rmbAmount",
                         width: "80",
                         overHidden: true,
                     },
                     {
-                        label: "外币",
+                        label:  this.$t("sea118n.foreignCurrency"),
                         prop: "usdAmount",
                         width: "80",
                         overHidden: true,

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -77,7 +77,7 @@
                     @click.stop="allClick('同步主单到分单')">{{ $t("btn118n.setInfoMMToMH") }}
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || showLock" v-if="form.billType == 'MM'"
-                    @click.stop="allClick('同步分单信息')">{{ $t("btn118n.unsetInfoMMToMH") }}
+                    @click.stop="allClick('同步分单信息')">{{ $t("btn118n.getInfoMMToMH") }}
                 </el-button>
                 <el-button v-if="form.id && form.billType == 'MH'" size="small" type="success"
                     @click.stop="allClick('提单确认')">{{ $t("btn118n.SIInfoImport") }}

src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -1111,13 +1111,13 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: this.$t("sea118n.QTY"),
-                        prop: "GW",
+                        label: this.$t("sea118n.GW"),
+                        prop: "grossWeight",
                         width: "120",
                         overHidden: true
                     },
                     {
-                        label: this.$t("sea118n.CMB"),
+                        label: this.$t("sea118n.CBM"),
                         prop: "measurement",
                         width: "120",
                         overHidden: true