From b64157b1475aeaaf8366fde1c04f3a925d7ba96c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 30 十二月 2022 10:35:54 +0800
Subject: [PATCH] 器具管理维护

---
 WebTM/views/基础资料/基础资料/Gy_StockCheckItemList.html              |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html         |    4 
 WebTM/views/基础资料/基础资料/Sc_MouldStockBillMain_Temp.html         |    1 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html       |    8 ++
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileResume.html               |    9 ++-
 WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html         |   39 +++++++------
 WebTM/views/设备管理/Sb_EquipMaintainBillList.html                |    9 ++-
 WebTM/views/模治具管理/器具报表/ReportInventoryAccount.html            |    4 
 WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html      |    6 +
 WebTM/views/模治具管理/器具报表/ReportMouldStock.html                  |    2 
 WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html |   19 +++--
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html            |   10 ++-
 WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html         |    7 +
 WebTM/views/设备管理/Sb_EquipDotCheckBillList.html                |   35 ++++++-----
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeChangeBillList.html     |    2 
 WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html       |    2 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html         |   12 ++-
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html |    4 
 18 files changed, 104 insertions(+), 71 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemList.html"
index f52204b..ed67b5a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemList.html"
@@ -183,7 +183,7 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.msg("鏌ヨ鎴愬姛");
                         } else {
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_MouldStockBillMain_Temp.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_MouldStockBillMain_Temp.html"
index 12c413b..4b41620 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_MouldStockBillMain_Temp.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_MouldStockBillMain_Temp.html"
@@ -225,6 +225,7 @@
                 $("#HMaterName").val("");
                 $("#HSourceBillNo").val("");
                 $("#HMaker").val("");
+                $("#HBarCode").val("");
                 $("#btnSearch").click();
             }
             //鍒犻櫎
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
index d509100..013caf3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
@@ -282,8 +282,8 @@
 
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
-                $("#HStartDate").val("");//鏃ユ湡
-                $("#HEndDate").val("");//鐗╂枡
+                $("#HStartDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HSupName").val("");//寰�鏉ュ崟浣�
                 get_FastQuery();
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
index c603182..00da794 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportMouldStock.html"
@@ -246,6 +246,8 @@
 
             // #region 鍒濆鍖栫晫闈�
             function set_ClearBill(HDate, HNumber, HBarCode, HSupName) {
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                 resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
                 //鍒濆鏌ヨ
                 get_Display(HDate, HNumber, HBarCode, HSupName);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
index 2cb1e38..e0c4051 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
@@ -294,7 +294,6 @@
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
                 OperationType = 1;
-                linteridSub = -1;
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
@@ -308,7 +307,7 @@
             }
             else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
 
-                RoadBillMain(linterid, linteridSub);
+                RoadBillMain(linterid);
             }
             set_ClearBill();
 
@@ -723,8 +722,7 @@
             function set_AddNew(data) {
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                 var index = layer.load();
 
                 $.ajax({
@@ -751,13 +749,13 @@
                 });
             }
             //缂栬緫
-            function RoadBillMain(linterid, linteridSub) {
-                var sWhere = " and hmainid ='" + linterid + "' and hsubid='" + linteridSub + "' ";
+            function RoadBillMain(linterid) {
+                var sWhere = " and hmainid ='" + linterid + "'";
 
                 $.ajax({
                     url: GetWEBURL() + '/Sc_MouldRepairSendWorkBill/GetMouldRepairSendWorkBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (d) {
                         //涓昏〃
                         form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -795,7 +793,12 @@
                             , "HRemark": d.data[0].澶囨敞
                         });
                         //瀛愯〃
-                        var rowdata = [{ "瀛愮淮淇」鐩�": d.data[0].瀛愮淮淇」鐩�, "HRepairID": d.data[0].HRepairID, "瀛愮淮淇」鐩唬鐮�": d.data[0].瀛愮淮淇」鐩唬鐮�, "HRepairExplanation": d.data[0].瀛愮淮淇姹�, "瀛愯礋璐d汉浠g爜": d.data[0].瀛愯礋璐d汉浠g爜, "HManagerID": d.data[0].瀛愯礋璐d汉id, "瀛愯礋璐d汉": d.data[0].瀛愯礋璐d汉, "HMoney": d.data[0].缁翠慨璐圭敤, "HRemark": d.data[0].琛ㄤ綋澶囨敞 }];
+                        var rowdata = [];
+                        for (var i = 0; i < d.data.length; i++) {
+                            rowdata.push(
+                                { "瀛愮淮淇」鐩�": d.data[i].瀛愮淮淇」鐩�, "HRepairID": d.data[i].HRepairID, "瀛愮淮淇」鐩唬鐮�": d.data[i].瀛愮淮淇」鐩唬鐮�, "HRepairExplanation": d.data[i].瀛愮淮淇姹�, "瀛愯礋璐d汉浠g爜": d.data[i].瀛愯礋璐d汉浠g爜, "HManagerID": d.data[i].瀛愯礋璐d汉id, "瀛愯礋璐d汉": d.data[i].瀛愯礋璐d汉, "HMoney": d.data[i].缁翠慨璐圭敤, "HRemark": d.data[i].琛ㄤ綋澶囨敞 }
+                            )
+                        } 
                         option.data = rowdata;
                         table.render(option);
                     }
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
index 42f16b0..13b3597 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldLifeChangeBillList.html"
@@ -673,12 +673,12 @@
 
 
             form.on('submit(Exit)', function (data) {//
-                if (hID == undefined) {
+                if (params[params[0]] == undefined) {
                     //鍏抽棴椤电
                     Pub_Close(2);
                 }
                 else {
-                    //鍏抽棴椤电
+                    //鍏抽棴寮圭獥
                     Pub_Close(1);
                 }
             });
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.html"
index f13563e..98a46dd 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldLifeChangeBillList.html"
@@ -237,7 +237,7 @@
                             shift: 2,
                             area: ['100%', '100%'],
                             maxmin: true,
-                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html',
+                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html?hID=0',
                             end: function () {
                                 //鍒锋柊椤甸潰,
                                 location.reload();
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
index bd9051b..f48d8ec 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
@@ -465,7 +465,7 @@
                     var InterID = data[0].hmainid.toString();
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Sc_MouldProdInHouseBill/AuditMouldProdInHouseBills", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag":1 },
                         success: function (result) {
                             if (result.count == 1) {
@@ -498,7 +498,7 @@
                     var InterID = data[0].hmainid.toString();
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "Sc_MouldProdInHouseBill/AuditMouldProdInHouseBills", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
                         success: function (result) {
                             if (result.count == 1) {
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
index 56d08f8..630a076 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
@@ -741,7 +741,13 @@
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                Pub_Close(1);
+                if (typeof (params[params[0]]) == "undefined") {//鏂板
+                    Pub_Close(2);
+                }
+                else  {//缂栬緫
+                    Pub_Close(1);
+                }
+               
             });
             //鎵撳嵃Printing
             form.on("submit(view)", function (data) {
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/Gy_MouldFileResume.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/Gy_MouldFileResume.html"
index 6ad46db..d4fd1b3 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/Gy_MouldFileResume.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/Gy_MouldFileResume.html"
@@ -220,6 +220,9 @@
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             function set_ClearBill() {
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+                //鍒濆鍖栬〃鏍�
                 //鍒濆鍖栬〃鏍�(涓昏〃)
                 set_InitGrid();
                 //鍒濆鍖栬〃鏍�(瀛愯〃1)
@@ -512,7 +515,7 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
                 }
                 if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -522,8 +525,8 @@
                 //$("#HBillType").val("");//鍗曟嵁绫诲瀷
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HMouldType").val("");//璁惧绫诲瀷
-                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 sWhere = "";
                 $("#btnSearch").click();
             }
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/Sb_MouldRepairWorkBillList.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/Sb_MouldRepairWorkBillList.html"
index 495cef1..76a45bf 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/Sb_MouldRepairWorkBillList.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/Sb_MouldRepairWorkBillList.html"
@@ -703,7 +703,7 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
                 }
                 if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate1 + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
                 }
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
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_MouldConkBookBillList.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_MouldConkBookBillList.html"
index 8ec6589..40943f3 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_MouldConkBookBillList.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_MouldConkBookBillList.html"
@@ -102,23 +102,23 @@
                                         </div>
                                     </div>
                                 </div>
-                        </div>
-                        <table class="" id="mainTable" lay-filter="mainTable"></table>
-                        <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm" style="display:none;"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back" style="display:none;"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
-                        </script>
+                            <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            <script type="text/html" id="toolbarDemo">
+                                <div class="layui-btn-container">
+                                    <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm" style="display:none;"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back" style="display:none;"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                </div>
+                            </script>
                     </form>
                 </div>
             </div>
@@ -128,6 +128,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -193,8 +194,8 @@
             form.on('submit(btnReSearch)', function (data) {
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#btnSearch").click();
                 $("#ColContent").val("");
                 $("#ColName").val("0");
@@ -208,6 +209,8 @@
 
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
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_MouldDotCheckBillList.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_MouldDotCheckBillList.html"
index 5556048..3a7a0f7 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_MouldDotCheckBillList.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_MouldDotCheckBillList.html"
@@ -153,6 +153,9 @@
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             //鍔犺浇鏁版嵁鍒扮綉鏍�
@@ -230,8 +233,8 @@
             function set_ClearQuery() {
                 $("#HBillNo").val("");
                 $("#PartModul").val("");
-                $("#BenginHCreateDate").val("");
-                $("#EndHCreateDate").val("");
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
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_MouldMaintainBillList.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_MouldMaintainBillList.html"
index da70260..6118be9 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_MouldMaintainBillList.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_MouldMaintainBillList.html"
@@ -258,7 +258,9 @@
 
            //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
            // 鍒濆鍖栫晫闈�
-           function set_ClearBill() {
+            function set_ClearBill() {
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 //鍒濆鍖栬〃鏍�(涓昏〃)
                 set_InitGrid();
                 //鍒濆鍖栬〃鏍�(瀛愯〃)
@@ -483,10 +485,10 @@
                     sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
                 }
                 if (BenginHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
                 }
                 if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -497,8 +499,8 @@
                 $("#HBillType").val("");//鍗曟嵁绫诲瀷
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 //$("#btnSearch").click();
                 $("#ColContent").val("");
                 $("#ColName").val("0");
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_MouldRepairCheckBillList.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_MouldRepairCheckBillList.html"
index 7a2f768..fa6ebd4 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_MouldRepairCheckBillList.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_MouldRepairCheckBillList.html"
@@ -145,6 +145,8 @@
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
+            $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+            $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             //鍔犺浇鏁版嵁鍒扮綉鏍�
@@ -435,8 +437,8 @@
             function set_ClearQuery() {
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#BenginHCreateDate").val();//Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")
-                $("#EndHCreateDate").val();//Format(new Date(), "yyyy-MM-dd")
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index 2949ad2..d4640d2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -29,15 +29,15 @@
                                     </div>
                                 </div>
                                 <!--<div class="layui-inline">
-        <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
-        <div class="layui-input-block">
-            <select name="HBillType" id="HBillType">
-                <option value="">鎵�鏈�</option>
-                <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
-                <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
-            </select>
-        </div>
-    </div>-->
+                                    <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+                                    <div class="layui-input-block">
+                                        <select name="HBillType" id="HBillType">
+                                            <option value="">鎵�鏈�</option>
+                                            <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
+                                            <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
+                                        </select>
+                                    </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
@@ -117,10 +117,10 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></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-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></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>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
@@ -135,6 +135,7 @@
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/PubCustom.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -205,6 +206,8 @@
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
@@ -457,7 +460,7 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
                 }
                 if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -468,8 +471,8 @@
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HSourceBillNo").val("");//婧愬崟鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index 6551033..7bbfbe4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -95,6 +95,7 @@
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../layuiadmin/PubCustom.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -167,7 +168,8 @@
             //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
             //鍒濆鍖栭〉闈�
             function set_ClearBill() {
-
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
@@ -257,8 +259,8 @@
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HSourceBillNo").val("");//婧愬崟鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 sWhere = "";
                 $("#btnSearch").click();
             }
@@ -279,7 +281,7 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
                 }
                 if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index bf7f128..5bf663c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -261,6 +261,9 @@
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             function set_ClearBill() {
+                //鍒濆鍖栨棩鏈�
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 //鍒濆鍖栬〃鏍�(涓昏〃)
                 set_InitGrid();
                 //鍒濆鍖栬〃鏍�(瀛愯〃1)
@@ -613,7 +616,7 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
                 }
                 if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -624,8 +627,8 @@
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HSourceBillNo").val("");//婧愬崟鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");

--
Gitblit v1.9.1