Explorar o código

报表接口调试

lilei hai 3 meses
pai
achega
8a3be35b96

+ 111 - 1
src/api/reportData.js

@@ -1316,7 +1316,80 @@ export const tireOutDetailListExport = (params) => {
 /*
 *   轮胎费用报表
 */
-
+// 服务费运费明细-分页列表
+export const subsidyDetailList = (params) => {
+  const url = `/report/subsidyDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('服务费运费明细查询')
+    }
+  })
+}
+// 服务费运费明细-合计
+export const subsidyDetailCount = (params) => {
+  return axios({
+    url: '/report/subsidyDetail/queryCount',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('服务费运费明细合计查询')
+    }
+  })
+}
+// 服务费运费明细-导出
+export const subsidyDetailExport = (params) => {
+  return axios({
+    url: '/report/subsidyDetail/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('服务费运费明细导出')
+    }
+  })
+}
+// 服务费运费-分页列表
+export const subsidyMonthList = (params) => {
+  const url = `/report/subsidyMonth/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('服务费运费列表查询')
+    }
+  })
+}
+// 服务费运费-合计
+export const subsidyMonthCount = (params) => {
+  return axios({
+    url: '/report/subsidyMonth/queryCount',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('服务费运费合计查询')
+    }
+  })
+}
+// 服务费运费-导出
+export const subsidyMonthExport = (params) => {
+  return axios({
+    url: '/report/subsidyMonth/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('服务费运费导出')
+    }
+  })
+}
 // 轮胎费用报表   列表
 export const tireFeeReportList = (params) => {
   const url = `/report/tireFee/queryPage/${params.pageNo}/${params.pageSize}`
@@ -1331,6 +1404,43 @@ export const tireFeeReportList = (params) => {
     }
   })
 }
+// 增量补贴-分页列表
+export const subsidyStepList = (params) => {
+  const url = `/report/subsidyStep/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('增量补贴-分页列表')
+    }
+  })
+}
+// 增量补贴-合计
+export const subsidyStepCount = (params) => {
+  return axios({
+    url: '/report/subsidyStep/queryCount',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('增量补贴-合计')
+    }
+  })
+}
+// 增量补贴-导出
+export const subsidyStepExport = (params) => {
+  return axios({
+    url: '/report/subsidyStep/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('增量补贴-导出')
+    }
+  })
+}
 
 // 轮胎费用报表  统计
 export const tireFeeReportCount = (params) => {

+ 31 - 37
src/views/reportData/tireSubsidyReport/incrementalSubsidyList.vue

@@ -38,7 +38,7 @@
             </a-col>
             <a-col :flex="2">
               <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="incSubSidy-dealerName" @change="custChange" />
+                <custList id="incSubSidy-dealerName" dataAuthFlag="0" placeholder="请输入客户名称" ref="custList" @change="custChange" />
               </a-form-model-item>
             </a-col>
             <a-col :flex="2">
@@ -92,15 +92,13 @@
           </template>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">订货数量合计:{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty: '--' }}</a-col>
-              <a-col :md="4" :sm="24">增量补贴金额:{{ (totalData && (totalData.rebateAmountSys || totalData.rebateAmountSys==0)) ? toThousands(totalData.rebateAmountSys): '--' }}</a-col>
+              <a-col :md="4" :sm="24">订货数量合计:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty: '--' }}</a-col>
+              <a-col :md="4" :sm="24">增量补贴金额:{{ (totalData && (totalData.subsidyAmount || totalData.subsidyAmount==0)) ? toThousands(totalData.subsidyAmount): '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
       </a-spin>
     </a-card>
-    <!-- 导出提示框 -->
-    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </div>
 </template>
 
@@ -113,14 +111,13 @@ import { STable, VSelect } from '@/components'
 import quarterDate from '@/views/common/quarterDate.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
-import reportModal from '@/views/common/reportModal.vue'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+import custList from '@/views/common/custList.vue'
 // 接口
-import { tireFeeReportList, tireFeeReportCount, tireFeeListExport } from '@/api/reportData'
+import { subsidyStepList, subsidyStepCount, subsidyStepExport } from '@/api/reportData'
 export default {
   name: 'QuarterQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, quarterDate, subarea, AreaList, dealerSubareaScopeList, reportModal },
+  components: { STable, VSelect, quarterDate, subarea, AreaList, custList },
   data () {
     return {
       spinning: false,
@@ -128,19 +125,17 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
-      showExport: false, // 导出弹窗
       timeInfo: [], // 日期
       //  查询条件
       queryParam: {
-        queryType: 'quarter', // 轮胎季度费用报表
+        subsidyType: 'QUARTER', // 轮胎季度费用报表
         queryDate: undefined, // 选择年份+季度
         subareaArea: {
           subareaSn: '', // 区域
           subareaAreaSn: '' // 分区
         },
-        customSn: undefined, // 客户sn
+        dealerSn: undefined, // 客户sn
         dealerEntity: {
-          dealerName: undefined, // 客户名称
           provinceSn: undefined, // 省
           citySn: undefined, // 市
           districtSn: undefined // 区
@@ -154,9 +149,12 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        const params = Object.assign(parameter, this.queryParam)
+        const year = this.queryParam.queryDate.substr(0, 4)
+        const quarter = this.queryParam.queryDate.substr(5, 1)
+        const params = Object.assign(parameter, this.queryParam, { bizYear: year, bizQuarter: quarter })
         // 获取列表数据  有分页
-        return tireFeeReportList(params).then(res => {
+        // 获取列表数据  有分页
+        return subsidyStepList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -164,8 +162,7 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              data.list[i].year = this.queryParam.queryDate.substr(0, 4)
-              data.list[i].quarter = ['一', '二', '三', '四'][this.queryParam.queryDate.substr(5, 1) - 1] + '季度'
+              data.list[i].quarter = ['一', '二', '三', '四'][data.list[i].bizQuarter - 1] + '季度'
             }
             this.disabled = false
             // 获取统计数据
@@ -193,19 +190,19 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '年度', dataIndex: 'year', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '年度', dataIndex: 'bizYear', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '季度', dataIndex: 'quarter', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '10%', align: 'center' },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订货数量(总部)', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '订货数量(转单)', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货数量(总部)', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '订货数量合计', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '季度目标', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '季度增量补贴', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '增量补贴金额', dataIndex: 'rebateAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '订货数量(总部)', dataIndex: 'salesQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '订货数量(转单)', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货数量(总部)', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '订货数量合计', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '季度目标', dataIndex: 'subsidyTarget', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '季度增量补贴', dataIndex: 'subsidyValue', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '增量补贴金额', dataIndex: 'subsidyAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }
@@ -234,12 +231,12 @@ export default {
     },
     // 客户名称 change
     custChange (val) {
-      this.queryParam.dealerEntity.dealerName = val.name
-      this.queryParam.customSn = val.key
+      this.queryParam.dealerName = val.name
+      this.queryParam.dealerSn = val.key
     },
     // 统计
     getCount (params) {
-      tireFeeReportCount(params).then(res => {
+      subsidyStepCount(params).then(res => {
         if (res.status == 200 && res.data) {
           this.totalData = res.data
         } else {
@@ -269,19 +266,17 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.queryType = 'quarter'
+      this.queryParam.subsidyType = 'QUARTER'
       this.queryParam.queryDate = undefined
       this.queryParam.dealerEntity.provinceSn = undefined
       this.queryParam.dealerEntity.citySn = undefined
       this.queryParam.dealerEntity.districtSn = undefined
-      this.queryParam.dealerEntity.dealerName = undefined
-      this.queryParam.customSn = undefined
       this.queryParam.subareaArea.subareaSn = ''
       this.queryParam.subareaArea.subareaAreaSn = ''
+      this.queryParam.dealerName = undefined
+      this.queryParam.dealeSn = undefined
       this.$refs.subarea.clearData()
-      if (this.advanced) {
-        this.$refs.dealerSubareaScopeList.resetForm()
-      }
+      this.$refs.custList.resetForm()
       this.totalData = null
       this.$refs.areaList.clearData()
       this.$refs.table.clearTable()
@@ -305,8 +300,7 @@ export default {
       const _this = this
       _this.exportLoading = true
       _this.spinning = true
-      _this.showExport = true
-      hdExportExcel(tireFeeListExport, _this.queryParam, '增量补贴报表(季度)', function () {
+      hdExportExcel(subsidyStepExport, _this.queryParam, '增量补贴报表(' + this.queryParam.queryDate + '季度)-', function () {
         _this.exportLoading = false
         _this.spinning = false
       })

+ 34 - 42
src/views/reportData/tireSubsidyReport/incrementalSubsidyYearList.vue

@@ -12,7 +12,7 @@
           :model="queryParam">
           <a-row :gutter="15" type="flex">
             <a-col :flex="1">
-              <a-form-model-item prop="queryDate">
+              <a-form-model-item prop="bizYear">
                 <div style="display: inline;" slot="label">
                   <a-popover placement="top">
                     <template slot="content">
@@ -27,7 +27,7 @@
                   id="yearQueryList-time"
                   style="width: 100%"
                   placeholder="请选择年份"
-                  :value="queryParam.queryDate"
+                  :value="queryParam.bizYear"
                   @change="changeYear"
                   allowClear>
                   <a-select-option v-for="item in years" :value="item" :key="item">
@@ -48,7 +48,7 @@
             </a-col>
             <a-col :flex="2">
               <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="incSubSidyYear-dealerName" @change="custChange" />
+                <custList id="incSubSidyYear-dealerName" dataAuthFlag="0" placeholder="请输入客户名称" ref="custList" @change="custChange" />
               </a-form-model-item>
             </a-col>
             <a-col :flex="2">
@@ -102,15 +102,13 @@
           </template>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">订货数量合计:{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty: '--' }}</a-col>
-              <a-col :md="4" :sm="24">增量补贴金额:{{ (totalData && (totalData.rebateAmountSys || totalData.rebateAmountSys==0)) ? toThousands(totalData.rebateAmountSys): '--' }}</a-col>
+              <a-col :md="4" :sm="24">订货数量合计:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty: '--' }}</a-col>
+              <a-col :md="4" :sm="24">增量补贴金额:{{ (totalData && (totalData.subsidyAmount || totalData.subsidyAmount==0)) ? toThousands(totalData.subsidyAmount): '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
       </a-spin>
     </a-card>
-    <!-- 导出提示框 -->
-    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </div>
 </template>
 
@@ -122,14 +120,13 @@ import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
-import reportModal from '@/views/common/reportModal.vue'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+import custList from '@/views/common/custList.vue'
 // 接口
-import { tireFeeReportList, tireFeeReportCount, tireFeeListExport } from '@/api/reportData'
+import { subsidyStepList, subsidyStepCount, subsidyStepExport } from '@/api/reportData'
 export default {
   name: 'QuarterQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, AreaList, dealerSubareaScopeList, reportModal },
+  components: { STable, VSelect, subarea, AreaList, custList },
   data () {
     return {
       spinning: false,
@@ -137,12 +134,11 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
-      showExport: false, // 导出弹窗
       toYears: new Date().getFullYear(), // 今年
       //  查询条件
       queryParam: {
-        queryType: 'year', // 轮胎年度费用报表
-        queryDate: moment().year(), // 选择年份
+        subsidyType: 'YEAR', // 轮胎年度费用报表
+        bizYear: moment().year(), // 选择年份
         subareaArea: {
           subareaSn: '', // 区域
           subareaAreaSn: '' // 分区
@@ -157,7 +153,7 @@ export default {
       },
       totalData: null, // 合计
       rules: {
-        'queryDate': [{ required: true, message: '请选择查询年份', trigger: 'change' }]
+        'bizYear': [{ required: true, message: '请选择查询年份', trigger: 'change' }]
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -165,7 +161,7 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         // 获取列表数据  有分页
-        return tireFeeReportList(params).then(res => {
+        return subsidyStepList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -173,7 +169,6 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              data.list[i].year = this.queryParam.queryDate
             }
             this.disabled = false
             // 获取统计数据
@@ -213,16 +208,16 @@ export default {
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '10%', align: 'center' },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订货数量(总部)', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '订货数量(转单)', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货数量(总部)', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '订货数量合计', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '年度目标', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '年度增量补贴', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '增量补贴金额', dataIndex: 'rebateAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '增量已补金额', dataIndex: 'rebateAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '剩余增量补贴金额', dataIndex: 'rebateAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '订货数量(总部)', dataIndex: 'salesQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '订货数量(转单)', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货数量(总部)', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '订货数量合计', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '年度目标', dataIndex: 'subsidyTarget', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '年度增量补贴', dataIndex: 'subsidyValue', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '增量补贴金额', dataIndex: 'subsidyAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '增量已补金额', dataIndex: 'settleAmountFinish', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '剩余增量补贴金额', dataIndex: 'settleAmountWait', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }
@@ -231,9 +226,9 @@ export default {
     // 选择查询年份  change
     changeYear (val) {
       if (!val) {
-        this.queryParam.queryDate = void 0
+        this.queryParam.bizYear = void 0
       } else {
-        this.queryParam.queryDate = val
+        this.queryParam.bizYear = val
       }
     },
     // 查询
@@ -243,19 +238,19 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择查询季度')
+          _this.$message.error('请选择查询')
           return false
         }
       })
     },
     // 客户名称 change
     custChange (val) {
-      this.queryParam.dealerEntity.dealerName = val.name
-      this.queryParam.customSn = val.key
+      this.queryParam.dealerName = val.name
+      this.queryParam.dealerSn = val.key
     },
     // 统计
     getCount (params) {
-      tireFeeReportCount(params).then(res => {
+      subsidyStepCount(params).then(res => {
         if (res.status == 200 && res.data) {
           this.totalData = res.data
         } else {
@@ -276,19 +271,17 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.queryType = 'year'
-      this.queryParam.queryDate = undefined
+      this.queryParam.subsidyType = 'YEAR'
+      this.queryParam.bizYear = moment().year()
       this.queryParam.dealerEntity.provinceSn = undefined
       this.queryParam.dealerEntity.citySn = undefined
       this.queryParam.dealerEntity.districtSn = undefined
-      this.queryParam.dealerEntity.dealerName = undefined
-      this.queryParam.customSn = undefined
+      this.queryParam.dealerName = undefined
+      this.queryParam.dealerSn = undefined
       this.queryParam.subareaArea.subareaSn = ''
       this.queryParam.subareaArea.subareaAreaSn = ''
       this.$refs.subarea.clearData()
-      if (this.advanced) {
-        this.$refs.dealerSubareaScopeList.resetForm()
-      }
+      this.$refs.custList.resetForm()
       this.totalData = null
       this.$refs.areaList.clearData()
       this.$refs.table.clearTable()
@@ -311,8 +304,7 @@ export default {
       const _this = this
       _this.exportLoading = true
       _this.spinning = true
-      _this.showExport = true
-      hdExportExcel(tireFeeListExport, _this.queryParam, '增量补贴报表(年度)', function () {
+      hdExportExcel(subsidyStepExport, _this.queryParam, '增量补贴报表(' + this.queryParam.bizYear + '年度)-', function () {
         _this.exportLoading = false
         _this.spinning = false
       })

+ 69 - 56
src/views/reportData/tireSubsidyReport/serviceFreightDetailList.vue

@@ -25,7 +25,6 @@
                 </div>
                 <rangeDate
                   ref="rangeDate"
-                  :showTime="false"
                   :value="queryParam.time"
                   id="sfdetail-time"
                   @change="dateChange" />
@@ -33,27 +32,27 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="记账主体">
-                <a-input id="sfdetail-acount" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入记账主体"/>
+                <custList id="sfdetail-belongDealer" dataAuthFlag="0" placeholder="请输入记账主体" ref="belongDealer" @change="belongDealerChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="业务单号">
-                <a-input id="sfdetail-bizNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入业务单号"/>
+                <a-input id="sfdetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户名称">
-                  <a-input id="sfdetail-custName" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入客户名称"/>
+                  <custList id="sfdetail-custName" dataAuthFlag="0" placeholder="请输入客户名称" ref="custList" @change="custChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务类型">
                   <v-select
-                    v-model="queryParam.dealerLevel"
-                    ref="dealerLevel"
-                    id="sfdetail-dealerLevel"
-                    code="DEALER_LEVEL"
+                    v-model="queryParam.bizType"
+                    ref="bizType"
+                    id="sfdetail-bizType"
+                    code="SUBSIDY_BIZ_TYPE"
                     placeholder="请选择业务类型"
                     allowClear></v-select>
                 </a-form-model-item>
@@ -66,8 +65,8 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="是否轮胎省仓">
                   <v-select
-                    v-model="queryParam.provinceFlag"
-                    id="sfdetail-provinceFlag"
+                    v-model="queryParam.belongProvinceFlag"
+                    id="sfdetail-belongProvinceFlag"
                     code="Flag"
                     placeholder="请选择是否轮胎省仓"
                     allowClear></v-select>
@@ -137,15 +136,13 @@
           </template>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="6" :sm="24">服务费金额:{{ (totalData && (totalData.outAmount || totalData.outAmount==0)) ? toThousands(totalData.outAmount): '--' }}</a-col>
-              <a-col :md="6" :sm="24">运费补贴金额:{{ (totalData && (totalData.rebateAmountSys || totalData.rebateAmountSys==0)) ? toThousands(totalData.rebateAmountSys): '--' }}</a-col>
+              <a-col :md="6" :sm="24">服务费金额:{{ (totalData && (totalData.subsidyServiceAmount || totalData.subsidyServiceAmount==0)) ? toThousands(totalData.subsidyServiceAmount): '--' }}</a-col>
+              <a-col :md="6" :sm="24">运费补贴金额:{{ (totalData && (totalData.subsidyShippingAmount || totalData.subsidyShippingAmount==0)) ? toThousands(totalData.subsidyShippingAmount): '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
       </a-spin>
     </a-card>
-    <!-- 导出提示框 -->
-    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </div>
 </template>
 
@@ -159,15 +156,13 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
-import reportModal from '@/views/common/reportModal.vue'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import custList from '@/views/common/custList.vue'
 // 接口
-import { tireFeeReportList, tireFeeReportCount, tireFeeListExport } from '@/api/reportData'
+import { subsidyDetailList, subsidyDetailCount, subsidyDetailExport } from '@/api/reportData'
 export default {
   name: 'ServiceFreightDetailList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, AreaList, dealerSubareaScopeList, custList, reportModal },
+  components: { STable, VSelect, rangeDate, subarea, AreaList, custList },
   data () {
     return {
       spinning: false,
@@ -175,7 +170,6 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
-      showExport: false, // 导出弹窗
       //  查询条件
       queryParam: {
         time: [
@@ -184,18 +178,21 @@ export default {
         ], // 日期
         beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
         endDate: getDate.getCurrMonthDays().endtime, // 结束时间
-        customSn: undefined, // 客户sn
+        bizNo: undefined, // 业务单号
+        bizType: undefined, // 业务类型
+        belongProvinceFlag: undefined, // 是否轮胎省仓
         subareaArea: {
-          subareaSn: '', // 区域
-          subareaAreaSn: '' // 分区
+          subareaSn: undefined, // 区域
+          subareaAreaSn: undefined // 分区
         },
         dealerEntity: {
-          dealerName: undefined, // 客户名称
-          provinceSn: undefined, // 省
-          citySn: undefined, // 市
-          districtSn: undefined // 区
+          provinceSn: undefined,
+          citySn: undefined,
+          districtSn: undefined
         },
-        provinceFlag: '1'// 是轮胎省仓
+        belongDealerSn: undefined,
+        transferDealerSn: undefined,
+        dealerSn: undefined
       },
       totalData: null, // 合计
       showOutDetail: false, // 出库明细弹窗
@@ -208,8 +205,9 @@ export default {
         this.spinning = true
         const oldParams = Object.assign(parameter, this.queryParam)
         const params = JSON.parse(JSON.stringify(oldParams))
+        delete params.time
         // 获取列表数据  有分页
-        return tireFeeReportList(params).then(res => {
+        return subsidyDetailList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -247,16 +245,16 @@ export default {
         { title: '业务单号', dataIndex: 'bizNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '100px', align: 'center' },
-        { title: '记账主体', dataIndex: 'bizUserName', width: '90px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '轮胎省仓', dataIndex: 'provinceFlag', width: '80px', align: 'center', customRender: function (text) { return text == '1' ? '是' : '否' } },
-        { title: '销售数量', dataIndex: 'dealerEntity.taskNum', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '销售金额', dataIndex: 'serviceAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴', dataIndex: 'crossRegionQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '运费补贴金额', dataIndex: 'serviceAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '发货经销商', dataIndex: 'parentDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '业务类型', dataIndex: 'parentDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '80px', align: 'center' },
+        { title: '记账主体', dataIndex: 'belongDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '轮胎省仓', dataIndex: 'belongProvinceFlagDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售数量', dataIndex: 'bizQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '销售金额', dataIndex: 'bizAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴', dataIndex: 'subsidyShippingDiff', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '运费补贴金额', dataIndex: 'subsidyShippingAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '客户名称', dataIndex: 'dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '发货经销商', dataIndex: 'transferDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       return arr
     }
@@ -281,21 +279,27 @@ export default {
       } else {
         this.queryParam.time = []
       }
-      this.queryParam.beginDate = date[0] ? date[0].replace(/-/g, '') : ''
-      this.queryParam.endDate = date[1] ? date[1].replace(/-/g, '') : ''
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
     },
     // 选择发货经销商
     custTireChange (val) {
+      this.queryParam.transferDealerName = val.name
       this.queryParam.transferDealerSn = val.key
     },
+    // 记账主体
+    belongDealerChange (val) {
+      this.queryParam.belongDealerName = val.name
+      this.queryParam.belongDealerSn = val.key
+    },
     // 客户名称 change
     custChange (val) {
-      this.queryParam.dealerEntity.dealerName = val.name
-      this.queryParam.customSn = val.key
+      this.queryParam.dealerName = val.name
+      this.queryParam.dealerSn = val.key
     },
     // 统计
     getCount (params) {
-      tireFeeReportCount(params).then(res => {
+      subsidyDetailCount(params).then(res => {
         if (res.status == 200 && res.data) {
           this.totalData = res.data
         } else {
@@ -303,7 +307,7 @@ export default {
         }
       })
     },
-    // 地区
+    // 地区省份
     areaChange (val) {
       this.queryParam.dealerEntity.provinceSn = val[0] ? val[0] : undefined
       this.queryParam.dealerEntity.citySn = val[1] ? val[1] : undefined
@@ -311,25 +315,35 @@ export default {
     },
     // 区域分区  change
     subareaChange (val) {
-      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : ''
-      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : ''
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
     //  重置
     resetSearchForm () {
+      this.queryParam.time = [
+        moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ]
       this.$refs.rangeDate.resetDate(this.queryParam.time)
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      this.queryParam.bizNo = undefined
+      this.queryParam.bizType = undefined
+      this.queryParam.belongDealerSn = undefined
+      this.queryParam.transferDealerSn = undefined
+      this.queryParam.dealerSn = undefined
+      this.queryParam.belongProvinceFlag = undefined
       this.queryParam.dealerEntity.provinceSn = undefined
       this.queryParam.dealerEntity.citySn = undefined
       this.queryParam.dealerEntity.districtSn = undefined
-      this.queryParam.dealerEntity.dealerName = undefined
-      this.queryParam.customSn = undefined
-      this.queryParam.subareaArea.subareaSn = ''
-      this.queryParam.subareaArea.subareaAreaSn = ''
-      this.$refs.subarea.clearData()
-      this.$refs.areaList.clearData()
+      this.queryParam.subareaArea.subareaSn = undefined
+      this.queryParam.subareaArea.subareaAreaSn = undefined
       if (this.advanced) {
-        this.$refs.dealerSubareaScopeList.resetForm()
+        this.$refs.dealerTireScopeList.resetForm()
+        this.$refs.belongDealer.resetForm()
+        this.$refs.custList.resetForm()
+        this.$refs.subarea.clearData()
+        this.$refs.areaList.clearData()
       }
       this.totalData = null
       this.$refs.table.clearTable()
@@ -342,7 +356,7 @@ export default {
         if (valid) {
           _this.exportList()
         } else {
-          _this.$message.error('请选择查询年份')
+          _this.$message.error('请选择查询时间')
           return false
         }
       })
@@ -353,8 +367,7 @@ export default {
       const params = JSON.parse(JSON.stringify(_this.queryParam))
       _this.exportLoading = true
       _this.spinning = true
-      _this.showExport = true
-      hdExportExcel(tireFeeListExport, params, '轮胎年度费用报表', function () {
+      hdExportExcel(subsidyDetailExport, params, '轮胎服务费运费明细报表-', function () {
         _this.exportLoading = false
         _this.spinning = false
       })

+ 36 - 54
src/views/reportData/tireSubsidyReport/serviceFreightList.vue

@@ -44,7 +44,7 @@
             </a-col>
             <a-col :flex="2">
               <a-form-model-item label="记账主体">
-                <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入记账主体" id="serviceFreight-provinceDealerName" @change="custProvinceChange" />
+                <custList id="serviceFreight-belongDealer" dataAuthFlag="0" placeholder="请输入记账主体" ref="belongDealer" @change="belongDealerChange" />
               </a-form-model-item>
             </a-col>
             <a-col :flex="2">
@@ -98,15 +98,13 @@
           </template>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="6" :sm="24">服务费金额合计:{{ (totalData && (totalData.serviceAmountSys || totalData.serviceAmountSys==0)) ? toThousands(totalData.serviceAmountSys): '--' }}</a-col>
-              <a-col :md="6" :sm="24">运费补贴金额合计:{{ (totalData && (totalData.serviceAmountProvince || totalData.serviceAmountProvince==0)) ? toThousands(totalData.serviceAmountProvince): '--' }}</a-col>
+              <a-col :md="6" :sm="24">服务费金额合计:{{ (totalData && (totalData.subsidyServiceTotal || totalData.subsidyServiceTotal==0)) ? toThousands(totalData.subsidyServiceTotal): '--' }}</a-col>
+              <a-col :md="6" :sm="24">运费补贴金额合计:{{ (totalData && (totalData.subsidyShippingTotal || totalData.subsidyShippingTotal==0)) ? toThousands(totalData.subsidyShippingTotal): '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
       </a-spin>
     </a-card>
-    <!-- 导出提示框 -->
-    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </div>
 </template>
 
@@ -118,14 +116,13 @@ import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
-import reportModal from '@/views/common/reportModal.vue'
-import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+import custList from '@/views/common/custList.vue'
 // 接口
-import { tireFeeReportList, tireFeeReportCount, tireFeeListExport } from '@/api/reportData'
+import { subsidyMonthList, subsidyMonthCount, subsidyMonthExport } from '@/api/reportData'
 export default {
   name: 'MonthQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, AreaList, reportModal, dealerSubareaScopeList },
+  components: { STable, VSelect, subarea, AreaList, custList },
   data () {
     return {
       spinning: false,
@@ -133,24 +130,16 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       exportLoading: false, // 导出按钮加载状态
-      showExport: false, // 导出弹窗
       monthVal: moment().format('YYYY-MM'), // 初始化月份值
       //  查询条件
       queryParam: {
-        queryType: 'month', // 轮胎月度费用报表
-        queryDate: moment().format('YYYYMM'), // 选择月份
-        dealerLevel: undefined, // 客户等级
-        customSn: undefined, // 客户sn
-        parentDealerSn: undefined, // 轮胎省仓sn
+        queryDate: moment().format('YYYY-MM'), // 选择月份
         dealerEntity: {
-          dealerName: undefined, // 客户名称
           provinceSn: undefined, // 省
           citySn: undefined, // 市
           districtSn: undefined // 区
         },
-        parentDealerEntity: {
-          dealerName: undefined // 轮胎省仓名称
-        },
+        belongDealerSn: undefined, // 记账主体
         subareaArea: {
           subareaSn: '', // 区域
           subareaAreaSn: '' // 分区
@@ -165,8 +154,11 @@ export default {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
+        params.bizYear = params.queryDate.split('-')[0]
+        params.bizMonth = params.queryDate.split('-')[1]
+        delete params.queryDate
         // 获取列表数据  有分页
-        return tireFeeReportList(params).then(res => {
+        return subsidyMonthList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -174,7 +166,6 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              data.list[i].mothDay = this.queryParam.queryDate.substr(0, 4) + '-' + this.queryParam.queryDate.substr(4, 2)
             }
             this.disabled = false
             this.getCount(params)
@@ -201,19 +192,19 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '月份', dataIndex: 'mothDay', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '10%', align: 'center' },
-        { title: '记账主体', dataIndex: 'parentDealerEntity.dealerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '服务费(记)', dataIndex: 'currentPointShareFactory', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '服务费(扣)', dataIndex: 'currentPointShareSys', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '服务费合计', dataIndex: 'serviceAmountSys', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴(总部记)', dataIndex: 'serviceAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴(总部扣)', dataIndex: 'serviceAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴(转单记)', dataIndex: 'serviceAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴(转单扣)', dataIndex: 'serviceAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴合计', dataIndex: 'serviceAmountProvince', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '月份', dataIndex: 'mothDay', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '6%', align: 'center' },
+        { title: '记账主体', dataIndex: 'belongDealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '服务费(记)', dataIndex: 'subsidyServiceSales', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '服务费(扣)', dataIndex: 'subsidyServiceReturn', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '服务费合计', dataIndex: 'subsidyServiceTotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴(总部记)', dataIndex: 'subsidyShippingSales', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴(总部扣)', dataIndex: 'subsidyShippingReturn', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴(转单记)', dataIndex: 'subsidyShippingTransferAdd', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴(转单扣)', dataIndex: 'subsidyShippingTransferSub', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴合计', dataIndex: 'subsidyShippingTotal', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }
@@ -227,7 +218,7 @@ export default {
     onChangeMonth (date, dateString) {
       this.monthVal = dateString
       if (date && dateString != '') {
-        this.queryParam.queryDate = dateString.replace('-', '')
+        this.queryParam.queryDate = dateString
       } else {
         this.queryParam.queryDate = void 0
       }
@@ -244,19 +235,14 @@ export default {
         }
       })
     },
-    // 客户名称 change
-    custChange (val) {
-      this.queryParam.dealerEntity.dealerName = val.name
-      this.queryParam.customSn = val.key
-    },
-    // 轮胎省仓客户名称 change
-    custProvinceChange (val) {
-      this.queryParam.parentDealerEntity.dealerName = val.name
-      this.queryParam.parentDealerSn = val.key
+    // 记账主体
+    belongDealerChange (val) {
+      this.queryParam.belongDealerName = val.name
+      this.queryParam.belongDealerSn = val.key
     },
     // 统计
     getCount (params) {
-      tireFeeReportCount(params).then(res => {
+      subsidyMonthCount(params).then(res => {
         if (res.status == 200 && res.data) {
           this.totalData = res.data
         } else {
@@ -277,22 +263,19 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.queryType = 'month'
       this.monthVal = moment().format('YYYY-MM')
-      this.queryParam.queryDate = moment().format('YYYYMM')
+      this.queryParam.queryDate = moment().format('YYYY-MM')
       this.queryParam.dealerEntity.provinceSn = undefined
       this.queryParam.dealerEntity.citySn = undefined
       this.queryParam.dealerEntity.districtSn = undefined
       this.queryParam.dealerEntity.dealerName = undefined
-      this.queryParam.parentDealerEntity.dealerName = undefined
-      this.queryParam.customSn = undefined
-      this.queryParam.parentDealerSn = undefined
       this.queryParam.subareaArea.subareaSn = ''
       this.queryParam.subareaArea.subareaAreaSn = ''
       this.queryParam.dealerLevel = undefined
-      this.$refs.subarea.clearData()
-      this.$refs.provinceDealerList.resetForm()
+      this.queryParam.belongDealerSn = undefined
+      this.$refs.belongDealer.resetForm()
       this.totalData = null
+      this.$refs.subarea.clearData()
       this.$refs.areaList.clearData()
       this.$refs.table.clearTable()
       this.$refs.ruleForm.resetFields()
@@ -315,8 +298,7 @@ export default {
       const params = JSON.parse(JSON.stringify(_this.queryParam))
       _this.exportLoading = true
       _this.spinning = true
-      _this.showExport = true
-      hdExportExcel(tireFeeListExport, params, '轮胎月度费用报表', function () {
+      hdExportExcel(subsidyMonthExport, params, '轮胎服务费运费报表(' + this.queryParam.queryDate + '月份)-', function () {
         _this.exportLoading = false
         _this.spinning = false
       })