From 3ccf32f224519ba7e1f38b8d5b0f4d1e7a8cffaf Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 十一月 2023 10:09:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/PublicPage/HSourceReportHtml.html | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 2e61ae0..f5b786c 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -33,7 +33,7 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
@@ -44,11 +44,17 @@
</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="HDeptName" id="HDeptName" style="width:190px;">
+ </div>
+ </div>-->
+ <div class="layui-inline" id="HProcExchBillNoHidden" style="display:none;">
+ <label class="layui-form-label">娴佽浆鍗″彿</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="width:190px;">
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
@@ -271,7 +277,8 @@
case '濮斿璁㈠崟':
HModName = "WW_EntrustOrderBill_1601";
break;
- case '鐢熶骇鍏ュ簱':
+ case '鐢熶骇鍏ュ簱鍗�':
+ $("#HProcExchBillNoHidden").show();
HModName = "ProductInBill_1202";
break;
case '閲囪喘鍏ュ簱':
@@ -377,6 +384,7 @@
var PartNumber = $("#PartNumber").val();//鐗╂枡缂栫爜
var PartName = $("#PartName").val();//鐗╂枡鍚嶇О
var HDeptName = $("#HDeptName").val();//閮ㄩ棬
+ var HProcExchBillNo = $("#HProcExchBillNo").val();//娴佽浆鍗�
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -478,6 +486,24 @@
}
return sWhere;
break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
+ if (HDeptName && HDeptName != 0) {
+ sWhere += " and HDeptID = '" + HDeptName + "'";
+ }
+ if (HProcExchBillNo!="") {
+ sWhere += " and 娴佽浆鍗″彿 like '" + HProcExchBillNo + "%'";
+ }
+ return sWhere;
+ break;
case '閫�璐ч�氱煡鍗�':
return sWhere;
break;
--
Gitblit v1.9.1