From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 268 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 175 insertions(+), 93 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 a3d1da1..3a82337 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({
@@ -388,6 +410,8 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+
+ window.HDeptType = 0;
//#endregion
//鍒濆鍖栬〃鍗曟彃浠�
@@ -578,7 +602,7 @@
data: { "HBillType": '4502' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(0);
+ $("#HInterID").val(d.data[0].HInterID);
}
});
}
@@ -624,7 +648,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ //$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
layer.confirm(data.Message, {
btn: ['纭']
}, function (index) {
@@ -709,7 +733,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -719,7 +743,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HSendMan").val(checkStatus.data[0].HName);
+ $("#HSendMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -737,16 +761,18 @@
//鍙戦�侀儴闂�
form.on('submit(HDeptList)', function () {
+ HDeptType = 1;
+
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '璧勬簮鍒楄〃',
+ title: '閮ㄩ棬鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/DeptInformation.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -756,8 +782,49 @@
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鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
+ //鎺ユ敹閮ㄩ棬
+ form.on('submit(HRecDeptList)', function () {
+ HDeptType = 2;
+
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.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].閮ㄩ棬鍚嶇О);
+ $("#HRecDeptID").val(checkStatus.data[0].HItemID);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -977,6 +1044,21 @@
return [year, month, day].join('-');
}
+
+ function GetHEmpValue(obj) { //鍙戦�佷汉
+ $("#HSendMan").val(obj[0].鑱屽憳鍚嶇О);
+ }
+
+ function GetHDeptNameValue(obj) { //閮ㄩ棬
+ if (HDeptType == 1) {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ } else if (HDeptType == 2) {
+ $("#HRecDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HRecDeptID").val(obj[0].HItemID);
+ }
+ }
+
</script>
</body>
</html>
--
Gitblit v1.9.1