SHA1
--- a/src/pages/PurchaseAdmin/PurchaseList/WorkingHours/index.js
+++ b/src/pages/PurchaseAdmin/PurchaseList/WorkingHours/index.js
@@ -177,7 +177,7 @@ function List(props) {
 
				     let params = [
			
 
				       {
			
 
				         type_id: Number(item.type_id),
			
 
				-        comment: '',
			
 
				+        comment: item.comment,
			
 
				         // 父级id
			
 
				         parent_type_id: allType[item.type_id].parent_id,
			
 
				         data: [
			
--- a/src/services/ReportDaily.js
+++ b/src/services/ReportDaily.js
@@ -232,6 +232,8 @@ export async function getHoliday(onProcess) {
 
				   let res,
			
 
				     days = {
			
 
				       '2023-07-07': 1,
			
 
				+      '2024-01-26': 1,
			
 
				+      '2024-02-09': 1,
			
 
				     };
			
 
				   res = await axios.get(
			
 
				     `https://www.mxnzp.com/api/holiday/list/year/${year}?ignoreHoliday=false&app_id=kf6mqlkirgupfcok&app_secret=MDRIVy83WTN4Q0lEaUZVMEFGejFWdz09`
نویسنده	SHA1 پیام	تاریخ
xujunjie	d75a8dda2e 日志时间过滤	1 سال پیش
xujunjie	eb81e3086f Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop	1 سال پیش
xujunjie	4bb33d2caf 年会日期过滤	1 سال پیش
Renxy	a9336e7508 修改保存后，不显示备注	1 سال پیش