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

src/views/ecw/box/batchMarkup.vue

@@ -12,7 +12,7 @@
         <selector :disabled="approval" v-model="form.freightUnitId" :options="unitList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
     </div>
     <div class="mt-10">
-        {{$t('清关费加价价')}}
+        {{$t('清关费加价')}}
         <!--货币-->
         <selector  :disabled="approval" v-model="form.clearanceCurrencyId" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable  class="w-100 ml-10" />
         <!--金额-->
@@ -273,9 +273,8 @@ export default {
   methods:{
     // 检查正数
     checkPositive(object, field){
-      object[field] = parseInt(object[field])
-      if(isNaN(object[field]) || object[field] < 0) object[field] = ''
-      else object[field] = object[field].toString()
+      object[field] = parseFloat(object[field])
+      object[field] = isNaN(object[field]) ? '' : object[field].toString()
     },
     // 表格多选
     handleSelectionChange(selection) {

src/views/ecw/box/indexAir.vue

@@ -511,7 +511,7 @@ export default {
           case "editLadingBill":
             const cabinetLabel = this.getCabinetName(row.cabinetId);
             const title = this.$t(
-              "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
+              "查看提单 {selfNo}",
               {
                 selfNo: row.selfNo,
                 cubNo: row.cubNo,

src/views/ecw/box/ladingBill/index.vue

@@ -95,7 +95,7 @@
     <el-row>
       <el-col class="totle-info">
         <div>{{$t('总计')}}：{{getSumData}}</div>
-        <div>{{$t('容量')}}：{{calcCapacity}}</div>
+        <!--<div>{{$t('容量')}}：{{calcCapacity}}</div>-->
       </el-col>
     </el-row>
 
@@ -172,7 +172,7 @@ export default {
         this.shipmentObj.cubNo ?? ""
       } 柜型：${cabinetLabel}`; */
       const title = this.$t(
-        "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
+        "查看提单 {selfNo}",
         {
           selfNo: this.shipmentObj.selfNo,
           cubNo: this.shipmentObj.cubNo,

src/views/ecw/order/prepayDeal.vue

@@ -318,7 +318,7 @@
              </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item :label="$t('预付商品货值占订单总运费+清关费比例')+':'" label-width="320px">
+          <el-form-item :label="$t('货值三分之一占运费和清关费总和比例')+':'" label-width="320px">
               {{orderFee.needWorthScale}}%
           </el-form-item>
           </el-col>