更新收款单国际化

src/i18n/languages/en_US.json

@@ -3791,22 +3791,47 @@
     "内部号不能为空": "Internal number cannot be empty",
     "版本链接不能为空": "Version link cannot be empty",
     "强制更新不能为空": "Forced update cannot be empty",
-    "货物毛重(KGS)": "",
-    "请输入货物毛重": "",
-    "提单确认件.xlsx": "",
-    "提交佣金付款单反核销申请成功，请耐心等待审核结果": "",
-    "客户档案未设置银行账户。": "",
-    "反核销审核详情": "Anti-nuclear verification details",
-    "全部核销审核详情": "All verification audit details",
-    "取消全部核销审核": "Cancel all verification checks",
-    "提交收款单反核销": "submit receipt for cancellation verification",
-    "输入金额不对": "",
-    "标签超过1000需要耐心等候标签生成，请稍候": "",
-    "首次入仓时间": "",
-    "订单{no}的放货箱数不能大于控货箱数": "",
-    "请填写合作开始时间": "",
-    "请填写合作结束时间": "",
-    "境内外": "",
+    "请输入名称-中文": "Please enter a name - Chinese",
+    "请输入名称-英文": "Please enter a name - English",
+    "请输入内部名称-中文": "Please enter internal name - Chinese",
+    "请输入内部名称-英文": "Please enter the internal name - English",
+    "备注-中文": "Remarks - Chinese",
+    "备注-英文": "Remarks - English",
+    "请输入备注-英文": "Please enter remarks - English",
+    "货物毛重(KGS)": "Gross weight of goods (KGS)",
+    "请输入货物毛重": "Please enter the gross weight of the goods",
+    "提单确认件.xlsx": "Bill of Lading Confirmation.xlsx",
+    "提交佣金付款单反核销申请成功，请耐心等待审核结果": "Successfully submitted the commission payment form cancellation application. Please be patient and wait for the review result",
+    "客户档案未设置银行账户。": "The customer profile does not have a bank account set up.",
+    "反核销审核详情": "Details of anti verification approval",
+    "全部核销审核详情": "Full verification and review details",
+    "取消全部核销审核": "Cancel All Write-off Review",
+    "提交收款单反核销": "Submit payment receipt for reverse verification",
+    "输入金额不对": "Incorrect input amount",
+    "标签超过1000需要耐心等候标签生成，请稍候": "Tags exceeding 1000 require patience to wait for tag generation, please wait",
+    "首次入仓时间": "First entry time",
+    "订单{no}的放货箱数不能大于可放货箱数": "The number of delivery boxes for order {no} cannot be greater than the number of available delivery boxes",
+    "请填写合作开始时间": "Please fill in the start time of cooperation",
+    "请填写合作结束时间": "Please fill in the cooperation end time",
+    "境内外": "domestic and foreign",
+    "佣金付款单反审核": "De-approval of commission payment documents",
+    "佣金付款单核销申请": "Commission Payment Document Verification Application",
+    "佣金付款单反核销申请": "Commission Payment Document Reverse Write-off Application",
+    "取消佣金付款单反审核": "Cancel the approval of commission payment documents",
+    "提交取消反审核": "Submit Cancel De-approval",
+    "取消佣金付款单核销": "Cancel commission payment document verification",
+    "取消付款单核销": "Cancel Payment Order Write-off",
+    "取消佣金付款单反核销": "Cancel Commission Payment Document Cancellation",
+    "取消付款单反核销": "Cancel Payment Document Cancellation Write-off",
+    "零": "zero",
+    "玖": "nine",
+    "仟": "Thousand",
+    "兆": "Megabyte",
+    "角": "horn",
+    "厘": "Centimeters",
+    "取消付款单反审核": "Cancel Payment Order De-approval",
+    "提交核销": "Submit for verification",
+    "是否确认删除渠道管理编号为{channelId}的数据项?": "Are you sure to delete the data item with channel management number {channelId}?",
     "流程详情":"Flow details",
     "收款单核销审核":"The payment voucher verification review"
 }

src/router/index.js

@@ -171,13 +171,13 @@ export const constantRoutes = [
       path: 'empAchievement',
       component: (resolve) => require(['@/views/ecw/deptTarget/empAchievement'], resolve),
       name: '员工业绩',
-      meta: {title: '员工业绩', activeMenu: '/deptTarget/index'}
+      meta: {title: '员工业绩',titleEn: 'Emp Achievement', activeMenu: '/deptTarget/index'}
     },
       {
         path: 'myDeptAchievement',
         component: (resolve) => require(['@/views/ecw/deptTarget/myDeptAchievement'], resolve),
         name: '我的部门业绩',
-        meta: {title: '我的部门业绩', activeMenu: '/deptTarget/myDeptAchievement'}
+        meta: {title: '我的部门业绩',titleEn: 'My dept Achievement', activeMenu: '/deptTarget/myDeptAchievement'}
       }
     ]
   },

src/views/ecw/box/indexSea.vue

@@ -119,7 +119,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit" v-hasPermi="['shipment:box:update']">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.prStatus>21" command="edit" v-hasPermi="['shipment:box:update']">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item  command="sea" v-hasPermi="['shipment:box:action:sea']">{{$t('操作-海运')}}</el-dropdown-item>
               <el-dropdown-item command="error" v-hasPermi="['shipment:box:action:error']">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost" v-hasPermi="['shipment:box:action:cost']">{{$t('费用登记')}}</el-dropdown-item>

src/views/ecw/box/shippingSea/nodePage/booking.vue

@@ -8,13 +8,13 @@
         <supplierSelect v-model="bookingObj.shipCompanyType" :companyType="'9'" :placeholder="$t('请选择船公司类型')" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item :label="$t('驳船港')">
-        <dockSelect v-model="bookingObj.bargePortId" :placeholder="$t('请选择驳船港')" :allDocks="this.$attrs.allDocks" />
+        <dockSelect v-model="bookingObj.bargePortId" :placeholder="$t('请选择驳船港')" portType="2" :allDocks="this.$attrs.allDocks" />
       </el-form-item>
       <el-form-item :label="$t('起运港')">
-        <dockSelect v-model="bookingObj.bigPortId" :placeholder="$t('请选择起运港')" :allDocks="this.$attrs.allDocks" />
+        <dockSelect v-model="bookingObj.bigPortId" :placeholder="$t('请选择起运港')" portType="2" :allDocks="this.$attrs.allDocks" />
       </el-form-item>
       <el-form-item :label="$t('目的港')">
-        <dockSelect v-model="bookingObj.destPortId" :placeholder="$t('请选择目的港')" :allDocks="this.$attrs.allDocks" />
+        <dockSelect v-model="bookingObj.destPortId" :placeholder="$t('请选择目的港')" portType="2" :allDocks="this.$attrs.allDocks" />
       </el-form-item>
       <el-form-item :label="$t('订舱公司')">
         <supplierSelect v-model="bookingObj.spaceCompanyId" :companyType="'1'" :placeholder="$t('请选择订舱公司')" :allSupplier="this.$attrs.allSupplier" />

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -244,6 +244,7 @@
 import dayjs from "dayjs";
 import supplementOrder from "./supplementOrder.vue";
 import { getCabinetPage } from "@/api/ecw/cabinet";
+import { getbox } from "@/api/ecw/box";
 import {
   loadSecGoodsList,
   orderTagList,
@@ -333,6 +334,7 @@ export default {
       selectedUsers: [],
       // 订单信息
       boxOrderInfo: {},
+      newshipmentObj: {}
     };
   },
   created() {
@@ -341,9 +343,16 @@ export default {
     getCabinetPage(null).then((response) => {
       this.cabinetList = response.data.list;
     });
+    this.getBoxInfo()
   },
   methods: {
     getTotlContent,
+    getBoxInfo() {
+      getbox(this.shipmentObj.id).then((res) => {
+        const { data } = res;
+        this.newshipmentObj = data ?? {};
+      });
+    },
     /* 装柜部分列表 */
     getLoadSecGoodsList() {
       loadSecGoodsList({ shipmentId: this.shipmentObj.id }).then((res) => {
@@ -419,6 +428,8 @@ export default {
         case "modifyCabinet":
           this.$set(this.dialogConfig, "fullscreen", false);
           this.modifyCabinetObj = {};
+          this.$set(this.modifyCabinetObj,'cabinetId',this.newshipmentObj.cabinetId)
+          this.$set(this.modifyCabinetObj,'cubNo',this.newshipmentObj.cubNo)
           break;
         case "splitOrder":
           this.$set(this.dialogConfig, "fullscreen", true);
@@ -534,6 +545,7 @@ export default {
       };
       boxUpdate(params).then((res) => {
         serviceMsg(res, this);
+        this.getBoxInfo()
         this.closeDialog2();
       });
     },

src/views/ecw/box/shippingSea/nodePage/common/dockSelect.vue

@@ -14,6 +14,7 @@ export default {
   props: {
     value: Number,
     allDocks: Array,
+    portType: String
   },
   model: {
     prop: "value",
@@ -24,7 +25,8 @@ export default {
   },
   computed: {
     getDock() {
-      return this.allDocks;
+      if(!this.portType) return this.allDocks;
+      return this.allDocks.filter(item=>item.portType==this.portType)
     },
   },
   methods: {

src/views/ecw/box/shippingSea/nodePage/common/supplierSelect.vue

 <template>
-  <el-select filterable :value="value === 0 ? undefined : value" @change="change" v-bind="$attrs" clearable>
-    <el-option v-for="supplier in getSuppliers" :key="supplier.id" :label="$l(supplier, 'company')" :value="supplier.id"></el-option>
+  <el-select
+    filterable
+    :value="value === 0 ? undefined : value"
+    @change="change"
+    v-bind="$attrs"
+    clearable
+  >
+    <el-option
+      v-for="supplier in getSuppliers"
+      :key="supplier.id"
+      :label="$l(supplier, 'company')"
+      :value="supplier.id"
+    ></el-option>
   </el-select>
 </template>
 
@@ -14,6 +25,10 @@ export default {
     companyType: String,
     value: Number,
     allSupplier: Array,
+    areaType: {
+      type: Number,
+      default: 0
+    },
   },
   model: {
     prop: "value",
@@ -24,9 +39,12 @@ export default {
   },
   computed: {
     getSuppliers() {
-      if (!this.companyType) return this.allSupplier;
-      return this.allSupplier.filter((item) =>
-        item.areaType == 1
+      let allSupplier = this.allSupplier.filter(
+        (item) => item.areaType == this.areaType
+      );
+      if(this.areaType == 1 || !this.companyType) return allSupplier;
+      return allSupplier.filter((item) =>
+        item.companyTypes.includes(this.companyType)
       );
     },
   },

src/views/ecw/box/shippingSea/nodePage/subMaterial.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form ref="subMaterialForm" :model="subMaterialObj" label-width="140px">
       <el-form-item :label="$t('代理商AGENT')">
-        <supplierSelect v-model="subMaterialObj.agentId" :placeholder="$t('请选择供应商')" :allSupplier="this.$attrs.allSupplier" disabled />
+        <supplierSelect v-model="subMaterialObj.agentId" :areaType="1" :placeholder="$t('请选择供应商')" :allSupplier="this.$attrs.allSupplier" disabled />
       </el-form-item>
       <el-form-item :label="$t('提单号M/BL NO.')" class="two-element">
         <el-input v-model="subMaterialObj.blMblNo" :placeholder="$t('请输入提单号')"></el-input>
@@ -23,11 +23,11 @@
         <ladingSelect v-model="subMaterialObj.shipperId" :placeholder="$t('请选择托运人')" :allUsers="this.$attrs.allLading" />
       </el-form-item>
       <el-form-item :label="$t('收货人')">
-        <el-input v-model="subMaterialObj.consigneeName" readonly></el-input>
+        <el-input v-model="subMaterialObj.consigneeName" disabled></el-input>
         <!-- <userSelect v-model="subMaterialObj.consigneeId" :placeholder="$t('请选择收货人')" :allUsers="this.$attrs.allUsers" /> -->
       </el-form-item>
       <el-form-item :label="$t('通知方')">
-        <el-input v-model="subMaterialObj.notifyingName" readonly></el-input>
+        <el-input v-model="subMaterialObj.notifyingName" disabled></el-input>
         <!-- <userSelect v-model="subMaterialObj.notifyingId" :placeholder="$t('请选择通知方')" :allUsers="this.$attrs.allUsers" /> -->
       </el-form-item>
       <el-form-item label="Mark & No.">
@@ -129,18 +129,23 @@ export default {
     });
     const voName = this.$attrs.currNode.voName;
     let oldData = { ...this.shipmentObj[voName] };
+    oldData = formatNumberString(oldData, ["issueType"]);this.subMaterialObj = {
+      ...oldData,
+      packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
+    };
+    if(!this.shipmentObj.ladingBillInfo){
+      console.log(this.shipmentObj,'111')
       this.$set(this.subMaterialObj,'agentId',this.shipmentObj.agentInfo?.agentId||undefined)
       this.$set(this.subMaterialObj,'soNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
+      this.$set(this.subMaterialObj,'blMblNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
       this.$set(this.subMaterialObj,'markNo',"N/M")
       this.$set(this.subMaterialObj,'startPortId',this.shipmentObj.bookSeaInfo?.bigPortId||undefined)
+      this.$set(this.subMaterialObj,'shipCompanyId',Number(this.shipmentObj.bookSeaInfo?.shipCompanyType)||undefined)
       this.$set(this.subMaterialObj,'destPortId',this.shipmentObj.bookSeaInfo?.destPortId||undefined)
       this.$set(this.subMaterialObj,'kgs',this.shipmentObj.customsInfo?.dcGoodsWgt||undefined)
       this.$set(this.subMaterialObj,'containerSealNo',(this.shipmentObj.trailerInfo?.tlContainerNo||'')+'/'+(this.shipmentObj.trailerInfo?.tlStripSeal||'/'))
-    oldData = formatNumberString(oldData, ["issueType"]);
-    this.subMaterialObj = {
-      ...oldData,
-      packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
-    };
+      this.subMaterialObj.containerSealNo = this.subMaterialObj.containerSealNo.replace('//','')
+    }
     
     this.getSup(this.subMaterialObj.agentId)
   },

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -73,7 +73,11 @@
               <el-table-column :label="$t('重量')" align="center" prop="warehouseInInfo.weight">
               </el-table-column>
               <el-table-column :label="$t('数量（个）')" align="center" prop="quantity"></el-table-column>
-              <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>
+              <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
+                <template slot-scope="scope">
+                  {{notset(scope.row.positionNo)}}
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('状态')" align="center" prop="tallyStatus">
                 <template slot-scope="scope">
                   {{scope.row.tallyStatus === 1 ? $t('已理货') : $t('未理货')}}
@@ -150,6 +154,13 @@ export default {
   methods: {
     // 格式化日期
     formatDate,
+    //去重
+    notset(string){
+      if(!string) return string
+      let arr = string.split(',')
+      arr = arr.filter((item,index)=>{return arr.indexOf(item)==index})
+      return arr.toString()
+    },
     // 查询理货列表
     getList() {
       getTallyList({ shipmentId: this.shipmentObj.id }).then((res) => {

src/views/ecw/box/shippingSea/nodePage/tally/warehouseDetail.vue

@@ -33,7 +33,9 @@
       <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
       <el-table-column :label="$t('数量（个）')" prop="quantityAll" />
       <el-table-column :label="$t('快递单号')" prop="expressNo" />
-      <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>
+      <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
+        <template slot-scope="{row}">{{row.orderLocationBackVOList.map(e => (e.areaName + (e.locationName === null ? '' : e.locationName))).join(',')}}</template>
+      </el-table-column>
       <el-table-column :label="$t('入仓时间')" prop="inTime">
         <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
       </el-table-column>

src/views/ecw/box/shippingSea/nodePage/trailer.vue

@@ -7,7 +7,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('拖车公司')">
-        <supplierSelect v-model="trailerObj.tlCompanyId" :companyType="'4'" :placeholder="$t('请选择拖车公司')" :allSupplier="this.$attrs.allSupplier" />
+        <supplierSelect v-model="trailerObj.tlCompanyId" :companyType="'4'" :areaType="0" :placeholder="$t('请选择拖车公司')" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item :label="$t('拖车时间')" prop="tlTime">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="trailerObj.tlTime"></el-date-picker>

src/views/ecw/channel/edit.vue

@@ -10,19 +10,19 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item :label="$t('中文名称')" prop="nameZh">
-                            <el-input v-model="form.nameZh" placeholder="请输入名称-中文" />
+                            <el-input v-model="form.nameZh" :placeholder="$t('请输入名称-中文')" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item :label="$t('名称英文')" prop="nameEn">
-                            <el-input v-model="form.nameEn" placeholder="请输入名称-英文" />
+                            <el-input v-model="form.nameEn" :placeholder="$t('请输入名称-英文')" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item :label="$t('内部名称中文')" prop="internalNameZh">
                             <el-input
                                 v-model="form.internalNameZh"
-                                placeholder="请输入内部名称-中文"
+                                :placeholder="$t('请输入内部名称-中文')"
                             />
                         </el-form-item>
                     </el-col>
@@ -30,7 +30,7 @@
                         <el-form-item :label="$t('内部名称英文')" prop="internalNameEn">
                             <el-input
                                 v-model="form.internalNameEn"
-                                placeholder="请输入内部名称-英文"
+                                :placeholder="$t('请输入内部名称-英文')"
                             />
                         </el-form-item>
                     </el-col>
@@ -95,16 +95,16 @@
                     </el-col> -->
                 </el-row>
 
-                <el-form-item label="备注-中文" prop="remarksZh">
+                <el-form-item :label="$t('备注-中文')" prop="remarksZh">
                     <el-input
                         v-model="form.remarksZh"
-                        placeholder="请输入备注-中文"
+                        :placeholder="$t('请输入备注-中文')"
                     />
                 </el-form-item>
-                <el-form-item label="备注-英文" prop="remarksEn">
+                <el-form-item :label="$t('备注-英文')" prop="remarksEn">
                     <el-input
                         v-model="form.remarksEn"
-                        placeholder="请输入备注-英文"
+                        :placeholder="$t('请输入备注-英文')"
                     />
                 </el-form-item>
                 <!-- <el-form-item label="状态(0:禁用 1:启用)" prop="status">

src/views/ecw/channel/index.vue

@@ -201,7 +201,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const channelId = row.channelId;
-      this.$modal.confirm('是否确认删除渠道管理编号为"' + channelId + '"的数据项?').then(function() {
+      this.$modal.confirm(this.$t('是否确认删除渠道管理编号为{channelId}的数据项?'),{channelId} ).then(function() {
           return deleteChannel(channelId);
         }).then(() => {
           this.getList();

src/views/ecw/currency/index.vue

@@ -214,6 +214,7 @@ export default {
         fuhao: undefined,
         status: undefined,
         huilv: undefined,
+        exchangeToFc: undefined,
         aorder: undefined,
         createAt: undefined,
         updateAt: undefined,

src/views/ecw/customer/edit.vue

@@ -200,7 +200,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="13">
-              <el-form-item :label="$t('泡货标准')" prop="weightUnit">
+              <el-form-item :label="$t('泡货标准')" prop="lightUnit">
                 <el-switch v-model="showPao"/>
                 <el-input v-model="form.lightUnit" :placeholder="$t('请输入泡货标准')" v-show="showPao">
                   <template slot="append">kg/cbm</template>
@@ -800,8 +800,21 @@ export default {
           }
 
             // 重货标准和泡货标准，未打开就不传，提交前清空一下
-            if(!this.showZhong) this.form.weightUnit = ''
-            if(!this.showPao) this.form.lightUnit = ''
+            if(!this.showZhong) {
+              this.form.weightUnit = null
+              this.zhongLines = []
+            }
+            if (!this.showZhong1) {
+              this.zhongLines = []
+            }
+            if(!this.showPao) {
+              this.form.lightUnit = null
+              this.paoLines = []
+            }
+            if (!this.showPao1) {
+              this.paoLines = []
+            }
+            this.updateCustomerLines()
           const form = {...this.form, type: this.form.type?.join(','), transportType: (this.form.transportType || [])?.join(','), taxRate: Number(this.form.taxRate)}
 
           // 检查路线是否启用了但是没选择目的仓

src/views/ecw/deptTarget/allAchievement.vue

@@ -3,13 +3,13 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('关键字')" prop="transportType">
+      <el-form-item :label="$t('关键字')" prop="key">
         <el-input v-model="queryParams.key" :placeholder="$t('请输入关键字查找')" clearable/>
       </el-form-item>
       <el-form-item :label="$t('运输方式')" prop="transportType">
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable/>
       </el-form-item>
-      <el-form-item :label="$t('唛头')" prop="transportType">
+      <el-form-item :label="$t('唛头')" prop="marks">
         <el-input v-model="queryParams.marks" :placeholder="$t('请输入关键字查找')" clearable />
       </el-form-item>
       <el-form-item :label="$t('资源类型')" prop="customerType">
@@ -444,10 +444,8 @@
                 // this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
                 // this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
                 // 执行导出
-                this.$modal.confirm(this.$t('是否确认导出所有部门业绩数据项?')).then(() => {
                 this.exportLoading = true;
-                    return exportDetailExcel(params);
-                }).then(response => {
+                exportDetailExcel(params).then(response => {
                 this.$download.excel(response, `${this.$t('业绩明细')}.xls`);
 
                 this.exportLoading = false;
@@ -466,10 +464,8 @@
                 // this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
                 // this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
                 // 执行导出
-                this.$modal.confirm(this.$t('是否确认导出所有部门业绩统计?')).then(() => {
                 this.exportLoading = true;
-                    return exportStatisticsExcel(params);
-                }).then(response => {
+                exportStatisticsExcel(params).then(response => {
                 this.$download.excel(response, `${this.$t('业绩统计')}.xls`);
 
                 this.exportLoading = false;

src/views/ecw/deptTarget/myDeptAchievement.vue

@@ -3,13 +3,13 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('关键字')" prop="transportType">
+      <el-form-item :label="$t('关键字')" prop="key">
         <el-input v-model="queryParams.key" :placeholder="$t('请输入关键字查找')" />
       </el-form-item>
       <el-form-item :label="$t('运输方式')" prop="transportType">
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number"/>
       </el-form-item>
-      <el-form-item :label="$t('唛头')" prop="transportType">
+      <el-form-item :label="$t('唛头')" prop="marks">
         <el-input v-model="queryParams.marks" :placeholder="$t('请输入关键字查找')" />
       </el-form-item>
       <el-form-item :label="$t('资源类型')" prop="customerType">

src/views/ecw/financial/commission-Payment.vue

@@ -108,14 +108,14 @@
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:edit']" v-if="[0,2].includes(row.state)" @click="$router.push({path:'/financial/commission-requestFunds',query:{id:row.id}})" >{{$t('编辑')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:delete']" @click="deleteFn(row)" v-if="[0,2].includes(row.state)" > {{$t('删除')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:details']"  v-if="[7,3,1,5].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})"   >{{$t('审核详情')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn('取消审核',7, row, '取消审核' )"  >{{$t('取消审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn('佣金付款单反审核', 1, row, '提交反审核',)" >{{$t('反审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn('佣金付款单核销申请', 2, row, '提交核销')"  >{{$t('核销')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn($t('取消审核'),7, row, $t('取消审核') )"  >{{$t('取消审核')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn($t('佣金付款单反审核'), 1, row, $t('提交反审核'),)" >{{$t('反审核')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn($t('佣金付款单核销申请'), 2, row, $t('提交核销'))"  >{{$t('核销')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:print']" v-if="[4,6].includes(row.state)" @click="$router.push({path:'/financial/printPaymentVoucherCommission',query:{id:row.id}})"  >{{$t('打印')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn('佣金付款单反核销申请', 3, row, '提交反核销')" >{{$t('反核销')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn('取消佣金付款单反审核',4, row, '提交取消反审核' )" >{{$t('取消反审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)"  @click="bridgeFn('取消佣金付款单核销',5, row, '取消付款单核销' )" > {{$t('取消核销')}} </el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelCancellingWrite-off']"  v-if="[7].includes(row.state)"  @click="bridgeFn('取消佣金付款单反核销',6, row, '取消付款单反核销' )" > {{$t('取消反核销')}} </el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn($t('佣金付款单反核销申请'), 3, row, $t('提交反核销'))" >{{$t('反核销')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn($t('取消佣金付款单反审核'),4, row, $t('提交取消反审核') )" >{{$t('取消反审核')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)"  @click="bridgeFn($t('取消佣金付款单核销'),5, row, $t('取消付款单核销') )" > {{$t('取消核销')}} </el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelCancellingWrite-off']"  v-if="[7].includes(row.state)"  @click="bridgeFn($t('取消佣金付款单反核销'),6, row, $t('取消付款单反核销') )" > {{$t('取消反核销')}} </el-button>
        </template>
       </el-table-column>
     </el-table>

src/views/ecw/financial/commission-requestFunds.vue

@@ -751,13 +751,13 @@ export default {
     },
     convertCurrency(money) {
       //汉字的数字
-      var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
+      var cnNums = new Array(this.$t('零'), this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), this.$t('玖'));
       //基本单位
-      var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
+      var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), this.$t('仟'));
       //对应整数部分扩展单位
-      var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
+      var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), this.$t('兆'));
       //对应小数部分单位
-      var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
+      var cnDecUnits = new Array(this.$t('角'), this.$t('分'), this.$t('毫'), this.$t('厘'));
       //整数金额时后面跟的字符
       var cnInteger = this.$t('整');
       //整型完以后的单位

src/views/ecw/financial/components/commissionPaymentDetails.vue

 <template>
 <div>
   <el-descriptions :column="5"  size="mini">
-    <el-descriptions-item label="付款单">{{record.paymentNo}}</el-descriptions-item>
-    <el-descriptions-item label="客户名称">{{record.customerName}}</el-descriptions-item>
-    <el-descriptions-item label="创建时间">{{parseTime(record.createTime)}}</el-descriptions-item>
-    <el-descriptions-item label="业务员">{{record.salesmanName}}</el-descriptions-item>
-    <el-descriptions-item label="付款金额">{{record.totalAmount}}rmb</el-descriptions-item>
-    <el-descriptions-item v-if="record.reason" label="申请理由">{{record.reason}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('付款单')">{{record.paymentNo}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('客户名称')">{{record.customerName}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('创建时间')">{{parseTime(record.createTime)}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('业务员')">{{record.salesmanName}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('付款金额')">{{record.totalAmount}}rmb</el-descriptions-item>
+    <el-descriptions-item v-if="record.reason" :label="$t('申请理由')">{{record.reason}}</el-descriptions-item>
   </el-descriptions>
   <router-link :to="{path:'/financial/commission-requestFunds',query:{lookId: this.record.id}}">
-    <el-button type="primary">查看详情</el-button>
+    <el-button type="primary">{{$t('查看详情')}}</el-button>
   </router-link>
 </div>
 </template>
@@ -37,6 +37,7 @@ export default {
     id:{
       handler:function (newVal){
         commissionPaymentGetPaymentApprove({id:newVal}).then(r => {
+          console.log(r,'rrr');
           getCommissionPayment({id:r.data.paymentId}).then(res => {
             this.record = res.data;
             this.record.reason = r.data.reason //申请理由

src/views/ecw/financial/paymentVoucher.vue

@@ -141,25 +141,25 @@
                      v-hasPermi="['ecw:paymentVoucher:edit']" type="text">{{ $t('编辑') }}
           </el-button>
           <!--          <el-button v-if="[1,3].includes(row.state)" size="mini" v-hasPermi="['ecw:paymentVoucher:process']" type="text" @click="examineClick(scope.row.id)">{{ $t('审核') }}</el-button>-->
-          <el-button size="mini"  type="text" v-show="[1].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Unapprove']"  @click="bridgeFn(1, '取消审核',row)">
+          <el-button size="mini"  type="text" v-show="[1].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Unapprove']"  @click="bridgeFn(1, $t('取消审核'),row)">
             {{ $t('取消审核') }}
           </el-button>
           <el-button size="mini" type="text" v-show="[7,3,1,5].includes(row.state)"  v-hasPermi="['ecw:paymentVoucher:details']" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})" >{{ $t('审核详情') }}</el-button>
-          <el-button size="mini" type="text"  v-if="[3].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-De-approval']" @click="bridgeFn(2, '取消付款单反审核',row)" >{{ $t('取消反审核') }}</el-button>
-          <el-button size="mini"  type="text" v-if="[5].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Write-off']" @click="bridgeFn(3, '取消付款单核销',row)"  >{{ $t('取消核销') }}</el-button>
+          <el-button size="mini" type="text"  v-if="[3].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-De-approval']" @click="bridgeFn(2, $t('取消付款单反审核'),row)" >{{ $t('取消反审核') }}</el-button>
+          <el-button size="mini"  type="text" v-if="[5].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Write-off']" @click="bridgeFn(3, $t('取消付款单核销'),row)"  >{{ $t('取消核销') }}</el-button>
 
           <el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:De-approval']"
-                     @click="bridgeFn(4, '反审核',row)">{{ $t('反审核') }}
+                     @click="bridgeFn(4, $t('反审核'),row)">{{ $t('反审核') }}
           </el-button>
           <el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:writeOff']"
-                     @click="bridgeFn(5, '核销',row)">{{ $t('核销') }}
+                     @click="bridgeFn(5, $t('核销'),row)">{{ $t('核销') }}
           </el-button>
 
           <el-button v-if="[6].includes(row.state)" size="mini" type="text"
-                     v-hasPermi="['ecw:paymentVoucher:cancelWriteOff']" @click="bridgeFn(6, '反核销',row)">
+                     v-hasPermi="['ecw:paymentVoucher:cancelWriteOff']" @click="bridgeFn(6, $t('反核销'),row)">
             {{ $t('反核销') }}
           </el-button>
-          <el-button  v-if="[7].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Cancelling-Write-off']" size="mini" type="text" @click="bridgeFn(7, '取消付款单反核销',row)" > {{ $t('取消反核销') }}</el-button>
+          <el-button  v-if="[7].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Cancelling-Write-off']" size="mini" type="text" @click="bridgeFn(7, $t('取消付款单反核销'),row)" > {{ $t('取消反核销') }}</el-button>
           <!-- <el-button v-if="scope.row.state == 3" size="mini" type="text">{{ $t('开票') }}</el-button> -->
 
           <el-button v-if="[6,4].includes(row.state)" size="mini" type="text" @click="toprint(row.id)"

src/views/ecw/financial/printPaymentVoucher.vue

@@ -198,13 +198,13 @@
       },
       convertCurrency(money) {
         //汉字的数字
-        var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
+        var cnNums = new Array(this.$t('零'), this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), this.$t('玖'));
         //基本单位
-        var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
+        var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), this.$t('仟'));
         //对应整数部分扩展单位
-        var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
+        var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), this.$t('兆'));
         //对应小数部分单位
-        var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
+        var cnDecUnits = new Array(this.$t('角'), this.$t('分'), this.$t('毫'), this.$t('厘'));
         //整数金额时后面跟的字符
         var cnInteger = this.$t('整');
         //整型完以后的单位

src/views/ecw/order/batchSingleApplication.vue

@@ -19,8 +19,12 @@
           <template v-slot="{row}">
             <div v-if="row.costVO">
               {{$t('箱数')}}：{{ row.costVO.totalNum }}
-              {{ row.costVO.totalVolume }}m³
-              {{ row.costVO.totalWeight }}kg
+               <div>
+                 体积：{{ row.costVO.totalVolume }}CBM
+               </div>
+                <div>
+                  重量：{{ row.costVO.totalWeight }}kg
+                </div>
             </div>
           </template>
         </el-table-column>

src/views/ecw/order/cargoControl.vue

@@ -59,7 +59,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button>
+          :loading="exportLoading" v-hasPermi="['ecw:cargo:export:search']">{{$t('导出')}}</el-button>
       </el-form-item>
     </el-form>
 

src/views/ecw/order/components/TransferCargo.vue

@@ -152,15 +152,15 @@ export default {
             if(!valid){
               return false
             }
-            // 放货箱数不能大于总控货箱数
+            // 放货箱数不能大于可放货箱数
             let errNos = []
             this.selectedOrders.forEach(item => {
-              if(item.releaseNum > item.sumNum){
+              if(item.releaseNum > item.sumNum - item.releaseNum){
                 errNos.push(item.orderNo)
               }
             })
             if(errNos.length){
-              return this.$message.error(this.$t("订单{no}的放货箱数不能大于控货箱数", {no: errNos.join(",")}))
+              return this.$message.error(this.$t("订单{no}的放货箱数不能大于可放货箱数", {no: errNos.join(",")}))
             }
             updateApply(Object.assign({
               cargoControlPickId: this.cargoControlPickId,

src/views/ecw/order/components/warehouseDetails.vue

@@ -20,9 +20,9 @@
       :label="$t('下单统计')">
       <template v-slot="{row}">
         <div v-if="row.costVO">
-          箱数：{{row.costVO.totalNum}}
-          {{row.costVO.totalVolume}}m³
-          {{row.costVO.totalWeight}}kg
+          <div>箱数：{{row.costVO.totalNum}}</div>
+           <div>体积：{{row.costVO.totalVolume}}CMB</div>
+           <div>重量：{{row.costVO.totalWeight}}kg</div>
         </div>
       </template>
     </el-table-column>

src/views/ecw/order/index.vue

@@ -311,7 +311,7 @@
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206])">
+                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206,212,213])">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)"  v-hasPermi="['ecw:order:merge']">{{$t('合单申请')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"   v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
                 </template>
@@ -347,7 +347,7 @@
                   </template>
                   <!-- 入仓补充 -->
                   <template v-if="
-                    include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
+                    include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 214, 215, 216]) &&
                     scope.row.abnormalState != 1 &&
                     include(scope.row.status, [2,3,5,10,9,8])
                     ">
@@ -356,7 +356,7 @@
                   <!-- 入仓修改 -->
                   <template v-if="
                       (
-                        include(scope.row.inWarehouseState, [201, 202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205]) &&
+                        include(scope.row.inWarehouseState, [201, 202, 207, 202, 209, 210, 202, 211, 202, 214, 215, 216, 204, 205]) &&
                         scope.row.status != 11 && exclude(scope.row.shipmentState, [314,315,317,318])
                       )
                     ">

src/views/ecw/order/transferWarehousing.vue

@@ -366,8 +366,8 @@ export default {
           Wweight += Number(m.weight || 0)
         })
        })
-      let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume}m³ ${weight}Kg`
-      let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume}m³ ${Wweight}Kg`
+      let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume.toFixed(2)}m³ ${weight.toFixed(2)}Kg`
+      let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume.toFixed(2)}m³ ${Wweight.toFixed(2)}Kg`
       return [this.$t('合计：'),text,text2]
     },
     cancellationOfOrder(){

src/views/ecw/order/warehousing/index.vue

@@ -55,7 +55,7 @@
         prop="expressNo"
         v-slot="{row}"
         :label="$t('快递单号')">
-        {{ row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '' }}
+        {{ row.expressNo || (row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '') }}
       </el-table-column>
       <el-table-column
         prop="createTime"