From dea35c2c9c4ca4980a5137075d400273ec943742 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 07 五月 2024 14:07:19 +0800
Subject: [PATCH] 网页版：模块测试以及功能完善（新增修改删除审核反审核功能测试，必录项目测试并页面标记，原单下推和选择原单功能测试） 设备档案、设备分类 设备保养规程、设备点检规程 设备保养计划-》设备保养记录（流程测试并完善流程，关联数量，反写关闭等功能测试） 设备点检计划-》设备点检记录（流程测试并完善流程，关联数量，反写关闭等功能测试） 设备故障登记-》设备维修记录单-》设备维修验收单（流程测试并完善流程，关联数量，反写关闭等功能测试）
---
WebTM/views/设备管理/Sb_EqpRepairCheckBillList.html | 5
WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html | 54 +++++-----
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleEdit.html | 5
WebTM/views/设备管理/设备规程单/Sb_EquipMaintainRuleList.html | 41 ++++----
WebTM/views/设备管理/Sb_EquipMaintainBillList.html | 58 +++++------
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleEdit.html | 11 +
WebTM/Files/XMJDHB00000319/帅威验收.jpg | 0
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 4
WebTM/views/设备管理/设备规程单/Sb_EquipDotCheckRuleList.html | 7
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html | 17 +-
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 2
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 4
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html | 8 -
WebTM/views/基础资料/公用基础资料/Gy_EquipType.html | 13 ++
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 12 +
WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html | 10 +
WebTM/views/设备管理/Sb_EqpMaintenanceBillList.html | 7
WebTM/views/设备管理/Sb_EqpConkBookBillList.html | 7
WebTM/Properties/PublishProfiles/JFTM.pubxml | 2
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 2
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 4
21 files changed, 149 insertions(+), 124 deletions(-)
diff --git "a/WebTM/Files/XMJDHB00000319/\345\270\205\345\250\201\351\252\214\346\224\266.jpg" "b/WebTM/Files/XMJDHB00000319/\345\270\205\345\250\201\351\252\214\346\224\266.jpg"
new file mode 100644
index 0000000..57b5c5e
--- /dev/null
+++ "b/WebTM/Files/XMJDHB00000319/\345\270\205\345\250\201\351\252\214\346\224\266.jpg"
Binary files differ
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml b/WebTM/Properties/PublishProfiles/JFTM.pubxml
index 79d8489..70a8712 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\LAYUI</PublishUrl>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipType.html"
index 3dc4a37..32e36bc 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipType.html"
@@ -125,6 +125,7 @@
break;
//鍙嶅叧闂�
case 'set_CancelCloseBill': set_CloseBill(2);
+ break;
//绂佺敤鎸夐挳
case 'btn-Stop':
set_De_Stop(0);
@@ -132,7 +133,6 @@
//鍙嶇鐢ㄦ寜閽�
case 'btn-DeStop':
set_De_Stop(1);
- break;
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
@@ -205,7 +205,15 @@
, { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200, sort: true}
, { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200, sort: true}
, { field: 'HRemark', title: '澶囨敞', width: 200, sort: true}
- , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200, sort: true}
+ , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200, sort: true }
+ , { field: 'HMakeEmp', title: '鍒跺崟浜�', sort: true }
+ , { field: 'HMakeTime', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.HMakeTime ==null ?'':layui.util.toDateString(d.HMakeTime, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: 'HCheckEmp', title: '瀹℃牳浜�', sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.HCheckTime ==null ?'':layui.util.toDateString(d.HCheckTime, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: 'HModifyEmp', title: '淇敼浜�', sort: true }
+ , { field: 'HModifyTime', title: '淇敼鏃ユ湡', templet: "<div>{{d.HModifyTime ==null ?'':layui.util.toDateString(d.HModifyTime, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: 'HCloseEmp', title: '鍏抽棴浜�', sort: true }
+ , { field: 'HCloseTime', title: '鍏抽棴鏃ユ湡', templet: "<div>{{d.HCloseTime ==null ?'':layui.util.toDateString(d.HCloseTime, 'yyyy-MM-dd')}}</div>", sort: true }
]]
};
}
@@ -389,6 +397,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 36484ee..c8b07de 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -113,7 +113,7 @@
<label class="layui-form-label">缁翠慨椤圭洰<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HRepairName" id="HRepairName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="RepairItemList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -519,7 +519,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HRepairName").val(checkStatus.data[0].缁翠慨椤圭洰);
- $("#HRepairID").val(checkStatus.data[0].HItemID);
+ $("#HRepairID").val(checkStatus.data[0].hitemid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 9b8fe05..e57a020 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -119,7 +119,7 @@
<label class="layui-form-label">缁翠慨璁板綍<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMouldRepairWorkName" id="HMouldRepairWorkName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldRepairWorkID" id="HMouldRepairWorkID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldRepairWorkID" id="HMouldRepairWorkID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldRepairWork" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -752,7 +752,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HRepairCheckID: checkStatus.data[0].HItemID,
+ HRepairCheckID: checkStatus.data[0].hitemid,
HRepairCheckCode: checkStatus.data[0].缁翠慨楠屾敹椤圭洰浠ｇ爜,
HRepairCheckName: checkStatus.data[0].缁翠慨楠屾敹椤圭洰,
});
@@ -767,7 +767,7 @@
if (OptionData.length > 0) {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- HRepairCheckID: OptionData[0].HItemID,
+ HRepairCheckID: OptionData[0].hitemid,
HRepairCheckCode: OptionData[0].缁翠慨楠屾敹椤圭洰浠ｇ爜,
HRepairCheckName: OptionData[0].缁翠慨楠屾敹椤圭洰,
});
@@ -863,8 +863,12 @@
layer.msg("鏃ユ湡涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
+ if ($("#HMouldRepairWorkID").val() == '0') {
+ layer.msg("缁翠慨璁板綍涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//鍒ゆ柇鐗╂枡鏄庣粏椤�
- if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+ if (typeof (sSubStr) != "undefined" || sSubStr != "" || sSubStr != "[]") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
if (sSubStr[i].HRepairCheckID == "" || sSubStr[i].HDotCheckItemID == "") {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
index 816dc49..c53c38f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
@@ -417,7 +417,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -470,7 +470,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 780
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -588,7 +588,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- //get_FastQuery();
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
@@ -621,6 +621,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
index a547ec4..dea58da 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
@@ -289,7 +289,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -416,7 +416,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 780
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -616,7 +616,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- //get_FastQuery();
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
@@ -649,6 +649,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
index a5a5f96..6af4bf4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
@@ -236,7 +236,7 @@
//鍒濆鍖栬〃鏍�(涓昏〃)
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -493,7 +493,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- //get_FastQuery();
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
@@ -526,6 +526,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 71cf943..441ee77 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -408,7 +408,7 @@
return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
}
$("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
- $("#HPlanNo").val(checkStatus.data[0].hmainid);
+ $("#HPlanNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HEquipDotCheckPlanInterID").val(checkStatus.data[0].hmainid);
//$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
//$("#HEquipID").val(checkStatus.data[0].璁惧ID);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index 4aba6b7..c64c2a7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -55,11 +55,6 @@
</div>
</div>
<div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">寮�濮嬫椂闂�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" name="BenginHCreateDate" id="BenginHCreateDate">
@@ -274,7 +269,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -635,6 +630,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index c3e7b18..f7c9ee2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -53,14 +53,14 @@
</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>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍛ㄦ湡鍗曚綅</label>
- <div class="layui-input-block" style="margin-left: 120px;width: 185px;" ">
+ <div class="layui-input-block" style="margin-left: 120px;width: 185px;">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
@@ -76,7 +76,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">
@@ -790,6 +790,10 @@
layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HCheckCycle").val() == '' || $("#HCheckCycle").val() == '0') {
+ layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index 9881bb6..bcda536 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -250,7 +250,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -307,8 +307,8 @@
, { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200, sort: true }
, { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, sort: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true, sort: true }
- , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
- , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200, sort: true }
, { field: '鐐规鍛ㄦ湡', title: '鐐规鍛ㄦ湡', width: 200, sort: true }
, { field: '鎽樿', title: '鎽樿', width: 200, sort: true }
@@ -325,15 +325,15 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200, sort: true }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true, sort: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true, sort: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200, sort: true }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true, sort: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200, sort: true }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true, sort: true }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true, sort: true }
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true, sort: true }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200, sort: true }
@@ -511,6 +511,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 6e7f173..55c80f2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -64,7 +64,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧</label>
+ <label class="layui-form-label">璁惧<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="hidden" name="HEquipID" id="HEquipID" class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HEquipName" id="HEquipName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index f3de829..fae5674 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -286,29 +286,6 @@
};
});
- //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
- table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
- var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
- var linterid = datas.hmainid;
- $.ajax({
- url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
- type: "GET",
- data: { "HInterID": linterid },
- success: function (data1) {
- if (data1.count == 1) {
- option1.data = data1.list[0];
- table1.render(option1);
- option2.data = data1.list[1];
- table2.render(option2);
- } else {
- layer.alert("鑾峰彇澶辫触", { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
- });
-
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -331,7 +308,7 @@
//鍒濆鍖栬〃鏍�(瀛愯〃2)
set_InitGrid2();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -374,15 +351,15 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>", hide: true }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
@@ -408,6 +385,26 @@
layui.each(table.cache.mainTable, function (i, l) {
if (obj.tr.index() == l.LAY_TABLE_INDEX) {
l.LAY_CHECKED = flag;
+ }
+ });
+
+ var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ var linterid = datas.hmainid;
+ $.ajax({
+ url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option1.data = data1.list[0];
+ table1.render(option1);
+ option2.data = data1.list[1];
+ table2.render(option2);
+ } else {
+ layer.alert("鑾峰彇澶辫触", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
})
@@ -697,6 +694,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
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 42738a6..2a1556b 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">
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index 0b6ff1f..2f3c30b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -248,8 +248,24 @@
};
});
- //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
- table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
var linterid = datas.hmainid;
$.ajax({
@@ -267,25 +283,6 @@
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
- });
-
- table.on('row(mainTable)', function (obj) {
- //閫変腑琛屾敼鍙橀鑹�
- var flag = !obj.tr.find(':checkbox:first').prop('checked');
- obj.tr.find(':checkbox').prop('checked', flag);
- if (flag) {
- obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
- } else {
- obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
- }
- //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
- layui.each(table.cache.mainTable, function (i, l) {
- if (obj.tr.index() == l.LAY_TABLE_INDEX) {
- l.LAY_CHECKED = flag;
}
});
})
@@ -314,7 +311,7 @@
//鍒濆鍖栬〃鏍�(瀛愯〃2)
set_InitGrid2();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -341,21 +338,21 @@
, { field: 'HEquipID', title: '璁惧ID', width: 160, hide: true, sort: true }
, { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200, sort: true }
, { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, sort: true }
- , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
- , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200, sort: true }
, { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200, sort: true }
, { field: '鎽樿', title: '鎽樿', width: 200, sort: true }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200, sort: true }
, { field: '澶囨敞', title: '澶囨敞', width: 200, sort: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, sort: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200, sort: true }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '淇敼浜�', title: '淇敼浜�', width: 200, sort: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200, sort: true }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, sort: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true, sort: true }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true, sort: true }
, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true, sort: true }
@@ -600,6 +597,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index fd2548b..1b0a674 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -135,7 +135,9 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">瀵瑰簲ERP鐗╂枡<label style="color:red"> * </label></label>
+ <label class="layui-form-label">瀵瑰簲ERP鐗╂枡
+ <!--<label style="color:red"> * </label>-->
+ </label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="float:left;width:150px;">
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
index 24b8aaa..7f91ef2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleEdit.html"
@@ -76,9 +76,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐐规鍛ㄦ湡</label>
+ <label class="layui-form-label">鐐规鍛ㄦ湡 <label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle">
+ <input class="layui-input" name="HCheckCycle" lay-verify="HCheckCycle" id="HCheckCycle" value="">
</div>
</div>
<div class="layui-inline">
@@ -538,6 +538,13 @@
//淇濆瓨
function set_btnSave(data) {
+
+ var HCheckCycle = $("#HCheckCycle").val();
+
+ if (HCheckCycle == "") {
+ return layer.msg("鐐规鍛ㄦ湡涓嶈兘涓虹┖!");
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
index aad991d..3808aa5 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipDotCheckRuleList.html"
@@ -260,10 +260,10 @@
$("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
- set_InitGrid();
+ //set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -362,7 +362,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 780
, page: true
, totalRow: true
, cellMinWidth: 90
@@ -579,6 +579,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
index e790a08..8361bcd 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleEdit.html"
@@ -71,7 +71,10 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇鍛ㄦ湡</label>
+ <label class="layui-form-label">
+ 淇濆吇鍛ㄦ湡
+ <label style="color:red"> * </label>
+ </label>
<div class="layui-input-inline">
<input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
</div>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
index 667c73d..2e533ea 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\350\247\204\347\250\213\345\215\225/Sb_EquipMaintainRuleList.html"
@@ -267,7 +267,24 @@
});
//鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
- table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
var linterid = datas.hmainid;
$.ajax({
@@ -285,25 +302,6 @@
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
- });
-
- table.on('row(mainTable)', function (obj) {
- //閫変腑琛屾敼鍙橀鑹�
- var flag = !obj.tr.find(':checkbox:first').prop('checked');
- obj.tr.find(':checkbox').prop('checked', flag);
- if (flag) {
- obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
- } else {
- obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
- }
- //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
- layui.each(table.cache.mainTable, function (i, l) {
- if (obj.tr.index() == l.LAY_TABLE_INDEX) {
- l.LAY_CHECKED = flag;
}
});
})
@@ -338,7 +336,7 @@
//鍒濆鍖栬〃鏍�(瀛愯〃2)
set_InitGrid2();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -670,6 +668,7 @@
data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
+ get_FastQuery();
layer.msg(result.Message, { icon: 1 });
layer.close(wait);
} else {
--
Gitblit v1.9.1