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/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 228 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 193 insertions(+), 35 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
index 472e81e..0074bc5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
@@ -535,7 +535,7 @@
<div class="layui-col-xs8 layui-inline">
<label class="layui-form-label" style="width: 12.5%;">韬唤璇�</label>
<div class="layui-input-block">
- <input class="layui-input" name="HIDCard" id="HIDCard" autocomplete="off" style=" width: 75%;">
+ <input class="layui-input" name="HIDCard" id="HIDCard" autocomplete="off" style=" width: 75%;">
</div>
</div>
</div>
@@ -581,7 +581,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">杞彮璋冧紤鏍囧織</label>
<div class="layui-input-inline">
- <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁璋冧紤">
+ <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁杞彮璋冧紤">
<input type="hidden" value="false" name="HShiftFlag" id="HShiftFlag">
</div>
</div>
@@ -619,20 +619,6 @@
<label class="layui-form-label" style="width: 12.5%;">鍖荤枟淇濋櫓</label>
<div class="layui-input-block">
<input class="layui-input" name="HMedicare" id="HMedicare" autocomplete="off" style=" width: 75%;">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">鍏昏�佷繚闄�</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HInsurance" id="HInsurance" autocomplete="off" style=" width: 75%;">
- </div>
- </div>
- <div class="layui-col-xs6 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">澶变笟淇濋櫓</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HDrydock" id="HDrydock" autocomplete="off" style=" width: 75%;">
</div>
</div>
</div>
@@ -869,7 +855,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鑱屽姟鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DutyList.html', 'yes']
+ , content: ['../../../views/绯荤粺绠＄悊/缁勭粐鏋舵瀯璁剧疆/Gy_DutyList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -877,9 +863,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HDutyName").val(checkStatus.data[0].HName);
- $("#HDutyID").val(checkStatus.data[0].HItemID);
- $("#HDutyNumber").val(checkStatus.data[0].HNumber);
+ $("#HDutyName").val(checkStatus.data[0].鑱屽姟);
+ $("#HDutyID").val(checkStatus.data[0].hitemid);
+ $("#HDutyNumber").val(checkStatus.data[0].缁勭粐鏋舵瀯浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -920,7 +906,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ョ鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -928,9 +914,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HWorkTypeName").val(checkStatus.data[0].HName);
+ $("#HWorkTypeName").val(checkStatus.data[0].宸ョ鍚嶇О);
$("#HWorkTypeID").val(checkStatus.data[0].HItemID);
- $("#HWorkTypeNumber").val(checkStatus.data[0].HNumber);
+ $("#HWorkTypeNumber").val(checkStatus.data[0].宸ョ浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -945,7 +931,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鏍哥畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjList.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html', 'yes']
//, content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -954,9 +940,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCTPrjName").val(checkStatus.data[0].HName);
+ $("#HCTPrjName").val(checkStatus.data[0].鏍哥畻鏂瑰紡鍚嶇О);
$("#HCTPrjID").val(checkStatus.data[0].HItemID);
- $("#HCTPrjNumber").val(checkStatus.data[0].HNumber);
+ $("#HCTPrjNumber").val(checkStatus.data[0].鏍哥畻鏂瑰紡浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -972,7 +958,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] //鑾峰彇寮规椤甸潰
@@ -980,9 +966,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) { }
@@ -999,7 +985,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宀椾綅鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_PostList.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1007,9 +993,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HPostName").val(checkStatus.data[0].HName);
+ $("#HPostName").val(checkStatus.data[0].宀椾綅鍚嶇О);
$("#HPostID").val(checkStatus.data[0].HItemID);
- $("#HPostNumber").val(checkStatus.data[0].HNumber);
+ $("#HPostNumber").val(checkStatus.data[0].宀椾綅浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1025,7 +1011,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] //鑾峰彇寮规椤甸潰
@@ -1033,9 +1019,9 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HGroupName").val(checkStatus.data[0].HName);
+ $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
$("#HGroupID").val(checkStatus.data[0].HItemID);
- $("#HGroupNumber").val(checkStatus.data[0].HNumber);
+ $("#HGroupNumber").val(checkStatus.data[0].鐝粍浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1225,6 +1211,163 @@
layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+
+ var HAge = $('#HAge').val();
+ if (HAge.substring(HAge.length - 1, HAge.length) == ".") {
+ layer.msg("骞撮緞鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HAge)) {
+ layer.msg("骞撮緞璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HContractYear = $('#HContractYear').val();
+ if (HContractYear.substring(HContractYear.length - 1, HContractYear.length) == ".") {
+ layer.msg("鍚堝悓鏈熼檺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HContractYear)) {
+ layer.msg("鍚堝悓鏈熼檺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ //var HInsuranceSubsidy = $('#HInsuranceSubsidy').val();
+ //if (HInsuranceSubsidy.substring(HInsuranceSubsidy.length - 1, HInsuranceSubsidy.length) == ".") {
+ // layer.msg("淇濋櫓琛ヨ创鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HInsuranceSubsidy)) {
+ // layer.msg("淇濋櫓琛ヨ创璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HOtherDeduct3 = $('#HOtherDeduct3').val();
+ //if (HOtherDeduct3.substring(HOtherDeduct3.length - 1, HOtherDeduct3.length) == ".") {
+ // layer.msg("鍏朵粬鎵ｆ3鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HOtherDeduct3)) {
+ // layer.msg("鍏朵粬鎵ｆ3璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HMedicare = $('#HMedicare').val();
+ //if (HMedicare.substring(HMedicare.length - 1, HMedicare.length) == ".") {
+ // layer.msg("鍖荤枟淇濋櫓鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HMedicare)) {
+ // layer.msg("鍖荤枟淇濋櫓璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HInsurance = $('#HInsurance').val();
+ //if (HInsurance.substring(HInsurance.length - 1, HInsurance.length) == ".") {
+ // layer.msg("鍏昏�佷繚闄╃殑缁撳熬涓嶈兘鏄�.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HMedicare)) {
+ // layer.msg("鍖荤枟淇濋櫓璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HDrydock = $('#HDrydock').val();
+ //if (HDrydock.substring(HDrydock.length - 1, HDrydock.length) == ".") {
+ // layer.msg("澶变笟淇濋櫓鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HDrydock)) {
+ // layer.msg("澶变笟淇濋櫓璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HBasePay = $('#HBasePay').val();
+ //if (HBasePay.substring(HBasePay.length - 1, HBasePay.length) == ".") {
+ // layer.msg("鍩烘湰宸ヨ祫鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HDrydock)) {
+ // layer.msg("鍩烘湰宸ヨ祫璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HExamLevPostMoney = $('#HExamLevPostMoney').val();
+ //if (HExamLevPostMoney.substring(HExamLevPostMoney.length - 1, HExamLevPostMoney.length) == ".") {
+ // layer.msg("鑱屽姟鑰冩牳宸ヨ祫鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HExamLevPostMoney)) {
+ // layer.msg("鑱屽姟鑰冩牳宸ヨ祫璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HExamRate = $('#HExamRate').val();
+ //if (HExamRate.substring(HExamRate.length - 1, HExamRate.length) == ".") {
+ // layer.msg("甯︾彮绯绘暟鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HExamRate)) {
+ // layer.msg("甯︾彮绯绘暟璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HHighestPay = $('#HHighestPay').val();
+ //if (HHighestPay.substring(HHighestPay.length - 1, HHighestPay.length) == ".") {
+ // layer.msg("鏈�楂樺伐璧勭殑缁撳熬涓嶈兘鏄�.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HHighestPay)) {
+ // layer.msg("鏈�楂樺伐璧勮杈撴纭叆鏁板瓧锛�");
+ // return;
+ // }
+ //}
+
+ //var HOverPayRate = $('#HOverPayRate').val();
+ //if (HOverPayRate.substring(HOverPayRate.length - 1, HOverPayRate.length) == ".") {
+ // layer.msg("瓒呴姣旂巼鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HOverPayRate)) {
+ // layer.msg("瓒呴姣旂巼璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
+ //var HLeftMoneyRate = $('#HLeftMoneyRate').val();
+ //if (HLeftMoneyRate.substring(HLeftMoneyRate.length - 1, HLeftMoneyRate.length) == ".") {
+ // layer.msg("鍓╀綑宸ヨ祫鐨勭粨灏句笉鑳芥槸.锛�");
+ // return;
+ //} else {
+ // var ref = /^[0-9]+\.?[0-9]*$/;
+ // if (!ref.test(HLeftMoneyRate)) {
+ // layer.msg("鍓╀綑宸ヨ祫璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ // return;
+ // }
+ //}
+
//if ($("#HGroupName").val() == 0) {
// layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
@@ -1280,6 +1423,21 @@
layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+
+ //if ($("#HIDCard").val() == '' || $("#HIDCard").val() == null) {
+ // layer.msg("韬唤璇佷笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+
+ //if ($("#HBankAccount").val() == '' || $("#HBankAccount").val() == null) {
+ // layer.msg("閾惰璐︽埛涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+
+
+
+
+
//if ($("#HGroupName").val() == '' || $("#HGroupName").val() == null) {
// layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
--
Gitblit v1.9.1