审核中理货，合包，出货，出仓，代理，报关，提单禁用提交

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

@@ -68,12 +68,12 @@
         <el-input type="textarea" :rows ="6" v-model="airCheckoutObj.remark" :placeholder="$t('备注')"></el-input>
       </el-form-item>
 
-    
+
     </el-form>
 
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
-      <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
+      <el-button :disabled="$attrs.shipmentObj.approvaling" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
     </el-row>
   </div>

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

@@ -122,7 +122,7 @@
     <el-row class="operate-button">
       <el-button type="primary" v-if="inOverReview" plain @click="canclOverAudit">{{$t('取消删单退场审核')}}</el-button>
       <el-button type="primary" @click="onSubmit(1)" :disabled="isCheckDeal('submit')">{{$t('保存')}}</el-button>
-      <el-button type="success" v-if="!inReview&&!inOverReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit')">{{$t('提交')}}</el-button>
+      <el-button type="success" v-if="!inReview&&!inOverReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit') || shipmentObj.approvaling">{{$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> -->

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

@@ -24,6 +24,7 @@
             <el-button
               size="small"
               type="primary"
+              :disabled="shipmentObj.approvaling"
               @click="
                 addMergedialogVisible = true
                 isMergeEdit = false
@@ -57,8 +58,8 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
-                  <el-button v-if="scope.row.status == 1" type="text" size="small" @click="editMerge(scope.row)">{{ $t('编辑') }}</el-button>
-                  <el-button type="text" size="small" @click="pkgPage(scope.row)">{{ $t('装箱') }}</el-button>
+                  <el-button :disabled="shipmentObj.approvaling" v-if="scope.row.status == 1" type="text" size="small" @click="editMerge(scope.row)">{{ $t('编辑') }}</el-button>
+                  <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="pkgPage(scope.row)">{{ $t('装箱') }}</el-button>
                   <el-button v-if="scope.row.status != 2" type="text" size="small" @click="deleteMerge(scope.row.id)">{{ $t('删除') }}</el-button>
                   <el-button type="text" size="small" @click="printTag(scope.row.id)">{{ $t('打印标签') }}</el-button>
                 </template>
@@ -115,7 +116,7 @@
         </el-dialog>
 
         <el-row style="margin-top: 15px" class="operate-button">
-          <el-button size="small" type="primary" @click="finish">{{ $t('完成') }}</el-button>
+          <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="finish">{{ $t('完成') }}</el-button>
           <el-button size="small" @click="$emit('closeDialog')">{{ $t('取消') }}</el-button>
         </el-row>
       </el-col>

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

@@ -61,7 +61,7 @@
       <el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary"  @click="$router.push({path: '/bpm/process-instance/detail', query: {id: airShipmentApprovalInfo.bpmProcessId}})">{{$t('出货审核中')}}</el-button>
       <el-button v-if="airShipmentApprovalInfo && airShipmentApprovalInfo.approvalStatus == 1" type="primary" @click="canclAudit">{{$t('取消出货审核')}}</el-button>
       <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
-      <el-button v-if="!airShipmentApprovalInfo || airShipmentApprovalInfo.approvalStatus != 1" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
+      <el-button :disabled="$attrs.shipmentObj.approvaling" v-if="!airShipmentApprovalInfo || airShipmentApprovalInfo.approvalStatus != 1" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
     </el-row>
   </div>

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

@@ -64,7 +64,7 @@
 
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
-      <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
+      <el-button :disabled="shipmentObj.approvaling" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
       <el-button :disabled="shipmentObj.ladingBillInfo == null" @click="download">{{$t('下载提单确认件')}}</el-button>
     </el-row>
@@ -134,7 +134,7 @@ export default {
       packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
     };
     if(!this.shipmentObj.ladingBillInfo){
-      
+
       this.$set(this.subMaterialObj,'agentId',this.shipmentObj.agentInfo?.agentId||undefined)
       this.$set(this.subMaterialObj,'soNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
       this.$set(this.subMaterialObj,'blMblNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
@@ -192,7 +192,7 @@ export default {
     download() {
       getBoxLadingBillPdf({shipmentId: this.shipmentObj.id}).then(res=>{
         let blob = new Blob([res], {type: "application/vnd.ms-excel"})
-        FileSaver.saveAs(blob, this.$t('提单确认件.xlsx')); 
+        FileSaver.saveAs(blob, this.$t('提单确认件.xlsx'));
       })
     }
   },

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

@@ -21,8 +21,8 @@
 
         <el-row style="margin-top: 15px">
           <el-row>
-            <el-button size="small" type="primary" @click="()=>tallyClick('batch')">{{$t('批量理货')}}</el-button>
-            <el-button size="small" type="primary" @click="()=>removeClick('batch')">{{$t('批量移出')}}</el-button>
+            <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="()=>tallyClick('batch')">{{$t('批量理货')}}</el-button>
+            <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="()=>removeClick('batch')">{{$t('批量移出')}}</el-button>
           </el-row>
           <el-row style="margin-top: 5px">
             <el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px">
@@ -93,8 +93,8 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
-                  <el-button type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
-                  <el-button type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
+                  <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
+                  <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -102,7 +102,7 @@
         </el-row>
 
         <el-row style="margin-top: 15px" class="operate-button">
-          <el-button size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button>
+          <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button>
           <el-button size="small" @click="cancel">{{$t('取消')}}</el-button>
         </el-row>
       </el-col>
@@ -203,6 +203,9 @@ export default {
     },
     // 理货点击
     tallyClick(type, data) {
+        if(this.shipmentObj.approvaling){
+            return this.$message.error(this.$t('业务待审核，暂不能操作'))
+        }
       if (type === "batch") {
         if (this.selectedRows.length === 0) {
           this.$message.error(this.$t("请选择需要理货的订单"));