From 77eb93df88b4e6106891c8c59b97d519cf6b416a Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 27 五月 2024 17:26:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index 2f0edf0..d013651 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -589,6 +589,7 @@
, { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
, { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
, { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
+ , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
];
@@ -648,7 +649,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "","HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
table.render(option_plan);
}
//缂栬緫鑾峰彇琛ㄥご
@@ -789,7 +790,7 @@
for (let i = 0; i < data.length; i++) {
rowdata.push(
{
- "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
+ "HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
, "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
}
)
@@ -937,7 +938,7 @@
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
- }
+ }
if (checkStatus.data.length === 1) {
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
--
Gitblit v1.9.1