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

src/views/bpm/processInstance/detail.vue

@@ -443,6 +443,18 @@ export default {
           component: "shippingDetail",
           processId: this.processInstance.businessKey,
           type: 'deleteExit'
+        },
+        // 空运到仓审核
+        air_warehouse: {
+          component: "shippingDetail",
+          processId: this.processInstance.businessKey,
+          type: 'air_warehouse'
+        },
+        // 空运到仓审核
+        air_warehouse_no: {
+          component: "shippingDetail",
+          processId: this.processInstance.businessKey,
+          type: 'air_warehouse'
         }
       }
       console.log('formCustomViewPath', this.processInstance.processDefinition.formCustomViewPath.trim())

src/views/ecw/box/components/Exception.vue

 <template>
-  <el-dialog :title="orderNo + $t('订单转异')" center :visible.sync="show" v-bind="$attrs" :close-on-click-modal="false">
+  <el-dialog :title="orderNo + $t('订单转异')" center :visible.sync="show" v-bind="$attrs" :close-on-click-modal="false" :before-close="cancel">
     <el-form label-position="top" label-width="200" ref="exceptionForm" :model="form" :rules="exceptionRules">
       <el-form-item :label="$t('原因类型')" prop="manualExceptionType">
         <dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>

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

@@ -124,6 +124,7 @@
       <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" v-if="inOverReview" @click="exitReviewDetail">{{$t('删单退场审核中')}}</el-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>
@@ -397,6 +398,9 @@ export default {
     },
     //提交删单退场审核
     approvalCreate(){
+      // this.$refs["cusDeclarationForm"].validate((valid) => {
+      //   if (valid) {}
+      // })
       if(!this.cusDeclarationObj.deleteExitType){
         this.$message.error(this.$t("请选择删单退场类型或者时间"));
         return;
@@ -414,10 +418,8 @@ export default {
             approvalStatus: 0,
             approvalType: 11,
             details: JSON.stringify(details)
-          }).then((res) => {
-            serviceMsg(res, this).then(() => {
-              this.cancel("submit");
-            });
+          }).then(() => {
+            this.onSubmit(1)
           });
     },
     /** 提交 */
@@ -603,6 +605,12 @@ export default {
       toReviewDetail.apply(this, [customsApprovalInfo.bpmProcessId]);
       this.cancel("close");
     },
+    //删单退场审核详情
+    exitReviewDetail() {
+      const { customsDeleteExitApprovalInfo } = this.shipmentObj;
+      toReviewDetail.apply(this, [customsDeleteExitApprovalInfo.bpmProcessId]);
+      this.cancel("close");
+    },
     /* 取消退场审核 */
     canclAudit() {
       console.log(this.shipmentObj)

src/views/ecw/box/shippingDetail.vue

@@ -9,7 +9,7 @@
       <el-descriptions-item :label="$t('出货渠道')">
         {{getShipChannelName(boxBackVO.shippingChannelId)}}
       </el-descriptions-item>
-      <el-descriptions-item :label="$t('柜型')" v-if="boxBackVO.transportType != 3">
+      <el-descriptions-item :label="$t('柜型')" v-if="boxBackVO.transportType != 3&&type!='air_warehouse'">
         {{cabinetLabel}}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('体积/重量')">
@@ -77,7 +77,7 @@
         <!-- <el-descriptions-item :label="$t('出货渠道')">
           {{getShipChannelName(boxBackVO.shippingChannelId)}}
         </el-descriptions-item> -->
-        <el-descriptions-item :label="$t('柜型')">
+        <el-descriptions-item v-if="type!='air_warehouse'" :label="$t('柜型')">
           {{cabinetLabel}}
         </el-descriptions-item>
         <el-descriptions-item :label="$t('体积') + '/' + $t('重量')">
@@ -119,7 +119,7 @@
           <el-table-column prop="installNum" :label="$t('实装箱数')" align="center"></el-table-column>
           <el-table-column prop="volume" label="体积m³" align="center"></el-table-column>
           <el-table-column prop="weight" :label="$t('重量')" align="center"></el-table-column>
-          <el-table-column prop="unloadNum" :label="$t('卸柜箱数')" align="center" v-if="isShowColumn(boxBackVO)"></el-table-column>
+          <el-table-column prop="unloadNum" :label="type=='air_warehouse'?$t('到仓箱数'):$t('卸柜箱数')" align="center" v-if="isShowColumn(boxBackVO)"></el-table-column>
         </el-table>
       </el-row>
     </el-dialog>

src/views/system/download/index.vue

@@ -87,7 +87,7 @@ export default {
               return downloadFileResponse(res.data)
           }).then(res => {
               console.log({res})
-              this.$download.download0(res.data, row.name + row.fileSuffix, res.headers['content-type'])
+              this.$download.download0(res.data, row.name + '.' + row.fileSuffix, res.headers['content-type'])
           }).finally(() => {
               // 刷新列表状态
               this.getList()