From 8a40cc6fac4cccaaca5b9412ed70c1416ba001a8 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 3 Jun 2025 15:16:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js
index afd0fe6149..c3445eaec9 100644
--- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js
+++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js
@@ -72,7 +72,7 @@ export default {
     // 导出
     exportExcel: function(data) {
         return request({
-            url: '/scm/v1/scmvehrebate/excelList',
+            url: '/scm/v1/scmvehrebate/excelListNew',
             method: 'post',
             data: data,
             responseType: 'blob', // 表明返回服务器返回的数据类型

From 9eefd096a675e395a807a750c2b713c5e62ad067 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 3 Jun 2025 15:26:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/statement/bikeRebateStatistics.js |  19 ++
 .../src/api/statement/rebateType.js           |  20 ++
 .../bikeRebateStatistics.vue                  | 256 ++++++++++++++++++
 .../bikeRebateStatisticsInfo.vue              |  99 +++++++
 .../rebateType/rebateNameByDetail.vue         | 103 +++++++
 .../rebateType/rebateTypeByDetail.vue         | 247 +++++++++++++++++
 6 files changed, 744 insertions(+)
 create mode 100644 anrui-reportcenter-ui/src/api/statement/bikeRebateStatistics.js
 create mode 100644 anrui-reportcenter-ui/src/api/statement/rebateType.js
 create mode 100644 anrui-reportcenter-ui/src/views/statement/bikeRebateStatistics/bikeRebateStatistics.vue
 create mode 100644 anrui-reportcenter-ui/src/views/statement/bikeRebateStatistics/bikeRebateStatisticsInfo.vue
 create mode 100644 anrui-reportcenter-ui/src/views/statement/rebateType/rebateNameByDetail.vue
 create mode 100644 anrui-reportcenter-ui/src/views/statement/rebateType/rebateTypeByDetail.vue

diff --git a/anrui-reportcenter-ui/src/api/statement/bikeRebateStatistics.js b/anrui-reportcenter-ui/src/api/statement/bikeRebateStatistics.js
new file mode 100644
index 0000000000..4759b809f3
--- /dev/null
+++ b/anrui-reportcenter-ui/src/api/statement/bikeRebateStatistics.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebate/statistics',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  getDetail: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebate/getDetail/' + data,
+      method: 'get'
+    })
+  }
+}
diff --git a/anrui-reportcenter-ui/src/api/statement/rebateType.js b/anrui-reportcenter-ui/src/api/statement/rebateType.js
new file mode 100644
index 0000000000..fa3823c0e3
--- /dev/null
+++ b/anrui-reportcenter-ui/src/api/statement/rebateType.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebate/typeStatistics',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  getTypeDetail: function(data) {
+    return request({
+      url: '/scm/v1/scmvehrebate/getTypeDetail',
+      method: 'post',
+      params: data
+    })
+  }
+}
diff --git a/anrui-reportcenter-ui/src/views/statement/bikeRebateStatistics/bikeRebateStatistics.vue b/anrui-reportcenter-ui/src/views/statement/bikeRebateStatistics/bikeRebateStatistics.vue
new file mode 100644
index 0000000000..1b93235c8f
--- /dev/null
+++ b/anrui-reportcenter-ui/src/views/statement/bikeRebateStatistics/bikeRebateStatistics.vue
@@ -0,0 +1,256 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="单车返利统计" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="事业部">
+                <el-input v-model="listQuery.params.division" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="品牌">
+                <el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.vehModelName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="销售日期">
+                <el-date-picker v-model="listQuery.params.saleDateStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.salesDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="实销日期">
+                <el-date-picker v-model="listQuery.params.acSaleDateStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.acSaleDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">单车返利统计列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
+            <el-table-column prop="vehModelName" label="车型" align="center" min-width="180" />
+            <el-table-column label="车架号" align="center" width="150">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="saleDate" label="销售日期" align="center" width="120" />
+            <el-table-column prop="acSaleDate" label="实销日期" align="center" width="120" />
+            <el-table-column label="返利金额" align="center">
+              <el-table-column prop="estimateRebate" label="预提" align="center" width="120" />
+              <el-table-column prop="uploadMoney" label="上传" align="center" width="120" />
+              <el-table-column prop="secondaryUploadMoney" label="二次上传" align="center" width="120" />
+              <el-table-column prop="stayDetermineMoney" label="待确定" align="center" width="120" />
+              <el-table-column prop="adjustmentMoney" label="调整" align="center" width="120" />
+              <el-table-column prop="notUploadMoney" label="未上传" align="center" width="120" />
+            </el-table-column>
+            <el-table-column label="其中费用" align="center">
+              <el-table-column prop="expectCost" label="预提" align="center" width="120" />
+              <el-table-column prop="money" label="上传" align="center" width="120" />
+            </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="division" label="事业部" align="center" width="120" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <bikeRebateStatisticsInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/statement/bikeRebateStatistics'
+import bikeRebateStatisticsInfo from './bikeRebateStatisticsInfo'
+
+export default {
+  name: 'BikeRebateStatistics',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    bikeRebateStatisticsInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          division: '',
+          useOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
+          vinNo: '',
+          vehModelName: '',
+          saleDateStart: '',
+          saleDateEnd: '',
+          acSaleDateStart: '',
+          acSaleDateEnd: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          division: '',
+          useOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
+          vinNo: '',
+          vehModelName: '',
+          saleDateStart: '',
+          saleDateEnd: '',
+          acSaleDateStart: '',
+          acSaleDateEnd: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      }
+      this.getList()
+    },
+    toInfo(row) {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/anrui-reportcenter-ui/src/views/statement/bikeRebateStatistics/bikeRebateStatisticsInfo.vue b/anrui-reportcenter-ui/src/views/statement/bikeRebateStatistics/bikeRebateStatisticsInfo.vue
new file mode 100644
index 0000000000..ff9c75a0a9
--- /dev/null
+++ b/anrui-reportcenter-ui/src/views/statement/bikeRebateStatistics/bikeRebateStatisticsInfo.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{title}}</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form class="formaddcopy02">
+        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
+          <el-table-column fixed label="序号" type="index" width="80" :index="index + 1" align="center" />
+          <el-table-column fixed prop="purchaseSystemName" label="采购系统" align="center" width="110" />
+          <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
+          <el-table-column fixed prop="vinNo" label="车架号" align="center" width="90" />
+          <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+          <el-table-column prop="rebateName" label="返利名称" align="center" width="130" />
+          <el-table-column prop="palceGenDate" label="所属年月" align="center" width="85" />
+          <el-table-column label="返利金额" align="center">
+            <el-table-column prop="estimateRebate" label="预提" align="center" width="100" />
+            <el-table-column prop="uploadMoney" label="上传" align="center" width="100" />
+            <el-table-column prop="secondaryUploadMoney" label="二次上传" align="center" width="100" />
+            <el-table-column prop="stayDetermineMoney" label="待确定" align="center" width="100" />
+            <el-table-column prop="adjustmentMoney" label="调整" align="center" width="100" />
+            <el-table-column prop="notUploadMoney" label="未上传" align="center" width="100" />
+          </el-table-column>
+          <el-table-column label="其中费用" align="center">
+            <el-table-column prop="expectCost" label="预提" align="center" width="100" />
+            <el-table-column prop="money" label="上传" align="center" width="100" />
+          </el-table-column>
+          <el-table-column label="日期" align="center">
+            <el-table-column prop="createTime" label="创建" align="center" width="95" />
+            <el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
+            <el-table-column prop="uploadDate" label="上传" align="center" width="95" />
+            <el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
+          </el-table-column>
+          <el-table-column label="状态" align="center">
+            <el-table-column label="流程" align="center" width="70">
+              <template slot-scope="scope">
+                <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="一次核对状态" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="secondCheckState" label="二次核对" align="center" width="120" />
+          </el-table-column>
+          <el-table-column prop="brandName" label="品牌" align="center" width="140" />
+          <el-table-column prop="useOrgName" label="分公司" align="center" width="150" />
+          <el-table-column prop="division" label="事业部" align="center" width="150" />
+          <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="110" />
+          <el-table-column label="其中" align="center">
+            <el-table-column prop="freight" label="运费" align="center" width="100" />
+            <el-table-column prop="topAmount" label="上装" align="center" width="100" />
+          </el-table-column>
+          <el-table-column label="返利计算" align="center">
+            <el-table-column prop="calculationModeValue" label="方式" align="center" width="80" />
+            <el-table-column prop="calculationStandard" label="标准" align="center" width="100" />
+          </el-table-column>
+          <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/statement/bikeRebateStatistics'
+export default {
+  data() {
+    return {
+      index: 0,
+      tableKey: 0,
+      listLoading: false,
+      list: [],
+      title: ''
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.title = '单车返利统计明细'
+      req.getDetail(row.vehSid).then((resp) => {
+        if (resp.success) {
+          this.list = resp.data
+        }
+      })
+    },
+    handleReturn() {
+      this.list = []
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/anrui-reportcenter-ui/src/views/statement/rebateType/rebateNameByDetail.vue b/anrui-reportcenter-ui/src/views/statement/rebateType/rebateNameByDetail.vue
new file mode 100644
index 0000000000..98e43ab59a
--- /dev/null
+++ b/anrui-reportcenter-ui/src/views/statement/rebateType/rebateNameByDetail.vue
@@ -0,0 +1,103 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div style="margin: 0 auto;">{{title}}</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form class="formaddcopy02">
+        <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
+          <el-table-column fixed label="序号" type="index" width="80" :index="index + 1" align="center" />
+          <el-table-column fixed prop="purchaseSystemName" label="采购系统" align="center" width="110" />
+          <el-table-column fixed prop="vinNo" label="车架号" align="center" width="90" />
+          <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
+          <el-table-column prop="palceGenDate" label="返利项目" align="center" width="85" />
+          <el-table-column prop="palceGenDate" label="所属年月" align="center" width="85" />
+          <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+          <el-table-column prop="rebateName" label="返利名称" align="center" width="130" />
+          <el-table-column label="返利金额" align="center">
+            <el-table-column prop="estimateRebate" label="预提" align="center" width="100" />
+            <el-table-column prop="uploadMoney" label="上传" align="center" width="100" />
+            <el-table-column prop="secondaryUploadMoney" label="二次上传" align="center" width="100" />
+            <el-table-column prop="stayDetermineMoney" label="待确定" align="center" width="100" />
+            <el-table-column prop="adjustmentMoney" label="调整" align="center" width="100" />
+            <el-table-column prop="notUploadMoney" label="未上传" align="center" width="100" />
+          </el-table-column>
+          <el-table-column label="其中费用" align="center">
+            <el-table-column prop="expectCost" label="预提" align="center" width="100" />
+            <el-table-column prop="money" label="上传" align="center" width="100" />
+          </el-table-column>
+          <el-table-column label="日期" align="center">
+            <el-table-column prop="createTime" label="创建" align="center" width="95" />
+            <el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
+            <el-table-column prop="uploadDate" label="上传" align="center" width="95" />
+            <el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
+          </el-table-column>
+          <el-table-column label="状态" align="center">
+            <el-table-column label="流程" align="center" width="70">
+              <template slot-scope="scope">
+                <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="一次核对状态" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="secondCheckState" label="二次核对" align="center" width="120" />
+          </el-table-column>
+          <el-table-column prop="brandName" label="品牌" align="center" width="140" />
+          <el-table-column prop="useOrgName" label="分公司" align="center" width="150" />
+          <el-table-column prop="division" label="事业部" align="center" width="150" />
+          <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="110" />
+          <el-table-column label="其中" align="center">
+            <el-table-column prop="freight" label="运费" align="center" width="100" />
+            <el-table-column prop="topAmount" label="上装" align="center" width="100" />
+          </el-table-column>
+          <el-table-column label="返利计算" align="center">
+            <el-table-column prop="calculationModeValue" label="方式" align="center" width="80" />
+            <el-table-column prop="calculationStandard" label="标准" align="center" width="100" />
+          </el-table-column>
+          <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/statement/rebateType'
+
+export default {
+  name: 'RebateNameByDetail',
+  data() {
+    return {
+      index: 0,
+      tableKey: 0,
+      listLoading: false,
+      list: [],
+      title: ''
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.title = '厂家返利名称明细'
+      req.getTypeDetail({ sid: row.sid, type: row.project }).then((resp) => {
+        if (resp.success) {
+          this.list = resp.data
+        }
+      })
+    },
+    handleReturn() {
+      this.list = []
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/anrui-reportcenter-ui/src/views/statement/rebateType/rebateTypeByDetail.vue b/anrui-reportcenter-ui/src/views/statement/rebateType/rebateTypeByDetail.vue
new file mode 100644
index 0000000000..cae568bb28
--- /dev/null
+++ b/anrui-reportcenter-ui/src/views/statement/rebateType/rebateTypeByDetail.vue
@@ -0,0 +1,247 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="厂家返利类型明细查询" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="事业部">
+                <el-input v-model="listQuery.params.division" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="品牌">
+                <el-input v-model="listQuery.params.brandName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="返利项目">
+                <el-input v-model="listQuery.params.project" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="返利类型">
+                <el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="所属年月">
+                <el-date-picker v-model="listQuery.params.palceGenDateStart" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.palceGenDateEnd" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">厂家返利类型明细列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
+            <el-table-column prop="project" label="返利项目" align="center" min-width="180" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" min-width="180" />
+            <el-table-column label="返利类型" align="center" width="150">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.rebateTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="estimateRebate" label="预提" align="center" width="120" />
+            <el-table-column prop="uploadMoney" label="上传" align="center" width="120" />
+            <el-table-column prop="adjustmentMoney" label="调整" align="center" width="120" />
+            <el-table-column label="未上传" align="center">
+              <el-table-column prop="notUploadMoney" label="合计" align="center" width="120" />
+              <el-table-column label="其中费用" align="center">
+                <el-table-column prop="moneyTotal" label="合计" align="center" width="120" />
+                <el-table-column prop="expectItureCost" label="支出" align="center" width="120" />
+                <el-table-column prop="expectTreatCost" label="待支付" align="center" width="120" />
+                <el-table-column prop="expectSuppCost" label="抵顶" align="center" width="120" />
+              </el-table-column>
+              <el-table-column prop="balance" label="其中返利" align="center" width="120" />
+            </el-table-column>
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="division" label="事业部" align="center" width="120" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <rebateNameByDetail v-show="viewState == 2" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/statement/rebateType'
+import rebateNameByDetail from './rebateNameByDetail'
+
+export default {
+  name: 'RebateTypeByDetail',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    rebateNameByDetail
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          division: '',
+          useOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
+          project: '',
+          rebateTypeValue: '',
+          palceGenDateStart: '',
+          palceGenDateEnd: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          division: '',
+          useOrgName: '',
+          purchaseSystemName: '',
+          brandName: '',
+          project: '',
+          rebateTypeValue: '',
+          palceGenDateStart: '',
+          palceGenDateEnd: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
+        }
+      }
+      this.getList()
+    },
+    toInfo(row) {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

From aebf23afaabbc9afa18fa49cb7052571e353481c Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 3 Jun 2025 15:43:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BE=E6=9C=9F?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=9A=84=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml           | 4 ++--
 .../riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
index 8033f273e7..6a55b7e9b6 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
@@ -78,7 +78,7 @@
         WHERE lbca.collMeasure LIKE '%远程控制%'
         AND lbca.nodeState = '已办结'
         ) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1
-        WHERE lrpd.dueDate &lt;= lrpd.updateTime -- 移除DATE_FORMAT函数
+        WHERE lrpd.dueDate &lt;= lrpd.updateTime and bv.riskState &lt; 9
         GROUP BY lrpd.sid
         ) a1
         LEFT JOIN (
@@ -194,7 +194,7 @@
         WHERE lbca.collMeasure LIKE '%远程控制%'
         AND lbca.nodeState = '已办结'
         ) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1
-        WHERE lrpd.dueDate &lt;= lrpd.updateTime -- 移除DATE_FORMAT函数
+        WHERE lrpd.dueDate &lt;= lrpd.updateTime and bv.riskState &lt; 9
         GROUP BY lrpd.sid
         ) a1
         LEFT JOIN (
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml
index 06189497cd..3e4b03a643 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml
@@ -106,7 +106,7 @@
         ON lrpd.busVinSid = bv.sid
         WHERE
         lrpd.dueDate &lt;= lrpd.updateTime
-        and lrpd.useOrgSid = #{useOrgSid} and bv.riskState = 0
+        and lrpd.useOrgSid = #{useOrgSid}
         GROUP BY lrpd.`sid`
         HAVING (yq_total > 0)) a1
         LEFT JOIN (

From e29d1e8791800fef990571f3347312777690ee91 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 3 Jun 2025 16:36:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/specialrebate/specialrebatemanagement.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js
index 5f2d3cb064..2befb7b84f 100644
--- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js
+++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js
@@ -54,7 +54,7 @@ export default {
   // 导出
   exportExcel: function(data) {
     return request({
-      url: '/scm/v1/scmspecialrebate/excelList',
+      url: '/scm/v1/scmspecialrebate/excelListNew',
       method: 'post',
       data: data,
       responseType: 'blob', // 表明返回服务器返回的数据类型