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

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

@@ -275,6 +275,7 @@ export default {
         this.$set(this.cusClearanceObj, 'clClearTime', formatDate(clear.clClearTime))
       }
       this.orderdialogVisible = false
+      this.cusClearanceObj.clearanceOrderIdList.push(val.orderId)
     },
     handleSelectionChange(val) {
       this.multipleSelectOrder = val
@@ -306,6 +307,7 @@ export default {
         this.$set(this.cusClearanceObj, 'clClearTime', null)
       }
       this.orderdialogVisible = false
+      this.cusClearanceObj.clearanceOrderIdList = this.multipleSelectOrder.map((item) => item.orderId)
     },
     getClAgent(type) {
       const agentId = this.$attrs.shipmentObj.agentInfo.agentId

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

@@ -82,7 +82,7 @@
         <el-table-column :label="$t('重量')" align="center" prop="weight" />
         <el-table-column :label="$t('订单状态')" align="center" prop="">
           <template slot-scope="scope">
-            {{scope.rowstatusMsg}}
+            {{scope.row.statusMsg}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('异常状态')" align="center" prop="">

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

@@ -220,13 +220,14 @@ export default {
           break;
         // 卸柜
         case "unloading":
-          this.$set(this.dialogConfig, "fullscreen", true);
           // 卸柜反审
           const unStatus = this.shipmentObj[node.keyName];
           if ([186].includes(unStatus)) {
             this.currentComponent = `reviewWidget`;
             this.$set(this.dialogConfig, "width", "700px");
             this.$set(this.dialogConfig, "title", this.$t("到仓反审"));
+          }else{
+            this.$set(this.dialogConfig, "fullscreen", true);
           }
           break;
       }