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

src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue

@@ -319,6 +319,7 @@ export default {
     // 提交补单
     onSupplementFinish(){
       this.showPackDialog = false
+      this.$emit('getBoxInfo')
     },
     changeStatus(){
       this.getList()

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

@@ -10,9 +10,9 @@
       <p class="label-font">{{selfNo}}</p>
       <el-input v-model="labelNo" :placeholder="$t('请输入')"></el-input>
       <div>
-        <el-button type="primary" @click="modifyUnload">{{$t('提交')}}</el-button>
-        <el-button type="primary" @click="modifyBatchUnload">{{$t('批量输入')}}</el-button>
-        <el-button type="primary" @click="modifyAllUnload">{{$t('一键卸柜')}}</el-button>
+        <el-button type="primary" :disabled="isSuccessReview" @click="modifyUnload">{{$t('提交')}}</el-button>
+        <el-button type="primary" :disabled="isSuccessReview" @click="modifyBatchUnload">{{$t('批量输入')}}</el-button>
+        <el-button type="primary" :disabled="isSuccessReview" @click="modifyAllUnload">{{$t('一键卸柜')}}</el-button>
       </div>
     </el-row>
 
@@ -132,7 +132,7 @@
       </div>
       <!-- 操作 -->
       <div v-if="!isUnderReview">
-        <el-button type="success" @click="onSubmit">{{$t('卸柜完成')}}</el-button>
+        <el-button type="success" :disabled="isSuccessReview" @click="onSubmit">{{$t('卸柜完成')}}</el-button>
         <el-button plain type="primary" @click="$emit('closeStart')">{{$t('返回')}}</el-button>
       </div>
       <div v-if="isUnderReview">
@@ -456,6 +456,11 @@ export default {
       const { currNode, shipmentObj } = this.$attrs;
       return shipmentObj[currNode.keyName] === 183 ? true : false;
     },
+    /* 是否卸柜审核成功 */
+    isSuccessReview() {
+      const { currNode, shipmentObj } = this.$attrs;
+      return shipmentObj[currNode.keyName] === 185 ? true : false;
+    },
     // 部分信息
     getSectionInfo() {
       const { totalStatistics, secStatistics } = this.pageData;