Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/box.js

@@ -49,6 +49,7 @@ export function exportboxExcel(query) {
     url: "/shipment/box/export-excel",
     method: "get",
     params: query,
+    timeout: 5 * 60000,
     responseType: "blob",
   });
 }

src/api/ecw/order.js

@@ -683,7 +683,8 @@ export function operateLogPage(params){
   return request({
     url: '/ecw/order-operate-log/page',
     method: 'get',
-    params: params
+    params: params,
+    timeout: 5 * 60000
   })
 }
 

src/views/ecw/box/indexFutureBox.vue

@@ -355,10 +355,13 @@ export default {
       }
       let data = {
         transportId: this.form.transportType,
-        channelId: this.form.shippingChannelId,
         departureId: this.form.startWarehouseId,
         objectiveId: this.form.destWarehouseId
       }
+      // 空运才需要渠道
+      if(data.transportId == 4){
+        data.channelId = this.form.shippingChannelId
+      }
       // 获得已封柜方数
       getBoxedVolume(data).then(res => {
         this.$set(this.form, 'loadingNumber', res.data || 0)

src/views/ecw/order/detail.vue

@@ -305,7 +305,7 @@
         </el-tab-pane>
         <!-- 这个地方v-hasPermi不生效，所以换checkPermi函数检查 -->
         <el-tab-pane :label="$t('操作日志')" name="five" v-if="checkPermi(['ecw:order:logs'])">
-          <el-table :data="logs">
+          <el-table :data="logs" v-loading="logsLoading">
             <el-table-column :label="$t('时间')" width="150">
               <template slot-scope="{row}">{{ parseTime(row.createTime) }}</template>
             </el-table-column>
@@ -460,7 +460,7 @@ export default {
       showWarehouseInItemId: null, // 当前显示的入仓
       showFeeDetailDialog: null, // 是否显示费用详情弹层
       feeDetail: null, // 费用详情
-
+      logsLoading: false, // 日志加载中
       logs: [], // 操作日志
       activeNames: [],//显示隐藏订单基本信息
       showText:this.$t('显示更多')
@@ -668,8 +668,11 @@ export default {
     },
     // 加载操作日志
     loadLogs(){
+      this.logsLoading = true
       operateLogPage({orderId: this.orderId, page: 1, rows: 10000}).then(res => {
         this.logs = res.data.list
+      }).finally(() => {
+        this.logsLoading = false
       })
     },
     downloadPackingList(){

src/views/ecw/order/index.vue

@@ -330,9 +330,7 @@
 
                 <!-- 合单日志，提货日志 -->
                 <template v-if="(
-                  scope.row.status > 2 &&
-                  exclude(scope.row.status + '-' + scope.row.shipmentState, ['17-391', '18-392', '15-332', '15-330']) &&
-                  exclude(scope.row.status + '-' + scope.row.inWarehouseState, ['16-202'])
+                  scope.row.status > 2
                 )">
                   <el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo"  v-hasPermi="['ecw:order:merge_log']">{{$t('合单日志')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo"  v-hasPermi="['ecw:order:split_log']">{{$t('提货日志')}}</el-dropdown-item>