From 226b08b8a5f3ecab663d6b0e02b48c3e16e644e0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/公用基础资料/Gy_BarCodeBill_Set_TempList.html | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 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_BarCodeBill_Set_TempList.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_BarCodeBill_Set_TempList.html"
index b7a2af7..6f9b2f9 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_BarCodeBill_Set_TempList.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_BarCodeBill_Set_TempList.html"
@@ -65,6 +65,14 @@
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">PNL鏉＄爜鍙�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input ForFilteringSchemes" name="HBarCode_PNL"
+ lay-verify="HBarCode_PNL" id="HBarCode_PNL" autocomplete="off">
+
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
lay-filter="btnSearch" id="btnSearch">
鏌ヨ
@@ -96,9 +104,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <= </option>
+ <=
+ </option>
<option value="<">
- < </option>
+ <
+ </option>
<option value="<>">
<>
</option>
@@ -130,9 +140,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <= </option>
+ <=
+ </option>
<option value="<">
- < </option>
+ <
+ </option>
<option value="<>">
<>
</option>
@@ -164,9 +176,11 @@
<option value=">=">>=</option>
<option value=">">></option>
<option value="<=">
- <= </option>
+ <=
+ </option>
<option value="<">
- < </option>
+ <
+ </option>
<option value="<>">
<>
</option>
@@ -188,9 +202,9 @@
<div id="page" style="position: relative; bottom: 0;"></div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Export" id="btn-Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
@@ -484,16 +498,16 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- if (data[i].name === '鏉＄爜缂栧彿') {
- col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
- templet: function (d) {
- return '<span style="color: blue;" lay-unrow >' + d.鏉＄爜缂栧彿 + '</span>'
- }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
- });
- } else {
+ //if (data[i].name === '鏉＄爜缂栧彿') {
+ // col.push({
+ // field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ // templet: function (d) {
+ // return '<span style="color: blue;" lay-unrow >' + d.鏉＄爜缂栧彿 + '</span>'
+ // }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
+ // });
+ //} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
- }
+ //}
}
}
}
@@ -537,6 +551,7 @@
var HBeginDate = $("#HBeginDate").val();//璧峰鏃ユ湡
var HEndDate = $("#HEndDate").val();//鎴鏃ユ湡
var HBarCode = $("#HBarCode").val();//鍗曟嵁鍙�
+ var HBarCode_PNL = $("#HBarCode_PNL").val()
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -616,10 +631,14 @@
sWhere += " and 鏉＄爜缂栧彿 like '%" + HBarCode + "%'";
}
if (HBeginDate != "" && HEndDate != "") {
- sWhere += "and 鍒涘缓鏃堕棿 between '" + HBeginDate + "' and '" + HEndDate + "'";
+ sWhere += " and 鍒涘缓鏃堕棿 between '" + HBeginDate + " 00:00:00' and '" + HEndDate + " 23:59:59'";
}
if (GetDataCols != "") {
sWhere += GetDataCols;
+ }
+
+ if (HBarCode_PNL != "") {
+ sWhere += " and PNL鏉＄爜鍙� like '%" + HBarCode_PNL +"%'"
}
//get_Display(sWhere);
@@ -825,6 +844,7 @@
$("#ColContent1").val("");
$("#ColName1").val("0");
$("#Comparator1").val("0");
+ $("#HBarCode_PNL").val("");
form.render('select');
sWhere = "";
get_FastQuery();
--
Gitblit v1.9.1