From 96785ebcfe1bc9210f3d9d4056f4ec29fb60d810 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 02 四月 2026 10:58:22 +0800
Subject: [PATCH] 1
---
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 150 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 124 insertions(+), 26 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 2809d20..b663682 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>
@@ -176,7 +180,7 @@
<label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HSellSupName" id="HSellSupName" style="float:left;width:150px;">
- <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -279,6 +283,10 @@
<option value="鍗犵敤">鍗犵敤</option>
<option value="鍔犲伐">鍔犲伐</option>
<option value="鍏虫満">鍏虫満</option>
+ <option value="寮�鏈�">寮�鏈�</option>
+ <option value="鐢熶骇">鐢熶骇</option>
+ <option value="寰呮満">寰呮満</option>
+ <option value="鍋滄満">鍋滄満</option>
<option value="寮傚父鍋滄満">寮傚父鍋滄満</option>
</select>
</div>
@@ -289,6 +297,32 @@
<label class="layui-form-label">鏁伴噰鐗╃悊鍦板潃</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMacAddress" id="HMacAddress">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏁伴噰IP鍦板潃</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HIPAddress" id="HIPAddress">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鑱旂綉鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HLinkNETMode" id="HLinkNETMode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囬泦鏂瑰紡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCollectMode" id="HCollectMode">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囬泦绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCollectClass" id="HCollectClass">
</div>
</div>
<div class="layui-inline">
@@ -310,12 +344,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>
@@ -341,12 +382,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">
@@ -373,6 +409,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;">
@@ -381,7 +425,7 @@
</div>
</div>
</div>
- </div>-->
+ </div>
</div>
</div>
<div class="layui-tab" lay-filter="table">
@@ -473,7 +517,7 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
+ Organ();
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -481,6 +525,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";
@@ -825,7 +883,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HEquipFileTypeName").val(checkStatus.data[0].HName);
+ $("#HEquipFileTypeName").val(checkStatus.data[0].璁惧鍒嗙被鍚嶇О);
$("#HEquipFileTypeID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -890,7 +948,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1240,6 +1298,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) {
@@ -1274,6 +1355,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ async: false,
data: { "HBillType": sBillType },
success: function (d) {
$("#HInterID").val(d.data[0].HInterID);
@@ -1291,6 +1373,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
$.ajax({
url: GetWEBURL() + "/Gy_EquipFileMain/Gy_EquipFileCheckDetai",
+ async: false,
type: "GET",
data: {
"HInterID": linterid
@@ -1338,9 +1421,26 @@
$("#HSourceID").val(d.data[0].HSourceID);
$("#HSourceName").val(d.data[0].HSourceName);
$("#HMacAddress").val(d.data[0].鏁伴噰鐗╃悊鍦板潃);
+ $("#HIPAddress").val(d.data[0].鏁伴噰IP鍦板潃);
+ $("#HLinkNETMode").val(d.data[0].鑱旂綉鏂瑰紡);
+ $("#HCollectMode").val(d.data[0].閲囬泦鏂瑰紡);
+ $("#HCollectClass").val(d.data[0].閲囬泦绫诲瀷);
$("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
- $("#HMainSourcelD").val(d.data[0].HMainSourcelD);
+ $("#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");
}
});
@@ -1448,13 +1548,7 @@
success: function (data) {
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
- if (linterid == undefined) {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- location.reload();
- }
- else {
- location.reload();
- }
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
});
}
else {
@@ -1482,7 +1576,7 @@
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
if (linterid == undefined) {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- location.reload();
+ /* location.reload();//閲嶆柊鍔犺浇褰撳墠椤甸潰*/
}
else {
location.reload();
@@ -1554,6 +1648,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