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

src/api/ecw/boxAir.js

@@ -71,7 +71,7 @@ export function createGoods(data) {
   });
 }
 
-/*****************************  理货 start **********************************/
+/*****************************  合包 start **********************************/
 
 /**
  * 获得获得合包箱分页

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

 <template>
   <div>
     <el-form ref="cusDeclarationForm" :rules="rules" :model="cusDeclarationObj" label-width="120px">
-      <el-form-item :label="$t('单证要求')">
-        <template v-for="(item, index) in cusDeclarationObj.documentInfo">
-          {{
-            (index === 0 || index === cusDeclarationObj.documentInfo.length)  ? "" :"/"
-          }}
-          <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item" :key="index" />
-        </template>
-        <el-button type="primary" style="margin-left:10px;" @click="downloadVGM">{{getButtonLabel(cusDeclarationObj.documentInfo)}}</el-button>
-      </el-form-item>
-      <el-form-item :label="$t('柜重')" prop="dcBoxWgt">
-        <el-input v-model="cusDeclarationObj.dcBoxWgt" :placeholder="$t('请输入柜重')" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('货重')" prop="dcGoodsWgt">
-        <el-input v-model="cusDeclarationObj.dcGoodsWgt" :placeholder="$t('请输入货重')" clearable />
-      </el-form-item>
-      <el-form-item :label="$t('VGM重量')">
-        <el-input v-model="cusDeclarationObj.dcVgmWgt" :placeholder="$t('请输入VGM重量')" clearable />
-      </el-form-item>
       <el-form-item :label="$t('报关方式')" prop="dcCustomsType">
         <el-select v-model="cusDeclarationObj.dcCustomsType" :placeholder="$t('请选择报关方式')">
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
@@ -61,9 +43,6 @@
         <el-form-item :label="$t('查验前图片')">
           <ImageUpload :limit="1" :isShowTip=false v-model="cusDeclarationObj.dcCheckPreImg" />
         </el-form-item>
-        <el-form-item :label="$t('新封条')">
-          <el-input v-model="cusDeclarationObj.dcStripSeal" :placeholder="$t('请输入新封条')" clearable />
-        </el-form-item>
         <el-form-item :label="$t('退场状态')" v-if="cusDeclarationObj.dcCheckStatus === '1' || cusDeclarationObj.dcCheckStatus === '2'">
           {{getCheckExamineStatus}}
         </el-form-item>
@@ -74,6 +53,33 @@
         <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('过机状态')" prop="overMachineStatus">
+        <el-radio-group v-model="cusDeclarationObj.overMachineStatus" :disabled="inReview">
+          <el-radio :label="1">{{$t('顺利')}}</el-radio>
+          <el-radio :label="2">{{$t('异常')}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="overMachineAbnormalStatus"  v-show="cusDeclarationObj.overMachineStatus === 2">
+        <el-radio-group v-model="cusDeclarationObj.overMachineAbnormalStatus" :disabled="inReview">
+          <el-radio :label="1">{{$t('敏感货')}}</el-radio>
+          <el-radio :label="2">{{$t('重量误报')}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="overMachineAbnormalStatus"  v-show="cusDeclarationObj.overMachineAbnormalStatus === 1">
+        <el-row class="operate-button" v-if="inReview">
+          <el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('全部退场审核中') : $t('部分退场审核中')}}</el-button>
+          <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('取消全部退场审核') : $t('取消部分退场审核')}}</el-button>
+        </el-row>
+      </el-form-item>
+      <el-form-item prop="weightMisreport"  v-show="cusDeclarationObj.overMachineAbnormalStatus === 2">
+        <el-radio-group v-model="cusDeclarationObj.weightMisreport" :disabled="inReview">
+          <el-radio :label="1">{{$t('机场误差3%')}}</el-radio>
+          <el-radio :label="2">{{$t('超过误差10KG')}}</el-radio>
+          <el-radio :label="3">{{$t('过机放行-未找到重货订单')}}</el-radio>
+          <el-radio :label="4">{{$t('过机放行-已找到重货订单')}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+
       <!-- <el-form-item :label="$t('装箱单')">
         <el-button type="primary">{{$t('下载装箱单')}}</el-button>
       </el-form-item> -->
@@ -82,16 +88,13 @@
       </el-form-item>
 
     </el-form>
-    <el-row class="operate-button" v-if="inReview">
-      <el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('全部退场审核中') : $t('部分退场审核中')}}</el-button>
-      <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('取消全部退场审核') : $t('取消部分退场审核')}}</el-button>
-    </el-row>
+    
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)" :disabled="isCheckDeal('submit')">{{$t('保存')}}</el-button>
       <el-button type="success" v-if="!inReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit')">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
       <el-button type="primary" @click="extraCost" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCustomsStatus === '3'">{{$t('额外费用')}}</el-button>
-      <el-button type="primary" @click="exceptionReg" :disabled="!isShowError">{{$t('异常登记')}}</el-button>
+      <!-- <el-button type="primary" @click="exceptionReg" :disabled="!isShowError">{{$t('异常登记')}}</el-button> -->
     </el-row>
 
     <!-- 对话框 -->

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

@@ -135,14 +135,14 @@ export default {
     },
     /** 节点点击 */
     nodeClick(currIndex, node) {
-      if (!checkPermi(['box:'+node.type+':action'])) {
-        this.$message.error(this.$t("没有此操作的权限"));
-        return;
-      }
-      if (currIndex > this.currIndex) {
-        this.$message.error(this.errorMsg);
-        return;
-      }
+      // if (!checkPermi(['box:'+node.type+':action'])) {
+      //   this.$message.error(this.$t("没有此操作的权限"));
+      //   return;
+      // }
+      // if (currIndex > this.currIndex) {
+      //   this.$message.error(this.errorMsg);
+      //   return;
+      // }
       this.currNode = node;
       this.currentComponent = `${node.type}Widget`;
       this.$set(this.dialogConfig, "width", "500px");