From 295f6bfa5526f20e24f2ad8baf51bcc876bf512a Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 12 七月 2022 16:20:35 +0800
Subject: [PATCH] nothing

---
 WebTM/views/PublicPage/HSourceReportHtml.html |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 3d5f779..8cb53a7 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -93,7 +93,6 @@
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
             var HSouceBillType =  decodeURI(params[params[2]]);//婧愬崟绫诲瀷
-            console.log(HSouceBillType);
         }
         var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
         var table = null;
@@ -200,7 +199,6 @@
                     async: false,
                     dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
                     success: function (data1) {
-                        console.log(data1);
                         for (var key in data1.list) {
                             resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                         }
@@ -220,7 +218,7 @@
                 cols_arr[0] = [];
                 cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
                 for (var i = 0; i < data.length; i++) {
-                    if (data[i].name.substr(0, 1) == 'H') {
+                    if (data[i].name.substr(0, 1) == 'H' || data[i].name.substr(0, 1) == 'h') {
                         cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
                     }
                     else {
@@ -248,7 +246,7 @@
                     id: 'layTable', //琛ㄦ牸id
                     where: { sWhere: sWhere, HSouceBillType: HSouceBillType, HOrgID: linterid }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
                     page: true,   //寮�鍚垎椤�
-                    totalRow: true, //寮�鍚悎璁�
+                    totalRow: false, //寮�鍚悎璁�
                     limit: 50,     //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
                     limits: [50, 500, 2000, 20000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
                     method: 'get',  //鎻愪氦鏂瑰紡
@@ -284,15 +282,51 @@
                         return sWhere;
                         break;
                     case '鐢熶骇姹囨姤鍗�':
+                        if (HBillNo) {
+                            sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                        }
+                        if (PartNumber) {
+                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        }
+                        if (PartName) {
+                            sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+                        }
                         return sWhere;
                         break;
                     case '閲囪喘璁㈠崟':
+                        if (HBillNo) {
+                            sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                        }
+                        if (PartNumber) {
+                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        }
+                        if (PartName) {
+                            sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+                        }
                         return sWhere;
                         break;
                     case '鏀舵枡閫氱煡鍗�':
+                        if (HBillNo) {
+                            sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                        }
+                        if (PartNumber) {
+                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        }
+                        if (PartName) {
+                            sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+                        }
                         return sWhere;
                         break;
                     case '濮斿璁㈠崟':
+                        if (HBillNo) {
+                            sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                        }
+                        if (PartNumber) {
+                            sWhere += " and 鐗╂枡浠g爜 like '%" + PartNumber + "%'";
+                        }
+                        if (PartName) {
+                            sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+                        }
                         return sWhere;
                         break;
                     case '閫�璐ч�氱煡鍗�':

--
Gitblit v1.9.1