Merge remote-tracking branch 'origin/release' 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/prepayDeal.vue

@@ -550,7 +550,7 @@
 
                  <div v-if="orderExceptionData.orderExceptionStatus==0"  class="price_list">
                     <div class="price_label">{{$t('全包价')}}:</div>
-                    <div v-if="!scope.row.seaFreightCurrency||!scope.row.seaFreightVolume">
+                    <div v-if="!row.seaFreightCurrency||!row.seaFreightVolume">
                       /
                     </div>
                     <div v-else>
@@ -577,7 +577,7 @@
                    <div  class="price_list">
                      <div class="price_label">{{$t('运费')}}:</div>
                      <div class="price_list">
-                       <div v-if="!scope.row.seaFreightCurrency||!scope.row.seaFreightVolume">
+                       <div v-if="!row.seaFreightCurrency||!row.seaFreightVolume">
                          /
                        </div>
                        <div v-else>
@@ -591,7 +591,7 @@
                    <div  class="price_list">
                      <div class="price_label">{{$t('清关费')}}:</div>
                      <div class="price_list">
-                       <div v-if="!scope.row.clearanceFreightCurrency||!scope.row.clearanceFreightVolume">
+                       <div v-if="!row.clearanceFreightCurrency||!row.clearanceFreightVolume">
                          /
                        </div>
                        <div v-else>