From 2a7f42931793527ceebfbc2eb9f4b7525084f764 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 28 五月 2025 13:45:13 +0800
Subject: [PATCH] 开工单停工单完工单优化，技能考核优化
---
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 104 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 95 insertions(+), 9 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 76bca7b..c1f3299 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"
@@ -273,19 +273,19 @@
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">淇敼鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
</div>
</div>
</div>
@@ -307,13 +307,13 @@
<div class="layui-inline">
<label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" disabled>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">浣滃簾鏃ユ湡:</label>
<div class="layui-input-inline">
- <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+ <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd"disabled>
</div>
</div>
</div>
@@ -1060,7 +1060,7 @@
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', style: 'background-color: #f9f9f9;' }
, { field: 'HProcExchInterID', title: '宸ュ簭娴佽浆鍗″唴鐮�', hide: true }
, { field: 'HProcExchEntryID', title: '宸ュ簭娴佽浆鍗″瓙鍐呯爜', hide: true }
- , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', templet: "#HProcExchInterID" }
+ , { field: 'HProcExchBillNo', title: '宸ュ簭娴佽浆鍗″彿', templet: "#HProcExchInterID", style: 'background-color: #f9f9f9;' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true }
, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true }
@@ -1132,6 +1132,7 @@
if (obj.event == "HRelationBillNo") {
var HProcID = $("#HProcID").val();
var HSourceID = $("#HSourceID").val();
+ var HMaterID = $("#HMaterID").val();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1140,7 +1141,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID+'', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID + '&HMaterID=' + HMaterID, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1243,6 +1244,91 @@
, btn2: function (index, layero) { }
, end: function () {
+ }
+ })
+ }
+ obj.event = "";
+ return false;
+ }
+ if (event.key == "F6") {
+ if (obj.event == "HRelationBillNo") {
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ var HMaterID = $("#HMaterID").val();
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鍓骇璁″垝鍗�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ if ($("#HSourceName").val() == checkStatus.data[0].鐢熶骇璧勬簮 && $("#HProcName").val() == checkStatus.data[0].宸ュ簭) {
+ obj.update({
+ "HProcExchInterID": checkStatus.data[0].hmainid
+ , "HProcExchEntryID": checkStatus.data[0].hsubid
+ , "HProcExchBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ , "HRelationBillInterID": checkStatus.data[0].hmainid
+ , "HRelationBillEntryID": checkStatus.data[0].hsubid
+ , "HRelationBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ , "HICMOInterID": checkStatus.data[0].hicmointerid
+ , "HICMOEntryID": checkStatus.data[0].HICMOEntryID
+ , "HICMOBillNo": checkStatus.data[0].鐢熶骇璁㈠崟鍙�
+ , "HMaterID": checkStatus.data[0].HMaterID
+ , "HMaterName": checkStatus.data[0].浜у搧
+ , "HProcID": checkStatus.data[0].HProcID
+ , "HProcName": checkStatus.data[0].宸ュ簭
+ , "HSourceInterID": checkStatus.data[0].hmainid
+ , "HSourceEntryID": checkStatus.data[0].hsubid
+ , "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�
+ , "HSourceBillType": 3772
+
+ })
+ }
+ else {
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
+ }
+
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ , end: function () {
+ if ($("#HSourceName").val() == OptionData[0].鐢熶骇璧勬簮 && $("#HProcName").val() == OptionData[0].宸ュ簭) {
+ obj.update({
+ "HProcExchInterID": OptionData[0].hmainid
+ , "HProcExchEntryID": OptionData[0].hsubid
+ , "HProcExchBillNo": OptionData[0].鍗曟嵁鍙�
+ , "HRelationBillInterID": OptionData[0].hmainid
+ , "HRelationBillEntryID": OptionData[0].hsubid
+ , "HRelationBillNo": OptionData[0].鍗曟嵁鍙�
+ , "HICMOInterID": OptionData[0].hicmointerid
+ , "HICMOEntryID": OptionData[0].HICMOEntryID
+ , "HICMOBillNo": OptionData[0].鐢熶骇璁㈠崟鍙�
+ , "HMaterID": OptionData[0].HMaterID
+ , "HMaterName": OptionData[0].浜у搧
+ , "HProcID": OptionData[0].HProcID
+ , "HProcName": OptionData[0].宸ュ簭
+ , "HSourceInterID": OptionData[0].hmainid
+ , "HSourceEntryID": OptionData[0].hsubid
+ , "HSourceBillNo": OptionData[0].鍗曟嵁鍙�
+ , "HSourceBillType": 3772
+
+ })
+ } else {
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
+ }
+
+ OptionData = [];
}
})
}
@@ -1472,8 +1558,8 @@
//鐢熶骇鐝
function GetHWorkShiftsValue(obj) {
- $("#HWorkShiftID").val(obj[0].HInterID); //褰撳墠宸ュ簭ID
- $("#HWorkShiftName").val(obj[0].鐝鍚嶇О); //褰撳墠宸ュ簭
+ $("#HWorkShiftID").val(obj[0].HInterID); //褰撳墠鐝
+ $("#HWorkShiftName").val(obj[0].鐝鍚嶇О); //褰撳墠鐝鍚嶇О
}
function GetSwipeCardStart(obj) {
--
Gitblit v1.9.1