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

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

@@ -53,7 +53,7 @@
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.dcPassTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 
-      <el-form-item :label="$t('过机状态')" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCheckStatus === '3'" prop="overMachineStatus">
+      <el-form-item :label="$t('过机状态')" prop="overMachineStatus">
         <el-radio-group v-model="cusDeclarationObj.overMachineStatus" :disabled="inReview||inOverReview">
           <el-radio :label="1">{{$t('顺利')}}</el-radio>
           <el-radio :label="2">{{$t('异常')}}</el-radio>

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

@@ -12,6 +12,12 @@
       <p style="color:#D9001B;" v-if="pageData.boxCustomsBackVO&&pageData.boxCustomsBackVO.overMachineStatus==2&&pageData.boxCustomsBackVO.overMachineAbnormalStatus==2&&pageData.boxCustomsBackVO.overWeight>0">
         {{$t('过机重量异常')}}:{{$t('超过机场重量')}}{{pageData.boxCustomsBackVO.overWeight}}kg
       </p>
+      <p style="color:#D9001B;" v-if="pageData.boxCustomsBackVO&&pageData.boxCustomsBackVO.overMachineStatus==2&&pageData.boxCustomsBackVO.overMachineAbnormalStatus==2&&pageData.boxCustomsBackVO.weightMisreport==3">
+        {{$t('过机放行-未找到重货订单')}}
+      </p>
+      <p style="color:#D9001B;" v-if="pageData.boxCustomsBackVO&&pageData.boxCustomsBackVO.overMachineStatus==2&&pageData.boxCustomsBackVO.overMachineAbnormalStatus==2&&pageData.boxCustomsBackVO.weightMisreport==4">
+        {{$t('过机放行-已找到重货订单')}}:{{pageData.boxCustomsBackVO.overOrders}}
+      </p>
     </el-row>
     <el-row class="number-area">
       <p class="label-font">{{$t('自编号')}}：</p>