From d0c4ee2d8acfca9c216acb9ee043be0112751069 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 19 一月 2024 12:22:43 +0800
Subject: [PATCH] 销售出库单维护列表：第一次加载没有按照时间进行过滤问题解决
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 245 +++++++++++++++++++++++++++++++-----------------
1 files changed, 156 insertions(+), 89 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 24b4277..c814326 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -121,7 +121,7 @@
<div class="layui-inline">
<label class="layui-form-label">涓婚:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off">
+ <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px">
</div>
</div>
</div>
@@ -136,29 +136,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙戦�侀儴闂�:</label>
- <div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" 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">
- <div class="layui-inline">
- <label class="layui-form-label">绱ф�ョ▼搴�:</label>
- <div class="layui-input-inline">
- <select name="HLevel" lay-filter="HLevel" id="HLevel">
- <option value="0" selected="selected">鏅��</option>
- <option value="1">绱ф��</option>
- </select>
- </div>
- </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" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
@@ -168,9 +145,32 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎶勯��:</label>
+ <div class="layui-inline">
+ <label class="layui-form-label">绱ф�ョ▼搴�:</label>
+ <div class="layui-input-inline">
+ <select name="HLevel" lay-filter="HLevel" id="HLevel">
+ <option value="鏅��" selected="selected">鏅��</option>
+ <option value="绱ф��">绱ф��</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍙戦�佺被鍨�:</label>
<div class="layui-input-inline">
- <input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <select name="HSendType" lay-filter="HSendType" id="HSendType">
+ <option value="鍏叡" selected="selected">鍏叡</option>
+ <option value="涓汉">涓汉</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶勯��:</label>
+ <div >
+ <input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:1035px;" disabled>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HCopyManList" id="HCopyManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -185,57 +185,6 @@
</button>
</div>
</div>-->
- <div class="layui-inline">
- <label class="layui-form-label">鍙戦�佺被鍨�:</label>
- <div class="layui-input-inline">
- <select name="HSendType" lay-filter="HSendType" id="HSendType">
- <option value="0" selected="selected">鍏叡</option>
- <option value="1">涓汉</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 class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">婧愬崟鍗曞彿:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
- <input id="HMainSourceInterID" name="HMainSourceInterID" type="hidden" />
- <input id="HMainSourceEntryID" name="HMainSourceEntryID" type="hidden" />
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍌績娆℃暟:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMaterModel" lay-verify="HMaterModel" id="HMaterModel" autocomplete="off" disabled>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鏁伴噺:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
- </div>
- </div>
</div>
<!--<div class="layui-form-item">
<div class="layui-inline">
@@ -252,7 +201,7 @@
<div class="layui-inline">
<label class="layui-form-label">璇︾粏绫诲:</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HDescription" id="HDescription" style="width:780px;"></textarea>
+ <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HDescription" id="HDescription" style="width:1080px;"></textarea>
</div>
</div>
</div>
@@ -260,7 +209,75 @@
<div class="layui-inline">
<label class="layui-form-label">澶囨敞:</label>
<div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HRemark" id="HRemark" style="width:780px;"></textarea>
+ <textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧缂栫爜:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterNumber" lay-verify="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍚嶇О:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterModel" lay-verify="HMaterModel" id="HMaterModel">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">娑夊強鏁伴噺:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
+ <input id="HMainSourceInterID" name="HMainSourceInterID" value="0" type="hidden" />
+ <input id="HMainSourceEntryID" name="HMainSourceEntryID" value="0" type="hidden" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍙戦�侀儴闂�:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" id="HDeptList" 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" name="HRecDeptName" id="HRecDeptName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HRecDeptID" id="HRecDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HRecDeptList" id="HRecDeptList" 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" style="display:none;">
+ <label class="layui-form-label">鍌績娆℃暟:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HHasten" lay-verify="HHasten" id="HHasten" autocomplete="off" value="0">
</div>
</div>
</div>
@@ -363,16 +380,21 @@
var linterid = params[params[1]];//婧愬崟id
var HEntryID = params[params[2]];//婧愬崟瀛恑d
var HSBillType = params[params[3]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
}
- var edit = function (data) {
- HBillType = data[0].HBillType;
- HMainSourceInterID = data[0].HSourceInterID;
- HMainSourceEntryID = data[0].HSourceEntryID;
- HMainSourceBillNo = data[0].HSourceBillNo;
- HMainSourceBillType = data[0].HSourceBillType;
+ //var edit = function (data) {
+ // HBillType = data[0].HBillType;
+ // HMainSourceInterID = data[0].HSourceInterID;
+ // HMainSourceEntryID = data[0].HSourceEntryID;
+ // HMainSourceBillNo = data[0].HSourceBillNo;
+ // HMainSourceBillType = data[0].HSourceBillType;
- }
+ //}
layui.config({
@@ -687,8 +709,14 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
- Pub_Close(1);
- window.parent.location.reload();
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
});
@@ -735,7 +763,7 @@
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '璧勬簮鍒楄〃',
+ title: '閮ㄩ棬鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
@@ -767,6 +795,45 @@
});
});
+
+ //鎺ユ敹閮ㄩ棬
+ form.on('submit(HRecDeptList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/DeptInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HRecDeptName").val(checkStatus.data[0].HName);
+ $("#HRecDeptID").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(HReceiveManList)', function () {
//椤甸潰灞�-鑷畾涔�
--
Gitblit v1.9.1