From 2be9019a81fa951dbeed12a9d9b27aa10feff4f3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 31 五月 2024 13:13:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 b26bbcd..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"
@@ -58,7 +58,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">淇濆吇鍛ㄦ湡</label>
+ <label class="layui-form-label" style="width: 85px;">淇濆吇鍛ㄦ湡<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
</div>
@@ -81,7 +81,7 @@
</div>
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁惧<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" lay-verify="HEquipName" name="HEquipName" id="HEquipName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
@@ -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