温红权 7 yıl önce
ebeveyn
işleme
fb3582f53c

+ 1 - 1
VisualInspection/fwq/js/appeal_management/appeal_list.js

@@ -14,7 +14,7 @@ function initQueryParams() {
         format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
 
     });
-    $("#start_time").val(getCurrentTimeFormat());
+    $("#start_time").val(getCurrentRealTimeFormat());
     //去上次查询保留的参数
     var store_params = $.zui.store.get('store_param_' + current_url);
     var checked_dept = null;

+ 1 - 1
VisualInspection/fwq/js/other_check/other_check.js

@@ -34,7 +34,7 @@ function init() {
         format: 'YYYY-MM-DD hh:mm',
         zIndex: 300000000000 // 分隔符可以任意定义,该例子表示只显示年月日
     });
-    $("#month_date").val(getCurrentTimeFormat());
+    $("#month_date").val(getCurrentRealTimeFormat());
     var road_manager;
     if (roleContains("STATION") || roleContains("WRECKER")) {
         road_manager = getCurrentUser().road_manager_id;

+ 1 - 1
VisualInspection/fwq/js/task/apply_task.js

@@ -4,7 +4,7 @@ function initApplyPage() {
         isinitVal: true,
         format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
     });
-    $("#start_time").val(getCurrentTimeFormat());
+    $("#start_time").val(getCurrentRealTimeFormat());
 
     setSASelect("#fsList");
 

+ 17 - 3
VisualInspection/fwq/js/task/task_list.js

@@ -11,16 +11,29 @@ function initQueryParams() {
     // 仅选择日期
     $.jeDate("#start_time", {
         isinitVal: true,
-        format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
+        format: 'YYYY-MM' // 分隔符可以任意定义,该例子表示只显示年月
     });
 
-    $("#start_time").val(getCurrentTimeFormat());
+    var store_params = $.zui.store.get('store_param_' + current_url);
+    var checked_dept = null;
+    if (store_params) {
+        checked_dept = store_params.checked_dept;
+
+        $("#start_time").val(store_params.end_time.substr(0, 7));
+        $("#hasScoreList").val(store_params.hasScore);
+        cur_page = store_params.currentpage;
+    } else {
+        $("#start_time").val(getCurrentRealTimeFormat());
+    }
+
+
     var page_params = $.zui.store.get("page_params");
+
+
     if (page_params && page_params.status) {
         cur_status = page_params.status;
     }
 
-    var checked_dept = null;
     if (roleContains("FWQ")) {
         checked_dept = getCurrentUser().organid;
     }
@@ -61,6 +74,7 @@ function queryTask() {
         "start_time": getMomentTimeFormat(t.starttime),
         "end_time": getMomentTimeFormat(t.endtime),
         "checked_dept": $("#fsList").val(),
+        "hasScore": $("#hasScoreList").val(),
         "check_status": cur_status
     };
     // console.log(data);

+ 1 - 1
VisualInspection/fwq/view/appeal_management/appeal_checked.html

@@ -48,7 +48,7 @@
             isinitVal: true,
             format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
         });
-        $("#start_time").val(getCurrentTimeFormat());
+        $("#start_time").val(getCurrentRealTimeFormat());
         //去上次查询保留的参数
         var store_params = $.zui.store.get('store_param_' + current_url);
         var checked_dept = null;

+ 1 - 1
VisualInspection/fwq/view/appeal_management/appeal_submited.html

@@ -39,7 +39,7 @@
             isinitVal: true,
             format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
         });
-        $("#start_time").val(getCurrentTimeFormat());
+        $("#start_time").val(getCurrentRealTimeFormat());
         //去上次查询保留的参数
         var store_params = $.zui.store.get('store_param_' + current_url);
         var checked_dept = null;

+ 19 - 19
VisualInspection/fwq/view/statistics/assess_type.html

@@ -3,9 +3,9 @@
 <link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css?__inline">
 <div class="container-fluid ">
     <div class="form-div">
-        <form  class="form-horizontal">
+        <form class="form-horizontal">
             <div class="form-group">
-                <div  class="form-group col-sm-5">
+                <div class="form-group col-sm-5">
                     <label class="col-sm-2">查询日期</label>
                     <div class="col-sm-5">
                         <input type="text" id="start-time" class="form-control form-date" placeholder="选择月份">
@@ -14,24 +14,24 @@
                         <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
                     </div> -->
                 </div>
-                <div  class="form-group col-sm-3">
+                <div class="form-group col-sm-3">
                     <div class="col-sm-6">
                         <button class="btn btn-info2" type="button" onclick="queryTypeClick()">查询</button>
                     </div>
                     <div class="col-sm-6">
-                        <button class="btn btn-info3" type="button" onclick="exportExcel()" >导出Excel</button>
+                        <button class="btn btn-info3" type="button" onclick="exportExcel()">导出Excel</button>
                     </div>
                 </div>
-            </div>    
+            </div>
         </form>
     </div>
     <div class="table-title"><span>温馨服务检查情况统计表</span></div>
 
     <div class="row">
-          <!-- 使用一个div来显示数据表格 -->
-          <div class="datatable" data-checkable="false" data-sortable="false"  style="margin-bottom:0px;">
-              <div class="table-head" >
-                  <table border="1" width="100%" height="90px" align="center">
+        <!-- 使用一个div来显示数据表格 -->
+        <div class="datatable" data-checkable="false" data-sortable="false" style="margin-bottom:0px;">
+            <div class="table-head">
+                <table border="1" width="100%" height="90px" align="center">
                     <thead class="table-thead">
                         <!-- <tr>
                         <th rowspan="2" width="6%">道管整体排名</th>
@@ -53,19 +53,19 @@
                     </thead>
                 </table>
             </div>
-          </div>
-          <div id="scrollTable" style="overflow:auto;">
-              <div class="table-head" style="margin:0px;">
-                  <table border="1" width="100%" height="90px" align="center" style="border-top:0px;">
+        </div>
+        <div id="scrollTable" style="overflow:auto;">
+            <div class="table-head" style="margin:0px;">
+                <table border="1" width="100%" height="90px" align="center" style="border-top:0px;">
                     <tbody class="table-tbody" style="background:white" align="center">
-               
+
                     </tbody>
-                  </table></div>
-          </div>
+                </table>
+            </div>
+        </div>
     </div>
 </div>
 <script>
-   
     $(document).ready(function() {
         // 设置滚动表格的高度
         $("#scrollTable").height($(window).height() - 300);
@@ -74,7 +74,7 @@
             isinitVal: true,
             format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
         });
-        $("#start-time").val(getCurrentTimeFormat());
+        $("#start-time").val(getCurrentRealTimeFormat());
         initQueryType();
     });
-</script>
+</script>

+ 1 - 1
VisualInspection/fwq/view/task/checked.html

@@ -49,7 +49,7 @@
             isinitVal: true,
             format: 'YYYY/MM' // 分隔符可以任意定义,该例子表示只显示年月
         });
-        $("#start_time").val(getCurrentTimeFormat());
+        $("#start_time").val(getCurrentRealTimeFormat());
         //去上次查询保留的参数
         var store_params = $.zui.store.get('store_param_' + current_url);
         var checked_dept = null;

+ 7 - 0
VisualInspection/js/util/util.js

@@ -856,6 +856,13 @@ function getCurrentTimeFormat() {
     return p.format("YYYY/MM");
 }
 
+function getCurrentRealTimeFormat() {
+    var m = (moment().get("M"));
+    var p = moment();
+    p = p.month(m);
+    return p.format("YYYY/MM");
+}
+
 function GV(selector) {
     return $(selector).val();
 }