Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-web/src/main/webapp/app/cit/report/cit-report-sheet/cit-report-sheet.js

@@ -89,8 +89,6 @@
                 var loadSheet = function (templateId, update) {
                     var prokjectId = vatSessionService.project.id;
                     var period = 0;
-                    setData();
-
                     return templateService.getPeriodTemplateJson(templateId,period,prokjectId).then(function (reportSpread) {
                         var spreadCtrl = getSpreadControl();
                         if (spreadCtrl) {

atms-web/src/main/webapp/app/cit/report/entryList-modal/entryList-modal.ctrl.js

@@ -32,8 +32,8 @@
                 mode: "standard"
             },
             selection: {
-                mode: "multiple",
-                deferred: true
+                mode: "multiple"/*,
+                deferred: true*/
             },
             sorting: {
                 mode: 'single'
@@ -80,8 +80,8 @@
             showColumnLines: true,
             filterRow: {
                 visible: true
-            },
-            selectionFilter: ["Task_Status", "=", "Completed"]
+            }/*,
+            selectionFilter: ["Task_Status", "=", "Completed"]*/
         };
 
         //设置数据源表格的列