From e192600a773d5b4afe4c5ad3d4a13773c0f61d29 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 26 五月 2025 09:18:31 +0800
Subject: [PATCH] 报表更新
---
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index fce8e8d..76bca7b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -122,7 +122,7 @@
<label class="layui-form-label">褰撳墠宸ュ簭:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
- <input id="HProcID" name="HProcID" type="hidden" />
+ <input id="HProcID" name="HProcID" value="0" type="hidden" />
</div>
</div>
</div>
@@ -131,7 +131,7 @@
<label class="layui-form-label">浜у搧浠g爜</label>
<div class="layui-input-inline">
<input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -161,7 +161,7 @@
<label class="layui-form-label">鐢熶骇璧勬簮</label>
<div class="layui-input-inline">
<input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -171,7 +171,7 @@
<label class="layui-form-label">鎿嶄綔鍛�:</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -192,8 +192,8 @@
<label class="layui-form-label">婧愬崟鍗曞彿</label>
<div class="layui-input-inline">
<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="">
+ <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="0">
<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -202,15 +202,15 @@
<div class="layui-inline" style="display:none">
<label class="layui-form-label">婧愬崟琛屽彿:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" autocomplete="off" disabled>
+ <input class="layui-input" name="HMainSourceEntryID" lay-verify="HMainSourceEntryID" id="HMainSourceEntryID" value="0" autocomplete="off" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐢熶骇璁㈠崟:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
- <input id="HICMOInterID" name="HICMOInterID" type="hidden" />
- <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
+ <input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0" />
+ <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0" />
</div>
</div>
</div>
@@ -219,7 +219,7 @@
<label class="layui-form-label">鐢熶骇鐝粍:</label>
<div class="layui-input-inline">
<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" id="HGroupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -229,7 +229,7 @@
<label class="layui-form-label">杞﹂棿:</label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -239,7 +239,7 @@
<label class="layui-form-label">鐢熶骇鐝:</label>
<div class="layui-input-inline">
<input type="text" name="HWorkShiftName" id="HWorkShiftName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HWorkShiftID" id="HWorkShiftID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWorkShiftID" id="HWorkShiftID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkShiftList" id="HWorkShiftLists" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -1130,6 +1130,8 @@
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == "HRelationBillNo") {
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1138,7 +1140,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID+'', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1148,7 +1150,7 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- if ($("#HMaterName").val() == checkStatus.data[0].浜у搧 && $("#HProcName").val() == checkStatus.data[0].宸ュ簭) {
+ if ($("#HSourceName").val() == checkStatus.data[0].鐢熶骇璧勬簮 && $("#HProcName").val() == checkStatus.data[0].宸ュ簭) {
obj.update({
"HProcExchInterID": checkStatus.data[0].hmainid
, "HProcExchEntryID": checkStatus.data[0].hsubid
@@ -1171,14 +1173,14 @@
})
}
else {
- return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐗╂枡涓庡伐搴�,璺熷綋鍓嶅伐鍗曚笉鍖归厤");
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
}
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
, end: function () {
- if ($("#HMaterName").val() == OptionData[0].浜у搧 && $("#HProcName").val() == OptionData[0].宸ュ簭) {
+ if ($("#HSourceName").val() == OptionData[0].鐢熶骇璧勬簮 && $("#HProcName").val() == OptionData[0].宸ュ簭) {
obj.update({
"HProcExchInterID": OptionData[0].hmainid
, "HProcExchEntryID": OptionData[0].hsubid
@@ -1200,7 +1202,7 @@
})
} else {
- return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐗╂枡涓庡伐搴�,璺熷綋鍓嶅伐鍗曚笉鍖归厤");
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
}
OptionData = [];
--
Gitblit v1.9.1