Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

* 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection:
  添加当前页记忆功能

VisualInspection/js/appeal_management/appeal_checked.js

@@ -39,9 +39,12 @@ function queryCheckedAppealTask(){
     // var pager = {
     //     page_size:10
     // }
-    $('#checked_datatable').mytable({'cols':cols,
+   checkedAppealTableObj = $('#checked_datatable').mytable({'cols':cols,
                             'url':"/checkAppeal/getTaskList/",
-                            'param':data}
+                            'param':data,
+                            'pager': {
+                                    'p_cur': cur_page
+                                }}
                             );
     //保存本次查询参数
     $.zui.store.set('store_param_'+current_url,data);
@@ -50,5 +53,5 @@ function queryCheckedAppealTask(){
 function showTaskDetail(id){
     var rowData=getItemByIdFromArr(id,$('#checked_datatable').mytable('getTableData'));
     $.checkTask = rowData;
-    changePage("/view/mytask/taskDetail.html");
+    changePage("/view/mytask/taskDetail.html",checkedAppealTableObj);
 }

VisualInspection/js/appeal_management/appeal_list.js

@@ -1,4 +1,5 @@
 var cur_status;
+var cur_page;
 function initAppealPage() {
     initQueryParams();
     initTableRowBtn();
@@ -43,6 +44,7 @@ function initQueryParams() {
         $("#start_time").val(store_params.start_time.substr(0,11));
         $("#end_time").val(store_params.end_time.substr(0,11));
         // $("#hasScoreList").val(store_params.hasScore);
+        cur_page = store_params.currentpage;
     }
     if(roleContains("STATION")){
         checked_dept = getCurrentUser().organid;     
@@ -126,10 +128,13 @@ function queryAppeal(){
     if(cur_status==12 || cur_status==13){
         data.check_status_arr = [12,13];
     }
-    $('#appeal_list_table').mytable({'cols':cols,
+    appealTableObj = $('#appeal_list_table').mytable({'cols':cols,
                             'url':"/checkAppeal/getTaskList",
-                            'param':data}
-                            );
+                            'param':data,
+                            'pager': {
+                                    'p_cur': cur_page
+                                }
+                            });
     //保存本次查询参数
     $.zui.store.set('store_param_'+current_url,data);
 }
@@ -147,8 +152,7 @@ function seeCheckAudit(id,task_id){
         }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        console.log("申诉："+$.checkTask.appeal.id);
-        changePage("/view/mytask/taskDetail.html");
+        changePage("/view/mytask/taskDetail.html",appealTableObj);
     });
 // }
 }
@@ -213,7 +217,7 @@ function showAppealCheck(id){
         console.log(data);
         // console.log("申诉："+$.checkTask.appeal.id);
         no_return_common_service('/task/update', {"id":id,"check_status":13})
-        changePage("/view/mytask/check.html");
+        changePage("/view/mytask/check.html",appealTableObj);
     });
 }
 //进入继续稽查页面
@@ -229,7 +233,7 @@ function showAppealContinueCheck(id){
         }
         $.checkTask = rowData;
         $.checkTask.appeal = data;
-        changePage("/view/mytask/check.html");
+        changePage("/view/mytask/check.html",appealTableObj);
     });
 }
 

VisualInspection/js/appeal_management/appeal_submited.js

@@ -36,21 +36,24 @@ function querySubmitedAppealTask(){
     // var pager = {
     //     page_size:10
     // }
-    $('#checked_datatable').mytable({'cols':cols,
+    submitedAppealTableObj = $('#submited_datatable').mytable({'cols':cols,
                             'url':"/checkAppeal/getTaskList/",
-                            'param':data}
+                            'param':data,
+                            'pager': {
+                                    'p_cur': cur_page
+                                }}
                             );
     //保存本次查询参数
     $.zui.store.set('store_param_'+current_url,data);
 }
 
 function showTaskDetail(id){
-    var rowData=getItemByIdFromArr(id,$('#checked_datatable').mytable('getTableData'));
+    var rowData=getItemByIdFromArr(id,$('#submited_datatable').mytable('getTableData'));
     $.checkTask = rowData;
     post_common_service("/checkAppeal/getByTaskId", {"task_id":rowData.id}, function(data){
         $.checkTask = rowData;
         $.checkTask.appeal = data;
         console.log("申诉："+$.checkTask.appeal.id);
-        changePage("/view/mytask/taskDetail.html");
+        changePage("/view/mytask/taskDetail.html", submitedAppealTableObj);
     });
 }

VisualInspection/js/lib/mytable.js

@@ -25,7 +25,7 @@ String.prototype.replaceAll = function(s1, s2) {
                 page_size: 10
             }
         };
-        this.options = $.extend({}, DEFAULTS, options);
+        this.options = $.extend(true,{}, DEFAULTS, options);
         this.element = element;
         // this.options = options;
         this.pager = options.pager;
@@ -62,8 +62,11 @@ String.prototype.replaceAll = function(s1, s2) {
             var page_size = pager.page_size;
             var param = options.param;
             // var obj = this.obj;
+            //加载层
+            var index = layer.load(2, {shade: false}); //0代表加载的风格，支持0-2
             post_common_service(url + "/" + p_cur + "/" + page_size, param, function(data) {
-                console.log(data);
+                // console.log(data);
+                layer.close(index);
                 if (!data) {
                     data = { list: [] };
                     // return;
@@ -232,11 +235,11 @@ String.prototype.replaceAll = function(s1, s2) {
                         }
                         element.tt_checkedIds = checkedIds;
                         $(element).data("select_cache", checkedIds);
-                        console.log(element.tt_checkedIds);
+                        // console.log(element.tt_checkedIds);
                     }
                 });
                 $(element).find('.table .table-datatable .table-hover').html("");
-                console.log("执行清空");
+                // console.log("执行清空");
             }
         },
         setPager: function(data) {

VisualInspection/js/main.js

@@ -165,10 +165,17 @@ function getPageInfo(id) {
 
 var current_url; //当前显示页面url
 var current_mid; //当前显示页面id
-function changePage(url) {
+function changePage(url, tableObj) {
     // var pre_param = $.zui.store.get('store_param_'+url);
     // console.log(pre_param);
     if (typeof(url) != "undefined") {
+        //记住表格当前页
+        if(tableObj){
+            var data_param = $.zui.store.get('store_param_'+current_url);
+            if(data_param) data_param.currentpage=tableObj.options.pager.p_cur;
+            $.zui.store.set('store_param_'+current_url,data_param);
+        }
+
         CURRENT_PAGE_URL = url;
         var page_params = GetQueryString(url);
         $.zui.store.set("page_params", page_params);

VisualInspection/js/mytask/checked.js

@@ -35,10 +35,14 @@ function queryCheckedTask(){
     // var pager = {
     //     page_size:10
     // }
-    $('#checked_datatable').mytable({'cols':cols,
+    checkedTaskTableObj = $('#checked_datatable').mytable({'cols':cols,
                             'url':"/task/getTaskList/",
-                            'param':data}
-                            );
+                            'param':data,
+                            'pager': {
+                                    'page_size': 10,
+                                    'p_cur': cur_page
+                                }
+                            });
     //保存上次查询参数
     $.zui.store.set('store_param_'+current_url,data);
 }
@@ -46,5 +50,5 @@ function queryCheckedTask(){
 function showTaskDetail(id){
     var rowData=getItemByIdFromArr(id,$('#checked_datatable').mytable('getTableData'));
     $.checkTask = rowData;
-    changePage("/view/mytask/taskDetail.html");
+    changePage("/view/mytask/taskDetail.html",checkedTaskTableObj);
 }

VisualInspection/js/mytask/task_list.js

@@ -1,4 +1,5 @@
 var cur_status;
+var cur_page;
 function initTaskPage() {
     initQueryParams();
     initTableRowBtn();
@@ -43,6 +44,7 @@ function initQueryParams() {
         $("#start_time").val(store_params.start_time.substr(0,11));
         $("#end_time").val(store_params.end_time.substr(0,11));
         $("#hasScoreList").val(store_params.hasScore);
+        cur_page = store_params.currentpage;
     }
     if(roleContains("STATION")){
         checked_dept = getCurrentUser().organid;     
@@ -128,11 +130,14 @@ function queryTask(){
     if(cur_status==2 || cur_status==3){
         data.check_status_arr = [2,3];
     }
-    $('#task_list_table').mytable({'cols':cols,
+    taskTableObj = $('#task_list_table').mytable({'cols':cols,
                             'checkable':checkable,
                             'url':"/task/getTaskList/",
-                            'param':data}
-                            );
+                            'param':data,
+                            'pager': {
+                                    'p_cur': cur_page
+                                }
+                            });
     $.zui.store.set('store_param_'+current_url,data);
 }
 //进入稽查页面
@@ -142,14 +147,15 @@ function showCheck(id){
     $.checkTask.appeal = null;
     //开始稽查
     no_return_common_service('/task/update', {"id":$.checkTask.id,"check_status":3});
-    changePage("/view/mytask/check.html");
+    
+    changePage("/view/mytask/check.html",taskTableObj);
 }
 //进入继续稽查页面
 function showContinueCheck(id){
     // $('#myModal').modal({name:"dd"});
     $.checkTask =getItemByIdFromArr(id,$('#task_list_table').mytable('getTableData'));
     $.checkTask.appeal = null;
-    changePage("/view/mytask/check.html");
+    changePage("/view/mytask/check.html",taskTableObj);
 }
 //处置无效任务申请
 function showApplyDetail(id){
@@ -206,9 +212,8 @@ function showTaskDetail(id){
     if(typeof($.checkTask)!="undefined" && typeof($.checkTask.appeal) != "undefined"){
         $.checkTask.appeal = null;
     }
-    
-    
-    changePage("/view/mytask/taskDetail.html");
+      
+    changePage("/view/mytask/taskDetail.html",taskTableObj);
 }
 //下发所有任务
 function dispatchTaskPatch(){

VisualInspection/view/appeal_management/appeal_checked.html

@@ -50,6 +50,7 @@
     <div class="datatable" id="checked_datatable"></div>
 </div>
 <script>
+    var cur_page;
     $(document).ready(function() {
         // 仅选择日期
         $("#start_time").datetimepicker(
@@ -89,6 +90,7 @@
             $("#start_time").val(store_params.start_time.substr(0,11));
             $("#end_time").val(store_params.end_time.substr(0,11));
             // $("#hasScoreList").val(store_params.hasScore);
+            cur_page = store_params.currentpage;
         }
         if(roleContains("STATION")){
             checked_dept = getCurrentUser().organid;     

VisualInspection/view/appeal_management/appeal_submited.html

@@ -37,9 +37,10 @@
     </div>
     <br>
 
-    <div class="datatable" id="checked_datatable"></div>
+    <div class="datatable" id="submited_datatable"></div>
 </div>
 <script>
+    var cur_page;
     $(document).ready(function() {
         // 仅选择日期
         $("#start_time").datetimepicker(
@@ -79,6 +80,7 @@
             $("#start_time").val(store_params.start_time.substr(0,11));
             $("#end_time").val(store_params.end_time.substr(0,11));
             // $("#hasScoreList").val(store_params.hasScore);
+            cur_page = store_params.currentpage;
         }
         if(roleContains("STATION")){
             checked_dept = getCurrentUser().organid;     

VisualInspection/view/mytask/checked.html

@@ -50,6 +50,7 @@
     <div class="datatable" id="checked_datatable"></div>
 </div>
 <script>
+    var cur_page;
     $(document).ready(function() {
         // 仅选择日期
         $("#start_time").datetimepicker(
@@ -81,7 +82,7 @@
         var store_params = $.zui.store.get('store_param_'+current_url);
         var checked_dept = null;
         var position_id = null;
-         var checked_person = null;
+        var checked_person = null;
         if(store_params) {
             checked_dept = store_params.checked_dept;
             position_id = store_params.position_id;
@@ -89,6 +90,7 @@
             $("#start_time").val(store_params.start_time.substr(0,11));
             $("#end_time").val(store_params.end_time.substr(0,11));
             $("#hasScoreList").val(store_params.hasScore);
+            cur_page = store_params.currentpage;
         }
         setFeSelect("#fsList",checked_dept);
         setJobSelect("#jobSelect",position_id);