From fba2bc699b2c689827d5956ab897084d09a30e8c Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 27 六月 2024 14:20:07 +0800
Subject: [PATCH] 1
---
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
index 7e169a5..9c021de 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList.html"
@@ -67,9 +67,20 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
+ </div>
+ </div> <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -178,7 +189,7 @@
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
- case 'btn-Delete':
+ case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length == 0 || checkStatus.data.length > 300) {
@@ -221,7 +232,7 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- })
+ })
break;
case 'btn-print':
var checkStatus = table.checkStatus('mainTable')
@@ -251,10 +262,12 @@
case 'btn-reload':
$("#HBarCode").val("");
$("#HMaterName").val("");
+ $("#HSourceBillNo").val("");
+ $("#HMaterNumber").val("");
sWhere = "";
get_Display(sWhere);
break;
- //浣滃簾鎸夐挳
+ //浣滃簾鎸夐挳
case 'set_Drop': set_DropBill(0);
break;
//鍙嶄綔搴熸寜閽�
@@ -308,7 +321,9 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBarCode").val("");
+ $("#HSourceBillNo").val("");
$("#HMaterName").val("");
+ $("#HMaterNumber").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
@@ -323,7 +338,9 @@
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBarCode = $("#HBarCode").val();
+ var HSourceBillNo = $("#HSourceBillNo").val();
var HMaterName = $("#HMaterName").val();
+ var HMaterNumber = $("#HMaterNumber").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -350,17 +367,24 @@
sWhere += " and " + ColName + " " + com;
}
if (HBeginDate) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) >= '" + HBeginDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
}
if (HEndDate) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇鏃ユ湡, 23) <= '" + HEndDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
}
if (HBarCode) {
- sWhere += " and 鏉＄爜缂栧彿 like '" + HBarCode + "'";
+ sWhere += " and 鏉＄爜缂栧彿 like '%" + HBarCode + "%'";
}
if (HMaterName) {
- sWhere += " and 鐗╂枡鍚嶇О like'" + HMaterName + "'";
+ sWhere += " and 鐗╂枡鍚嶇О like'%" + HMaterName + "%'";
}
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like'%" + HMaterNumber + "%'";
+ }
+ if (HSourceBillNo) {
+ sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
@@ -568,7 +592,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-
+
dataCol = data1.data[0].HGridString.split(',');
--
Gitblit v1.9.1