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

src/views/ecw/box/queryAir.vue

@@ -108,7 +108,7 @@
               <el-table-column prop="" :label="$t('操作')" align="center" width="120px">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" :disabled="scope.row.abnormalDealStatus === 1" @click="()=>updateStatus('single', scope.row)">{{$t('更新状态')}}</el-button>
-                  <el-button type="primary" size="small" :disabled="shipmentObj.clStatus!=132&&shipmentObj.clearanceInfo&&(shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) !== -1)" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
+                  <el-button type="primary" size="small" :disabled="!(shipmentObj.clStatus!=132&&shipmentObj.clearanceInfo&&(shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) !== -1))" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>

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

@@ -31,12 +31,18 @@
       </el-form-item>
 
       <el-form-item v-if="dtRealHeadTimeFlag||airArrivalInfo.arriveType==1" :label="$t('实际二程起飞时间')" prop="actSecondTime">
+        <template slot="label" slot-scope="scope">
+            <span style="color: red;">*</span>{{$t('实际二程起飞时间')}} 
+        </template>
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.actSecondTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('预计到港时间')" prop="estTime">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.estTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('实际到港时间')" prop="actTime">
+        <template slot="label" slot-scope="scope">
+            <span style="color: red;">*</span>{{$t('实际到港时间')}} 
+        </template>
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="airArrivalInfo.actTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 

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

@@ -2,9 +2,7 @@
   <div>
     <el-form ref="cDocForm" :model="cDocObj" label-width="100px">
       <el-form-item :label="$t('出单方式')">
-        <el-select v-model="cDocObj.cdOutBillType" :placeholder="$t('请选择出单方式')">
-          <el-option v-for="item in method" :key="item.value" :label="item.label" :value="item.value"></el-option>
-        </el-select>
+        {{method.find(item=>item.value = cDocObj.cdOutBillType).label}}
       </el-form-item>
 
       <template v-if="cDocObj.cdOutBillType === '1'">
@@ -107,9 +105,7 @@ export default {
       cdOutBillType:
         oldData.cdOutBillType === 0 ? undefined : oldData.cdOutBillType,
     };
-    if(!this.$attrs.shipmentObj.clearanceDocInfo){
-      this.$set(this.cDocObj,'cdOutBillType',this.$attrs.shipmentObj.clearanceDocInfo?.cdOutBillType||undefined)
-    }
+    this.$set(this.cDocObj,'cdOutBillType',2)
   },
   methods: {
     /** 提交 */

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

@@ -285,7 +285,7 @@
                 <el-table-column :label="$t('包装类型')" align="center" prop="">
                   <template slot-scope="scope">
                     <span v-for="(unit,index) in scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.units.split(',')" :key="index">
-                      <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" /><span v-if="index>0&&index<scope.row.warehouseInInfoVO.units.split(',').length-1">, </span>
+                      <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" /><span v-if="index<scope.row.warehouseInInfoVO.units.split(',').length-1">, </span>
                     </span>
                   </template>
                 </el-table-column>

src/views/ecw/order/edit.vue

@@ -901,6 +901,7 @@ export default {
     },
     'form.channelId'(){
         this.calculationPrice()
+        if(this.form.lineId) this.getOfferData()
     },
     'form.consigneeCountryCode'(){
       if(this.form.lineId) this.getOfferData()

src/views/ecw/order/prepayDeal.vue

@@ -1377,7 +1377,7 @@
             }
             calculationPrice(params).then(res => {
                 this.orderData.orderItemVOList.map((item, index) => {
-                    item.oneClearanceFreight = res.data.prodCostDtoList[index].clearanceFee
+                    item.oneClearanceFreight = res.data.prodCostDtoList[index].oneClearanceFee
                     item.clearanceFreightCurrency = res.data.prodCostDtoList[index].clearanceFeeCurrency
                     item.clearanceFreightVolume = res.data.prodCostDtoList[index].clearanceFeeVolume
                     item.oneSeaFreight = res.data.prodCostDtoList[index].oneFreight