From 78fbcff2eabefedc9602424c77d96b97a5aa4cc6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 17 十一月 2025 11:39:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 98 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 84 insertions(+), 14 deletions(-)
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 89d4130..a5f3f40 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"
@@ -42,6 +42,10 @@
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li>鍒跺崟淇℃伅</li>
+ </ul>
<h1 style="text-align:center;"><b>璁惧妗ｆ</b></h1>
<!--鍩烘湰淇℃伅-->
<div class="layui-tab-content">
@@ -67,9 +71,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏉″舰鐮�</label>
+ <label class="layui-form-label">鏉″舰鐮�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBarCode" id="HBarCode">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode" value="">
</div>
</div>
</div>
@@ -336,12 +340,19 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浣跨敤缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
</div>
</div>
- </div>
- <!--鍏朵粬淇℃伅-->
- <!--<div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
@@ -367,12 +378,7 @@
<input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
+
</div>
<div class="layui-form-item">
<div class="layui-inline">
@@ -399,6 +405,14 @@
<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;">
@@ -407,7 +421,7 @@
</div>
</div>
</div>
- </div>-->
+ </div>
</div>
</div>
<div class="layui-tab" lay-filter="table">
@@ -499,7 +513,7 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
+ Organ();
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -507,6 +521,20 @@
if (OperationType == 1) {//鏃犳簮鍗�
Stverf = "Add";
set_AddFNew();
+ } else if (OperationType == 2) {//鏃犳簮鍗�
+ Stverf = "Add";
+ set_EditFromGrid();
+ set_AddFNew();
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val("");
+ $("#HChecker").val("");
+ $("#HCheckDate").val("");
+ $("#HUpDater").val("");
+ $("#HUpDateDate").val("");
+ $("#HCloseMan").val("");
+ $("#HCloseDate").val("");
+ $("#HDeleteMan").val("");
+ $("#HDeleteDate").val("");
}
else if (OperationType == 3) {//缂栬緫
Stverf = "Update";
@@ -1266,6 +1294,29 @@
})
}
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ async: false,
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//琛屽唴鍒犻櫎
function set_GridDelete(obj) {
@@ -1300,6 +1351,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": sBillType },
success: function (d) {
$("#HInterID").val(d.data[0].HInterID);
@@ -1317,6 +1369,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
$.ajax({
url: GetWEBURL() + "/Gy_EquipFileMain/Gy_EquipFileCheckDetai",
+ async: false,
type: "GET",
data: {
"HInterID": linterid
@@ -1371,6 +1424,19 @@
$("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
$("#HMainSourceID").val(d.data[0].HMainSourceID);
$("#HMainSourceName").val(d.data[0].鎵�灞炰富鐢熶骇璁惧);
+
+ $("#HUSEORGID").val(d.data[0].HUSEORGID);
+ $("#HMaker").val(d.data[0].鍒跺崟浜�);
+ $("#HMakeDate").val(d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd"));
+ $("#HChecker").val(d.data[0].瀹℃牳浜�);
+ $("#HCheckDate").val(d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd"));
+ $("#HUpDater").val(d.data[0].淇敼浜�);
+ $("#HUpDateDate").val(d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd"));
+ $("#HCloseMan").val(d.data[0].鍏抽棴浜�);
+ $("#HCloseDate").val(d.data[0].鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍏抽棴鏃ユ湡), "yyyy-MM-dd"));
+ $("#HDeleteMan").val(d.data[0].浣滃簾浜�);
+ $("#HDeleteDate").val(d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd"));
+
form.render("select");
}
});
@@ -1578,6 +1644,10 @@
layer.msg("璇烽�夋嫨璁惧鐘舵�侊紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HBarCode").val() == '' || $("#HBarCode").val() == null) {
+ layer.msg("璇疯緭鍏ユ潯褰㈢爜锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
return Result;
}
</script>
--
Gitblit v1.9.1