From 301c9ba4bfa1af5547d723c2fbdbfb35071dab3b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 26 九月 2024 21:09:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/zymesSrmLayUi
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 8 ++++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 10 +++++++++-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 10 ++++++++++
3 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
index 810ee91..eaa037f 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
@@ -82,6 +82,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HDate1" id="HDate1">
@@ -489,6 +495,8 @@
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
+ if ($("#HSupName").val() != "")
+ sqlWhere += " and 渚涘簲鍟� like ^^%" + $("#HSupName").val() + "%^^";
if ($("#HModel").val() != "")
sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
//if ($("#HClStatus").val() != "")
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index e0345a7..c8aaf66 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -78,7 +78,13 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ </div>
+ </div>
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -515,6 +521,8 @@
sqlWhere += " and 閫佽揣鍗曞彿 like ^^%" + $("#HInnerBillNo").val() + "%^^";
if ($("#HOldMaterNumber").val() != "")
sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
+ if ($("#HSupName").val() != "")
+ sqlWhere += " and 渚涘簲鍟� like ^^%" + $("#HSupName").val() + "%^^";
if ($("#HMaterNumber").val() != "")
sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HMaterNumber").val() + "%^^";
if ($("#HNumber").val() != "")
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index eb1ae4e..9598a2a 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -136,6 +136,14 @@
</select>
</div>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟嗗悕绉�</label>
+ <div class="layui-input-block" style="width:130px;">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ </div>
+ </div>
+
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -568,6 +576,8 @@
sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠ｇ爜 like ^^%" + $("#HNumber").val() + "%^^";
+ if ($("#HSupName").val() != "")
+ sqlWhere += " and 渚涘簲鍟� like ^^%" + $("#HSupName").val() + "%^^";
if ($("#HName").val() != "")
sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
if ($("#HModel").val() != "")
--
Gitblit v1.9.1