Browse Source

销售利润报表

lilei 4 days ago
parent
commit
68db7b72bc

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1753769995847
+  "version": 1753841490396
 }
 }

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

@@ -2460,6 +2460,31 @@ export const asyncRouterMap = [
           permission: 'M_reportData'
           permission: 'M_reportData'
         },
         },
         children: [
         children: [
+          {
+            path: '/reportData/salesProfitReport',
+            redirect: '/reportData/salesProfitReport/index',
+            name: 'salesProfitReport',
+            component: BlankLayout,
+            meta: {
+              title: '销售利润报表',
+              icon: 'profile',
+              permission: 'M_salesProfitReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'salesProfitReportIndex',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesProfitReport/list.vue'),
+                meta: {
+                  title: '销售利润报表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_salesProfitReportList'
+                }
+              },
+            ]
+          },
           {
           {
             path: '/reportData/salesReport',
             path: '/reportData/salesReport',
             redirect: '/reportData/salesReport/index',
             redirect: '/reportData/salesReport/index',
@@ -2483,28 +2508,6 @@ export const asyncRouterMap = [
                   permission: 'M_salesReportList,M_salesDetailReportList'
                   permission: 'M_salesReportList,M_salesDetailReportList'
                 }
                 }
               },
               },
-              {
-                path: 'list',
-                name: 'salesReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReport/list.vue'),
-                meta: {
-                  title: '销售报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_salesReportList'
-                }
-              },
-              {
-                path: 'list',
-                name: 'salesDetailReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesDetailReport/list.vue'),
-                meta: {
-                  title: '销售明细报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_salesDetailReportList'
-                }
-              }
             ]
             ]
           },
           },
           {
           {

+ 1 - 1
src/views/reportData/salesDetailReport/list.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <a-spin :spinning="spinning" tip="Loading...">
   <a-spin :spinning="spinning" tip="Loading...">
-    <a-alert :show-icon="false" type="error" message="注:报表中成本包含急件冲减的成本" banner style="margin-bottom: 10px;" />
+    <a-alert :show-icon="false" type="error" message="注报表中成本包含急件冲减的成本" banner style="margin-bottom: 10px;" />
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-form-model
       <a-form-model

+ 377 - 0
src/views/reportData/salesProfitReport/list.vue

@@ -0,0 +1,377 @@
+<template>
+  <div class="jg-page-wrap">
+    <a-card size="small" :bordered="false" class="table-page-search-wrapper">
+      <!-- 搜索条件 -->
+      <a-form-model
+        id="salesReportList-form"
+        ref="ruleForm"
+        class="form-model-con"
+        layout="inline"
+        :model="queryParam"
+        :rules="rules"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        @keyup.enter.native="handleSearch" >
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="创建时间">
+              <rangeDate id="salesReportList-creatDate" ref="creatDate" v-model="creatTime" @change="creatDateChange" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="客户名称">
+              <custList id="salesReportList-salesTargetName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-item label="客户类型">
+              <custType id="salesReportList-salesTargetType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="收款方式">
+                <v-select
+                  code="SETTLE_STYLE"
+                  id="salesReportList-settleStyleSn"
+                  v-model="queryParam.settleStyleSn"
+                  allowClear
+                  placeholder="请选择收款方式"
+                ></v-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="审核时间">
+                <rangeDate id="salesReportList-rangeDate" ref="rangeDate" v-model="time" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="业务员">
+                <a-input id="salesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="单号">
+                <a-input id="salesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户所在区">
+                <AreaList id="salesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate id="salesReportList-outWareTime" ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户关系">
+                <v-select code="CUSTOMER_RELATION_TYPE" id="salesReportList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="急件">
+                <v-select
+                  v-model="queryParam.status"
+                  ref="status"
+                  id="salesReportList-status"
+                  code="URGENT_STATUS"
+                  placeholder="请选择急件状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReportList-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReportList-reset">重置</a-button>
+            <a-button
+              type="primary"
+              style="margin-left: 5px"
+              @click="handleExport"
+              :disabled="disabled"
+              :loading="exportLoading"
+              v-if="$hasPermissions('B_salesReportExport')"
+              class="button-warning"
+              id="salesReportList-export-btn">导出</a-button>
+            <a @click="advanced=!advanced" style="margin-left: 5px" id="salesReportList-advanced">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <!-- 合计 -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div class="ftext" slot="message">
+          总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
+          产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
+          <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
+            总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>;
+          </div>
+          总售价:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
+          折后总售价:<strong>{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? toThousands(totalData.discountedAmount) : '--' }}</strong>;
+          <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
+            总毛利:<strong>{{ (totalData && (totalData.totalProfit || totalData.totalProfit==0)) ? toThousands(totalData.totalProfit) : '--' }}</strong>。
+          </div>
+        </div>
+      </a-alert>
+      <!-- 列表 -->
+      <a-spin :spinning="spinning" tip="Loading...">
+        <s-table
+          class="sTable"
+          ref="table"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          bordered>
+        </s-table>
+      </a-spin>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { STable, VSelect } from '@/components'
+import rangeDate from '@/views/common/rangeDate.vue'
+import { downloadExcel } from '@/libs/JGPrint.js'
+import custType from '@/views/common/custType.js'
+import AreaList from '@/views/common/areaList.js'
+import custList from '@/views/common/custList.vue'
+import { reportSalesBillList, reportSalesBillCount, reportSalesBillExport } from '@/api/reportData'
+export default {
+  components: { STable, VSelect, rangeDate, custList, AreaList, custType },
+  mixins: [commonMixin],
+  data () {
+    return {
+      spinning: false,
+      labelCol: { span: 8 },
+      wrapperCol: { span: 16 },
+      advanced: false, // 高级搜索 展开/关闭
+      tableHeight: 0,
+      queryParam: { //  查询条件
+        createBeginDate: '', // 创建开始时间
+        createEndDate: '', // 创建结束时间
+        beginDate: '', // 审核开始时间
+        endDate: '', // 审核结束时间
+        outWarehouseBeginDate: '', // 出库开始时间
+        outWarehouseEndDate: '', // 出库结束时间
+        buyerNameCurrent: undefined, // 客户名称
+        buyerSnCurrent: undefined, // 客户sn
+        salesTargetType: undefined, // 客户类型
+        provinceSn: undefined, //  省
+        citySn: undefined, //  市
+        countySn: undefined, //  区
+        settleStyleSn: undefined,
+        salesBillNo: '', // 销售单号
+        salesManName: '', // 销售人员
+        buyerRelationType: undefined, // 客户关系
+        status: undefined // 急件状态
+      },
+      creatTime: [], // 创建时间
+      time: [], // 审核时间
+      outWareTime: [], // 出库时间
+      rules: {
+        'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false,
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        const params = Object.assign(parameter, this.queryParam)
+        this.spinning = true
+        delete params.time
+        return reportSalesBillList(params).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            // 总计
+            this.getCount(params)
+            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
+        })
+      },
+      totalData: null, //  合计
+      addrProvinceList: [], //  省下拉
+      addrCityList: [], //  市下拉
+      addrDistrictList: [], //  区下拉
+      allocateTypeList: [], //  调拨类型
+      custTypeList: [] //  客户类型 下拉数据
+    }
+  },
+  computed: {
+    columns () {
+      const _this = this
+      const arr = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '销售单号', dataIndex: 'salesBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件', dataIndex: 'productEntity.code', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'salesTargetName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总售价', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折扣金额', dataIndex: 'discountAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折后总售价', dataIndex: 'discountedAmount', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        // { title: '毛利', dataIndex: 'totalProfit', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '业务员', dataIndex: 'salesManName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '审核时间', dataIndex: 'salesAuditDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
+      ]
+      if (this.$hasPermissions('M_ShowAllCost')) {
+        arr.splice(7, 0, { title: '总成本', dataIndex: 'totalCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(11, 0, { title: '毛利', dataIndex: 'totalProfit', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      return arr
+    }
+  },
+  methods: {
+    // 所在区域
+    areaChange (val) {
+      this.queryParam.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.citySn = val[1] ? val[1] : undefined
+      this.queryParam.countySn = val[2] ? val[2] : undefined
+    },
+    // 合计
+    getCount (params) {
+      reportSalesBillCount(params).then(res => {
+        if (res.status == 200) {
+          this.totalData = res.data
+        } else {
+          this.totalData = null
+        }
+      })
+    },
+    // 创建时间
+    creatDateChange (date) {
+      this.creatTime = date
+      this.queryParam.createBeginDate = date[0] || ''
+      this.queryParam.createEndDate = date[1] || ''
+    },
+    //  创建时间  change
+    dateChange (date) {
+      this.time = date
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
+    },
+    // 出库时间
+    outWareDateChange (date) {
+      this.outWareTime = date
+      this.queryParam.outWarehouseBeginDate = date[0]
+      this.queryParam.outWarehouseEndDate = date[1]
+    },
+    //  查询
+    handleSearch () {
+      let hasVal = false
+      for (const key in this.queryParam) {
+        if (this.queryParam[key]) {
+          hasVal = true
+          break
+        }
+      }
+      if (hasVal) {
+        this.$refs.table.refresh(true)
+      } else {
+        this.$message.info('请至少输入一个查询条件')
+      }
+    },
+    // 客户名称
+    custSatelliteChange (v, row) {
+      if (row && row.customerSn) {
+        this.queryParam.buyerSnCurrent = row.customerSn
+        this.queryParam.buyerNameCurrent = undefined
+      } else {
+        this.queryParam.buyerNameCurrent = v
+        this.queryParam.buyerSnCurrent = undefined
+      }
+    },
+    //  重置
+    resetSearchForm () {
+      this.$refs.creatDate.resetDate()
+      this.creatTime = []
+      this.queryParam.createBeginDate = ''
+      this.queryParam.createEndDate = ''
+      this.queryParam.buyerNameCurrent = undefined
+      this.queryParam.buyerSnCurrent = undefined
+      this.queryParam.salesTargetType = undefined
+      this.queryParam.provinceSn = undefined
+      this.queryParam.citySn = undefined
+      this.queryParam.countySn = undefined
+
+      this.queryParam.settleStyleSn = undefined
+      this.queryParam.showCost = undefined
+      this.queryParam.salesBillNo = ''
+      this.queryParam.salesManName = ''
+      this.queryParam.buyerRelationType = undefined// 客户关系
+      this.queryParam.status = undefined // 急件状态
+      this.$refs.ruleForm.resetFields()
+      this.totalData = null
+      if (this.advanced) {
+        this.$refs.rangeDate.resetDate()
+        this.time = []
+        this.queryParam.beginDate = ''
+        this.queryParam.endDate = ''
+        this.$refs.outWareRangeDate.resetDate('')
+        this.outWareTime = []
+        this.queryParam.outWarehouseBeginDate = ''
+        this.queryParam.outWarehouseEndDate = ''
+        this.$refs.custSatelliteList.resetForm()
+        this.$refs.areaList.clearData()
+      }
+      this.$refs.table.clearTable()
+    },
+    // 导出
+    handleExport () {
+      const _this = this
+      let hasVal = false
+      for (const key in this.queryParam) {
+        if (this.queryParam[key]) {
+          hasVal = true
+          break
+        }
+      }
+      if (hasVal) {
+        const params = _this.queryParam
+        params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
+        _this.exportLoading = true
+        _this.spinning = true
+        reportSalesBillExport(params).then(res => {
+          downloadExcel(res, '销售报表')
+          _this.exportLoading = false
+          _this.spinning = false
+          _this.queryParam.showCost = undefined
+        })
+      } else {
+        this.$message.info('请至少输入一个查询条件')
+      }
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.resetSearchForm()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
+  }
+}
+</script>

+ 1 - 1
src/views/reportData/salesReport/list.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <a-spin :spinning="spinning" tip="Loading...">
   <a-spin :spinning="spinning" tip="Loading...">
-    <a-alert :show-icon="false" type="error" message="注:报表中成本包含急件冲减的成本" banner style="margin-bottom: 10px;" />
+    <a-alert :show-icon="false" type="error" message="注报表中成本包含急件冲减的成本" banner style="margin-bottom: 10px;" />
     <!-- 搜索条件 -->
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
     <div class="table-page-search-wrapper">
       <a-form-model
       <a-form-model