From 266b2556a076f2d0b0b924c1088496e943d1bebb Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 25 三月 2022 16:37:21 +0800
Subject: [PATCH] 器具出入库列表界面增加以下过滤条件

---
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html |   98 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 83 insertions(+), 15 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
index 1e687c3..7b41bce 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
@@ -31,11 +31,11 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <!--<div class="layui-colla-title layui-inline">
+                                <div class="layui-colla-title layui-inline">
                                     <div class="layui-inline">
                                         <span>鏇村</span>
                                     </div>
-                                </div>-->
+                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
@@ -54,18 +54,54 @@
                                         <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁勭粐鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" style="width:190px;">
+                                    </div>
+                                </div>
+
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                <!--<div class="layui-colla-content">
+                                <div class="layui-colla-content">
                                     <div class="layui-inline">
                                         <div class="layui-inline">
                                             <span>鍏朵粬鏉′欢></span>
                                         </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="HDept" id="HDept" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鍣ㄥ叿浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">浠撳簱</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HWhName" id="HWhName" style="width:190px;">
+                                        </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" style="width:190px;">
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -180,6 +216,7 @@
                         , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
                         //, { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 125 }
                         //, { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 125 }
+                        , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125 }
                         , { field: '鏀舵枡浠撳簱ID', title: '鏀舵枡浠撳簱ID', width: 200, hide: true }
                         , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', width: 125 }
                         , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 125 }
@@ -402,17 +439,42 @@
 
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
-                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                if (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+                var HDept = $("#HDept").val();       //閮ㄩ棬淇℃伅
+                var HMaterNumber = $("#HMaterNumber").val();   //鐗╂枡浠g爜    
+                var HModelNumber = $("#HModelNumber").val();    //鍣ㄥ叿浠g爜
+                var HWhName = $("#HWhName").val();  //浠撳簱鍚嶇О
+                var HSupName = $("#HSupName").val();    //寰�鏉ュ崟浣�
+               
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
                 }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+                }
+                if (HStockOrgName) {
+                    sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
                 }
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HDept) {
+                    sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
+                }
+                if (HMaterNumber) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+                }
+                if (HModelNumber) {
+                    sWhere += " and 妯″叿浠g爜 like '%" + HModelNumber + "%'";
+                }
+                if (HWhName) {
+                    sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+                }
+                if (HSupName) {
+                    sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -420,9 +482,15 @@
             //#endregion
             //#region 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");
+                $("#HDept").val("");
+                $("#HMaterNumber").val("");
+                $("#HModelNumber").val("");
+                $("#HWhName").val("");
+                $("#HSupName").val("");
+                $("#HStockOrgName").val("");
                 sWhere = "";
                 get_Display(sWhere);
             }

--
Gitblit v1.9.1