From e9286b34ea211c256ca734e59fc92f131ac37c46 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 18 Dec 2024 11:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9=E3=80=81?=
 =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E8=BF=94=E5=88=A9=E9=A2=84=E6=8F=90=E3=80=81?=
 =?UTF-8?q?=E6=A0=B8=E5=AF=B9--=E5=8A=9E=E7=90=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E6=A0=87=E9=A2=98=E5=8C=85=E5=90=AB=E7=9A=84=E5=B9=B4?=
 =?UTF-8?q?=E6=9C=88=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bicyclerebatecheck/bicyclerebatecheckAdd.vue          | 2 +-
 .../huikuanhedui/collectionrebatecheckedAdd.vue           | 8 ++++++--
 .../huikuanyuti/collectionrebatewithholdingAdd.vue        | 8 ++++++--
 .../specialrebatecheck/specialrebatecheckAdd.vue          | 8 ++++++--
 .../specialrebatewithholdingAdd.vue                       | 8 ++++++--
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
index 2768bfb2a5..1bc56c3d4c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue
@@ -138,7 +138,7 @@ export default {
       if (day > 6) {
         month = date.getMonth() + 1 // 本月
       }
-      this.formobj.withApply = year + '年' + month + '月'
+      this.formobj.checkApply = year + '年' + month + '月'
     },
     init() {
       fetchBySid(this.formobj.createOrgSid).then((res) => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
index 50aeb4da8d..69b96e5bd7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
@@ -113,8 +113,12 @@ export default {
     // 获取制单日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.checkApply = year + '年' + month + '月'
     },
     init() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
index fc6ef48f5d..660f56315d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
@@ -119,8 +119,12 @@ export default {
     // 获取日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.collectionApply = year + '年' + month + '月'
     },
     showAdd(createOrgSid) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
index 21c8d24c4b..89467af237 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
@@ -120,8 +120,12 @@ export default {
     // 获取制单日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.checkApply = year + '年' + month + '月'
     },
     init() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue
index 3e0e3efbb4..a34f43c307 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue
@@ -115,8 +115,12 @@ export default {
     // 获取日期
     newDate() {
       let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
+      let year = date.getFullYear() // 本年
+      let month = date.getMonth() // 上一月
+      let day = date.getDate() // 本日
+      if (day > 6) {
+        month = date.getMonth() + 1 // 本月
+      }
       this.formobj.withApply = year + '年' + month + '月'
     },
     showAdd(createOrgSid) {