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

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

@@ -67,6 +67,14 @@ export default {
     onSubmit(operateType) {
       this.$refs["unloadingForm"].validate((valid) => {
         if (valid) {
+          if (operateType === 2) {
+            const { keyName } = this.$attrs.currNode;
+            const ulStatus = this.$attrs.shipmentObj[keyName];
+            if (ulStatus !== 185) {
+              this.$message.error(this.$t("请先通过卸柜审批"));
+              return;
+            }
+          }
           unloadCreate({
             ...this.unloadingObj,
             shipmentId: this.$attrs.shipmentObj.id,

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

@@ -126,11 +126,11 @@
       </div>
       <!-- 操作 -->
       <div v-if="!isUnderReview">
-        <el-button type="success" @click="onSubmit">{{$t('完成到仓')}}</el-button>
+        <el-button type="success" @click="onSubmit">{{$t('提交完成到仓审核')}}</el-button>
         <el-button plain type="primary" @click="$emit('closeStart')">{{$t('返回')}}</el-button>
       </div>
       <div v-if="isUnderReview">
-        <el-button type="primary" @click="jumpReviewDetail">{{$t('卸柜审核中')}}</el-button>
+        <el-button type="primary" @click="jumpReviewDetail">{{$t('到仓审核中')}}</el-button>
         <el-button plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button>
         <el-button plain type="primary" @click="$emit('closeStart')">{{$t('返回')}}</el-button>
       </div>

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

@@ -192,7 +192,7 @@ export default {
           if ([186].includes(unStatus)) {
             this.currentComponent = `reviewWidget`;
             this.$set(this.dialogConfig, "width", "700px");
-            this.$set(this.dialogConfig, "title", this.$t("卸柜反审"));
+            this.$set(this.dialogConfig, "title", this.$t("到仓反审"));
           }
           break;
       }