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

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

@@ -160,7 +160,7 @@ export default {
     this.$set(this.airArrivalInfo, 'arriveOrderIdList', [])
     this.arrivalOrderList = this.$attrs.shipmentObj.airArrivalInfo ? this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList : []
     shipmentOrderList(this.$attrs.shipmentObj.id).then((r) => {
-      this.orderList = r.data
+      this.orderList = r.data ?? []
     })
   },
   computed: {

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

@@ -173,7 +173,7 @@ export default {
     if (typeof this.$attrs.shipmentObj.airArrivalInfo?.arrivalOrderList != 'undefined' && this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList) this.arrivalOrderList = this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList
     if (typeof this.$attrs.shipmentObj.clearanceInfo?.clearanceOrderList != 'undefined' && this.$attrs.shipmentObj.clearanceInfo.clearanceOrderList) this.clearanceOrderList = this.$attrs.shipmentObj.clearanceInfo.clearanceOrderList
     shipmentOrderList(this.$attrs.shipmentObj.id).then((r) => {
-      this.orderList = r.data
+      this.orderList = r.data ?? []
     })
   },
   watch: {

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -305,6 +305,16 @@ export default {
     },
     /** 提交 */
     onSubmit() {
+      let flag = false
+      this.pageData.sectionOrderList.forEach(item=>{
+        if(![118428,15].includes(item.status)){
+          flag = true
+        }
+      })
+      if(flag){
+        this.$message.error(this.$t("存在未到港或未清关的订单"));
+        return
+      }
       if(this.getUnLoadNumCount>0){
         approvalCreate({
             shipmentId: this.$attrs.shipmentObj.id,

src/views/ecw/box/shippingAir/seaProcess.vue

@@ -150,7 +150,7 @@ export default {
         }
       }
       console.log(currIndex,this.currIndex)
-      if (currIndex > this.currIndex) {
+      if (currIndex > this.currIndex && !['cusClearance', 'unloading'].includes(node.type)) {
         this.$message.error(this.errorMsg);
         return;
       }
@@ -186,10 +186,6 @@ export default {
           break;
         // 清关
         case "cusClearance":
-          if((!this.shipmentObj.airArrivalInfo || this.shipmentObj.airArrivalInfo.arriveType == 0) && this.shipmentObj.sapStatus != 152){
-            this.$message.error(this.$t("请先完成到港操作"));
-            return;
-          }
           this.$set(this.dialogConfig, "width", "700px");
           break;
         // AGENT
@@ -224,10 +220,6 @@ export default {
           break;
         // 卸柜
         case "unloading":
-          if((!this.shipmentObj.clearanceInfo || this.shipmentObj.clearanceInfo.clearanceType == 0) && this.shipmentObj.clStatus != 132){
-            this.$message.error(this.$t("请先完成清关操作"));
-            return;
-          }
           // 卸柜反审
           const unStatus = this.shipmentObj[node.keyName];
           if ([186].includes(unStatus)) {
@@ -277,10 +269,6 @@ export default {
 
           if (start.includes(val[keyName]) && val[voName]) {
             node.currStatus = "wait";
-            if(type === "arrival" || type === "cusClearance"){
-              ++nodeIndex;
-              continue;
-            }
           }
 
           if (wait.includes(val[keyName])) {

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

@@ -215,14 +215,20 @@
 							<template slot-scope="scope">
 								<template v-if="scope.row.charging != 1">
 									<div class="flex">
-                    {{$t('运费')}}
+                    {{$t('运费')}}:
+                    <template v-if="scope.row.oneSeaFreight">
                       <el-input v-model="scope.row.oneSeaFreight" @change="updateField(scope.row, 'oneSeaFreight')" size="mini" style="width: 80px"></el-input>
                       {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}
+                    </template>
+                    <template v-else>{{$t('未报价')}}</template>
                   </div>
 									<div class="flex">
-                    {{$t('清关费')}}
+                    {{$t('清关费')}}:
+                    <template v-if="scope.row.oneClearanceFreight">
                       <el-input v-model="scope.row.oneClearanceFreight" @change="updateField(scope.row, 'oneClearanceFreight')" size="mini" style="width: 80px"></el-input>
                       {{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}
+                    </template>
+                    <template v-else>{{$t('未报价')}}</template>
                   </div>
                 </template>
                 <template v-else>