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/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>