lilei 3 vuotta sitten
vanhempi
commit
b4cda9f04e

+ 217 - 22
src/config/router.config.js

@@ -188,6 +188,142 @@ export const asyncRouterMap = [
               }
             ]
           },
+          {
+            path: '/salesManagement/pushOrderManagement',
+            redirect: '/salesManagement/pushOrderManagement/list',
+            name: 'pushOrderManagement',
+            component: BlankLayout,
+            meta: {
+              title: '下推订单列表',
+              icon: 'vertical-align-bottom',
+              permission: 'M_pushOrderManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'pushOrderManagementList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/list.vue'),
+                meta: {
+                  title: '下推订单列表',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_pushOrderManagementList'
+                }
+              },
+              {
+                path: 'detail/:sn/:type',
+                name: 'pushOrderDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/detail.vue'),
+                meta: {
+                  title: '下推订单详情',
+                  icon: 'vertical-align-bottom',
+                  hidden: true
+                  // permission: 'M_outboundList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/salesCollection',
+            redirect: '/salesManagement/salesCollection/list',
+            name: 'salesCollection',
+            component: BlankLayout,
+            meta: {
+              title: '销售收款',
+              icon: 'vertical-align-bottom',
+              // permission: 'M_salesCollectionList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesCollectionList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesCollection/list.vue'),
+                meta: {
+                  title: '销售收款',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  // permission: 'M_salesCollectionList'
+                }
+              },
+            ]
+          },
+          {
+            path: '/salesManagement/stockPrint',
+            redirect: '/salesManagement/stockPrint/list',
+            name: 'stockPrint',
+            component: BlankLayout,
+            meta: {
+              title: '备货打印',
+              icon: 'vertical-align-bottom',
+              // permission: 'M_stockPrintList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'stockPrintList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/stockPrint/list.vue'),
+                meta: {
+                  title: '备货打印',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  // permission: 'M_stockPrintList'
+                }
+              },
+            ]
+          },
+          {
+            path: '/salesManagement/receiptPrint',
+            redirect: '/salesManagement/receiptPrint/list',
+            name: 'receiptPrint',
+            component: BlankLayout,
+            meta: {
+              title: '收款打印',
+              icon: 'vertical-align-bottom',
+              // permission: 'M_receiptPrintList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'receiptPrintList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/receiptPrint/list.vue'),
+                meta: {
+                  title: '收款打印',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  // permission: 'M_receiptPrintList'
+                }
+              },
+            ]
+          },
+          {
+            path: '/salesManagement/matchSendOutOrder',
+            redirect: '/salesManagement/matchSendOutOrder/list',
+            name: 'matchSendOutOrder',
+            component: BlankLayout,
+            meta: {
+              title: '发货对单',
+              icon: 'vertical-align-bottom',
+              // permission: 'M_matchSendOutOrderList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'matchSendOutOrderList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/matchSendOutOrder/list.vue'),
+                meta: {
+                  title: '发货对单',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  // permission: 'M_matchSendOutOrderList'
+                }
+              },
+            ]
+          },
           {
             path: '/salesManagement/examineVerify',
             redirect: '/salesManagement/examineVerify/list',
@@ -239,37 +375,26 @@ export const asyncRouterMap = [
             ]
           },
           {
-            path: '/salesManagement/pushOrderManagement',
-            redirect: '/salesManagement/pushOrderManagement/list',
-            name: 'pushOrderManagement',
+            path: '/salesManagement/sendOutOrder',
+            redirect: '/salesManagement/sendOutOrder/list',
+            name: 'sendOutOrder',
             component: BlankLayout,
             meta: {
-              title: '下推订单列表',
-              icon: 'vertical-align-bottom',
-              permission: 'M_pushOrderManagementList'
+              title: '发货单列表',
+              icon: 'export',
+              // permission: 'M_sendOutOrderList'
             },
             hideChildrenInMenu: true,
             children: [
               {
                 path: 'list',
-                name: 'pushOrderManagementList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/list.vue'),
+                name: 'sendOutOrderList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/sendOutOrder/list.vue'),
                 meta: {
-                  title: '下推订单列表',
-                  icon: 'vertical-align-bottom',
+                  title: '发货单列表',
+                  icon: 'export',
                   hidden: true,
-                  permission: 'M_pushOrderManagementList'
-                }
-              },
-              {
-                path: 'detail/:sn/:type',
-                name: 'pushOrderDetail',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/detail.vue'),
-                meta: {
-                  title: '下推订单详情',
-                  icon: 'vertical-align-bottom',
-                  hidden: true
-                  // permission: 'M_outboundList'
+                  // permission: 'M_osendOutOrderList'
                 }
               }
             ]
@@ -648,6 +773,26 @@ export const asyncRouterMap = [
                   hidden: true,
                   permission: 'M_financialCollectionList'
                 }
+              },
+              {
+                path: 'add',
+                name: 'financialCollectionAdd',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/edit.vue'),
+                meta: {
+                  title: '新增财务收款',
+                  icon: 'monitor',
+                  hidden: true
+                }
+              },
+              {
+                path: 'edit/:sn',
+                name: 'financialCollectionEdit',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/edit.vue'),
+                meta: {
+                  title: '编辑财务收款',
+                  icon: 'monitor',
+                  hidden: true
+                }
               }
             ]
           }
@@ -1085,6 +1230,56 @@ export const asyncRouterMap = [
               }
             ]
           },
+          {
+            path: '/allocationManagement/transfersPrint',
+            redirect: '/allocationManagement/transfersPrint/list',
+            name: 'transfersPrint',
+            component: BlankLayout,
+            meta: {
+              title: '调拨打印',
+              icon: 'pull-request',
+              // permission: 'M_transfersPrintList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'transfersPrintList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transfersPrint/list.vue'),
+                meta: {
+                  title: '调拨打印',
+                  icon: 'pull-request',
+                  hidden: true,
+                  // permission: 'M_transfersPrintList'
+                }
+              },
+            ]
+          },
+          {
+            path: '/allocationManagement/matchSendOutOrder',
+            redirect: '/allocationManagement/matchSendOutOrder/list',
+            name: 'matchSendOutOrderAllocation',
+            component: BlankLayout,
+            meta: {
+              title: '发货对单',
+              icon: 'vertical-align-bottom',
+              // permission: 'M_matchSendOutOrderAllocationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'matchSendOutOrderAllocationList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/matchSendOutOrder/list.vue'),
+                meta: {
+                  title: '发货对单',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  // permission: 'M_matchSendOutOrderAllocationList'
+                }
+              },
+            ]
+          },
           {
             path: '/allocationManagement/transferReturn',
             redirect: '/allocationManagement/transferReturn/list',

+ 8 - 0
src/views/allocationManagement/matchSendOutOrder/list.vue

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

+ 8 - 0
src/views/allocationManagement/transfersPrint/list.vue

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

+ 9 - 5
src/views/common/commonModal.vue

@@ -11,9 +11,10 @@
     :width="416">
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main" v-html="modalHtml"></div>
+      <slot></slot>
       <div class="btn-box">
-        <a-button type="primary" class="button-warning" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button type="primary" class="button-info" @click="handleCommonOk">{{ okText }}</a-button>
+        <a-button @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
+        <a-button type="primary" class="button-primary" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
     </a-spin>
   </a-modal>
@@ -75,7 +76,7 @@ export default {
     //  重定义的弹框状态
     isShow (newValue, oldValue) {
       if (!newValue) {
-        this.$emit('close')
+        this.$emit('cancel')
       }
     }
   }
@@ -104,8 +105,11 @@ export default {
       }
     }
     .btn-box{
-      text-align: right;
-      margin-top: 20px;
+      text-align: center;
+      margin-top: 30px;
+      .ant-btn{
+        margin:0 20px;
+      }
     }
   }
 </style>

+ 8 - 0
src/views/financialManagement/financialCollection/edit.vue

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

+ 8 - 0
src/views/salesManagement/matchSendOutOrder/list.vue

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

+ 2 - 0
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -189,6 +189,8 @@ export default {
         this.$router.push({ path: '/salesManagement/examineVerify/list', query: { closeLastOldTab: true } })
       } else if (this.$route.params.type == 'financialCollection') { // 财务收款
         this.$router.push({ path: '/financialManagement/financialCollection/list', query: { closeLastOldTab: true } })
+      } else if (this.$route.params.type == 'salesCollection') { // 销售收款
+        this.$router.push({ path: '/salesManagement/salesCollection/list', query: { closeLastOldTab: true } })
       }
     },
     //  详情

+ 8 - 0
src/views/salesManagement/receiptPrint/list.vue

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

+ 8 - 0
src/views/salesManagement/salesCollection/detail.vue

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

+ 502 - 0
src/views/salesManagement/salesCollection/list.vue

@@ -0,0 +1,502 @@
+<template>
+  <a-card size="small" :bordered="false" class="salesCollectionList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <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="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销售单号">
+                <a-input id="salesCollectionList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="备货单号">
+                <a-input id="salesCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="经销商名称">
+                  <a-input id="salesCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入经销商名称"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="商户级别">
+                  <v-select
+                    v-model="queryParam.dealerLevel"
+                    ref="dealerLevel"
+                    id="salesCollectionList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择商户级别"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款类型">
+                  <v-select
+                    v-model="queryParam.settleType"
+                    ref="settleType"
+                    id="salesCollectionList-settleType"
+                    code="SETTLE_STYLE"
+                    placeholder="请选择收款类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款时间">
+                  <rangeDate ref="rangeSettleDate" @change="dateSettleChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款方式">
+                  <v-select
+                    v-model="queryParam.settleStyle"
+                    ref="settleStyle"
+                    id="salesCollectionList-settleStyle"
+                    code="SETTLE_STYLE"
+                    placeholder="请选择收款方式"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.billStatus"
+                    ref="billStatus"
+                    id="salesCollectionList-billStatus"
+                    code="DISPATCH_BILL_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.settleState"
+                    ref="settleState"
+                    id="salesCollectionList-settleState"
+                    code="FINANCIAL_RECEIVE_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.voidFlag"
+                    ref="voidFlag"
+                    id="salesCollectionList-voidFlag"
+                    code="VOID_FLAG"
+                    placeholder="请选择单据状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所在区域">
+                  <subarea id="salesCollectionList-subarea" v-model="queryParam.subareaSn"></subarea>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-row>
+                  <a-form-item label="地区">
+                    <a-col span="24">
+                      <a-form-item prop="dealerProvinceSn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealerProvinceSn" allowClear @change="getCityList" placeholder="请选择省">
+                          <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-item>
+                    </a-col>
+                    <!-- <a-col span="7" offset="1">
+                      <a-form-item prop="dealerCitySn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealerCitySn" allowClear @change="getAreaList" placeholder="请选择市">
+                          <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-item>
+                    </a-col>
+                    <a-col span="7" offset="1">
+                      <a-form-item prop="dealerCountySn" style="margin: 0;">
+                        <a-select v-model="queryParam.dealerCountySn" allowClear placeholder="请选择区/县">
+                          <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                        </a-select>
+                      </a-form-item>
+                    </a-col> -->
+                  </a-form-item>
+                </a-row>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesCollectionList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesCollectionList-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>
+      <!-- 操作按钮 -->
+      <div class="table-operator">
+        <a-button type="primary" @click="handlePlColle()" class="button-error">批量收款</a-button>
+        <span style="margin-left: 8px">
+          <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+        </span>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :row-selection=" showSelect?{ columnWidth: 40 }:null"
+        @rowSelection="rowSelectionFun"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
+        bordered>
+        <!-- 单号 -->
+        <template slot="bizNo" slot-scope="text, record">
+          <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record)">{{ record.bizNo }}</span>
+          <span v-else>{{ record.bizNo }}</span>
+        </template>
+        <!-- 下推单号 -->
+        <template slot="dispatchBillNo" slot-scope="text, record">
+          <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleBhDetail(record)">{{ record.dispatchBillNo }}</span>
+          <span v-else>{{ record.dispatchBillNo || '--' }}</span>
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-button
+            size="small"
+            type="link"
+            v-if="record.settleState=='WAIT' && record.voidFlag!=1 && $hasPermissions('B_financialCollection_receipt')"
+            class="button-warning"
+            @click="handleColle(row)"
+            id="salesCollectionList-audit-btn">收款</a-button>
+          <span v-else>--</span>
+        </template>
+      </s-table>
+      <!-- 销售收款弹框 -->
+      <commonModal
+        :openModal="showSkModal"
+        modalTit="销售收款"
+        @cancel="showSkModal=false"
+        @ok="handleSaveColle"
+      >
+        <div style="text-align: center;line-height: 24px;">
+          <div v-if="handlePlData.length">箭冠汽配西安大兴店,共 {{ handlePlData && handlePlData.length }} 个备货单,合计 1266.45 元</div>
+          <div style="padding: 15px 0;font-weight: bold;">请选择收款类型</div>
+          <div>
+            <v-select
+              v-model="queryParam.settleType"
+              showType="radio"
+              code="SALES_SOURCE"
+            ></v-select>
+          </div>
+        </div>
+      </commonModal>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import moment from 'moment'
+import getDate from '@/libs/getDate.js'
+import { STable, VSelect } from '@/components'
+import rangeDate from '@/views/common/rangeDate.vue'
+import subarea from '@/views/common/subarea.js'
+import { getArea } from '@/api/data'
+import commonModal from '@/views/common/commonModal.vue'
+import { settleReceiptList, settleReceipt } from '@/api/settleReceipt'
+export default {
+  name: 'SalesCollectionList',
+  mixins: [commonMixin],
+  components: { STable, VSelect, subarea, rangeDate, commonModal },
+  data () {
+    return {
+      spinning: false,
+      showTipModal: false,
+      showSkModal: false,
+      tableHeight: 0,
+      queryParam: { //  查询条件
+        beginDate: getDate.getThreeMonthDays().starttime + ' 00:00:00',
+        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        bizNo: '',
+        dispatchBillNo: '',
+        beginDateSettle: '',
+        endDateSettle: '',
+        settleClientName: '',
+        dealerLevel: undefined,
+        settleStyle: undefined,
+        subareaSn: undefined,
+        billStatus: undefined,
+        settleState: undefined,
+        voidFlag: undefined,
+        dealerProvinceSn: undefined,
+        dealerCitySn: undefined,
+        dealerCountySn: undefined
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      auditDate: [
+        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ], //  审核时间
+      advanced: false,
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        return settleReceiptList(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.total = data.count || 0
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
+      },
+      total: 0, // 合计
+      addrProvinceList: [], //  省下拉
+      addrCityList: [], //  市下拉
+      addrDistrictList: [], //  区下拉
+      rowSelectionInfo: null,
+      handlePlData: []
+    }
+  },
+  // 根据权限显示列表字段
+  computed: {
+    // 是否显示table选择框
+    showSelect () {
+      return this.$hasPermissions('B_productInfo_batchAudit')
+    },
+    columns () {
+      const arr = [
+        { title: '创建时间', dataIndex: 'createDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'bizNo' }, width: '10%', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
+        { title: '发货编号', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '客户名称', dataIndex: 'settleClientName', align: 'left', width: '9%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'settleClientName', align: 'left', width: '9%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品款数', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品数量', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款类型', dataIndex: 'settleStyleDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款时间', dataIndex: 'settleTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'settleStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '4%', align: 'center' }
+      ]
+      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+        arr.splice(8, 0, { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      }
+      return arr
+    }
+  },
+  methods: {
+    // 表格选中项
+    rowSelectionFun (obj) {
+      this.rowSelectionInfo = obj || null
+    },
+    //  审核时间  change
+    dateAuditChange (date) {
+      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
+      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
+    },
+    //  收款时间  change
+    dateSettleChange (date) {
+      this.queryParam.beginDateSettle = date[0] ? date[0] + ' 00:00:00' : ''
+      this.queryParam.endDateSettle = date[1] ? date[1] + ' 23:59:59' : ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.$refs.rangeAuditDate.resetDate(this.auditDate)
+      if (this.advanced) { //  查询条件未展开时,该组件未渲染
+        this.$refs.rangeSettleDate.resetDate()
+      }
+      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime + ' 00:00:00'
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.bizNo = ''
+      this.queryParam.dispatchBillNo = ''
+      this.queryParam.beginDateSettle = ''
+      this.queryParam.endDateSettle = ''
+      this.queryParam.settleClientName = ''
+      this.queryParam.dealerLevel = undefined
+      this.queryParam.settleStyle = undefined
+      this.queryParam.subareaSn = undefined
+      this.queryParam.billStatus = undefined
+      this.queryParam.settleState = undefined
+      this.queryParam.voidFlag = undefined
+      this.queryParam.dealerProvinceSn = undefined
+      this.queryParam.dealerCitySn = undefined
+      this.queryParam.dealerCountySn = undefined
+      this.$refs.table.refresh(true)
+    },
+    // 销售单详情
+    handleDetail (row) {
+      this.$router.push({ name: 'salesDetail', params: { sn: row.bizSn, type: 'salesCollection' } })
+    },
+    // 备货单号
+    handleBhDetail (row) {
+      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'salesCollection' } })
+    },
+    // 收款
+    handlePlColle () {
+      const _this = this
+      const slen = _this.rowSelectionInfo.selectedRowKeys.length
+      if (!_this.rowSelectionInfo || (_this.rowSelectionInfo && slen < 1)) {
+        _this.$message.warning('请在列表勾选后再进行批量操作!')
+        return
+      }
+      // 判断是否选择相同的客户
+      const settleClientName = _this.rowSelectionInfo.selectedRows[0].settleClientName
+      const haseq = _this.rowSelectionInfo.selectedRows.filter(item => item.settleClientName == settleClientName)
+      if (haseq.length == slen) {
+        this.handlePlData = _this.rowSelectionInfo.selectedRows
+        this.showSkModal = true
+      } else {
+        this.$info({
+          title: '操作提示',
+          centered: true,
+          content: '您所选择的备货单,不属于同一个客户,无法收款,请重新选择。只能针对一个客户的备货单进行批量收款。',
+          onOk () {}
+        })
+      }
+    },
+    handleColle (row) {
+      this.handlePlData = [row]
+      this.showSkModal = true
+    },
+    handleSaveColle (row) {
+      const _this = this
+      _this.spinning = true
+      settleReceipt({ sn: row.accountReceiptSn }).then(res => {
+        if (res.status == 200) {
+          _this.$message.success(res.message)
+          _this.$refs.table.refresh()
+          _this.spinning = false
+        } else {
+          _this.spinning = false
+        }
+      })
+    },
+    // 获取城市列表
+    getCityList (val) {
+      this.addrCityList = []
+      this.addrDistrictList = []
+      this.queryParam.dealerCitySn = undefined
+      this.queryParam.dealerCountySn = undefined
+      if (val) {
+        this.getArea('city', val)
+      }
+    },
+    // 获取区县列表
+    getAreaList (val) {
+      this.addrDistrictList = []
+      this.queryParam.dealerCountySn = undefined
+      if (val) {
+        this.getArea('district', val)
+      }
+    },
+    //  省/市/区
+    getArea (leve, sn) {
+      let params
+      if (leve == 'province') {
+        params = { type: '2' }
+      } else {
+        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
+      }
+      getArea(params).then(res => {
+        if (res.status == 200) {
+          if (leve == 'province') {
+            this.addrProvinceList = res.data || []
+          } else if (leve == 'city') {
+            this.addrCityList = res.data || []
+          } else if (leve == 'district') {
+            this.addrDistrictList = res.data || []
+          }
+        } else {
+          if (leve == 'province') {
+            this.addrProvinceList = []
+          } else if (leve == 'city') {
+            this.addrCityList = []
+          } else if (leve == 'district') {
+            this.addrDistrictList = []
+          }
+        }
+      })
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.getArea('province')
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 235
+    }
+  },
+  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()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
+  }
+}
+</script>
+
+<style lang="less">
+  .salesCollectionList-wrap{
+    .active{
+      color: #ed1c24;
+      cursor: pointer;
+    }
+    .common{
+      color: rgba(0, 0, 0);
+    }
+  }
+</style>

+ 2 - 0
src/views/salesManagement/salesQuery/detail.vue

@@ -313,6 +313,8 @@ export default {
         this.$router.push({ path: '/salesManagement/pushOrderManagement/list', query: { closeLastOldTab: true } })
       } else if (this.$route.params.type == 'financialCollection') { // 财务收款
         this.$router.push({ path: '/financialManagement/financialCollection/list', query: { closeLastOldTab: true } })
+      } else if (this.$route.params.type == 'salesCollection') { // 销售收款
+        this.$router.push({ path: '/salesManagement/salesCollection/list', query: { closeLastOldTab: true } })
       } else {
         this.$router.push({ path: '/salesManagement/salesQuery/list', query: { closeLastOldTab: true } })
       }

+ 8 - 0
src/views/salesManagement/sendOutOrder/detail.vue

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

+ 8 - 0
src/views/salesManagement/sendOutOrder/list.vue

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

+ 8 - 0
src/views/salesManagement/stockPrint/list.vue

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

+ 8 - 0
src/views/salesManagement/stockPrint/printStockClasList.vue

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

+ 188 - 0
src/views/salesManagement/waitDispatch/dsModal.vue

@@ -0,0 +1,188 @@
+<template>
+  <a-modal
+    centered
+    class="dealerAccountEdit-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="下推销售单"
+    v-model="isShow"
+    @cancle="isShow=false"
+    :width="800">
+    <!-- 表单 -->
+    <div>
+      <a-spin :spinning="spinning" tip="Loading...">
+        <a-form-model
+          id="dealerAccountEdit-form"
+          ref="ruleForm"
+          :model="form"
+          :rules="rules"
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+        >
+          <a-form-model-item label="客户名称" prop="tenantSn">
+            <span>{{ detailData ? (detailData.org ? detailData.org.name : '--') : '--' }}</span>
+          </a-form-model-item>
+          <a-form-model-item label="收货客户名称" prop="name" extra="(如果收货客户和下单客户相同,则不需要选择收货客户名称)">
+            <custList ref="custList" @change="custChange"></custList>
+          </a-form-model-item>
+          <a-form-model-item label="发货编号" prop="phone">
+            <a-input
+              id="dealerAccountEdit-phone"
+              :maxLength="11"
+              v-model.trim="form.phone"
+              placeholder="请输入发货编号"
+              allowClear />
+          </a-form-model-item>
+          <a-form-model-item label="备货打印" prop="org.childUserMaxNum">
+            <a-radio-group>
+              <a-radio :value="1">
+                允许打印
+              </a-radio>
+              <a-radio :value="2">
+                暂不打印
+              </a-radio>
+            </a-radio-group>
+          </a-form-model-item>
+        </a-form-model>
+        <div class="btn-cont">
+          <a-button type="primary" id="dealerAccountEdit-save" @click="handleSave">保存</a-button>
+          <a-button id="dealerAccountEdit-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+        </div>
+      </a-spin>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import custList from '@/views/common/custList.vue'
+import { dealerUserSave, dealerUserDetail } from '@/api/dealer'
+export default {
+  name: 'DealerAccountEditModal',
+  mixins: [commonMixin],
+  components: { custList },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    itemId: {
+      type: [Number, String],
+      default: ''
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      spinning: false,
+      formItemLayout: {
+        labelCol: { span: 4 },
+        wrapperCol: { span: 18 }
+      },
+      form: {
+        tenantSn: '',
+        name: '',
+        phone: '',
+        loginName: '',
+        password: '',
+        org: {
+          childUserMaxNum: ''
+        }
+      },
+      rules: {
+        tenantSn: [{ required: true, message: '请选择经销商', trigger: 'change' }],
+        name: [{ required: true, message: '请输入管理员姓名', trigger: 'blur' }]
+      },
+      detailData: null //  详情数据
+    }
+  },
+  methods: {
+    custChange (val) {
+      this.form.tenantSn = val.key
+    },
+    //  保存
+    handleSave () {
+      const _this = this
+      _this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const formData = JSON.parse(JSON.stringify(_this.form))
+          formData.id = _this.itemId ? _this.itemId : undefined
+          if (!formData.password) {
+            delete formData.password
+          }
+          _this.spinning = true
+          dealerUserSave(formData).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$emit('ok')
+              _this.isShow = false
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    //  获取详情
+    getDetail () {
+      dealerUserDetail({ id: this.itemId }).then(res => {
+        if (res.status == 200) {
+          this.detailData = res.data
+          this.form.tenantSn = this.detailData.tenantSn || ''
+          this.form.name = this.detailData.name || ''
+          this.form.phone = this.detailData.phone || ''
+          this.form.loginName = this.detailData.loginName || ''
+          this.form.password = this.detailData.password || ''
+          const childUserMaxNum = this.detailData ? (this.detailData.org ? (this.detailData.org.childUserMaxNum ? this.detailData.org.childUserMaxNum : '') : '') : ''
+          this.form.org.childUserMaxNum = childUserMaxNum
+        } else {
+          this.detailData = null
+          this.$refs.ruleForm.resetFields()
+        }
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.$refs.ruleForm.resetFields()
+        this.form.tenantSn = ''
+        this.form.name = ''
+        this.form.phone = ''
+        this.form.loginName = ''
+        this.form.password = ''
+        this.form.org.childUserMaxNum = ''
+        if (this.itemId == '') {
+          this.$refs.custList.resetForm()
+        }
+      }
+    },
+    itemId (newValue, oldValue) {
+      if (this.isShow && newValue) {
+        this.getDetail()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .dealerAccountEdit-modal{
+    .ant-modal-body {
+      padding: 40px 40px 24px;
+    }
+    .btn-cont {
+      text-align: center;
+      margin: 35px 0 10px;
+    }
+  }
+</style>

+ 6 - 2
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -54,7 +54,7 @@
     <div class="table-operator">
       <a-button type="primary" :disabled="newLoading" class="button-info" @click="handlePlAdd">批量添加</a-button>
       <a-button type="danger" :disabled="newLoading" class="button-error" @click="handlePlCancel">批量取消</a-button>
-      <a-button type="default" :disabled="newLoading" @click="handleOneDispatch">有货一键下推</a-button>
+      <a-button type="default" :disabled="newLoading" @click="showDsModal=true">有货一键下推</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
@@ -120,15 +120,18 @@
         <span v-else>--</span>
       </template>
     </s-table>
+    <!-- 一键下推 -->
+    <dsModal :openModal="showDsModal" @close="showDsModal=false" />
   </div>
 </template>
 
 <script>
 import { salesDetailAllStockList } from '@/api/salesDetail'
 import { STable, VSelect } from '@/components'
+import dsModal from './dsModal.vue'
 export default {
   name: 'QueryPart',
-  components: { STable, VSelect },
+  components: { STable, VSelect, dsModal },
   props: {
     newLoading: Boolean
   },
@@ -139,6 +142,7 @@ export default {
   },
   data () {
     return {
+      showDsModal: false,
       advanced: true, // 高级搜索 展开/关闭
       showSetting: false, // 设置弹框
       productType: [],