完善翻译

src/i18n/languages/en_US.json

@@ -3790,5 +3790,25 @@
     "版本号不能为空": "Version number cannot be empty",
     "内部号不能为空": "Internal number cannot be empty",
     "版本链接不能为空": "Version link cannot be empty",
-  "强制更新不能为空": "Forced update cannot be empty"
+    "强制更新不能为空": "Forced update cannot be empty",
+    "货物毛重(KGS)": "",
+    "请输入货物毛重": "",
+    "提单确认件.xlsx": "",
+    "提交佣金付款单反核销申请成功，请耐心等待审核结果": "",
+    "客户档案未设置银行账户。": "",
+    "反核销审核详情": "",
+    "全部核销审核详情": "",
+    "取消全部核销审核": "",
+    "提交收款单反核销": "",
+    "输入金额不对": "",
+    "确定要取消此报价单么？": "",
+    "确定要恢复此报价单么？": "",
+    "确定要删除此报价单么？": "",
+    "标签超过1000需要耐心等候标签生成，请稍候": "",
+    "首次入仓时间": "",
+    "订单{no}的放货箱数不能大于可放货箱数": "",
+    "请填写合作开始时间": "",
+    "请填写合作结束时间": "",
+    "境内外": "",
+    "合计：{totalNum}箱，{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG": "Total：{totalNum}Box，{totalVolume}m³(Test) {totalChargeVolume}m³(Weight) {totalWeight}KG"
 }
\ No newline at end of file

src/views/ecw/offer/detail.vue

@@ -781,13 +781,13 @@
       /** 删除按钮操作 */
       handleDelete() {
         const offerId = this.offerId;
-        this.$modal.confirm(this.$t('是否确认删除报价单管理编号为')+'"' + offerId + '"'+this.$t('的数据项')+'?').then(function() {
+        this.$confirm(this.$t('是否确认删除报价单管理编号为')+'"' + offerId + '"'+this.$t('的数据项')+'?').then(function() {
             return deleteOffer(offerId);
           }).then(() => {
             this.$router.push({
               path: "/offer/result"
             });
-            this.$modal.msgSuccess(this.$t("删除成功"));
+            this.$message.success(this.$t("删除成功"));
           }).catch(() => {});
       },
     }

src/views/ecw/offer/index.vue

@@ -258,7 +258,7 @@ export default {
       params.pageNo = undefined;
       params.pageSize = undefined;
       // 执行导出
-      this.$modal.confirm(this.$t('是否确认导出所有报价单管理数据项?')).then(() => {
+      this.$confirm(this.$t('是否确认导出所有报价单管理数据项?')).then(() => {
           this.exportLoading = true;
           if(this.dept){
             return exportDeptOfferExcel(params)
@@ -269,13 +269,13 @@ export default {
         }).catch(() => {});
     },
     cancel(id){
-      this.doAction('确定要取消此报价单么？', cancel, id);
+      this.doAction(this.$t('确定要取消此报价单么？'), cancel, id);
     },
     recovery(id){
-      this.doAction('确定要恢复此报价单么？', recovery, id);
+      this.doAction(this.$t('确定要恢复此报价单么？'), recovery, id);
     },
     deleteOffer(id){
-      this.doAction('确定要删除此报价单么？', deleteOffer, id);
+      this.doAction(this.$t('确定要删除此报价单么？'), deleteOffer, id);
     },
     doAction(tips, action, id){
       this.$confirm(tips).then(res => {

src/views/ecw/order/index.vue

@@ -128,26 +128,26 @@
           :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button> -->
         <el-dropdown v-hasPermi="isAll ? ['ecw:order:export','ecw:order:export:other']:[exportPermiString]">
           <el-button type="primary" :loading="exportLoading" size="mini">
-            导出 <i class="el-icon-arrow-down el-icon--right"></i>
+            {{$t('导出')}} <i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item>
-            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item>
+            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">{{$t('导出勾选')}}</el-dropdown-item>
+            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">{{$t('导出搜索')}}</el-dropdown-item>
             <template v-if="isAll">
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportAbnormal">异常单统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportHeavyOrder">重货单统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportReturnOrder">退仓单统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportSaleRepay">售后赔偿金额统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportCustomsDatas">报关数据统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShippingDatas">客户出货量统计</el-dropdown-item>
-              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShipFee">预付运费统计</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportAbnormal">{{$t('异常单统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportHeavyOrder">{{$t('重货单统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportReturnOrder">{{$t('退仓单统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportSaleRepay">{{$t('售后赔偿金额统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportCustomsDatas">{{$t('报关数据统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShippingDatas">{{$t('客户出货量统计')}}</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShipFee">{{$t('预付运费统计')}}</el-dropdown-item>
             </template>
           </el-dropdown-menu>
         </el-dropdown>
       </el-col>
       <el-col :span="15" v-if="statistics">
         <!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 -->
-        合计：{{statistics.totalNum}}箱，{{statistics.totalVolume}}m³(测) {{statistics.totalChargeVolume}}m³(重) {{statistics.totalWeight}}KG
+        {{$t('合计：{totalNum}箱，{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG', statistics)}}
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -366,7 +366,7 @@
                   <!-- 退仓 -->
                   <template v-if="
                       (
-                        include(scope.row.inWarehouseState, [202, 210, 211, 213, 214, 215, 216]) &&
+                        include(scope.row.inWarehouseState, [202, 210, 211, 214, 215, 216]) &&
                         exclude(scope.row.abnormalState, [1])
                       ) ||
                       include(scope.row.status, [16])