From c02a4fb2fab7eb54998633490fb5c410bb4f1151 Mon Sep 17 00:00:00 2001
From: "SGK\\17962" <1796293269@qq.com>
Date: Fri, 22 Aug 2025 17:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=90=A5=E9=94=80=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E5=BD=95=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cds-fontend-2025.V1/src/views/mps/market/index.vue | 6 +++---
.../views/mps/market/modules/market-operate-drawer.vue | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cds-fontend-2025.V1/src/views/mps/market/index.vue b/cds-fontend-2025.V1/src/views/mps/market/index.vue
index 35e3c9f..4c228d5 100644
--- a/cds-fontend-2025.V1/src/views/mps/market/index.vue
+++ b/cds-fontend-2025.V1/src/views/mps/market/index.vue
@@ -401,9 +401,9 @@ const {
};
// 只有当checkType为'9'时才显示编辑按钮
- // if (row.checkFlag !== '9') {
- // return null;
- // }
+ if (row.checkFlag !== '9') {
+ return null;
+ }
return (
{editBtn()}
diff --git a/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue b/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue
index 1b3aa1f..2d0abff 100644
--- a/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue
+++ b/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue
@@ -530,18 +530,18 @@ function getDateRange() {
if (props.operateType === 'add') {
// 新增时限制为当月
const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
- const endOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+ // const endOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0);
return {
startDate: startOfMonth.getTime(),
- endDate: endOfMonth.getTime()
+ endDate: now
};
} else {
// 修改时限制为上月+本月
const startOfLastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
- const endOfLastMonth = new Date(now.getFullYear(), now.getMonth()+1, 0);
+ // const endOfLastMonth = new Date(now.getFullYear(), now.getMonth()+1, 0);
return {
startDate: startOfLastMonth.getTime(),
- endDate: endOfLastMonth.getTime()
+ endDate: now
};
}
}