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/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 144 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 134 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 0ad3e54..9f4a49f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -79,7 +79,16 @@
<input class="layui-input" name="HMacAddr" id="HMacAddr" autocomplete="off">
</div>
</div>
-
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpID-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
@@ -314,6 +323,14 @@
set_SaveBill(data);
});
+
+ //琛ㄥご淇℃伅璐熻矗浜哄脊绐�
+ form.on('submit(HEmpID-BT)', function () {
+ get_HEmpID();
+
+ });
+
+
//#endregion
@@ -394,6 +411,8 @@
, "HRemark": data.澶囨敞
, "HUSEORGID": data.HUSEORGID
, "HMacAddr": data.mac鍦板潃
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.璐熻矗浜�
});
layer.close(ajaxLoad);
@@ -423,6 +442,79 @@
layer.msg("璇烽�夋嫨宸ヤ綔涓績锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+
+ var HWorkTimes = $('#HWorkTimes').val();
+ if (HWorkTimes.substring(HWorkTimes.length - 1, HWorkTimes.length) == ".") {
+ layer.msg("鍗曠彮宸ユ椂鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HWorkTimes)) {
+ layer.msg("鍗曠彮宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HRelationID = $('#HRelationID').val();
+ if (HRelationID.substring(HRelationID.length - 1, HRelationID.length) == ".") {
+ layer.msg("鍏宠仈ID鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HRelationID)) {
+ layer.msg("鍏宠仈ID璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HMaxWorkTimes = $('#HMaxWorkTimes').val();
+ if (HMaxWorkTimes.substring(HMaxWorkTimes.length - 1, HMaxWorkTimes.length) == ".") {
+ layer.msg("鍗曠彮鏈�澶у伐鏃剁殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HMaxWorkTimes)) {
+ layer.msg("鍗曠彮鏈�澶у伐鏃惰杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HMinAdd = $('#HMinAdd').val();
+ if (HMinAdd.substring(HMinAdd.length - 1, HMinAdd.length) == ".") {
+ layer.msg("鏈�灏忚繘闃剁殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HMinAdd)) {
+ layer.msg("鏈�灏忚繘闃惰杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HClassCount = $('#HClassCount').val();
+ if (HClassCount.substring(HClassCount.length - 1, HClassCount.length) == ".") {
+ layer.msg("姣忔棩鐝鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HClassCount)) {
+ layer.msg("姣忔棩鐝璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HOverTimes = $('#HOverTimes').val();
+ if (HOverTimes.substring(HOverTimes.length - 1, HOverTimes.length) == ".") {
+ layer.msg("鍔犵彮宸ユ椂鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HOverTimes)) {
+ layer.msg("鍔犵彮宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
var sMainStr = JSON.stringify(data.field) + ";" +sessionStorage["HUserName"];
$.ajax({
type: "POST",
@@ -458,7 +550,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ュ簭鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -466,7 +558,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
$("#HProcID").val(checkStatus.data[0].HItemID);
$("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -484,7 +576,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../PublicPage/DeptInformation.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -492,9 +584,9 @@
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);
- $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+ $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -510,7 +602,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ヤ綔涓績鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -518,7 +610,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績);
+ $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
$("#HCenterID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -535,7 +627,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐝粍鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../PublicPage/GroupInformation.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -543,7 +635,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HGroup").val(checkStatus.data[0].HName);
+ $("#HGroup").val(checkStatus.data[0].鐝粍鍚嶇О);
$("#HGroupID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -552,6 +644,38 @@
}
//#endregion
+ //閫夋嫨璐熻矗浜�
+ function get_HEmpID() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浜哄憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.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 > 1 || checkStatus.data.length == 0) {
+ return layer.msg('璇烽�夋嫨涓�鏁版嵁');
+ }
+ $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ });
+ }
+
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Add_Edit_Gy_Source.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
--
Gitblit v1.9.1