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

src/api/ecw/futureBox.js

@@ -76,4 +76,20 @@ export function getWareHousedVolume(params){
     method: 'get',
     params
   })
-}
\ No newline at end of file
+}
+// 根据运输方式ID获取异常订单方数
+export function getExceptionVolume(params){
+  return request({
+    url: '/ecw/future-box/getExceptionVolume',
+    method: 'get',
+    params
+  })
+}
+// 根据运输方式ID获取自单代报订单方数
+export function getOrderReportVolume(params){
+  return request({
+    url: '/ecw/future-box/getOrderReportVolume',
+    method: 'get',
+    params
+  })
+}

src/api/ecw/order.js

@@ -570,4 +570,89 @@ export function orderExportDeptSearch(params){
     responseType: 'arraybuffer',
     params
   })
-}
\ No newline at end of file
+}
+
+// 参数搜索导出异常订单统计 Excel
+export function exportAbnormal(params){
+  return request({
+    url: '/ecw/order/export/export-exception',
+    method: 'get',
+    params: params,
+    responseType: 'blob'
+  })
+}
+
+
+// 参数搜索导出重货单统计 Excel
+export function exportHeavyOrder(params){
+  return request({
+    url: '/ecw/order/export-heavyOrder',
+    method: 'get',
+    params: params,
+    responseType: 'blob'
+  })
+}
+
+// 参数搜索导出退仓单统计统计 Excel
+export function exportReturnOrder(params){
+  return request({
+    url: '/ecw/order-exception/export-returnOrder',
+    method: 'get',
+    params: params,
+    responseType: 'blob'
+  })
+}
+
+// 参数搜索导出售后赔偿金额统计 Excel
+export function exportSaleRepay(params){
+  return request({
+    url: '/ecw/order-exception/export-saleRepay',
+    method: 'get',
+    params: params,
+    responseType: 'blob'
+  })
+}
+
+
+// 参数搜索导出报关数统计 Excel
+export function exportCustomsDatas(params){
+  return request({
+    url: '/ecw/order-exception/export-customDatas',
+    method: 'get',
+    params: params,
+    responseType: 'blob'
+  })
+}
+
+
+// 参数搜索导出客户出货量统计 Excel
+export function exportShippingDatas(params){
+  return request({
+    url: '/ecw/order-exception/export-shipDatas',
+    method: 'get',
+    params: params,
+    responseType: 'blob'
+  })
+}
+
+
+// 参数搜索导出预付运费统计 Excel
+export function exportShipFee(params){
+  return request({
+    url: '/ecw/order-exception/export-shipFee',
+    method: 'get',
+    params: params,
+    responseType: 'blob'
+  })
+}
+
+
+// 参数搜索导出卸货费统计 Excel
+export function exportUnload(params){
+  return request({
+    url: '/ecw/order-exception/export-excel',
+    method: 'get',
+    params: params,
+    responseType: 'blob'
+  })
+}

src/views/ecw/box/indexFutureBox.vue

@@ -63,17 +63,27 @@
           {{getShipChannelName(row.shippingChannelId)}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('待入仓方数')" align="center" prop="readyWarehousingNumber">
+      <el-table-column :label="$t('待入仓订单方数')" align="center" prop="readyWarehousingNumber">
         <template slot-scope="{row}">
           {{row.readyWarehousingNumber  || 0}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('已入仓方数')" align="center" prop="warehousedNumber">
+      <el-table-column :label="$t('已入仓订单方数')" align="center" prop="warehousedNumber">
         <template slot-scope="{row}">
           {{row.warehousedNumber  || 0}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('在仓方数')" align="center" prop="warehousingNumber" >
+       <el-table-column :label="$t('异常订单方数')" align="center" prop="exceptionNumber">
+        <template slot-scope="{row}">
+          {{row.getExceptionVolume || 0}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('待排单订单方数')" align="center" prop="warehousingNumber">
+        <template slot-scope="{row}">
+          {{row.warehousingNumber  || 0}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('自单代报订单方数')" align="center" prop="orderReportNumber" >
         <template slot-scope="{row}">
           {{row.warehousingNumber  || 0}}
         </template>
@@ -133,15 +143,21 @@
             <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('待入仓方数')">
+        <el-form-item :label="$t('待入仓订单方数')">
           {{form.readyWarehousingNumber}} m³
         </el-form-item>
-        <el-form-item :label="$t('已入仓方数')">
+        <el-form-item :label="$t('已入仓订单方数')">
           {{form.warehousedNumber}} m³
         </el-form-item>
-        <el-form-item :label="$t('在仓方数')">
+        <el-form-item :label="$t('异常订单方数')">
+          {{form.exceptionNumber}} m³
+        </el-form-item>
+        <el-form-item :label="$t('待排单订单方数')">
           {{form.warehousingNumber}} m³
         </el-form-item>
+        <el-form-item :label="$t('自单代报订单方数')">
+          {{form.orderReportNumber}} m³
+        </el-form-item>
         <el-form-item :label="$t('已装柜仓数')">
           {{form.loadingNumber}} m³
         </el-form-item>
@@ -174,7 +190,7 @@
 </template>
 
 <script>
-import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel, getBoxedVolume, getToBeWareHousedVolume,getWareHousedVolume } from "@/api/ecw/futureBox";
+import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel, getBoxedVolume, getToBeWareHousedVolume,getWareHousedVolume,getExceptionVolume, getOrderReportVolume} from "@/api/ecw/futureBox";
 import {getCabinetPage} from "@/api/ecw/cabinet";
 import { getChannelList } from '@/api/ecw/channel';
 import { getWarehouseList } from "@/api/ecw/warehouse"
@@ -211,7 +227,9 @@ export default {
         readyWarehousingNumber: null,
         warehousedNumber: null,
         warehousingNumber: null,
+        exceptionNumber: null,
         loadingNumber: null,
+        orderReportNumber: null,
         futureNumber: null,
         gpNumber: null,
         hqNumber: null,
@@ -352,12 +370,22 @@ export default {
       getWareHousedVolume(data).then(res => {
         this.$set(this.form, 'warehousedNumber', res.data || 0)
       })
+       // 获得异常订单方数
+      getExceptionVolume(data).then(res => {
+        this.$set(this.form, 'exceptionNumber', res.data || 0)
+      })
+      // 获得自单代报订单方数
+      getOrderReportVolume(data).then(res => {
+        this.$set(this.form, 'orderReportNumber', res.data || 0)
+      })
     },
     setDefaultVolume(){
       this.$set(this.form, 'loadingNumber', 0)
       this.$set(this.form, 'readyWarehousingNumber', 0)
       this.$set(this.form, 'warehousedNumber', 0)
       this.$set(this.form, 'warehousingNumber', 0)
+      this.$set(this.form, 'exceptionNumber',0)
+      this.$set(this.form,'orderReportNumber',0)
     },
     /** 查询列表 */
     getList() {
@@ -387,7 +415,9 @@ export default {
         readyWarehousingNumber: undefined,
         warehousedNumber: undefined,
         warehousingNumber: undefined,
+        exceptionNumber: undefined,
         loadingNumber: undefined,
+        orderReportNumber: undefined,
         futureNumber: undefined,
         gpNumber: undefined,
         hqNumber: undefined,

src/views/ecw/box/indexSea.vue

@@ -65,11 +65,11 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:create']">{{$t('出货安排')}}
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:action:create']">{{$t('出货安排')}}
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:export']">{{$t('导出')}}
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:action:export']">{{$t('导出')}}
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/ecw/box/indexSeaAir.vue

@@ -51,11 +51,11 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:create']">{{$t('出货安排')}}
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:seaAir:action:create']">{{$t('出货安排')}}
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:export']">{{$t('导出')}}
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:seaAir:action:export']">{{$t('导出')}}
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/ecw/order/cargoControl.vue

@@ -66,7 +66,7 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="2">
-        <el-button type="primary" plain icon="el-icon-setting" size="mini" :disabled="multiple" @click="batchReview">{{$t('批量复核')}}</el-button>
+        <el-button v-hasPermi="['ecw:cargo_control:batch_review']" type="primary" plain icon="el-icon-setting" size="mini" :disabled="multiple" @click="batchReview">{{$t('批量复核')}}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

src/views/ecw/order/index.vue

@@ -121,7 +121,7 @@
       <el-col :span="1.5">
 <!--        <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" :disabled="!batchWarehouseAdjustment">{{$t('批量调仓')}}-->
 <!--        </el-button>-->
-        <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="showBatchPickup=true">{{$t('批量提货')}}</el-button>
+        <el-button type="primary" v-hasPermi="['ecw:order:batch_release']" plain icon="el-icon-setting" size="mini" @click="showBatchPickup=true">{{$t('批量提货')}}</el-button>
       </el-col>
       <el-col :span="1.5">
         <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -133,15 +133,14 @@
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item>
             <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item>
-            <template v-if="isAll" v-hasPermi="['ecw:order:export:other']">
-              <el-dropdown-item @click.native="$message('// TODO')">异常单统计</el-dropdown-item>
-              <el-dropdown-item @click.native="$message('// TODO')">重货单统计</el-dropdown-item>
-              <el-dropdown-item @click.native="$message('// TODO')">退仓单统计</el-dropdown-item>
-              <el-dropdown-item @click.native="$message('// TODO')">售后赔偿金额统计</el-dropdown-item>
-              <el-dropdown-item @click.native="$message('// TODO')">报关数据统计</el-dropdown-item>
-              <el-dropdown-item @click.native="$message('// TODO')">客户出货量统计</el-dropdown-item>
-              <el-dropdown-item @click.native="$message('// TODO')">预付运费统计</el-dropdown-item>
-              <el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item>
+            <template v-if="isAll">
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportAbnormal">异常单统计</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportHeavyOrder">重货单统计</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportReturnOrder">退仓单统计</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportSaleRepay">售后赔偿金额统计</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportCustomsDatas">报关数据统计</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShippingDatas">客户出货量统计</el-dropdown-item>
+              <el-dropdown-item hasPermi="[exportPermiString]" @click.native="exportShipFee">预付运费统计</el-dropdown-item>
             </template>
           </el-dropdown-menu>
         </el-dropdown>
@@ -340,7 +339,7 @@
                     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_update']">{{$t('入仓补充')}}</el-dropdown-item>
+                    <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_replenish']">{{$t('入仓补充')}}</el-dropdown-item>
                   </template>
                   <!-- 入仓修改 -->
                   <template v-if="
@@ -469,7 +468,15 @@ import {
   orderDeptStatistics,
   orderExportSearch,
   orderExportMySearch,
-  orderExportDeptSearch
+  orderExportDeptSearch,
+  exportAbnormal,
+  exportHeavyOrder,
+  exportReturnOrder,
+  exportSaleRepay,
+  exportCustomsDatas,
+  exportShippingDatas,
+  exportShipFee,
+  exportUnload
 } from "@/api/ecw/order";
 /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
 import PrintTag from './components/PrintTag'
@@ -648,6 +655,37 @@ export default {
     exportSearch(){
       return this.exportExcel(this.getExportFunc(), this.combinedQueryParams, this.$t("导出搜索"))
     },
+    // 导出异常单
+    exportAbnormal(){
+      return this.exportExcel(exportAbnormal, this.combinedQueryParams, this.$t("异常单统计"))
+    },
+    // 退仓单统计
+    exportReturnOrder(){
+      return this.exportExcel(exportReturnOrder, this.combinedQueryParams, this.$t("退仓单统计"))
+    },
+    // 售后赔偿金额统计
+    exportSaleRepay(){
+      return this.exportExcel(exportSaleRepay, this.combinedQueryParams, this.$t("售后赔偿金额统计"))
+    },
+    // 报关数据统计
+    exportCustomsDatas(){
+      return this.exportExcel(exportCustomsDatas, this.combinedQueryParams, this.$t("报关数据统计"))
+    },
+
+    // 客户出货量统计
+    exportShippingDatas(){
+      return this.exportExcel(exportShippingDatas, this.combinedQueryParams, this.$t("客户出货量统计"))
+    },
+
+    // 预付运费统计
+    exportShipFee(){
+      return this.exportExcel(exportShipFee, this.combinedQueryParams, this.$t("预付运费统计"))
+    },
+
+    // 卸货费统计
+    exportUnload(){
+      return this.exportExcel(exportUnload, this.combinedQueryParams, this.$t("卸货费统计"))
+    },
     // 通用导出函数
     exportExcel(func, params, fileName = null){
       this.exportLoading = true;

src/views/system/menu/index.vue

@@ -82,7 +82,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.type == 2">
+          <el-col :span="12" v-if="form.type == 2 || form.type == 1">
             <el-form-item :label="$t('显示菜单')" prop="isShowInMenuBar">
               <dict-selector v-model="form.isShowInMenuBar" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" form-type="radio" />
             </el-form-item>