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

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

@@ -10,8 +10,8 @@
       <el-form-item :label="$t('目的港')">
         <dockSelect v-model="bookingObj.destPortId" :placeholder="$t('请选择目的港')" portType="1" :allDocks="this.$attrs.allDocks" />
       </el-form-item>
-      <el-form-item :label="$t('Shipper')">
-        <supplierSelect v-model="bookingObj.shipperId" :companyType="'5'" :placeholder="$t('请选择Shipper')" :allSupplier="this.$attrs.allSupplier" />
+      <el-form-item :label="$t('订舱代理')">
+        <supplierSelect v-model="bookingObj.shipperId" :companyType="'5'" :placeholder="$t('请选择订舱代理')" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item :label="$t('航空公司')">
         <supplierSelect v-model="bookingObj.airlineCompanyId" :companyType="'7'" :placeholder="$t('请选择航空公司')" :allSupplier="this.$attrs.allSupplier" />

src/views/ecw/box/shippingAir/nodePage/preinstall.vue

@@ -54,7 +54,7 @@
 
       <el-form-item :label="$t('特性')" prop="attrId">
         <el-select v-model="queryParams.attrId" :placeholder="$t('特性')">
-          <el-option v-for="item in attrIdList" :label="item.label" :value="item.value*1" :key="item.value"></el-option>
+          <el-option v-for="item in attrIdList" :label="item.label" :value="item.value" :key="item.value"></el-option>
         </el-select>
       </el-form-item>
 
@@ -171,8 +171,11 @@
                     </el-table-column>
                     <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum">
                       <template slot-scope="scope">
-                        {{scope.row.warehouseInInfoVO.cartonsNum}}
-                      </template>
+                    <el-button v-if="scope.row.mixStatus == 1" type="text" @click="seeBox(scope.row.orderId,scope.row.orderItemId)">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</el-button>
+                    <template v-else>
+                      {{scope.row.warehouseInInfoVO.cartonsNum}}
+                    </template>
+                  </template>
                     </el-table-column>
                     <el-table-column :label="$t('体积') + '/' + $t('重量') + '/' + $t('重货比')" align="center" width="140" prop="volumeWeight">
                       <template slot-scope="scope">
@@ -528,8 +531,8 @@ export default {
     /** 特性 */
     attrIdList() {
       let data = []
-      if(this.queryParams.shippingChannelId){
-        let attrs = this.channelList.find(item=>this.queryParams.shippingChannelId == item.channelId)
+      if(this.queryParams.channelId){
+        let attrs = this.channelList.find(item=>this.queryParams.channelId == item.channelId)
         if(attrs){
           let attrId = attrs.attrId.split(',')
           attrId.forEach((item,index)=>{
@@ -551,7 +554,7 @@ export default {
     this.handleQuery("pre");
     this.smartInstall = 0;
     // 查询渠道
-      getChannelList().then((res) => (this.channelList = res.data));
+    getChannelList().then((res) => (this.channelList = res.data));
   },
   methods: {
     formatDate,

src/views/ecw/box/shippingAir/nodePage/twoWayTakeoff.vue

@@ -4,8 +4,8 @@
       <el-form-item :label="$t('预计起飞时间')">
         {{getTakeOffTime()}}
       </el-form-item>
-      <el-form-item :label="$t('预计到港时间')" prop="est_time">
-        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="twoWayTakeoffObj.est_time" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      <el-form-item :label="$t('预计到港时间')" prop="estTime">
+        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="twoWayTakeoffObj.estTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('实际起飞时间')" prop="dtRealFlyTime">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="twoWayTakeoffObj.dtRealFlyTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -65,7 +65,7 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["dtRealFlyTime"], "YYYY-MM-DD HH:mm:ss");
     oldData = formatDateStr(oldData, ["dtRealHeadTime"], "YYYY-MM-DD HH:mm:ss");
-    oldData = formatDateStr(oldData, ["est_time"], "YYYY-MM-DD HH:mm:ss");
+    oldData = formatDateStr(oldData, ["estTime"], "YYYY-MM-DD HH:mm:ss");
     this.twoWayTakeoffObj = oldData;
     if(this.$attrs.shipmentObj['bookAirInfo'].voyage && this.$attrs.shipmentObj['bookAirInfo'].voyage == 2){
       this.dtRealHeadTimeFlag = true

src/views/ecw/box/shippingAir/utils.js

@@ -903,7 +903,7 @@ function getColmnMapping() {
         type: "supplier",
       },
       {
-        title: i18n.$t("Shipper"),
+        title: i18n.$t("订舱代理"),
         key: "shipperId",
         type: "supplier",
       },
@@ -1058,7 +1058,7 @@ function getColmnMapping() {
     boxAirFlyInfo:  [
       {
         title: i18n.$t("预计到港时间"),
-        key: "dtRealFlyTime",
+        key: "estTime",
         type: "datetime",
       },
       {