From ac5962f71fe0f4fd4e7e44fb74a02bba7ff816b4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 六月 2024 12:14:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 insertions(+), 4 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 1b0a674..a5b6e8b 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"
@@ -135,8 +135,9 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">瀵瑰簲ERP鐗╂枡
- <!--<label style="color:red"> * </label>-->
+ <label class="layui-form-label">
+ 瀵瑰簲ERP鐗╂枡
+ <!--<label style="color:red"> * </label>-->
</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
@@ -276,6 +277,33 @@
<option value="鍏虫満">鍏虫満</option>
<option value="寮傚父鍋滄満">寮傚父鍋滄満</option>
</select>
+ </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="HMacAddress" id="HMacAddress">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁涓荤敓浜ц澶�</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HMainSourceFlag" lay-filter="HMainSourceFlag" id="HMainSourceFlag">
+ <option value="鍚�" selected="selected">鍚�</option>
+ <option value="鏄�">鏄�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵�灞炰富鐢熶骇璁惧</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMainSourceName" id="HMainSourceName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HMainSourceID" id="HMainSourceID" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSourceList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
</div>
@@ -836,6 +864,43 @@
}
});
});
+
+ //鎵�灞炰富鐢熶骇璁惧
+ form.on('submit(HMainSourceList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '涓荤敓浜ц澶囧垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true
+ , content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HMainSourceName").val(checkStatus.data[0].璁惧鍚嶇О);
+ $("#HMainSourceID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
//#endregion
@@ -929,6 +994,10 @@
$("#HLogo").val(d.data[0].鍝佺墝);
$("#HSourceID").val(d.data[0].HSourceID);
$("#HSourceName").val(d.data[0].HSourceName);
+ $("#HMacAddress").val(d.data[0].鏁伴噰鐗╃悊鍦板潃);
+ $("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
+ $("#HMainSourcelD").val(d.data[0].HMainSourcelD);
+ $("#HMainSourceName").val(d.data[0].鎵�灞炰富鐢熶骇璁惧);
form.render("select");
}
});
@@ -973,7 +1042,7 @@
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
if (linterid == undefined) {
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
location.reload();
}
else {
@@ -1005,7 +1074,7 @@
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
if (linterid == undefined) {
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
location.reload();
}
else {
--
Gitblit v1.9.1