From 4fa5220ef45e56030d61d469d92edaac1bfcdc6a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 28 Oct 2024 17:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9=E6=A0=B8=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionrebatetobechecked.vue           | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
index 45ae226046..840613f5d2 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
@@ -40,9 +40,14 @@
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="预提日期">
-                <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <el-date-picker v-model="listQuery.params.withholdingStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <el-date-picker v-model="listQuery.params.withholdingEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="上传日期">
+                <el-date-picker v-model="listQuery.params.uploadStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.uploadEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -181,8 +186,10 @@ export default {
           rebateName: '',
           collectionEndDate: '',
           collectionStartDate: '',
-          createStartTime: '',
-          createEndTime: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          withholdingStartDate: '',
+          withholdingEndDate: '',
           collectionTypeKey: '',
           createOrgSid: '',
           state: '',
@@ -211,6 +218,11 @@ export default {
   },
   methods: {
     init() {
+      typeValues({ type: 'rebateType' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
       typeValues({ type: 'paymentType' }).then((res) => {
         if (res.success) {
           this.collectionType_list = res.data
@@ -296,8 +308,10 @@ export default {
           rebateName: '',
           collectionEndDate: '',
           collectionStartDate: '',
-          createStartTime: '',
-          createEndTime: '',
+          uploadStartDate: '',
+          uploadEndDate: '',
+          withholdingStartDate: '',
+          withholdingEndDate: '',
           collectionTypeKey: '',
           createOrgSid: '',
           state: '',