From 93b5c8b431ed4ae8101c3db6c391bf1c21ef57cb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 27 五月 2024 09:10:44 +0800
Subject: [PATCH] 上模单下模单器具截取字符优化
---
WebTM/layuiadmin/zgqCustom/zgqCustom.js | 8 ++++
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit_PDA.html | 33 ++++++++++++++++
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit_PDA.html | 34 ++++++++++++++++
3 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/WebTM/layuiadmin/zgqCustom/zgqCustom.js b/WebTM/layuiadmin/zgqCustom/zgqCustom.js
index eebc3b2..d2e1a53 100644
--- a/WebTM/layuiadmin/zgqCustom/zgqCustom.js
+++ b/WebTM/layuiadmin/zgqCustom/zgqCustom.js
@@ -33,6 +33,14 @@
return fmt;
}
+//鍒ゆ柇涓�涓瓧绗︿覆鏄惁涓烘棩鏈�
+function isValidDate(dateString) {
+ // 灏嗘棩鏈熷瓧绗︿覆杞崲涓烘棩鏈熷璞�
+ var date = new Date(dateString);
+ // 濡傛灉杞崲鍚庣殑鏃ユ湡涓庡師鏃ユ湡涓嶄竴鑷达紝鍒欎笉鏄湁鏁堟棩鏈�
+ return !isNaN(date.getTime());
+}
+
/**
*鍒ゆ柇鎵嬫満杩樻槸鐢佃剳锛岀數鑴戣繑鍥瀟rue锛屾墜鏈鸿繑鍥瀎alse
*by zgq
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
index acbfb1f..210557d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit_PDA.html"
@@ -503,8 +503,9 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
var BillNoType2 = HBarCode.substr(0, 2);
- var BillNoType3 = HBarCode.substr(0, 3);
+ var BillNoType3 = HBarCode.substr(0, 5);
var BillNoType4 = HBarCode.substr(0, 4);
+ var BillNoType5 = HBarCode.substr(0, 8);
var index = layer.load();
$.ajax({
@@ -538,6 +539,7 @@
//鍣ㄥ叿妗ｆ
case "MJD":
case "PAK":
+ case "https":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HMouldID": data.hmainid,
"HMouldNumber": data.妯″叿缂栧彿,
@@ -562,6 +564,35 @@
break;
}
+ if (BillNoType5.length == 8) {
+ BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
+ }
+
+ if (isValidDate(BillNoType5)) {
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": data.HEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOEntryID": data.HICMOEntryID
+ });
+ }
+
+ switch (BillNoType5) {
+ //娴佽浆鍗�
+ case "GXLX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": data.HEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOEntryID": data.HICMOEntryID
+ });
+ break;
+ }
+
$("#HBarCode").val("");
layer.close(index);
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
index f3d2fe3..eb16694 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit_PDA.html"
@@ -504,8 +504,9 @@
//鏉″舰鐮佸洖杞︽柟娉�
function txtHBarCode_KeyDown(HBarCode) {
var BillNoType2 = HBarCode.substr(0, 2);
- var BillNoType3 = HBarCode.substr(0, 3);
+ var BillNoType3 = HBarCode.substr(0, 5);
var BillNoType4 = HBarCode.substr(0, 4);
+ var BillNoType5 = HBarCode.substr(0, 8);
var index = layer.load();
$.ajax({
@@ -540,6 +541,7 @@
//鍣ㄥ叿妗ｆ
case "MJD":
case "PAK":
+ case "https":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HMouldID": data.hmainid,
"HMouldNumber": data.妯″叿缂栧彿,
@@ -565,6 +567,36 @@
}
+
+ if (BillNoType5.length == 8) {
+ BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
+ }
+
+ if (isValidDate(BillNoType5)) {
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": data.HEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOEntryID": data.HICMOEntryID
+ });
+ }
+
+ switch (BillNoType5) {
+ //娴佽浆鍗�
+ case "GXLX":
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HProcExchInterID": data.hmainid,
+ "HProcExchEntryID": data.HEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HICMOInterID": data.hicmointerid,
+ "HICMOEntryID": data.HICMOEntryID
+ });
+ break;
+ }
+
$("#HBarCode").val("");
--
Gitblit v1.9.1