From 24cf0b6db81cf1cad07d26c9bfbf12564681e7a3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 四月 2024 11:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index 38e8fa5..3c8ba1d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -113,10 +113,10 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�3澶╁墠
const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
.toISOString()
.replace('T', ' ')
@@ -129,7 +129,7 @@
addListener(xGrid.value,gridOptions)
})
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+//绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
@@ -546,7 +546,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
case 'copyAll' :{
@@ -560,7 +559,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
case 'clearChecked' :{
@@ -573,7 +571,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
}
--
Gitblit v1.8.0