From 5a41caded26a3b4a5aeb9cbcd83ba4fcf60fd3ee Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 10 十一月 2025 16:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
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 ec1bbeb..417308b 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"
@@ -110,7 +110,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缁翠慨椤圭洰<label style="color:red"> * </label></label>
+ <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="0" style="float:left;width:150px;">
@@ -366,6 +366,7 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var HMainSourceBillNo = params[params[3]];
}
layui.config({
@@ -414,6 +415,9 @@
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
+ }
+ else if (OperationType == 4) {//涓嬫帹
+ setInit_PushBill();
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -999,16 +1003,16 @@
var data = result.data.h_v_Sb_EquipRepairWorkBill_Edit[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
+ , "HDate": formatDate(data.鏃ユ湡, "yyyy-MM-dd")
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HEmpID": data.HEmpID //缁翠慨浜篒D
, "HEmpName": data.缁翠慨浜� //缁翠慨浜�
- , "HRepairBeginDate": formatDate(data.缁翠慨寮�濮嬫棩鏈�) //缁翠慨寮�濮嬫棩鏈�
+ , "HRepairBeginDate": formatDate(data.缁翠慨寮�濮嬫棩鏈�, "yyyy-MM-dd") //缁翠慨寮�濮嬫棩鏈�
, "HEquipID": data.HEquipID //璁惧ID
, "HEquipName": data.璁惧鍚嶇О //璁惧鍚嶇О
, "HManagerID": data.HManagerID //璐熻矗浜篒D
, "HManagerName": data.璐熻矗浜� //璐熻矗浜哄悕绉�
- , "HRepairEndDate": formatDate(data.缁翠慨缁撴潫鏃ユ湡) //缁翠慨缁撴潫鏃ユ湡
+ , "HRepairEndDate": formatDate(data.缁翠慨缁撴潫鏃ユ湡, "yyyy-MM-dd") //缁翠慨缁撴潫鏃ユ湡
, "HRepairID": data.HRepairID //缁翠慨椤圭洰ID
, "HRepairName": data.缁翠慨椤圭洰 //缁翠慨椤圭洰鍚嶇О
, "HDeptID": data.HDeptID //缁翠慨閮ㄩ棬ID
@@ -1028,15 +1032,15 @@
, "HRepairer": data.鎶ヤ慨浜�
, "HIsCapacityImpact": data.鏄惁鏈変骇鑳藉奖鍝�
, "HMaker": data.鍒跺崟浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : formatDate(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
, "HChecker": data.瀹℃牳浜�
- , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : formatDate(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
, "HUpDater": data.淇敼浜�
- , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : formatDate(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
, "HCloseMan": data.鍏抽棴浜�
- , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+ , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : formatDate(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
, "HDeleteMan": data.浣滃簾浜�
- , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : formatDate(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
} else {
@@ -1233,6 +1237,57 @@
});
}
}
+
+ //#region 涓嬫帹椤甸潰鍒濆鍖�
+ function setInit_PushBill() {
+ //鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
+ get_MAXNum();
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭缁翠慨浜篒D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭缁翠慨浜�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+ $("#HManagerID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜篒D
+ $("#HManagerName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜�
+ $("#HMainSourceBillType").val() == "璁惧缁翠慨鐧昏鍗�";
+ $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+ $("#HMainSourceBillNo").val(HMainSourceBillNo);
+ document.getElementById('HMainSourceBillNo').style.backgroundColor = '#efefef4d';
+ //鎸夐�夊崟鍙峰姞杞借〃浣撴暟鎹�
+ $.ajax({
+ url: GetWEBURL() + 'Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillSubByHMainSourceBillNo',
+ type: "GET",
+ data: { "HMainSourceBillNo": HMainSourceBillNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var EndData = result.data;
+
+ $("#HMainSourceInterID").val(EndData[0].hmainid);
+ $("#HMainSourceEntryID").val(EndData[0].hsubid);
+ // 鍥炲～璁惧淇℃伅
+ $("#HEquipName").val(EndData[0].璁惧鍚嶇О);
+ $("#HEquipID").val(EndData[0].HEquipID);
+
+
+ if (EndData && EndData.length > 0) {
+ // 缁翠慨淇℃伅琛ㄦ牸
+ option.data = EndData; // 浣跨敤鑾峰彇鐨勬暟鎹�
+ table.render(option);
+
+
+ option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" }];
+
+ table.render(option1);
+ }
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
// 琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�1 閰嶄欢
function set_GridCellCheck1(obj) {
@@ -1475,10 +1530,10 @@
layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if ($("#HRepairName").val() == '') {
- layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HRepairName").val() == '') {
+ // layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
//鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
var reg = /^\d+(\.\d+)?$/;
if (reg.test($("#HPlanTimes").val()) == false || $("#HPlanTimes").val() == '') {
--
Gitblit v1.9.1