From bdc4e1bddd257f1fb04854e8654149b7d9f4975d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 20 十一月 2023 12:02:54 +0800
Subject: [PATCH] 1
---
WebTM/views/设备管理/Sb_EquipDotCheckBillList_PDA.html | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
index dd4482c..d77c8e2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList_PDA.html"
@@ -37,7 +37,27 @@
</div>
<div class="layui-inline">
<input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
- </div>
+ </div>
+
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">璁惧缂栫爜</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEqNumber" lay-verify="HEqNumber" id="HEqNumber">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">璁惧鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEqName" lay-verify="HEqName" id="HEqName">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-top:2px;">
+ <label class="layui-form-label" style="width: 60px;">鍗� 鎹� 鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="width:125px;">
+ </div>
+ </div>
+
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -213,7 +233,7 @@
, height: 'full-70'
, totalRow: false //寮�鍚悎璁�
, cols: [col]
- , data: data1.data
+ , data: data1.data == null ? [] : data1.data
};
table.render(option);
@@ -237,12 +257,22 @@
function get_FastQuery() {
var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
-
+ var HEqNumber = $("#HEqNumber").val(); //璁惧浠ｇ爜
+ var HEqName = $("#HEqName").val(); //璁惧鍚嶇О
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
if (HBeginDate != "" && HEndDate != "") {
sWhere += " and 鏃ユ湡 between '" + HBeginDate + "' and '" + HEndDate + "' ";
}
-
+ if (HEqNumber != "") {
+ sWhere += " and 璁惧浠ｇ爜 like '%" + HEqNumber + "%'"
+ }
+ if (HEqName != "") {
+ sWhere += " and 璁惧鍚嶇О like '%" + HEqName + "%'"
+ }
+ if (HBillNo != "") {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
+ }
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
@@ -255,12 +285,8 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HMaterNumber").val("");
$("#HBillNo").val("");
- $("#HProductName").val("");
- $("#HProductModel").val("");
- $("#ColContent").val("");
- $("#ColName").val("0");
- $("#Comparator").val("0");
- ColFilter();
+ $("#HEqNumber").val(""); //璁惧浠ｇ爜
+ $("#HEqName").val(""); //璁惧鍚嶇О
sWhere = "";
}
--
Gitblit v1.9.1