From dfd5eae1fc5e23550aee7782ee82a9b7ac476e75 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 19 十二月 2022 16:09:37 +0800
Subject: [PATCH] 寿命调整单 日期显示 寿命调整单 单据 新寿命 未保存进去

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldLifeChangeBillList.html     |  159 +++++++++++++++++++++++++---------------------------
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldLifeChangeBillList.html |   18 +++---
 2 files changed, 86 insertions(+), 91 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\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 fa464fc..42f16b0 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"
@@ -202,21 +202,21 @@
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
-                    , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
-                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', width: 100 }
+                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', width: 100 }
                     , { field: 'HPropertyID', title: 'HPropertyID', edit: 'text', width: 100, hide: true }
                     , { field: 'HPropertyCode', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HPropertyCode', width: 100 }
-                    , { field: 'HPropertyName', title: '杈呭姪灞炴��', edit: 'text', width: 100 }
+                    , { field: 'HPropertyName', title: '杈呭姪灞炴��', width: 100 }
                     , { field: 'HSecUnitID', title: 'HSecUnitID', edit: 'text', width: 100, hide: true }
                     , { field: 'HSecUnitCode', title: '杈呭姪璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HSecUnitCode', width: 100 }
-                    , { field: 'HSecUnitName', title: '杈呭姪璁¢噺鍗曚綅', edit: 'text', width: 100 }
+                    , { field: 'HSecUnitName', title: '杈呭姪璁¢噺鍗曚綅', width: 100 }
                     , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', edit: 'text', width: 100 }
                     , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
                     , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
-                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 100 }
                     , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HLeaveLife', title: '鍘熷墿浣欏鍛�', edit: 'text', width: 100 }
-                    , { field: 'HNewLife', title: '鏂板墿浣欏鍛�', edit: 'text', width: 100 }
+                    , { field: 'HNewLeaveLife', title: '鏂板墿浣欏鍛�', edit: 'text', width: 100 }
                     , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
                 ]]
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
@@ -224,7 +224,7 @@
             //鍒ゆ柇鏄惁鏂板
             if (hID == null || hID == 0) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLife": 0, "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" }];
                 table.render(option);
             }
             else {
@@ -260,7 +260,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLife": 0, "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HSecUnitRate": 0, "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HNewLeaveLife": 0, "HRemark": "" };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         //table.cache["mainTable"].push(AddRow[rows]);
@@ -340,7 +340,7 @@
                                         HMaterName: checkStatus.data[0].HName,
                                         HMaterSpec: checkStatus.data[0].HModel,
                                         HLeaveLife: checkStatus.data[0].HLeaveLife,
-                                        HNewLife: checkStatus.data[0].HNewLife,
+                                        HNewLeaveLife: checkStatus.data[0].HNewLife,
                                         HDesignLife: checkStatus.data[0].HDesignLife,  //璁捐瀵垮懡
 
                                     });
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 dc56fd0..f13563e 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"
@@ -128,6 +128,8 @@
     <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/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -145,78 +147,81 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //var option = {
+            //    elem: '#mainTable'
+            //    , toolbar: '#toolbarDemo'
+            //    , height: 550
+            //    , page: true
+            //    , cellMinWidth: 90
+            //    , limits: [50, 500, 5000, 20000]
+            //    , limit: 50
+            //    , cols: [[
+            //        { type: 'checkbox', fixed: 'left' }
+            //        ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+            //        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+            //        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+            //        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
+            //        , { field: 'HEmID', title: 'HEmID', width: 200, hide: true }
+            //        , { field: '璋冩暣浜轰唬鐮�', title: '璋冩暣浜轰唬鐮�', width: 200 }
+            //        , { field: '璋冩暣浜�', title: '璋冩暣浜�', width: 200 }
+            //        , { field: 'HMangerID', title: 'HEmID', width: 200, hide: true }
+            //        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
+            //        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+            //        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+            //        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+            //        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
+            //        , { field: '璋冩暣鍘熷洜', title: '璋冩暣鍘熷洜', width: 115 }
+            //        , { field: '鎽樿', title: '鎽樿', width: 200 }
+            //        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
+            //        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+            //        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+            //        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+            //        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
+            //        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+            //        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+            //        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
+            //        , { field: '妯″叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 200 }
+            //        , { field: '妯″叿', title: '鍣ㄥ叿', width: 200 }
+            //        , { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
+            //        , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 200 }
+            //        , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 200 }
+            //        , { field: 'HSecUnitID', title: 'HSecUnitID', width: 200, hide: true }
+            //        , { field: '杈呭姪璁¢噺鍗曚綅浠g爜', title: '杈呭姪璁¢噺鍗曚綅浠g爜', width: 200 }
+            //        , { field: '杈呭姪璁¢噺鍗曚綅', title: '杈呭姪璁¢噺鍗曚綅', width: 200 }
+            //        , { field: '鎹㈢畻鐜�', title: '鎹㈢畻鐜�', width: 200 }
+            //        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
+            //        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
+            //        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 }
+            //        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 }
+            //        , { field: '鍘熷墿浣欏鍛�', title: '鍘熷墿浣欏鍛�', width: 200 }
+            //        , { field: '鏂板墿浣欏鍛�', title: '鏂板墿浣欏鍛�', width: 200 }
+            //        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+            //        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+            //        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+            //        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+            //        , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+            //        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+            //        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+            //        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+            //        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+            //        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+            //        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+            //        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+            //        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+            //        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+            //    ]]
+            //};
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , limits: [50, 500, 5000, 20000]
-                , limit: 50
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
-                    , { field: 'HEmID', title: 'HEmID', width: 200, hide: true }
-                    , { field: '璋冩暣浜轰唬鐮�', title: '璋冩暣浜轰唬鐮�', width: 200 }
-                    , { field: '璋冩暣浜�', title: '璋冩暣浜�', width: 200 }
-                    , { field: 'HMangerID', title: 'HEmID', width: 200, hide: true }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 200 }
-                    , { field: '璋冩暣鍘熷洜', title: '璋冩暣鍘熷洜', width: 115 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
-                    , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
-                    , { field: '妯″叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 200 }
-                    , { field: '妯″叿', title: '鍣ㄥ叿', width: 200 }
-                    , { field: 'HPropertyID', title: 'HPropertyID', width: 200, hide: true }
-                    , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 200 }
-                    , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 200 }
-                    , { field: 'HSecUnitID', title: 'HSecUnitID', width: 200, hide: true }
-                    , { field: '杈呭姪璁¢噺鍗曚綅浠g爜', title: '杈呭姪璁¢噺鍗曚綅浠g爜', width: 200 }
-                    , { field: '杈呭姪璁¢噺鍗曚綅', title: '杈呭姪璁¢噺鍗曚綅', width: 200 }
-                    , { field: '鎹㈢畻鐜�', title: '鎹㈢畻鐜�', width: 200 }
-                    , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
-                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 }
-                    , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 200 }
-                    , { field: '鍘熷墿浣欏鍛�', title: '鍘熷墿浣欏鍛�', width: 200 }
-                    , { field: '鏂板墿浣欏鍛�', title: '鏂板墿浣欏鍛�', width: 200 }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                ]]
-            };
             var HModName = "Sc_MouldLifeChangeBillList";
             var col = [];
             var titleData = ["鍗曟嵁ID", "HEmID", "HEmID", "HDeptID", "hsubid", "HMaterID", "HPropertyID", "HSecUnitID", "Hunitid", "婧愬崟涓诲唴鐮�", "婧愬崟绫诲瀷","hmainid","HEmpID","HMangerID","HUnitID","HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var index = layer.load(0);
 
-            //鍒濆鍖栬〃鏍�
-            DisPlay_HideColumn();
+          //鍒濆鍖栨椂闂�
+            $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+            $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -320,20 +325,8 @@
                 //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                 url: GetWEBURL() + '/Sc_MouldLifeChangeBill/GetMouldLifeChangeBill',
                 type: "GET",
+                async: false,
                 data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                //success: function (data1) {
-                //    if (data1.count == 1) {
-                //        option.data = data1.data;
-                //        table.render(option);
-                //        layer.close(index);
-                //    } else {
-                //        layer.close(index);
-                //        layer.alert(data1.code + data1.Message, { icon: 5 });
-                //    }
-                //}, error: function () {
-                //    layer.close(index);
-                //    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                //}
                 success: function (data1) {
                     if (data1.count == 1) {
                         var data = [];
@@ -365,7 +358,7 @@
                             , toolbar: '#toolbarDemo'
                             , cols: [col]
                             , data: data1.data
-                            , height: 550
+                            , height: 800
                             , page: true
                             , cellMinWidth: 90
                             , limit: 50
@@ -390,11 +383,13 @@
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             });
+              //鍒濆鍖栬〃鏍�
+            DisPlay_HideColumn();
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#ColContent").val("");
                 $("#ColName").val("0");

--
Gitblit v1.9.1