Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/api/ecw/offer.js

@@ -124,3 +124,12 @@ export function recovery(id) {
     params: {id}
   })
 }
+
+// 获取部门报价单列表
+export function offerDeptPage(params) {
+  return request({
+    url: '/ecw/offer/dept/page',
+    method: 'get',
+    params
+  })
+}

src/api/ecw/order.js

@@ -505,3 +505,39 @@ export function warehousePictureList(data){
     data
   })
 }
+
+// 获得部门订单分页
+export function deptOrderPage(params){
+  return request({
+    url: '/ecw/order/dept-order-page',
+    method: 'GET',
+    params
+  })
+}
+
+// 获得订单统计
+export function orderStatistics(params){
+  return request({
+    url: '/ecw/order/statistics',
+    method: 'GET',
+    params
+  })
+}
+
+// 获得我的订单统计
+export function orderMyStatistics(params){
+  return request({
+    url: '/ecw/order/my/statistics',
+    method: 'GET',
+    params
+  })
+}
+
+// 获得部门订单统计
+export function orderDeptStatistics(params){
+  return request({
+    url: '/ecw/order/dept/statistics',
+    method: 'GET',
+    params
+  })
+}
\ No newline at end of file

src/views/ecw/offer/index.vue

@@ -143,7 +143,7 @@
 </template>
 
 <script>
-import { deleteOffer, getOfferPage, exportOfferExcel,cancel, recovery } from "@/api/ecw/offer";
+import { deleteOffer, getOfferPage, exportOfferExcel,cancel, recovery, offerDeptPage } from "@/api/ecw/offer";
 import { getCurrencyList } from '@/api/ecw/currency';
 import {getTradeCityList} from '@/api/ecw/region'
 import UserSelector from '@/components/UserSelector'
@@ -170,8 +170,8 @@ export default {
         pageSize: 10
       },
       currencyList: [],
-      tradeCityList:[]
-
+      tradeCityList:[],
+      dept: false, // 是否部门订单
     };
   },
   computed:{
@@ -193,6 +193,11 @@ export default {
     this.getList()
   },
   created() {
+    console.log("offer index", this.$route)
+    // 部门订单
+    if(this.$route.fullPath.indexOf('dept') > -1){
+      this.dept = true
+    }
     getTradeCityList().then(res => this.tradeCityList = res.data)
 
     getCurrencyList().then(res => {
@@ -205,8 +210,9 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
+      let func = this.dept ? offerDeptPage : getOfferPage
       // 执行查询
-      getOfferPage(this.queryParams).then(response => {
+      func(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;

src/views/ecw/order/dept.vue

+<template>
+    <index dept />
+</template>
+<script>
+import Index from './index'
+export default {
+    name: 'EcwOrderDept',
+    components: {Index}
+}
+</script>
\ No newline at end of file

src/views/ecw/order/index.vue

@@ -124,8 +124,29 @@
         <el-button type="primary" 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"
-          :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button>
+        <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button> -->
+        <el-dropdown v-hasPermi="['ecw:order:export']">
+          <el-button type="primary" :loading="exportLoading" size="mini">
+            导出 <i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item @click.native="exportChecked">导出勾选</el-dropdown-item>
+            <el-dropdown-item @click.native="exportSearch">导出搜索</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>
+            <el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-col>
+      <el-col :span="15" v-if="statistics">
+        <!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 -->
+        合计：{{statistics.totalNum}}箱，{{statistics.totalVolume}}m³(测) {{statistics.totalChargeVolume}}m³(重) {{statistics.totalWeight}}KG
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -418,7 +439,11 @@ import {
   orderSpecialNeed,
   cancelOrder,
   recoveryOrder,
-  getMyOrderPage
+  getMyOrderPage,
+  deptOrderPage,
+  orderStatistics,
+  orderMyStatistics,
+  orderDeptStatistics
 } from "@/api/ecw/order";
 /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
 import PrintTag from './components/PrintTag'
@@ -444,7 +469,8 @@ export default {
     CustomerSelector, ProductSelector, Selector,specialNeeds,PrintTag, PrintWarehouseReceipt, PrintLadingBill, BatchPickup,withdrawal
   },
   props: {
-    mine: Boolean
+    mine: Boolean, // 标识我的订单列表
+    dept: Boolean // 标识部门订单列表
   },
   data() {
     return {
@@ -501,7 +527,8 @@ export default {
         page: 1,
         rows: 20,
       },
-      currencyList:[]
+      currencyList:[],
+      statistics: null ,// 统计数据
     };
   },
   watch:{
@@ -565,6 +592,29 @@ export default {
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
   },
   methods: {
+    // 导出勾选
+    exportChecked(){
+      if(!this.ids.length){
+        return this.$message.error(this.$t('请勾选需要导出的订单'))
+      }
+      return this.exportExcel(exportOrderExcel, {orderIdList: this.ids})
+    },
+    // 导出搜索
+    exportSearch(){
+      return this.exportExcel(exportOrderExcel, this.combinedQueryParams)
+    },
+    // 通用导出函数
+    exportExcel(func, params, fileName = null){
+      this.exportLoading = true;
+      func(params).then(res => {
+        if(!fileName){
+          fileName = this.$t('订单')
+        }
+        this.$download.excel(res, fileName + '.xls');
+      }).finally(() => {
+        this.exportLoading = false
+      })
+    },
     // 提取路径中的运输方式
     getTransportFromRoute(){
         let match = this.$route.path.match(/transport_(\d)/)
@@ -603,19 +653,37 @@ export default {
     getList() {
       this.loading = true;
       console.log('this.combinedQueryParams', this.combinedQueryParams)
+      let func = getOrderPage
       if(this.mine){
-        return getMyOrderPage(this.combinedQueryParams).then(response => {
+        func = getMyOrderPage
+        /* return getMyOrderPage(this.combinedQueryParams).then(response => {
           this.list = response.data.list;
           this.total = response.data.total;
           this.loading = false;
-        });
+        }); */
+      }else if(this.dept){
+        func = deptOrderPage
       }
       // 执行查询
-      getOrderPage(this.combinedQueryParams).then(response => {
+      func(this.combinedQueryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
       });
+
+      this.getStatistics()
+    },
+    // 获得统计数据
+    getStatistics(){
+      let func = orderStatistics
+      if(this.mine){
+        func = orderMyStatistics
+      }else if(this.dept){
+        func = orderDeptStatistics
+      }
+      func(this.combinedQueryParams).then(res => {
+        this.statistics = res.data
+      })
     },
 
     /** 搜索按钮操作 */