From cb3ef438f93b4663eca9740517e11fd48afa53ca Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 23 九月 2024 19:52:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html | 10 +++++
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 12 +++++
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 34 +++++++++++++++++
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 34 +++++++++++++++++
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 2
WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html | 2
7 files changed, 92 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
index 8bca499..cd1b5f0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
@@ -646,7 +646,7 @@
, "HMangerName": d.data[0].璐熻矗浜�
, "HRemark": d.data[0].琛ㄥご澶囨敞
//鍏朵粬淇℃伅
- , "hmakers": d.data[0].鍒跺崟浜�
+ , "hmaker": d.data[0].鍒跺崟浜�
, "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
, "hchecker": d.data[0].瀹℃牳浜�
, "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 4de8122..9bc42e3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -228,6 +228,12 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁翠慨鍙楃悊鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRepairAccepDate" id="HRepairAccepDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -913,6 +919,9 @@
laydate.render({
elem: '#HRepairEndDate'
});
+ laydate.render({
+ elem: '#HRepairAccepDate'
+ });
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -1006,6 +1015,7 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HRepairBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HRepairEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HRepairAccepDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
});
}
@@ -1065,7 +1075,7 @@
, "HMainSourceBillNo": data.HMainSourceBillNo
, "HMainSourceInterID": data.HMainSourceInterID
, "HMainSourceEntryID": data.HMainSourceEntryID
-
+ , "HRepairAccepDate": formatDate(data.缁翠慨鍙楃悊鏃ユ湡)
});
} else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index c4c02ab..b9208c0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -129,6 +129,32 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">瑕佹眰瀹屾垚鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" id="HRequestComDate" name="HRequestComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈�杩戜繚鍏绘ā鏁�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HRecentMainModule" lay-verify="HRecentMainModule" id="HRecentMainModule" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绱妯℃暟</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCumulativeModule" lay-verify="HCumulativeModule" id="HCumulativeModule" value="0" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏈鐢熶骇妯℃暟</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProductionModule" lay-verify="HProductionModule" id="HProductionModule" value="0" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
@@ -1016,6 +1042,9 @@
laydate.render({
elem: '#HEndDate'
});
+ laydate.render({
+ elem: '#HRequestComDate'
+ });
}
//鍒濆鍖栬〃鏍�
@@ -1127,6 +1156,7 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HRequestComDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
});
@@ -1162,6 +1192,10 @@
, "HMouldMaintainRuleInterNo": data.鍣ㄥ叿淇濆吇瑙勭▼
, "HMaintainLevID": data.HMaintainLevID
, "HMaintainLevName": data.淇濆吇绾у埆鍚嶇О
+ , "HRequestComDate": formatDate(data.瑕佹眰瀹屾垚鏃ユ湡)
+ , "HRecentMainModule": data.鏈�杩戜繚鍏绘ā鏁�
+ , "HCumulativeModule": data.绱妯℃暟
+ , "HProductionModule": data.鏈鐢熶骇妯℃暟
});
if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
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 ba77c7e..eec789e 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"
@@ -173,6 +173,36 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绱ф�ョ▼搴�</label>
+ <div class="layui-input-inline">
+ <select name="HUrgenLevel" lay-filter="HUrgenLevel" id="HUrgenLevel">
+ <option value="浣�" selected="selected">浣�</option>
+ <option value="涓�">涓�</option>
+ <option value="楂�">楂�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶ヤ慨绫诲埆</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRepairCategory" id="HRepairCategory" class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶ヤ慨浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HRepairer" id="HRepairer" class="layui-input" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁鏈変骇鑳藉奖鍝�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HIsCapacityImpact" id="HIsCapacityImpact" class="layui-input" value="">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -916,6 +946,10 @@
, "HMainSourceBillNo": data.HMainSourceBillNo
, "HMainSourceInterID": data.HMainSourceInterID
, "HMainSourceEntryID": data.HMainSourceEntryID
+ , "HRepairCategory": data.鎶ヤ慨绫诲埆
+ , "HUrgenLevel": data.绱ф�ョ▼搴�
+ , "HRepairer": data.鎶ヤ慨浜�
+ , "HIsCapacityImpact": data.鏄惁鏈変骇鑳藉奖鍝�
});
} 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 2809d20..332ac1c 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"
@@ -176,7 +176,7 @@
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HSellSupName" id="HSellSupName" style="float:left;width:150px;">
- <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index 8be3475..3559bc0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -1376,7 +1376,7 @@
"HCheckPostID": tableSub[i]["纭鑰呰鑹睮D"],
"HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
"HDotCheckType": tableSub[i]["鐐规绫诲瀷"],
- "HRelationID": tableSub[i]["HRelationID"],
+ "HRelationID": tableSub[i]["HRelationID"] == null ? "0" : tableSub[i]["HRelationID"],
"HRelationName": relationName,
"HCheckResult": "",
"HRemark": ""
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
index f60e65f..418eecd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
@@ -400,6 +400,8 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鏍规嵁鐢ㄦ埛甯﹀嚭閮ㄩ棬 宸ヤ綔涓績
+ get_UserList();
//鏌ヨ
get_Display(sWhere);
get_Display2(sWhere);
@@ -594,6 +596,14 @@
});
}
+ //鏍规嵁鐢ㄦ埛甯﹀嚭閮ㄩ棬 宸ヤ綔涓績
+ function get_UserList() {
+ $("#HDeptID").val(sessionStorage["HDeptID"] );
+ $("#HDeptName").val(sessionStorage["HDept"]);
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]);
+ $("#HCenterName").val(sessionStorage["HWorkCenter"]);
+ }
+
//杞﹂棿閫夋嫨椤甸潰
function btnHDeptID() {
layer.open({
--
Gitblit v1.9.1