Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release

src/views/ecw/box/indexAir.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
       <el-form-item :label="$t('自编号')" prop="selfNo">
         <el-input v-model="queryParams.selfNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -43,6 +43,18 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('目的港清关')" prop="destinationClearance">
+          <el-select v-model="queryParams.destinationClearance" :placeholder="$t('请选择目的港清关')" clearable size="small">
+            <el-option v-for="item in destinationClearanceData" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('发货方式')" prop="deliveryType">
+          <el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small">
+            <el-option v-for="item in deliveryTypeData" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-row>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
@@ -332,7 +344,31 @@ export default {
         '13':430,
         '14':435,
         '15':438,
-      }
+      },
+      destinationClearanceData: [
+        {
+          label: '我司清关',
+          value: 1
+        },
+        {
+          label: '合作方清关',
+          value: 2
+        },
+        {
+          label: '客户',
+          value: 3
+        },
+      ],
+      deliveryTypeData: [
+        {
+          label: '多票',
+          value: 1
+        },
+        {
+          label: '单票',
+          value: 2
+        }
+      ]
     }
   },
   computed: {

src/views/ecw/box/shippingAir/nodePage/mergePkg/pkgPage.vue

@@ -71,17 +71,17 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item :label="$t('长')" prop="pkgLength">
-                  <el-input-number v-model="sealBoxForm.pkgLength" :controls="false" :precision="2" style="width: 100px" />
+                  <el-input-number v-model="sealBoxForm.pkgLength" :controls="false" :precision="2" style="width: 100px" @change="culSumVolume" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('宽')" prop="pkgWidth">
-                  <el-input-number v-model="sealBoxForm.pkgWidth" :controls="false" :precision="2" style="width: 100px" />
+                  <el-input-number v-model="sealBoxForm.pkgWidth" :controls="false" :precision="2" style="width: 100px" @change="culSumVolume" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('高')" prop="pkgHight">
-                  <el-input-number v-model="sealBoxForm.pkgHight" :controls="false" :precision="2" style="width: 100px" />
+                  <el-input-number v-model="sealBoxForm.pkgHight" :controls="false" :precision="2" style="width: 100px" @change="culSumVolume" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -188,6 +188,20 @@ export default {
       })
       return arr.toString()
     },
+    //计算封箱体积
+    culSumVolume() {
+      let temp = this.accMul(this.sealBoxForm.pkgLength, this.sealBoxForm.pkgWidth)
+      let sumVolume = this.accMul(temp, this.sealBoxForm.pkgHight)
+      this.$set(this.sealBoxForm, 'sumVolume', sumVolume)
+    },
+    accMul(arg1,arg2)
+    {
+      var m=0,s1=arg1.toString(),s2=arg2.toString();
+      try{m+=s1.split(".")[1].length}catch(e){}
+      try{m+=s2.split(".")[1].length}catch(e){}
+      let num = Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m)
+      return num.toFixed(2)
+    },
     getpositionNo(arr){
       if(!arr) return arr
       let data = []

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

@@ -621,11 +621,8 @@ export default {
         this.reset()
       }
 
-      // 空运需要获取货币和体积单位
-      if([3, 4].indexOf(this.orderData.transportId) > -1){
-        getCurrencyList().then(res => this.currencyList = res.data)
-        getUnitList().then(res => this.unitList = res.data)
-      }
+      getCurrencyList().then(res => this.currencyList = res.data)
+      getUnitList().then(res => this.unitList = res.data)
     })
     // 获取入仓记录
     getOrderWarehouseIn(this.queryParams.orderId).then(res => {
@@ -946,22 +943,6 @@ export default {
       if(!this.orderData || !this.orderData.orderItemVOList ||this.orderData.length==0){
         return sums
       }
-      /*var orderSum = 0
-      var orderV = 0
-      var orderW = 0
-      var leviteSum = 0
-      var leviteV = 0
-      var leviteW = 0
-      this.orderData.orderItemVOList.forEach((column, index) => {
-        orderSum += column.num
-        orderV += column.volume
-        orderW += column.weight
-        leviteSum += column.warehouseInInfoVO?column.warehouseInInfoVO.cartonsNum:0
-        leviteV += column.warehouseInInfoVO?column.warehouseInInfoVO.volume:0
-        leviteW += column.warehouseInInfoVO?column.warehouseInInfoVO.weight:0
-      });
-      sums[1] = this.$t('下单统计')+' '+ orderSum+' '+this.$t('箱')+' '+ orderV.toFixed(2) +' m³ ' + orderW + ' kg ' + ' '+this.$t('入仓统计：')+ leviteSum+' '+this.$t('箱')+' '+ leviteV.toFixed(2) +' m³ ' + leviteW + ' kg'
-      */
       sums[1] = [
         this.$t('下单统计'),
         this.orderData.costVO?.totalNum + ' '+this.$t('箱'),