From da888727ba7d84afa1daea2e1a56f00e5d27dbb1 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 25 一月 2024 08:39:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/项目管理/周计划/PM_WorkTaskWeekBill.html | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBill.html"
index 883a53e..95f64e9 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\221\250\350\256\241\345\210\222/PM_WorkTaskWeekBill.html"
@@ -816,12 +816,16 @@
// 濡傛灉鍒氬ソ鏄涓�鍛�
if (weekNo == 1) {
// 鍦ㄥ師鏂囨。杩涜浜嗕慨鏀�
- fistday = addDate(one_fistday, 7);
- lastday = addDate(one_lastday, 7);
+ //fistday = addDate(one_fistday, 7);
+ //lastday = addDate(one_lastday, 7);
+ fistday = one_fistday;
+ lastday = one_lastday;
} else {
// 鍦ㄥ師鏂囨。杩涜浜嗕慨鏀�
- fistday = addDate(one_lastday, (weekNo - 1) * 7 + 1);
- lastday = addDate(one_lastday, weekNo * 7);
+ //fistday = addDate(one_lastday, (weekNo - 1) * 7 + 1);
+ //lastday = addDate(one_lastday, weekNo * 7);
+ fistday = addDate(one_fistday, (weekNo - 1) * 7);
+ lastday = addDate(one_lastday, (weekNo - 1) * 7);
}
console.log(fistday, lastday);
return [fistday, lastday];
--
Gitblit v1.9.1