Explorar o código

调拨、销售一览表

chenrui hai 1 ano
pai
achega
ebf127dd5f

+ 12 - 0
src/api/allocateBill.js

@@ -211,3 +211,15 @@ export const updatePrintState = params => {
     method: 'post'
   })
 }
+
+// 调拨一览表  列表分页
+export const queryOverviewPage = (params) => {
+  const url = `/allocateBill/queryOverviewPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 12 - 0
src/api/sales.js

@@ -290,3 +290,15 @@ export const exportForWarehouse = params => {
     responseType: 'blob'
   })
 }
+
+// 销售一览表 列表
+export const salesOverviewQueryPage = (params) => {
+  const url = `/salesOverview/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 37 - 12
src/config/router.config.js

@@ -560,26 +560,26 @@ export const asyncRouterMap = [
             ]
           },
           {
-            path: '/salesManagement/salesAllocationList',
-            redirect: '/salesManagement/salesAllocationList/index',
-            name: 'salesAllocationList',
+            path: '/salesManagement/salesList',
+            redirect: '/salesManagement/salesList/list',
+            name: 'salesList',
             component: BlankLayout,
             meta: {
-              title: '销售/调拨一览表',
-              icon: 'file-protect',
-              permission: 'M_salesAllocationList'
+              title: '销售一览表',
+              icon: 'file-protect'
+              // permission: 'M_salesList'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: 'index',
-                name: 'salesAllocationListIndex',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesAllocationList/index.vue'),
+                path: 'list',
+                name: 'salesMainList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesList/list.vue'),
                 meta: {
-                  title: '销售/调拨一览表',
+                  title: '销售一览表',
                   icon: 'file-protect',
-                  hidden: true,
-                  permission: 'M_salesAllocationListIndex'
+                  hidden: true
+                  // permission: 'M_salesList'
                 }
               }
             ]
@@ -1659,6 +1659,31 @@ export const asyncRouterMap = [
                 }
               }
             ]
+          },
+          {
+            path: '/allocationManagement/allocationList',
+            redirect: '/allocationManagement/allocationList/list',
+            name: 'allocationList',
+            component: BlankLayout,
+            meta: {
+              title: '调拨一览表',
+              icon: 'vertical-align-top'
+              // permission: 'M_allocationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'allocationMainList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/allocationList/list.vue'),
+                meta: {
+                  title: '调拨一览表',
+                  icon: 'vertical-align-top',
+                  hidden: true
+                  // permission: 'M_allocationList'
+                }
+              }
+            ]
           }
         ]
       },

+ 353 - 0
src/views/allocationManagement/allocationList/list.vue

@@ -0,0 +1,353 @@
+<template>
+  <a-card size="small" :bordered="false" class="pushOrder-wrap">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="创建时间">
+              <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调往对象">
+              <a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="费用/调拨类型">
+              <AllocateType id="allocateBillList-costTypeName" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收货客户名称">
+                <dealerSearchList ref="receiverSn" @change="custChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="allocateBillList-state"
+                  code="ALLOCATE_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调拨单号">
+                <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调出仓库">
+                <warehouse
+                  v-model="queryParam.warehouseSn"
+                  id="allocateBillList-warehouseSn"
+                  placeholder="请选择调出仓库"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="打印状态">
+                <v-select
+                  v-model="queryParam.printState"
+                  ref="printState"
+                  id="allocateBillList-printState"
+                  code="PRINT_STATUS"
+                  placeholder="请选择打印状态"
+                  allowClear
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="对单状态">
+                <v-select
+                  v-model="queryParam.checkStatus"
+                  ref="checkStatus"
+                  id="allocateBillList-checkStatus"
+                  code="CHECK_STATUS"
+                  placeholder="请选择对单状态"
+                  allowClear
+                ></v-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y:tableHeight, x:1890 }"
+        :defaultLoadData="false"
+        bordered>
+        <!-- 起止时间 -->
+        <template slot="promoDate" slot-scope="text, record">
+          <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~ {{ record.promoEndDate }}</span>
+          <span v-else>--</span>
+        </template>
+        <!-- 调拨单号 -->
+        <template slot="allocateNo" slot-scope="text, record">
+          <span class="link-bule" @click="handleDetail(record,2)">{{ record.allocateNo }}</span>
+        </template>
+        <!-- 发货单号  -->
+        <template slot="sendBillNo" slot-scope="text, record">
+          <span v-if="record.sendBill&&record.sendBill.sendBillNo" class="link-bule" @click="handleDetail(record,1)">{{ record.sendBill.sendBillNo }}</span>
+          <span v-else>--</span>
+        </template>
+        <!-- 调拨类型 -->
+        <template slot="allocateType" slot-scope="text, record">
+          <div>
+            <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
+            <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
+            <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
+          </div>
+        </template>
+      </s-table>
+      <!-- 查看详情 -->
+      <commonModal
+        modalTit="调拨单详情"
+        bodyPadding="10px"
+        width="70%"
+        :showFooter="false"
+        :openModal="showDetailModal"
+        @cancel="showDetailModal = false">
+        <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
+      </commonModal>
+      <!-- 发货单详情 -->
+      <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
+    </a-spin>
+  </a-card>
+  </div></template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import moment from 'moment'
+import getDate from '@/libs/getDate.js'
+import rangeDate from '@/views/common/rangeDate.vue'
+import { STable, VSelect } from '@/components'
+import commonModal from '@/views/common/commonModal.vue'
+import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
+import AllocateType from '@/views/common/allocateType.js'
+import dealerSearchList from '@/views/common/dealerSearchList.vue'
+import warehouse from '@/views/common/chooseWarehouse.js'
+import { queryOverviewPage } from '@/api/allocateBill'
+import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
+export default {
+  name: 'PushOrderManagementList',
+  mixins: [commonMixin],
+  components: { STable, VSelect, allocationDetailModal, AllocateType, warehouse, dealerSearchList, rangeDate, commonModal, detailModal },
+  data () {
+    return {
+      spinning: false,
+      advanced: true, // 高级搜索 展开/关闭
+      disabled: false, //  查询、重置按钮是否可操作
+      showDetailModal: false,
+      showTipModal: false,
+      bizSn: null,
+      tableHeight: 0,
+      allocateTypeVal: [],
+      time: [
+        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ],
+      // 查询参数
+      queryParam: { //  查询条件
+        beginDate: getDate.getThreeMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
+        targetName: '', //  调往对象
+        costTypeSn: undefined, // 费用类型
+        allocateSortSn: undefined, //  调拨类型1
+        allocateTypeSn: undefined, //  调拨类型2
+        state: undefined, //  业务状态
+        allocateNo: '', //  调拨单号
+        receiverSn: undefined,
+        checkStatus: undefined,
+        printState: undefined,
+        warehouseSn: undefined
+      },
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        return queryOverviewPage(Object.assign(parameter, this.queryParam)).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
+      }
+    }
+  },
+  computed: {
+    columns () {
+      const _this = this
+      const arr = [
+        { title: '创建时间', dataIndex: 'createDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
+        { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '150px', fixed: 'left' },
+        { title: '调往对象', dataIndex: 'targetName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
+        { title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
+        { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '120px', fixed: 'left' },
+        { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
+        { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总成本', dataIndex: 'totalCost', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        { title: '总售价', dataIndex: 'totalPrice', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        { title: '总数量', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '费用类型', dataIndex: 'costTypeName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型', scopedSlots: { customRender: 'allocateType' }, width: '100px', align: 'center' },
+        { title: '调出仓库', dataIndex: 'warehouseName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'stateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货创建时间', dataIndex: 'sendBill.createDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
+
+        { title: '发货状态', dataIndex: 'sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '托运日期', dataIndex: 'sendBill.sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收货人', dataIndex: 'sendBill.customerCacateName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '物流电话', dataIndex: 'sendBill.transportTele', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '物流单号', dataIndex: 'sendBill.transportNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+
+        { title: '总件数', dataIndex: 'sendBill.totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收货状态', dataIndex: 'sendBill.receiveFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收货时间', dataIndex: 'sendBill.receiveDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '物流情况', dataIndex: 'sendBill.transportStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'sendBill.transportRemark', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+      ]
+      return arr
+    }
+  },
+  methods: {
+    // 调拨详情
+    handleDetail (row, typeNum) {
+      if (typeNum == 2) {
+        this.bizSn = row.allocateSn
+        this.showDetailModal = true
+      } else {
+        this.showTipModal = true
+        this.$refs.detailModal.getDetail(row.sendBill, typeNum, '发货单详情')
+      }
+    },
+    //  时间  change
+    dateChange (date) {
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
+    },
+    // 调拨类型
+    changeAllocatype (val, opts) {
+      this.allocateTypeVal = val || []
+      this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
+      this.queryParam.allocateSortSn = val && val[1] ? val[1] : ''
+      this.queryParam.allocateTypeSn = val && val[2] ? val[2] : ''
+    },
+    // 收货客户名称
+    custChange (val) {
+      if (val.row) {
+        this.queryParam.receiverSn = val.row.dealerSn
+        this.queryParam.receiverName = undefined
+      } else {
+        this.queryParam.receiverSn = undefined
+        this.queryParam.receiverName = val.key
+      }
+    },
+    // 重置
+    resetSearchForm () {
+      this.$refs.rangeDate.resetDate(this.time)
+      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      this.queryParam.targetName = ''
+      this.queryParam.costTypeSn = undefined
+      this.queryParam.allocateSortSn = undefined
+      this.queryParam.allocateTypeSn = undefined
+      this.queryParam.state = undefined
+      this.queryParam.checkStatus = undefined
+      this.queryParam.printState = undefined
+      this.queryParam.allocateNo = ''
+      this.queryParam.receiverName = ''
+      this.queryParam.receiverSn = undefined
+      this.queryParam.warehouseSn = undefined
+      this.allocateTypeVal = []
+      this.$refs.receiverSn.resetForm()
+      this.$refs.table.refresh(true)
+      this.$refs.table.refresh()
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      _this.resetSearchForm()
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 210
+    }
+  },
+  watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
+  }
+}
+</script>
+<style lang="less">
+  .pushOrder-wrap{
+    .sTable{
+      margin-top: 10px;
+    }
+  }
+</style>

+ 0 - 8
src/views/salesManagement/salesAllocationList/allocationList.vue

@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>

+ 0 - 42
src/views/salesManagement/salesAllocationList/index.vue

@@ -1,42 +0,0 @@
-<template>
-  <div class="menusAuth-cons">
-    <a-tabs @change="tabChange" type="card">
-      <a-tab-pane tab="销售一览表" key="1">
-        <salesList types="dd"></salesList>
-      </a-tab-pane>
-      <a-tab-pane tab="调拨一览表" key="2">
-        <allocationList types="ls"></allocationList>
-      </a-tab-pane>
-    </a-tabs>
-  </div>
-</template>
-
-<script>
-import salesList from './salesList.vue'
-import allocationList from './allocationList.vue'
-export default {
-  name: 'SalesAllocationList',
-  components: {
-    salesList, allocationList
-  },
-  data () {
-    return {}
-  },
-  methods: {
-    tabChange (v) {
-      console.log(v)
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-    })
-  }
-}
-</script>
-
-<style>
-  .menusAuth-cons{
-    background: #fff;
-    padding: 10px;
-  }
-</style>

+ 111 - 118
src/views/salesManagement/salesAllocationList/salesList.vue → src/views/salesManagement/salesList/list.vue

@@ -97,47 +97,46 @@
         </a-form>
       </div>
     </a-card>
-    <!-- <a-card size="small" :bordered="false"> -->
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y:tableHeight, x:1890 }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 超时环节提示 -->
-        <template slot="tip" slot-scope="text, record">
-          <a-tooltip placement="top">
-            <template slot="title">
-              <span>已超时2天</span>
-            </template>
-            <div>
-              <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'26px'}"/>
-              <span>{{ record.salesBillNo }}</span>
-            </div>
-          </a-tooltip>
-        </template>
-        <!-- 销售单号 -->
-        <template slot="salesBillNo" slot-scope="text, record">
-          <span class="link-bule" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
-        </template>
-        <!-- 备货单号 -->
-        <template slot="dispatchBillNo" slot-scope="text, record">
-          <span class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
-        </template>
-        <!-- 发货单号  -->
-        <template slot="sendBillNo" slot-scope="text, record">
-          <span class="link-bule" @click="handleDetail(record,2)">{{ record.dispatchBillNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <div>
+    <a-card size="small" :bordered="false" style="margin-top:8px;">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y:tableHeight, x:1890 }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 超时环节提示 -->
+          <template slot="tip" slot-scope="text, record">
+            <a-tooltip placement="top">
+              <template slot="title">
+                <span>已超时{{ record.sendOverDay }}天(要求销售单下推后2天内备货)</span>
+              </template>
+              <div>
+                <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
+                <span>{{ record.billStatusDictValue }}</span>
+              </div>
+            </a-tooltip>
+          </template>
+          <!-- 销售单号 -->
+          <template slot="salesBillNo" slot-scope="text, record">
+            <span class="link-bule" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+          </template>
+          <!-- 备货单号 -->
+          <template slot="dispatchBillNo" slot-scope="text, record">
+            <span class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+          </template>
+          <!-- 发货单号  -->
+          <template slot="sendBillNo" slot-scope="text, record">
+            <span class="link-bule" @click="handleDetail(record,2)">{{ record.dispatchBillNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
             <a-button
               size="small"
               type="link"
@@ -154,12 +153,11 @@
               v-if="record.printStatus=='UNABLE_PRINT'&&record.voidFlag=='0'&&$hasPermissions('B_CANSEL_PRINT')"
               @click="handlePrint(record,0)"
             >取消打印</a-button>
-          </div>
-        </template>
-      </s-table>
+          </template>
+        </s-table>
 
-      <!-- 操作提示 -->
-      <!-- <commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
+        <!-- 操作提示 -->
+        <!-- <commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
         <div style="display:flex;flex-direction: column;align-items: center;">
           <div style="margin-bottom: 15px;font-size: 14px;"><strong>{{ tipData&&tipData.printType==1?'确认允许此单进行备货打印吗?':'确认此单取消备货打印吗?' }}</strong></div>
           <div style="line-height: 24px;">
@@ -169,24 +167,24 @@
         </div>
       </commonModal> -->
 
-      <!-- 查看销售单或备货单详情 -->
-      <commonModal
-        :modalTit="detailType?'备货单详情':'销售单详情'"
-        bodyPadding="10px"
-        width="70%"
-        :showFooter="false"
-        :openModal="showDetailModal"
-        @cancel="cancelDetail">
-        <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-        <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
-        <financialDetailModal v-if="detailType==3" ref="financialDetail" :bizSn="bizSn"></financialDetailModal>
-      </commonModal>
-      <!-- 发货说明 -->
-      <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
-      <!-- 发货单详情 -->
-      <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
-    </a-spin>
-    <!-- </a-card> -->
+        <!-- 查看销售单或备货单详情 -->
+        <commonModal
+          :modalTit="detailType?'备货单详情':'销售单详情'"
+          bodyPadding="10px"
+          width="70%"
+          :showFooter="false"
+          :openModal="showDetailModal"
+          @cancel="cancelDetail">
+          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+          <financialDetailModal v-if="detailType==3" ref="financialDetail" :bizSn="bizSn"></financialDetailModal>
+        </commonModal>
+        <!-- 发货说明 -->
+        <explainInfoModal v-drag :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal>
+        <!-- 发货单详情 -->
+        <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
+      </a-spin>
+    </a-card>
   </div>
 </template>
 
@@ -208,7 +206,7 @@ import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
 import financialDetailModal from '@/views/financialManagement/financialCollection/detail.vue'
 
 // import explainInfoModal from './explainInfoModal.vue'
-import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/dispatch'
+import { salesOverviewQueryPage } from '@/api/sales'
 export default {
   name: 'PushOrderManagementList',
   mixins: [commonMixin],
@@ -260,11 +258,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        // 查询总计
-        dispatchQueryCount(Object.assign(parameter, this.queryParam)).then(res => {
-          this.totalData = Object.assign(this.totalData, res.data || {})
-        })
-        return dispatchlList(Object.assign(parameter, this.queryParam)).then(res => {
+        return salesOverviewQueryPage(Object.assign(parameter, this.queryParam)).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -284,41 +278,41 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '超时环节提醒', scopedSlots: { customRender: 'tip' }, width: '120px', align: 'center', fixed: 'left' },
-        { title: '提交时间', dataIndex: 'createDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
+        { title: '超时环节提醒', scopedSlots: { customRender: 'tip' }, width: '160px', align: 'center', fixed: 'left' },
+        { title: '提交时间', dataIndex: 'submitDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
-        { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
+        { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center', fixed: 'left' },
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
         { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
         { title: '所在区域', dataIndex: 'subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在分区', dataIndex: 'subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'warehouseName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收款方式', dataIndex: 'settlePrintStateDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收款方式', dataIndex: 'settleStyleDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
 
-        { title: '审核时间', dataIndex: 'stockUpDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '下推数量', dataIndex: 'totalCategory', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '下推金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
-        { title: '备货允许打印时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备货时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货创建时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下推数量', dataIndex: 'dispatchTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '下推金额', dataIndex: 'dispatchSettledAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        { title: '备货允许打印时间', dataIndex: 'dispatchPushedDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备货时间', dataIndex: 'dispatchAuditDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货创建时间', dataIndex: 'sendCreateDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
 
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货状态', dataIndex: 'voidFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
-        { title: '收款时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '托运日期', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货状态', dataIndex: 'sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款金额', dataIndex: 'dispatchTotalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        { title: '收款时间', dataIndex: 'sendDate1', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货编号', dataIndex: 'dispatchSendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '托运日期', dataIndex: 'sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'receiverName', width: '80px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '物流电话', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '物流单号', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '物流电话', dataIndex: 'sendTransportTele', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '物流单号', dataIndex: 'sendTransportNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
 
-        { title: '总件数', dataIndex: 'totalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总件数', dataIndex: 'sendTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '运费合计', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
-        { title: '收货状态', dataIndex: 'printStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收货时间', dataIndex: 'financialStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '物流情况', dataIndex: 'settlePrintStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收货状态', dataIndex: 'sendReceiveFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收货时间', dataIndex: 'submitDate1', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '物流情况', dataIndex: 'sendTransportStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'checkStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       return arr
@@ -400,29 +394,29 @@ export default {
     },
     // 重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
-      this.queryParam.buyerSn = undefined
-      this.queryParam.receiverSn = undefined
-      this.$refs.dealerSubareaScopeList.resetForm()
-      this.$refs.shbuyerName.resetForm()
-      this.queryParam.salesBillNo = ''
-      this.queryParam.dispatchBillNo = ''
-      this.queryParam.billStatus = undefined
-      this.queryParam.voidFlag = undefined
-      this.queryParam.subareaArea.subareaSn = undefined
-      this.queryParam.subareaArea.subareaAreaSn = undefined
-      this.queryParam.shippingAddrProvinceSn = undefined
-      this.queryParam.printStatus = undefined
-      this.queryParam.checkStatus = undefined
-      this.queryParam.warehouseSn = undefined
-      this.queryParam.subareaArea.subareaSn = undefined
-      this.queryParam.subareaArea.subareaAreaSn = undefined
+      // this.$refs.rangeDate.resetDate(this.time)
+      // this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
+      // this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      // this.queryParam.buyerSn = undefined
+      // this.queryParam.receiverSn = undefined
+      // this.$refs.dealerSubareaScopeList.resetForm()
+      // this.$refs.shbuyerName.resetForm()
+      // this.queryParam.salesBillNo = ''
+      // this.queryParam.dispatchBillNo = ''
+      // this.queryParam.billStatus = undefined
+      // this.queryParam.voidFlag = undefined
+      // this.queryParam.subareaArea.subareaSn = undefined
+      // this.queryParam.subareaArea.subareaAreaSn = undefined
+      // this.queryParam.shippingAddrProvinceSn = undefined
+      // this.queryParam.printStatus = undefined
+      // this.queryParam.checkStatus = undefined
+      // this.queryParam.warehouseSn = undefined
+      // this.queryParam.subareaArea.subareaSn = undefined
+      // this.queryParam.subareaArea.subareaAreaSn = undefined
 
-      if (this.advanced) {
-        this.$refs.subarea.clearData()
-      }
+      // if (this.advanced) {
+      //   this.$refs.subarea.clearData()
+      // }
       this.$refs.table.refresh(true)
     },
     pageInit () {
@@ -430,10 +424,11 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
+      _this.resetSearchForm()
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 320
+      this.tableHeight = window.innerHeight - tableSearchH - 236
     }
   },
   watch: {
@@ -450,14 +445,12 @@ export default {
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()
-      this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.pageInit()
-      this.resetSearchForm()
     }
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {