From 5cabf7aed3e4578fa717760c92f0c22bcfb0dd4a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 25 七月 2022 17:27:58 +0800
Subject: [PATCH] nothing

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

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 0bc5d1e..8fa07aa 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
@@ -84,12 +84,12 @@
                                         <input type="text" class="layui-input" name="HName" id="HName">
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
+                                <div class="layui-inline">
                                     <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HModel" id="HModel">
                                     </div>
-                                </div>-->
+                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鐘舵��</label>
                                     <div class="layui-input-block">
@@ -163,7 +163,7 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg"><i class="layui-icon layui-icon-form"></i>鍙樻洿</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃閫佽揣鍗�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                         </div>
@@ -223,7 +223,7 @@
                 break;
             case "UnBarCode":
                 options[4].selected = true;
-                sql += " and 鐘舵�� like ^^%鏈敓鎴愭潯鐮�%^^";
+                sql += " and 鏉$爜鎵撳嵃鐘舵�� like ^^%鏈敓鎴愭潯鐮�%^^";
                 break;
         }
         //CreateReport("Report");  //鎵撳嵃
@@ -270,7 +270,8 @@
                     , { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��', sort: true/*, fixed: true*/ }
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, sort: true/*, fixed: true*/ }
                     , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿', width: 150, sort: true/*, fixed: true*/ }
-                    , { field: 'F_xbkf_Combo', title: '鑷畾涔夋爣璇�', width: 120 }
                    , { field: 'FSHDD', title: '閫佽揣鍦扮偣', width: 120 }
+                    , { field: 'F_xbkf_Combo', title: '鑷畾涔夋爣璇�', width: 120 }
                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 180 }
+                    , { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 180 }
                     //, { field: '鐗╂祦鍗曞彿', title: '鐗╂祦鍗曞彿', width: 150, sort: true/*, fixed: true*/ }
                     //, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
                     , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120, sort: true }
@@ -289,7 +290,7 @@
                     , { field: '棰勮鍒拌揣鏃ユ湡', title: '棰勮鍒拌揣鏃ユ湡', width: 150, sort: true, hide: true}
                     , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓籌D', width: 100, hide: true }
                     , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛怚D', width: 100, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 180 }
+                    , { field: 'FSHDD', title: '閫佽揣鍦扮偣', width: 120 }
                     , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 80, hide: true}
                     , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 180, sort: true, hide: true }
                     , { field: '濮斿璁㈠崟鍙�', title: '濮斿璁㈠崟鍙�', width: 180, sort: true, hide: true }
@@ -556,8 +557,8 @@
                     sqlWhere += " and 鐗╂枡浠g爜 like ^^%" + $("#HNumber").val() + "%^^";
                 if ($("#HName").val() != "")
                     sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
-                //if ($("#HModel").val() != "")
-                //    sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
+                if ($("#HModel").val() != "")
+                    sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
                 if ($("#HClStatus").val() != "")
                     sqlWhere += " and 鍗曟嵁鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
                 //if ($("#HPURCHASEORGID").val() != "")

--
Gitblit v1.9.1