From c02050eb36d1220e09b1e9ddd8b94a8fc691fd9f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 25 Feb 2025 15:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9=E7=AE=A1=E7=90=86=E3=80=81=E4=B8=93=E9=A1=B9=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9=E7=AE=A1=E7=90=86=E3=80=81=E5=8D=95=E8=BD=A6=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9=E3=80=81=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9--=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bicyclerebatetobechecked.vue              | 72 ++++++++++++++++++
 .../bicyclerebatemanagement.vue               | 74 ++++++++++++++++++-
 .../specialrebatetobechecked.vue              | 71 +++++++++++++++++-
 .../specialrebatemanagement.vue               | 74 ++++++++++++++++++-
 4 files changed, 287 insertions(+), 4 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
index d76a63314f..1ce250d3f7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
@@ -29,6 +29,17 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
+              <el-form-item label="所属年月">
+                <el-date-picker v-model="listQuery.params.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="预提年月">
+                <el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="上传日期">
+                <el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
               <el-form-item label="返利类型">
                 <el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
               </el-form-item>
@@ -40,6 +51,31 @@
                   <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
+              <el-form-item label="上传状态">
+                <el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="是否调整">
+                <el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="是否上传完成">
+                <el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="一次核对状态">
+                <el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="二次上传状态">
+                <el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -431,6 +467,26 @@ export default {
           dictValue: '是'
         }
       ],
+      uploadState_list: [
+        {
+          dictKey: '1',
+          dictValue: '已上传'
+        },
+        {
+          dictKey: '0',
+          dictValue: '未上传'
+        }
+      ],
+      whether_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '否'
+        }
+      ],
       listLoading: false,
       listQuery: {
         params: {
@@ -444,6 +500,14 @@ export default {
           state: '',
           createEndTime: '',
           createStartTime: '',
+          palceGenDate: '',
+          withholdingDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          uploadState: '',
+          isAdjustment: '',
+          isUploadFinish: '',
+          secondUploadState: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -584,6 +648,14 @@ export default {
           state: '',
           createEndTime: '',
           createStartTime: '',
+          palceGenDate: '',
+          withholdingDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          uploadState: '',
+          isAdjustment: '',
+          isUploadFinish: '',
+          secondUploadState: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
index 8ff6546308..db181fbc31 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
@@ -28,6 +28,17 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
+              <el-form-item label="所属年月">
+                <el-date-picker v-model="listQuery.params.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="预提年月">
+                <el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="上传日期">
+                <el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
               <el-form-item label="返利类型">
                 <el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@@ -36,11 +47,36 @@
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="状态">
+              <el-form-item label="流程状态">
                 <el-select v-model="listQuery.params.state" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
+              <el-form-item label="上传状态">
+                <el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="是否调整">
+                <el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="是否上传完成">
+                <el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="一次核对状态">
+                <el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="二次上传状态">
+                <el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -238,6 +274,26 @@ export default {
       FormLoading: false,
       listLoading: false,
       rebateType_list: [],
+      uploadState_list: [
+        {
+          dictKey: '1',
+          dictValue: '已上传'
+        },
+        {
+          dictKey: '0',
+          dictValue: '未上传'
+        }
+      ],
+      whether_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '否'
+        }
+      ],
       state_list: [
         {
           dictKey: '0',
@@ -272,6 +328,14 @@ export default {
           vinNo: '',
           vehModelName: '',
           brandName: '',
+          palceGenDate: '',
+          withholdingDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          uploadState: '',
+          isAdjustment: '',
+          isUploadFinish: '',
+          secondUploadState: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -399,6 +463,14 @@ export default {
           vinNo: '',
           vehModelName: '',
           brandName: '',
+          palceGenDate: '',
+          withholdingDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          uploadState: '',
+          isAdjustment: '',
+          isUploadFinish: '',
+          secondUploadState: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
index d5892e58d6..7e2dadb519 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
@@ -34,9 +34,40 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
+              <el-form-item label="所属年月">
+                <el-date-picker v-model="listQuery.params.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="预提年月">
+                <el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="上传日期">
+                <el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="上传状态">
+                <el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="是否调整">
+                <el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="是否上传完成">
+                <el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
               <el-form-item label="一次核对状态">
                 <el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="二次上传状态">
+                <el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
             </el-form>
@@ -83,7 +114,7 @@
               <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="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" />
@@ -410,6 +441,26 @@ export default {
       sids: [],
       FormLoading: false,
       rebateType_list: [],
+      uploadState_list: [
+        {
+          dictKey: '1',
+          dictValue: '已上传'
+        },
+        {
+          dictKey: '0',
+          dictValue: '未上传'
+        }
+      ],
+      whether_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '否'
+        }
+      ],
       state_list: [
         {
           dictKey: '0',
@@ -436,6 +487,14 @@ export default {
           onceCheckState: '',
           createEndTime: '',
           createStartTime: '',
+          palceGenDate: '',
+          withholdingDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          uploadState: '',
+          isAdjustment: '',
+          isUploadFinish: '',
+          secondUploadState: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -583,6 +642,14 @@ export default {
           onceCheckState: '',
           createEndTime: '',
           createStartTime: '',
+          palceGenDate: '',
+          withholdingDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          uploadState: '',
+          isAdjustment: '',
+          isUploadFinish: '',
+          secondUploadState: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
index 1df8cd08c9..d871a689c5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
@@ -22,6 +22,17 @@
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
+              <el-form-item label="所属年月">
+                <el-date-picker v-model="listQuery.params.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="预提年月">
+                <el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="上传日期">
+                <el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
+              </el-form-item>
               <el-form-item label="返利类型">
                 <el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@@ -30,11 +41,36 @@
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="状态">
+              <el-form-item label="流程状态">
                 <el-select v-model="listQuery.params.state" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
+              <el-form-item label="上传状态">
+                <el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="是否调整">
+                <el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="是否上传完成">
+                <el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="一次核对状态">
+                <el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="二次上传状态">
+                <el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -213,6 +249,26 @@ export default {
       FormLoading: false,
       listLoading: false,
       rebateType_list: [],
+      uploadState_list: [
+        {
+          dictKey: '1',
+          dictValue: '已上传'
+        },
+        {
+          dictKey: '0',
+          dictValue: '未上传'
+        }
+      ],
+      whether_list: [
+        {
+          dictKey: '1',
+          dictValue: '是'
+        },
+        {
+          dictKey: '0',
+          dictValue: '否'
+        }
+      ],
       state_list: [
         {
           dictKey: '0',
@@ -254,6 +310,14 @@ export default {
           createOrgName: '',
           purchaseSystemName: '',
           brandName: '',
+          palceGenDate: '',
+          withholdingDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          uploadState: '',
+          isAdjustment: '',
+          isUploadFinish: '',
+          secondUploadState: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -385,6 +449,14 @@ export default {
           createOrgName: '',
           purchaseSystemName: '',
           brandName: '',
+          palceGenDate: '',
+          withholdingDate: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          uploadState: '',
+          isAdjustment: '',
+          isUploadFinish: '',
+          secondUploadState: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''