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 | 399 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 311 insertions(+), 88 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 072b703..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"
@@ -33,7 +33,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
</div>
</div>
<div class="layui-card-body">
@@ -68,52 +68,87 @@
<input type="text" class="layui-input" name="HBarCode" id="HBarCode">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">璁惧浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HEquipFileNumber" id="HEquipFileNumber">
- </div>
- </div>
</div>
<div class="layui-form-item">
<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="HEquipFileNo" id="HEquipFileNo" >
+ <input type="text" class="layui-input" name="HEquipFileNo" id="HEquipFileNo">
</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="HName" id="HName" >
+ <input type="text" class="layui-input" name="HName" id="HName">
</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="HModel" id="HModel" >
+ <input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">璁惧鍨嬪彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HModel2" id="HModel2" >
+ <input type="text" class="layui-input" name="HModel2" id="HModel2">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">瀵瑰簲ERP鐗╂枡</label>
+ <label class="layui-form-label">璁惧浠ｇ爜<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;">
- <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+ <input type="text" class="layui-input" name="HEquipFileNumber" id="HEquipFileNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">榛樿淇濆吇瑙勭▼</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEquipMaintainRuleInterName" id="HEquipMaintainRuleInterName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipMaintainRuleInterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧鍒嗙被</label>
+ <label class="layui-form-label">榛樿鐐规瑙勭▼</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HEquipDotCheckRuleInterName" id="HEquipDotCheckRuleInterName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璧勬簮</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float:left;width:150px;">
+ <input type="hidden" class="layui-input" name="HSourceID" id="HSourceID" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <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;">
+ <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧鍒嗙被<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HEquipFileTypeName" id="HEquipFileTypeName" style="float:left;width:150px;">
<input type="hidden" class="layui-input" name="HEquipFileTypeID" id="HEquipFileTypeID" style="float:left;width:150px;">
@@ -123,7 +158,7 @@
</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="HUnitName" id="HUnitName" style="float:left;width:150px;">
<input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="float:left;width:150px;">
@@ -132,9 +167,9 @@
</button>
</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="HSellSupName" id="HSellSupName" style="float:left;width:150px;">
<input type="hidden" class="layui-input" name="HSellSupID" id="HSellSupID" style="float:left;width:150px;">
@@ -146,7 +181,7 @@
</div>
<div class="layui-form-item">
<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="HDeptName" id="HDeptName" style="float:left;width:150px;">
<input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="float:left;width:150px;">
@@ -156,7 +191,7 @@
</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="HUseEmpName" id="HUseEmpName" style="float:left;width:150px;">
<input type="hidden" class="layui-input" name="HUseEmpID" id="HUseEmpID" style="float:left;width:150px;">
@@ -166,7 +201,7 @@
</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="HRepairEmpName" id="HRepairEmpName" style="float:left;width:150px;" y>
<input type="hidden" class="layui-input" name="HRepairEmpID" id="HRepairEmpID" style="float:left;width:150px;">
@@ -190,19 +225,19 @@
<div class="layui-inline">
<label class="layui-form-label">鍑哄巶鏃ユ湡</label>
<div class="layui-input-inline">
- <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px; width:185px;">
+ <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瀹夎鍦扮偣</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HAddress" id="HAddress" >
+ <input type="text" class="layui-input" name="HAddress" id="HAddress">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瀹夎鏃ユ湡</label>
<div class="layui-input-inline">
- <input type="date" class="layui-input" name="HSetupDate" id="HSetupDate" >
+ <input type="date" class="layui-input" name="HSetupDate" id="HSetupDate">
</div>
</div>
<div class="layui-inline">
@@ -233,8 +268,8 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璁惧鐘舵��</label>
- <div class="layui-input-block">
+ <label class="layui-form-label">璁惧鐘舵��<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
<select name="HStatus" lay-filter="aihao" id="HStatus">
<option value="绌洪棽" selected="selected">绌洪棽</option>
<option value="鍗犵敤">鍗犵敤</option>
@@ -245,8 +280,35 @@
</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>
</div>
+ </div>
<!--鍏朵粬淇℃伅-->
<!--<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -359,6 +421,7 @@
, util = layui.util
;
var sBillType = "3308";
+ $("#HMakeSupID").val(0);
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -385,7 +448,126 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
set_btnSave(data);
})
+ //閫�鍑烘寜閽�
+ form.on('submit(Exit)', function () {
+ if (linterid == undefined) {
+ Pub_Close(2);
+ }
+ else {
+ Pub_Close(1);
+ }
+ })
+ //璁惧淇濆吇瑙勭▼
+ form.on('submit(HEquipMaintainRuleInterList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧淇濆吇瑙勭▼',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipMaintainRuleInterName").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HEquipMaintainRuleInterID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //璁惧鐐规瑙勭▼
+ form.on('submit(HEquipDotCheckRuleInterList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧鐐规瑙勭▼',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../璁惧瑙勭▼鍗�/Sb_EquipDotCheckRuleList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipDotCheckRuleInterName").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HEquipDotCheckRuleInterID").val(checkStatus.data[0].hmainid);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //鐢熶骇璧勬簮
+ form.on('submit(HSourceList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢熶骇璧勬簮',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
//瀵瑰簲Erp鐗╂枡
form.on('submit(HMaterList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -396,9 +578,9 @@
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/PartInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -406,7 +588,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
$("#HMaterID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -429,7 +612,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鍣ㄥ叿鍒嗙被鍒楄〃',
+ title: '璁惧鍒嗙被鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -470,9 +653,9 @@
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/UnitInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -480,7 +663,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HUnitName").val(checkStatus.data[0].HName);
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
$("#HUnitID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -507,9 +690,9 @@
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/DeptInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -517,7 +700,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
$("#HDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -544,9 +727,9 @@
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/SupplierInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -554,7 +737,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSellSupName").val(checkStatus.data[0].HName);
+ $("#HSellSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
$("#HSellSupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -581,9 +764,9 @@
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/SupplierInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -591,7 +774,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HMakeSupName").val(checkStatus.data[0].HName);
+ $("#HMakeSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
$("#HMakeSupID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -614,13 +797,13 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '渚涘簲鍟嗗垪琛�',
+ title: '鑱屽憳鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -628,7 +811,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HUseEmpName").val(checkStatus.data[0].HName);
+ $("#HUseEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HUseEmpID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -651,13 +834,13 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '渚涘簲鍟嗗垪琛�',
+ title: '鑱屽憳鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
+ maxmin: true
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -665,8 +848,45 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HRepairEmpName").val(checkStatus.data[0].HName);
+ $("#HRepairEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
$("#HRepairEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //鎵�灞炰富鐢熶骇璁惧
+ 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) {
@@ -694,6 +914,8 @@
laydate.render({
elem: '#HOutComDate'
});
+ $("#HEquipMaintainRuleInterID").val(0);
+ $("#HEquipDotCheckRuleInterID").val(0);
}
//鏂板
@@ -748,8 +970,8 @@
$("#HUnitName").val(d.data[0].鍗曚綅);
$("#HEquipFileTypeID").val(d.data[0].HEquipFileTypeID);
$("#HEquipFileTypeName").val(d.data[0].璁惧绫诲瀷);
- $("#HOutComDate").val(d.data[0].璁惧鍑哄巶鏃ユ湡);
- $("#HSellSupID").val(d.data[0].HSupID);
+ $("#HOutComDate").val(formatDate(d.data[0].璁惧鍑哄巶鏃ユ湡));
+ $("#HSellSupID").val(d.data[0].HSellSupID);
$("#HSellSupName").val(d.data[0].渚涘簲鍟�);
$("#HMakeSupID").val(d.data[0].HMakeSupID);
$("#HMakeSupName").val(d.data[0].鍒堕�犲晢);
@@ -760,14 +982,23 @@
$("#HRepairEmpID").val(d.data[0].HRepairEmpID);
$("#HRepairEmpName").val(d.data[0].缁存姢璐熻矗浜�);
$("#HAddress").val(d.data[0].瀹夎鍦扮偣);
- $("#HSetupDate").val(d.data[0].瀹夎鏃ユ湡);
- $("#HStartupDate").val(d.data[0].杩愯寮�濮嬫棩鏈�);
+ $("#HSetupDate").val(formatDate(d.data[0].瀹夎鏃ユ湡));
+ $("#HStartupDate").val(formatDate(d.data[0].杩愯寮�濮嬫棩鏈�));
$("#HStatus").val(d.data[0].褰撳墠鐘舵��);
-
+ $("#HEquipDotCheckRuleInterID").val(d.data[0].HEquipDotCheckRuleInterID);
+ $("#HEquipDotCheckRuleInterName").val(d.data[0].榛樿鐐规瑙勭▼);
+ $("#HEquipMaintainRuleInterID").val(d.data[0].HEquipMaintainRuleInterID);
+ $("#HEquipMaintainRuleInterName").val(d.data[0].榛樿淇濆吇瑙勭▼);
$("#HProNum").val(d.data[0].宸ョ▼缂栫爜);
$("#HWorkArea").val(d.data[0].浜у湴);
$("#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");
}
});
}
@@ -809,13 +1040,13 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ 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 {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ location.reload();
}
});
}
@@ -843,11 +1074,11 @@
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 {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ location.reload();
}
});
@@ -863,15 +1094,6 @@
}
}
- //閫�鍑烘寜閽�
- form.on('submit(Exit)', function () {
- if (linterid == undefined) {
- Pub_Close(2);
- }
- else {
- Pub_Close(1);
- }
- })
});
function AllowLoadData() { //闈炵┖楠岃瘉
@@ -879,7 +1101,7 @@
if ($("#HEquipFileNo").val() == '' || $("#HEquipFileNo").val() == null) {
layer.msg("璁惧缂栧彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
- }
+ }
if ($("#HEquipFileNumber").val() == '' || $("#HEquipFileNumber").val() == null) {
layer.msg("璁惧浠ｇ爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -892,10 +1114,11 @@
layer.msg("璁惧瑙勬牸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
- layer.msg("璇烽�夋嫨瀵瑰簲ERP鐗╂枡锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //鍑礉涓嶉渶瑕�
+ //if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
+ // layer.msg("璇烽�夋嫨瀵瑰簲ERP鐗╂枡锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
if ($("#HEquipFileTypeID").val() == '' || $("#HEquipFileTypeID").val() == null) {
layer.msg("璇烽�夋嫨璁惧鍒嗙被锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
--
Gitblit v1.9.1