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

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

@@ -558,6 +558,7 @@ export function orderExportSearch(params){
   return request({
     url: '/ecw/order/export/search',
     method: 'GET',
+    timeout: 5 * 60000,
     responseType: 'arraybuffer',
     params
   })
@@ -569,6 +570,7 @@ export function orderExportMySearch(params){
     url: '/ecw/order/export/my/search',
     responseType: 'arraybuffer',
     method: 'GET',
+    timeout: 5 * 60000,
     params
   })
 }
@@ -579,6 +581,7 @@ export function orderExportDeptSearch(params){
     url: '/ecw/order/export/dept/search',
     method: 'GET',
     responseType: 'arraybuffer',
+    timeout: 5 * 60000,
     params
   })
 }
@@ -589,6 +592,7 @@ export function exportAbnormal(params){
     url: '/ecw/order/export/export-exception',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -600,6 +604,7 @@ export function exportHeavyOrder(params){
     url: '/ecw/order/export/export-heavyOrder',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -610,6 +615,7 @@ export function exportReturnOrder(params){
     url: '/ecw/order/export/export-returnOrder',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -620,6 +626,7 @@ export function exportSaleRepay(params){
     url: '/ecw/order/export/export-saleRepay',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -631,6 +638,7 @@ export function exportCustomsDatas(params){
     url: '/ecw/order/export/export-customDatas',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -642,6 +650,7 @@ export function exportShippingDatas(params){
     url: '/ecw/order/export/export-shipDatas',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -653,6 +662,7 @@ export function exportShipFee(params){
     url: '/ecw/order/export/export-shipFee',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -664,6 +674,7 @@ export function exportUnload(params){
     url: '/ecw/order/export/export-excel',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -673,6 +684,7 @@ export function operateLogPage(params){
   return request({
     url: '/ecw/order-operate-log/page',
     method: 'get',
-    params: params
+    params: params,
+    timeout: 5 * 60000
   })
 }

src/api/system/operatelog.js

@@ -5,6 +5,7 @@ export function listOperateLog(query) {
   return request({
     url: '/system/operate-log/page',
     method: 'get',
+    timeout: 5*6000,
     params: query
   })
 }
@@ -15,6 +16,7 @@ export function exportOperateLog(query) {
     url: '/system/operate-log/export',
     method: 'get',
     params: query,
+    timeout: 5*6000,
     responseType: 'blob'
   })
 }

src/views/ecw/box/indexFutureBox.vue

@@ -338,10 +338,11 @@ export default {
       //在仓 = 已入仓-已封柜
       //this.$set(this.form, 'warehousingNumber', Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
     //},
+    /* 2023-05-06 微信群@郑屹反馈确认，由接口计算，前端无需处理
     'form.loadingNumber'(){
       //在仓 = 已入仓-已封柜
       this.$set(this.form, 'warehousingNumber',  Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
-    }
+    }*/
   },
   methods: {
     getVolume(){
@@ -354,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/box/shippingSea/nodePage/tally/index.vue

@@ -178,7 +178,7 @@ export default {
             list.push({
               ...oItem,
               warehouseInInfo,
-              // multiSpecification: item.multiSpecification,
+              multiSpecification: item.multiSpecification,
               positionNo: oItem.positionNo,
               tallyStatus: item.tallyStatus,
               tallyTime: item.tallyTime,

src/views/ecw/order/detail.vue

@@ -286,7 +286,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>
@@ -441,7 +441,7 @@ export default {
       showWarehouseInItemId: null, // 当前显示的入仓
       showFeeDetailDialog: null, // 是否显示费用详情弹层
       feeDetail: null, // 费用详情
-
+      logsLoading: false, // 日志加载中
       logs: [], // 操作日志
     }
   },
@@ -640,8 +640,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

@@ -318,9 +318,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>
@@ -342,13 +340,12 @@
                 <el-button type="text">{{$t('仓库')}}</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <!-- 入仓操作 -->
-                  <template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1]) || scope.row.inWarehouseState == 208">
+                  <template v-if="include(scope.row.status, [0,2]) || scope.row.inWarehouseState == 208">
                     <el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_add']">{{$t('入仓操作')}}</el-dropdown-item>
                   </template>
                   <!-- 入仓补充 -->
                   <template v-if="
                     include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 214, 215, 216]) &&
-                    scope.row.abnormalState != 1 &&
                     include(scope.row.status, [2,3,5,10,9,8])
                     ">
                     <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_replenish']">{{$t('入仓补充')}}</el-dropdown-item>

src/views/ecw/order/warehousing/index.vue

@@ -43,7 +43,7 @@
         :label="$t('入库货物属性')">
         <template v-slot="{row}">
           <template v-if="row.warehouseInInfoVO">
-            {{$t('品牌')}}：{{ [$t('无牌'), $t('有牌'), $t('中性')][row.feeType] }}<br>
+            {{$t('品牌')}}：{{ row.brandName }}<br>
             {{$t('箱数')}}：{{ row.warehouseInInfoVO.cartonsNum }}<br>
             {{$t('体积')}}：{{ row.warehouseInInfoVO.volume }}m³<br>
             {{$t('重量')}}：{{ row.warehouseInInfoVO.weight }}Kg