部门订单部门报价单，订单统计导出等

src/api/ecw/offer.js

@@ -123,4 +123,13 @@ export function recovery(id) {
     method: 'delete',
     params: {id}
   })
-}
+}
\ No newline at end of file
+
+// 获取部门报价单列表
+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/dept.vue

+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item :label="$t('编号')" prop="searchNumber">
+        <el-input v-model="queryParams.searchNumber" :placeholder="$t('请输入报价单号、订单号')" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+
+      <el-form-item :label="$t('客户')" prop="searchCustomer">
+        <el-input v-model="queryParams.searchCustomer" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      
+      <el-form-item :label="$t('创建时间')" prop="orderNo">
+        <el-date-picker v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t('到') }}<el-date-picker v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
+      
+      <el-form-item :label="$t('始发地')" prop="departureId">
+        <el-select v-model="queryParams.departureId" :placeholder="$t('请选择始发地')" clearable>
+          <el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('目的地')" prop="objectiveId">
+        <el-select v-model="queryParams.objectiveId" :placeholder="$t('请选择目的地')" clearable>
+          <el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item :label="$t('运输方式')" prop="transportId">
+        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('商品')" prop="prodTitle">
+        <el-input v-model="queryParams.prodTitle" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item :label="$t('控货')" prop="control">
+        <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" v-model="queryParams.control" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('客户经理')" prop="followUpSalesmanId">
+        <user-selector v-model="queryParams.followUpSalesmanId" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('销售阶段')" prop="status">
+        <dict-selector :type="DICT_TYPE.ECW_OFFER_STATUS" v-model="queryParams.status" clearable />
+      </el-form-item>
+      <el-form-item :label="$t('报关方式')" prop="customsType">
+        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable />
+      </el-form-item>
+
+      <div>
+        <el-form-item :label="$t('预计结束时间')" prop="orderNo">
+            <el-date-picker v-model="queryParams.beginStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t('到') }}<el-date-picker v-model="queryParams.endStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
+        </el-form-item>
+      </div>
+      
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <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="['ecw:offer: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="['ecw:offer:export']">{{$t('导出')}}</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list" border>
+      <el-table-column :label="$t('报价单号')" align="left" prop="number" width="200px">
+        <template slot-scope="{row}">
+          <el-link type="primary" @click.native="$router.push('detail?offerId=' + row.offerId)">{{row.number}}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('订单编号')" align="left" prop="orderNo" />
+      <el-table-column :label="$t('客户名称')" align="left" prop="relationName" />
+      <el-table-column :label="$t('目的地')" align="center" prop="objectiveName" />
+      <el-table-column :label="$t('销售阶段')" align="left" width="180">
+        <template slot-scope="{row}">
+          <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('预计结束时间')" align="left">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.stopTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('运输方式')" align="left">
+        <template slot-scope="scope" >
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
+        </template>
+      </el-table-column>
+      
+
+      <el-table-column :label="$t('预计销售额')" align="left" prop="estCost">
+        <template slot-scope="{row}">
+          <div class="" v-for="(item, feeIndex) in row.estCostVO.feeDtoList" :key="feeIndex">
+            <dict-tag :type="DICT_TYPE.ECW_COST_FEE_TYPE" :value="item.feeType" />
+            {{item.amount}} {{currencyMap[item.currencyId]}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('客户经理')" align="left" prop="creatorName">
+      </el-table-column>
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <!-- 
+          0 取消                                        恢复
+          1 特价审批    编辑、跟进、          取消    删除
+          2 草稿        编辑、                       删除
+          3 需求确认    编辑、跟进、结果、特价、取消   删除
+          4 赢单                                    删除
+          5 输单                                    删除
+          6 完成                                    删除
+          7 跟进中      编辑、跟进、结果、特价、取消、 删除
+          -->
+          <el-dropdown>
+            <el-button icon="el-icon-plus" circle type="primary"></el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item @click.native="$router.push('detail?offerId=' + scope.row.offerId)"                                                                                                                  >{{$t('详情')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)"                                   v-if="[1,2,3,7].indexOf(scope.row.status) > -1"        v-hasPermi="['ecw:offer:update']">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('logList?offerId=' + scope.row.offerId)"                           v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:update']">{{$t('跟进')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)" v-if="[3,7].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('结果')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)"                    v-if="[1,3,7].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('特价')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="cancel(scope.row.offerId)"                                                      v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:update']">{{$t('取消')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="recovery(scope.row.offerId)"                                                    v-if="[0].indexOf(scope.row.status) > -1"              v-hasPermi="['ecw:offer:update']">{{$t('恢复')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="deleteOffer(scope.row.offerId)"                                                 v-if="[0,1,2,3,4,5,6,7].indexOf(scope.row.status) > -1"  v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>          
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+  </div>
+</template>
+
+<script>
+import { deleteOffer, getOfferPage, exportOfferExcel,cancel, recovery } from "@/api/ecw/offer";
+import { getCurrencyList } from '@/api/ecw/currency';
+import {getTradeCityList} from '@/api/ecw/region'
+import UserSelector from '@/components/UserSelector'
+export default {
+  name: "EcwOfferIndex",
+  components: {
+    UserSelector
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 报价单管理列表
+      list: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10
+      },
+      currencyList: [],
+      tradeCityList:[]
+
+    };
+  },
+  computed:{
+    currencyMap(){
+        let map = {}
+        this.currencyList.forEach(item => {
+            map[item.id] = this.$l(item, 'title')
+        })
+        return map
+    },
+    exportCityList() {
+      return this.tradeCityList.filter(item => item.type == 2)
+    },
+    importCityList() {
+      return this.tradeCityList.filter(item => item.type == 1)
+    },
+  },
+  activated(){
+    this.getList()
+  },
+  created() {
+    getTradeCityList().then(res => this.tradeCityList = res.data)
+
+    getCurrencyList().then(res => {
+      this.currencyList = res.data
+    })
+
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getOfferPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10
+      }
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      return this.$router.push('create')
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      return this.$router.push('edit?id=' + row.offerId)
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const offerId = row.offerId;
+      this.$modal.confirm(this.$t('是否确认删除报价单管理编号为{offerId}的数据项?', {offerId})).then(function() {
+          return deleteOffer(offerId);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess(this.$t("删除成功"));
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal.confirm(this.$t('是否确认导出所有报价单管理数据项?')).then(() => {
+          this.exportLoading = true;
+          return exportOfferExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '报价列表.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    cancel(id){
+      this.doAction('确定要取消此报价单么？', cancel, id);
+    },
+    recovery(id){
+      this.doAction('确定要恢复此报价单么？', recovery, id);
+    },
+    deleteOffer(id){
+      this.doAction('确定要删除此报价单么？', deleteOffer, id);
+    },
+    doAction(tips, action, id){
+      this.$confirm(tips).then(res => {
+        return action(id)
+      })
+      .then(() => {
+        this.$message.success('操作成功')
+        this.handleQuery()
+      })
+    }
+  }
+};
+</script>

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

@@ -125,8 +125,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>
@@ -419,7 +440,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'
@@ -445,7 +470,8 @@ export default {
     CustomerSelector, ProductSelector, Selector,specialNeeds,PrintTag, PrintWarehouseReceipt, PrintLadingBill, BatchPickup,withdrawal
   },
   props: {
-    mine: Boolean
+    mine: Boolean, // 标识我的订单列表
+    dept: Boolean // 标识部门订单列表
   },
   data() {
     return {
@@ -502,7 +528,8 @@ export default {
         page: 1,
         rows: 20,
       },
-      currencyList:[]
+      currencyList:[],
+      statistics: null ,// 统计数据
     };
   },
   watch:{
@@ -566,6 +593,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)/)
@@ -604,19 +654,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
+      })
     },
 
     /** 搜索按钮操作 */