From cbd3c6396a01e2f78ed4dc82154cdb913abecfa7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 22 十月 2025 08:40:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 128 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 113 insertions(+), 15 deletions(-)
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 bdaab34..1399610 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"
@@ -35,11 +35,11 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <!--<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>-->
- <!--<li>鍏朵粬淇℃伅</li>-->
- <!--</ul>-->
<h1 style="text-align: center; padding: 10px 0;"><b>璁惧缁翠慨楠屾敹鍗�</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
@@ -119,7 +119,10 @@
<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;">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" 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>
@@ -144,6 +147,76 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -263,7 +336,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -377,7 +450,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes']
+ , content: ['../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -476,7 +549,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/Sb_EqpMaintenanceBillList.html', 'yes'],
+ content: ['../璁惧绠＄悊/Sb_EqpMaintenanceBillList.html?type=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -488,6 +561,14 @@
}
$("#HMouldRepairWorkName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldRepairWorkID").val(checkStatus.data[0].hmainid);
+ $("#HEquipID").val(checkStatus.data[0].HEquipID);
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].璐熻矗浜�);
+
+ $("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
+ $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -624,8 +705,21 @@
, "HCheckResult": data.楠屾敹缁撹 //楠屾敹缁撹
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
- , "HMouldRepairWorkID": data.HMouldRepairWorkID //澶囨敞
- , "HMouldRepairWorkName": data.HMouldRepairWorkNo //澶囨敞
+ , "HMouldRepairWorkID": data.HMouldRepairWorkID //缁翠慨璁板綍鍐呯爜
+ , "HMouldRepairWorkName": data.HMouldRepairWorkNo //缁翠慨璁板綍
+ , "HMainSourceBillNo": data.HMouldRepairWorkNo //缁翠慨璁板綍鍗�
+ , "HMainSourceInterID": data.HMouldRepairWorkID //缁翠慨璁板綍鍐呯爜
+ , "HMainSourceEntryID": data.HMouldRepairWorkEntryID //缁翠慨璁板綍瀛愬唴鐮�
+ , "HMaker": data.鍒跺崟浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "HChecker": data.瀹℃牳浜�
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "HUpDater": data.淇敼浜�
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+ , "HDeleteMan": data.浣滃簾浜�
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
@@ -739,7 +833,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -752,7 +846,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HRepairCheckID: checkStatus.data[0].HItemID,
+ HRepairCheckID: checkStatus.data[0].hitemid,
HRepairCheckCode: checkStatus.data[0].缁翠慨楠屾敹椤圭洰浠ｇ爜,
HRepairCheckName: checkStatus.data[0].缁翠慨楠屾敹椤圭洰,
});
@@ -767,7 +861,7 @@
if (OptionData.length > 0) {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- HRepairCheckID: OptionData[0].HItemID,
+ HRepairCheckID: OptionData[0].hitemid,
HRepairCheckCode: OptionData[0].缁翠慨楠屾敹椤圭洰浠ｇ爜,
HRepairCheckName: OptionData[0].缁翠慨楠屾敹椤圭洰,
});
@@ -863,8 +957,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 == "") {
@@ -913,7 +1011,7 @@
function GetGy_RepairCheckListValue(obj) {
OptionData = obj;
}
-
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1