From 791453617b93d367db37862068c5f7a674a1d69e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 15 三月 2024 15:55:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/PublicPage/MouldDotCheckRuleInterList.html | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/WebTM/views/PublicPage/MouldDotCheckRuleInterList.html b/WebTM/views/PublicPage/MouldDotCheckRuleInterList.html
index bfbe939..54f0dcc 100644
--- a/WebTM/views/PublicPage/MouldDotCheckRuleInterList.html
+++ b/WebTM/views/PublicPage/MouldDotCheckRuleInterList.html
@@ -36,15 +36,15 @@
<div class="layui-col-xs12 layui-inline">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
+ <label class="layui-form-label">瑙勭▼鍗曞彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HCycleUnit" id="HCycleUnit">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">淇濆吇鍛ㄦ湡</label>
+ <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HCheckCycle" id="HCheckCycle">
+ <input type="text" class="layui-input" name="HCycleUnit" id="HCycleUnit">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -87,8 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //鏍戝瀷100046 sessionStorage["OrganizationID"]
- var sWhere1 = " where HStopFlag=0 and HEndFlag=1 "; //鍒楄〃
+ var sWhere = ""; //鏍戝瀷100046 sessionStorage["OrganizationID"]
+ var sWhere1 = "where 1=1"; //鍒楄〃
var option = {
elem: '#mainTable'
@@ -99,7 +99,7 @@
, cols: [[
{ type: 'radio', fixed: 'left' }
, { field: 'hmainid', title: 'HInterID', sort: true, hide: true }
- , { field: '鐐规鍛ㄦ湡', title: '鐐规鍛ㄦ湡' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
, { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅' }
]]
};
@@ -190,10 +190,10 @@
}
function SeachFilter(sWhere1) {
- var HCheckCycle = $("#HCheckCycle").val();
+ var HBillNo= $("#HBillNo").val();
var HCycleUnit = $("#HCycleUnit").val();
- if (HCycleUnit) {
- sWhere1 += " and 鐐规鍛ㄦ湡 like '%" + HCheckCycle + "%'";
+ if (HBillNo) {
+ sWhere1 += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HCycleUnit) {
sWhere1 += " and 鍛ㄦ湡鍗曚綅 like '%" + HCycleUnit + "%'";
--
Gitblit v1.9.1