From bb8767c765af8549b5a5df80ce29f0c9404b27c7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 24 四月 2023 08:27:56 +0800
Subject: [PATCH] 基础资料 添加校验控制
---
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_PackType.html | 38 ++
WebTM/views/基础资料/公用基础资料/Gy_MaterTypeEdit.html | 10
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html | 42 ++-
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 30 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 25 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 19 +
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 169 +++++++++++++
WebTM/views/基础资料/基础资料/Gy_MatePriceSupEdit.html | 13 +
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit.html | 32 +
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 65 ++++
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html | 10
WebTM/views/基础资料/公用基础资料/Add_Edit_Pay_PeriodInfoSet.html | 60 ++++
WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html | 13 +
WebTM/views/基础资料/基础资料/Gy_TaxRateEdit.html | 13 +
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 175 ++++++++++++-
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 55 ++++
16 files changed, 711 insertions(+), 58 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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
index b036b1a..d023464 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/Add_Edit_Gy_Material.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/Add_Edit_Gy_Material.html"
@@ -777,6 +777,175 @@
return;
}
}
+
+ var HSecUnitRate = $('#HSecUnitRate').val();
+ if (HSecUnitRate.substring(HSecUnitRate.length - 1, HSecUnitRate.length) == ".") {
+ layer.msg("鎹㈢畻鐜囩殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HSecUnitRate)) {
+ layer.msg("鎹㈢畻鐜囪杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HHighStock = $('#HHighStock').val();
+ if (HHighStock.substring(HHighStock.length - 1, HHighStock.length) == ".") {
+ layer.msg("鏈�楂樺簱瀛樼殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HHighStock)) {
+ layer.msg("鏈�楂樺簱瀛樿杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HLowStock = $('#HLowStock').val();
+ if (HLowStock.substring(HLowStock.length - 1, HLowStock.length) == ".") {
+ layer.msg("鏈�浣庡簱瀛樼殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HLowStock)) {
+ layer.msg("鏈�浣庡簱瀛樿杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HSafeStock = $('#HSafeStock').val();
+ if (HSafeStock.substring(HSafeStock.length - 1, HSafeStock.length) == ".") {
+ layer.msg("瀹夊叏搴撳瓨鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HSafeStock)) {
+ layer.msg("瀹夊叏搴撳瓨璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HOrderPrice = $('#HOrderPrice').val();
+ if (HOrderPrice.substring(HOrderPrice.length - 1, HOrderPrice.length) == ".") {
+ layer.msg("閲囪喘鍗曚环鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HOrderPrice)) {
+ layer.msg("閲囪喘鍗曚环璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HSalePrice = $('#HSalePrice').val();
+ if (HSalePrice.substring(HSalePrice.length - 1, HSalePrice.length) == ".") {
+ layer.msg("閿�鍞崟浠风殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HSalePrice)) {
+ layer.msg("閿�鍞崟浠疯杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HPlanPrice = $('#HPlanPrice').val();
+ if (HPlanPrice.substring(HPlanPrice.length - 1, HPlanPrice.length) == ".") {
+ layer.msg("璁″垝鍗曚环鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HSalePrice)) {
+ layer.msg("璁″垝鍗曚环璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HstdPrice = $('#HstdPrice').val();
+ if (HstdPrice.substring(HstdPrice.length - 1, HstdPrice.length) == ".") {
+ layer.msg("鏍囧噯鎴愭湰鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HstdPrice)) {
+ layer.msg("鏍囧噯鎴愭湰璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HQtyMax = $('#HQtyMax').val();
+ if (HQtyMax.substring(HQtyMax.length - 1, HQtyMax.length) == ".") {
+ layer.msg("鏈�澶ц璐ч噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HQtyMax)) {
+ layer.msg("鏈�澶ц璐ч噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HKeepDays = $('#HKeepDays').val();
+ if (HKeepDays.substring(HKeepDays.length - 1, HKeepDays.length) == ".") {
+ layer.msg("淇濊川鏈熺殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HKeepDays)) {
+ layer.msg("淇濊川鏈熻杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HMinPickQty = $('#HMinPickQty').val();
+ if (HMinPickQty.substring(HMinPickQty.length - 1, HMinPickQty.length) == ".") {
+ layer.msg("鏈�灏忓寘瑁呴噺鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HMinPickQty)) {
+ layer.msg("鏈�灏忓寘瑁呴噺璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HPERUNITSTANDHOUR = $('#HPERUNITSTANDHOUR').val();
+ if (HPERUNITSTANDHOUR.substring(HPERUNITSTANDHOUR.length - 1, HPERUNITSTANDHOUR.length) == ".") {
+ layer.msg("鏍囧噯宸ユ椂鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HPERUNITSTANDHOUR)) {
+ layer.msg("鏍囧噯宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HSTDLABORPREPARETIME = $('#HSTDLABORPREPARETIME').val();
+ if (HSTDLABORPREPARETIME.substring(HSTDLABORPREPARETIME.length - 1, HSTDLABORPREPARETIME.length) == ".") {
+ layer.msg("鏍囧噯浜哄憳鍑嗗宸ユ椂鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HSTDLABORPREPARETIME)) {
+ layer.msg("鏍囧噯浜哄憳鍑嗗宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HSTDMACHINEPREPARETIME = $('#HSTDMACHINEPREPARETIME').val();
+ if (HSTDMACHINEPREPARETIME.substring(HSTDMACHINEPREPARETIME.length - 1, HSTDMACHINEPREPARETIME.length) == ".") {
+ layer.msg("鏍囧噯鏈哄櫒鍑嗗宸ユ椂鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HSTDMACHINEPREPARETIME)) {
+ layer.msg("鏍囧噯鏈哄櫒鍑嗗宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
//if ($("#HUnitGroupName").val() == 0) {
// layer.msg("璇烽�夋嫨璁￠噺鍗曚綅缁勶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
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/Add_Edit_Gy_PackType.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/Add_Edit_Gy_PackType.html"
index 00001af..04bbf64 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/Add_Edit_Gy_PackType.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/Add_Edit_Gy_PackType.html"
@@ -321,6 +321,44 @@
layer.msg("璇疯緭鍏ラ珮锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+
+
+ var HLenhth = $('#HLenhth').val();
+ if (HLenhth.substring(HLenhth.length - 1, HLenhth.length) == ".") {
+ layer.msg("闀跨殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HLenhth)) {
+ layer.msg("闀胯杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HWidth = $('#HWidth').val();
+ if (HWidth.substring(HWidth.length - 1, HWidth.length) == ".") {
+ layer.msg("瀹界殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HWidth)) {
+ layer.msg("瀹借杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
+ var HHeight = $('#HHeight').val();
+ if (HHeight.substring(HHeight.length - 1, HHeight.length) == ".") {
+ layer.msg("楂樼殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HHeight)) {
+ layer.msg("楂樿杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_PackType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
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/Add_Edit_Pay_PeriodInfoSet.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/Add_Edit_Pay_PeriodInfoSet.html"
index 408336e..fd81382 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/Add_Edit_Pay_PeriodInfoSet.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/Add_Edit_Pay_PeriodInfoSet.html"
@@ -232,6 +232,66 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
+
+ var HYear = $('#HYear').val();
+ if (HYear.substring(HYear.length - 1, HYear.length) == ".") {
+ layer.msg("骞翠唤鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HYear)) {
+ layer.msg("骞翠唤璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HPeriod = $('#HPeriod').val();
+ if (HPeriod.substring(HPeriod.length - 1, HPeriod.length) == ".") {
+ layer.msg("鏈堜唤鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HPeriod)) {
+ layer.msg("鏈堜唤璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HWorkTimes = $('#HWorkTimes').val();
+ if (HWorkTimes.substring(HWorkTimes.length - 1, HWorkTimes.length) == ".") {
+ layer.msg("鍩烘湰澶╂暟鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HWorkTimes)) {
+ layer.msg("鍩烘湰澶╂暟璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HOverWorkTimes = $('#HOverWorkTimes').val();
+ if (HOverWorkTimes.substring(HOverWorkTimes.length - 1, HOverWorkTimes.length) == ".") {
+ layer.msg("鍔犵彮澶╂暟鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HOverWorkTimes)) {
+ layer.msg("鍔犵彮澶╂暟璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
+ var HBasePay = $('#HBasePay').val();
+ if (HBasePay.substring(HBasePay.length - 1, HBasePay.length) == ".") {
+ layer.msg("鍩烘湰宸ヨ祫鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+$/;
+ if (!ref.test(HBasePay)) {
+ layer.msg("鍩烘湰宸ヨ祫璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
var sMainStr = JSON.stringify(data.field);
$.ajax({
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 ff2f6c8..57fc3fa 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" lay-verify="required|identity" autocomplete="off" style=" width: 75%;">
</div>
</div>
</div>
@@ -598,7 +598,7 @@
<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="HBankAccount" id="HBankAccount" autocomplete="off" style=" width: 75%;">
+ <input class="layui-input" name="HBankAccount" id="HBankAccount" lay-verify="required|bank" autocomplete="off" style=" width: 75%;">
</div>
</div>
<div class="layui-col-xs6 layui-inline">
@@ -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>
@@ -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;
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_MaterTypeEdit.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_MaterTypeEdit.html"
index 8c6b6fd..d541c2c 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_MaterTypeEdit.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_MaterTypeEdit.html"
@@ -55,14 +55,14 @@
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜锛�</label>
+ <label class="layui-form-label">浠ｇ爜锛�*</label>
<div class="layui-input-inline">
<input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
<input id="HItemID" name="HItemID" type="hidden" />
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍚嶇О锛�</label>
+ <label class="layui-form-label">鍚嶇О锛�*</label>
<div class="layui-input-inline">
<input class="layui-input" name="HName" id="HName" autocomplete="off">
</div>
@@ -95,7 +95,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浣跨敤缁勭粐锛�</label>
+ <label class="layui-form-label">浣跨敤缁勭粐锛�*</label>
<div class="layui-input-inline">
<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
</select>
@@ -264,11 +264,11 @@
//淇濆瓨
function Saver(data) {
- if ($("#HNumber").val() == 0) {
+ if ($("#HNumber").val() == "") {
layer.msg("璇疯緭鍏ヤ唬鐮侊紒");
return;
}
- if ($("#HName").val() == 0) {
+ if ($("#HName").val() == "") {
layer.msg("璇疯緭鍏ュ悕绉帮紒");
return;
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupEdit.html"
index ff6a866..810ac78 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MatePriceSupEdit.html"
@@ -308,6 +308,19 @@
//淇濆瓨HMaker
function set_AddNew(data) {
+
+ var HPrice = $('#HPrice').val();
+ if (HPrice.substring(HPrice.length - 1, HPrice.length) == ".") {
+ layer.msg("鍗曚环鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HPrice)) {
+ layer.msg("鍗曚环璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ";" + sessionStorage["HUserName"];
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateEdit.html"
index c36fdf6..620c5b6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TaxRateEdit.html"
@@ -196,6 +196,19 @@
//淇濆瓨HMaker
function set_AddNew(data) {
+
+ var HTaxRate = $('#HTaxRate').val();
+ if (HTaxRate.substring(HTaxRate.length - 1, HTaxRate.length) == ".") {
+ layer.msg("绋庣巼鐨勭粨灏句笉鑳芥槸.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HTaxRate)) {
+ layer.msg("绋庣巼璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ return;
+ }
+ }
+
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ";" + sessionStorage["HUserName"];
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index a0e856b..35966e4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -789,6 +789,19 @@
layer.msg("璇疯緭鍏ュ鎴峰悕绉帮紒", { icon: 5 });
return false;
}
+
+ var HTaxRate = $('#HTaxRate').val();
+ if (HTaxRate.substring(HTaxRate.length - 1, HTaxRate.length) == ".") {
+ layer.msg("澧炲�肩◣鐜囩殑缁撳熬涓嶈兘鏄�.锛�");
+ return;
+ } else {
+ var ref = /^[0-9]+\.?[0-9]*$/;
+ if (!ref.test(HTaxRate)) {
+ layer.msg("澧炲�肩◣鐜囪杈撴纭叆鏁板瓧锛�");
+ return;
+ }
+ }
+
//var HTaxRate = $("#HTaxRate").val();
//if (HTaxRate == null || HTaxRate == undefined || HTaxRate == "") {
// layer.msg("澧炲�肩◣鐜囦笉寰椾负绌猴紒", { icon: 5 });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html"
index 6b50c28..2bb33a1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit.html"
@@ -314,7 +314,21 @@
}
});
}
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+ else if (OperationType == 2)
+ {
+ RoadBillMain(linterid);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3710' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+ else if(OperationType == 3)
+ {//濡傛灉淇敼鍒欒蛋涓嬮潰
//绂佺敤缁勭粐閫夐」
$("#HPRDORGID").attr("disabled", true);
$("#HDate").attr("disabled", true);
@@ -881,14 +895,14 @@
, "HPlanQty": d.data[0].璁″垝鐢熶骇鏁伴噺
, "HPRDORGID": d.data[0].HPRDORGID
//鍏朵粬淇℃伅
- , "hmakers": d.data[0].鍒跺崟浜�
- , "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
- , "hchecker": d.data[0].瀹℃牳浜�
- , "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
- , "hupdater": d.data[0].淇敼浜�
- , "hupdatedate": d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
- , "hdeleteman": d.data[0].浣滃簾浜�
- , "hdeletedate": d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "hmakers": OperationType == 2 ? "" :d.data[0].鍒跺崟浜�
+ , "hmakedate": OperationType == 2 ? "" :d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "hchecker": OperationType==2?"":d.data[0].瀹℃牳浜�
+ , "hcheckdate": OperationType == 2 ? "" :d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "hupdater": OperationType == 2 ? "" : d.data[0].淇敼浜�
+ , "hupdatedate": OperationType == 2 ? "" : d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "hdeleteman": OperationType == 2 ? "" :d.data[0].浣滃簾浜�
+ , "hdeletedate": OperationType == 2 ? "" : d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
//瀛愯〃 璧嬪��
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index fbeea67..a6f4828 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -437,7 +437,19 @@
}
});
}
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰
+ else if (OperationType==2) {
+ RoadBillMain(linterid);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3710' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ }
+ else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰
//绂佺敤缁勭粐閫夐」
$("#HPRDORGID").attr("disabled", true);
$("#HDate").attr("disabled", true);
@@ -980,14 +992,14 @@
, "HWeight": d.data[0].HWeight
, "HColorRemark": d.data[0].鏌撹壊瑕佹眰
//鍏朵粬淇℃伅
- , "hmakers": d.data[0].鍒跺崟浜�
- , "hmakedate": d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
- , "hchecker": d.data[0].瀹℃牳浜�
- , "hcheckdate": d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
- , "hupdater": d.data[0].淇敼浜�
- , "hupdatedate": d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
- , "hdeleteman": d.data[0].浣滃簾浜�
- , "hdeletedate": d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
+ , "hmakers": OperationType == 2 ? "" :d.data[0].鍒跺崟浜�
+ , "hmakedate": OperationType == 2 ? "" : d.data[0].鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(d.data[0].鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+ , "hchecker": OperationType == 2 ? "" :d.data[0].瀹℃牳浜�
+ , "hcheckdate": OperationType == 2 ? "" : d.data[0].瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(d.data[0].瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+ , "hupdater": OperationType == 2 ? "" : d.data[0].淇敼浜�
+ , "hupdatedate": OperationType == 2 ? "" :d.data[0].淇敼鏃ユ湡 == null ? "" : Format(new Date(d.data[0].淇敼鏃ユ湡), "yyyy-MM-dd")
+ , "hdeleteman": OperationType == 2 ? "" : d.data[0].浣滃簾浜�
+ , "hdeletedate": OperationType == 2 ? "" :d.data[0].浣滃簾鏃ユ湡 == null ? "" : Format(new Date(d.data[0].浣滃簾鏃ユ湡), "yyyy-MM-dd")
});
form.render('select');
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 1c153b2..3a8e811 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -160,8 +160,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>鏂板(鏃犲垪琛�)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit_NT"><i class="layui-icon layui-icon-form"></i>缂栬緫(鏃犲垪琛�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_copy_NT"><i class="layui-icon layui-icon-form"></i>澶嶅埗(鏃犲垪琛�)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -252,11 +254,17 @@
//缂栬緫
case 'set_Edit': set_Edit();
break;
+ //澶嶅埗
+ case 'set_copy': set_copy();
+ break;
//鏂板(鏃犲垪琛�)
case 'set_AddNew_NT': set_AddNew_NT();
break;
//缂栬緫(鏃犲垪琛�)
case 'set_Edit_NT': set_Edit_NT();
+ break;
+ //澶嶅埗(鏃犲垪琛�)
+ case 'set_copy_NT': set_copy_NT();
break;
//瀹℃牳
case 'set_CheckBill': set_CheckBill();
@@ -728,6 +736,29 @@
}
}
+ // 澶嶅埗
+ function set_copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璁㈠崟缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit.html?OperationType=2&linterid=' + linterid + ''
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//鏂板(鏃犲垪琛�)
function set_AddNew_NT() {
layer.open({
@@ -768,6 +799,30 @@
}
}
+ // 澶嶅埗(鏃犲垪琛�)
+ function set_copy_NT() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid;
+ var HEntryID = data[0].hsubid;
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐢熶骇璁㈠崟缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//#region 鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index da9a894..af60af3 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -400,6 +400,9 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊娴佹按鍙�</button>
</div>
</script>
</form>
@@ -896,7 +899,19 @@
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
- break;
+ break;
+ //涓婁竴琛�
+ case 'btn_up':
+ btn_up(data);
+ break;
+ //涓嬩竴琛�
+ case 'btn_under':
+ btn_under(data);
+ break;
+ //鍒锋柊娴佹按鍙�
+ case 'btn_Refresh':
+ btn_Refresh(data);
+ break;
}
});
@@ -2068,6 +2083,54 @@
})
}
+ //涓婁竴琛�
+ function btn_up(data) {
+ if (data.length != 1) {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ } else if (option.data[0]["HProcNo"] == data[0]["HProcNo"]) {
+ layer.msg("棣栬鏁版嵁鏃犳硶绉诲姩锛�");
+ } else {
+ var tables = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HProcNo"] == data[0]["HProcNo"]) {
+ tables.push(option.data[i - 1]);
+ option.data[i - 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ break;
+ }
+ }
+ }
+ }
+
+ //涓嬩竴琛�
+ function btn_under(data) {
+ if (data.length != 1) {
+ layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+ } else if (option.data[option.data.length-1]["HProcNo"] == data[0]["HProcNo"]) {
+ layer.msg("鏈鏁版嵁鏃犳硶绉诲姩锛�");
+ } else {
+ var tables = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i]["HProcNo"] == data[0]["HProcNo"]) {
+ tables.push(option.data[i + 1]);
+ option.data[i + 1] = data[0];
+ option.data[i] = tables[0];
+ table.render(option);
+ break;
+ }
+ }
+ }
+ }
+
+ //鍒锋柊娴佹按鍙�
+ function btn_Refresh(data) {
+ for (var i = 0; i < option.data.length; i++) {
+ option.data[i]["HProcNo"] = (i + 1) * 10;
+ }
+ table.render(option);
+ }
+
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
index d5614cd..f91ad86 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
@@ -1035,7 +1035,7 @@
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrg": data.缁勭粐,
"HPRDOrgID": data.缁勭粐,
- "HQty": data.娴佽浆鍗℃暟閲�,
+ "HQty": result.data.length > 1 ? (result.data[0].娴佽浆鍗℃暟閲� < result.data[1].鍑虹珯鍏宠仈鏁伴噺 ? data.娴佽浆鍗℃暟閲�: result.data[1].鍑虹珯鍏宠仈鏁伴噺): data.娴佽浆鍗℃暟閲�,
});
@@ -1100,6 +1100,14 @@
, { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟' }
]]
, height: 500
+ , done: function (res, curr, count) {
+ for (var i in res.data) {
+ var item = res.data[i];
+ if (item["娴佹按鍙�"] == $("#HProcNo").val()) {
+ $("tr[data-index='" + i + "']").attr({ "style": "background-color:red;" });
+ }
+ }
+ }
}
table.render(option)
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
index 23f5f8a..c89074d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
@@ -432,7 +432,7 @@
var FirstEndHProcNo = 0; // 榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
$('#Detail').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤鏄庣粏鎸夐挳
- $("#Add").attr("style", "display:none;");//闅愯棌鏂板鎸夐挳
+ /* $("#Add").attr("style", "display:none;");//闅愯棌鏂板鎸夐挳*/
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
* 2.鏈夋簮鍗曟柊澧�
@@ -686,6 +686,9 @@
});
function txtHBarCode_KeyDown(HBarCode) {
+ if (HBarCode == "") {
+ return;
+ }
//鎵爜绫诲瀷1
var barNo = HBarCode.substr(0, 3);
//鎵爜绫诲瀷2
@@ -755,7 +758,7 @@
"HCenterID": data.HCenterID,
"lngBillSubKey": data.hsubid,
//"NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺),
- "HQty": data.娴佽浆鍗℃暟閲�,
+ "HQty": result.data.length > 1 ? (result.data[0].娴佽浆鍗℃暟閲� < result.data[1].杩涚珯鍏宠仈鏁伴噺 ? data.娴佽浆鍗℃暟閲� : result.data[1].杩涚珯鍏宠仈鏁伴噺) : data.娴佽浆鍗℃暟閲�,
});
//$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
//$("#HBarCode").css("background-color", "#efefef4d");
@@ -816,6 +819,14 @@
, { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟' }
]]
, height: 500
+ , done: function (res, curr, count) {
+ for (var i in res.data) {
+ var item = res.data[i];
+ if (item["娴佹按鍙�"] == $("#HProcNo").val()) {
+ $("tr[data-index='" + i + "']").attr({ "style": "background-color:red;" });
+ }
+ }
+ }
}
table.render(option)
break;
@@ -1155,6 +1166,9 @@
function txtHProcNo_KeyDown(sBillNo, sProcNo) {
var index = layer.load();
+ if (sBillNo == "") {
+ return;
+ }
$.ajax({
url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown_qiaoyi",
type: "GET",
@@ -1360,19 +1374,19 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
- $("#Add").attr("style", "display:inline;");//鏄剧ず鏂板鎸夐挳
+ //$("#Add").attr("style", "display:inline;");//鏄剧ず鏂板鎸夐挳
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
- if (sessionStorage["OrganizationID"] == 100038) {
- if (FirstEndHProcNo == 1) {
- //姹囨姤
- GetInStorage();
- } else if (FirstEndHProcNo == 2) {
- //鍏ュ簱
- BtnRK();
- //鎶ュ簾
- BtnBF();
- }
- }
+ //if (sessionStorage["OrganizationID"] == 100038) {
+ // if (FirstEndHProcNo == 1) {
+ // //姹囨姤
+ // GetInStorage();
+ // } else if (FirstEndHProcNo == 2) {
+ // //鍏ュ簱
+ // BtnRK();
+ // //鎶ュ簾
+ // BtnBF();
+ // }
+ //}
var HMaterID = $("#HMaterID").val();
var HWorkProcID = $("#HProcID").val();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 858de50..f921ab2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -1005,6 +1005,21 @@
set_EditFromGrid();
}
+ else if (OperationType == 4) {//澶嶅埗
+ set_EditFromGrid();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3772' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ }
+ });
+ }
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
@@ -1993,8 +2008,8 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_Sc_ProcessExchangeBillQuery[0];
form.val("component-form-group", {
- "HBillNo": data.鍗曟嵁鍙�
- , "HInterID": data.hmainid
+ "HBillNo": OperationType==4?"": data.鍗曟嵁鍙�
+ , "HInterID": OperationType == 4 ? "" : data.hmainid
, "HPRDORGID": data.HPRDORGID
, "HDate": formatDate(data.鏃ユ湡)
, "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 175bb78..eb84d5c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -127,6 +127,7 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_cf"><i class="layui-icon layui-icon-form"></i>鎷嗗垎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
@@ -226,7 +227,10 @@
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
- break;
+ break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//鎷嗗垎
case 'set_cf': set_cf();
break;
@@ -1522,6 +1526,25 @@
}
}
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].hmainid;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=4&linterid=' + linterid + '&HEntryID=&HSouceBillType='
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//鎷嗗垎
function set_cf() {
var checkStatus = table.checkStatus('mainTable')
--
Gitblit v1.9.1