'报表前端计算及ie日期bug修改'g

src/main/resources/static/app/app.js

@@ -131,6 +131,7 @@ angular.module('app', [
     	return angular.isObject(data) && String(data) !== '[object File]' ? $.param(data) : data;
     }];
     
+  
     //$httpProvider.defaults.withCredentials = true;跨越session失效
 
     // 默认表单验证参数

src/main/resources/static/app/business/reportMonthly/controller/reportMonthlyCtrl.js

@@ -8,10 +8,10 @@ angular.module('app.business')
         $scope.search = {id:""};
         $scope.loadData = function () {
             // console.log('列表数据')
-            console.log($scope.searchCondition,'$scope.searchCondition')
+            // console.log($scope.searchCondition,'$scope.searchCondition')
             reportMonthlyService.loadData($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition.reportPeriod,$scope.searchCondition.status,$scope.searchCondition.filledTime)
                 .then(function(data){
-                    console.log(data,'pageInfoData--monthData')
+                    // console.log(data,'pageInfoData--monthData')
                     $scope.pageInfoData = data;
 
                 },function(data){
@@ -23,7 +23,7 @@ angular.module('app.business')
         $scope.auditList = [];
         $scope.reportMonthly.status = null
 
-        console.log($stateParams,'$stateParams')
+        // console.log($stateParams,'$stateParams')
         //获取当前登陆人所在单位
         $scope.reportMonthly.orgName=$rootScope.orgInfo.orgName;
         $scope.reportMonthly.filledUnit=$rootScope.orgInfo.orgName;
@@ -34,7 +34,7 @@ angular.module('app.business')
         //获取当前时间
         var nowTime=new Date();
         $scope.year = nowTime.getFullYear()
-        console.log($scope.year,'year')
+        // console.log($scope.year,'year')
         $scope.reportMonthly.monthlyTime = nowTime;
         $scope.reportMonthly.filledTime=$rootScope.now;
         // console.log($rootScope.now,'$rootScope.now')
@@ -73,10 +73,10 @@ angular.module('app.business')
                 $scope.reportMonthly.companyOrgCode=$rootScope.orgInfo.companyOrgCode;//组织机构代码
                 // console.log($scope.reportMonthly.monthlyTime,$("input[name='monthlyTime']").val(),'月报表日期')
                 // $scope.reportMonthly.monthlyTime = $("input[name='monthlyTime']").val();
-                // console.log($scope.reportMonthly,'reportMonthly')
+                // console.log($scope.reportMonthly,'reportMonthly-查看保存数据')
                 reportMonthlyService.saveData(angular.toJson($scope.reportMonthly),orgId)
                     .then(function (data) {
-                        console.log(data,'data')
+                        // console.log(data,'data')
                         //alertService.showSuccess("操作成功");
                         alert("保存成功！");
                         $state.go('app.business.reportMonthly-list');
@@ -88,7 +88,26 @@ angular.module('app.business')
             }
         }
         
-       
+      //  计算比例
+        $scope.proport = function(a,b,c) {
+        // console.log('计划:'+a,'交易量：'+b,'类型：'+ c)
+        if(b!=0) {
+          // console.log('商不能为0！')
+          if(c == 1) {
+            // console.log('省级')
+            $scope.reportMonthly.provincePlanProportion = (b/a).toFixed(4)*100
+          }else if(c ==2 ){
+            // console.log('市级')
+            $scope.reportMonthly.municipalPlanProportion = (b/a).toFixed(4)*100
+
+          }else if(c == 3) {
+            // console.log("县级")
+            $scope.reportMonthly.countyPlanProportion = (b/a).toFixed(4)*100
+
+          }
+        }
+        
+      }
         
         $scope.loadMonthlyData = function () {
             $scope.type  = $stateParams.type
@@ -134,7 +153,7 @@ angular.module('app.business')
         if( $stateParams.id != undefined && $stateParams.id != null && $stateParams.id != '' &&  $stateParams.id != 0){
             $scope.loadMonthlyData();
         }
-        
+
         
         
         // 点击上报，修改其状态
@@ -151,13 +170,13 @@ angular.module('app.business')
                 reportMonthlys.orgName=$rootScope.orgInfo.orgName;
                 reportMonthlys.companyOrgCode=$rootScope.orgInfo.companyOrgCode;//组织机构代码
 
-                console.log(reportMonthlys,'reportMonthlys')
+                // console.log(reportMonthlys,'reportMonthlys')
                 reportMonthlyService.reportMonthly(reportMonthlys).then(function(data){
-                    console.log(data,"----上报结果");
+                    // console.log(data,"----上报结果");
                     if(data.status=="success"){
                         //alert("点击上报后不可再取消，确认上报");
                         reportMonthlyService.updateStatusm(id).then(function(data){
-                            console.log(data,"上报状态修改返回");
+                            // console.log(data,"上报状态修改返回");
                             if(data.status=="success"){
                                 // $scope.reportMonthly.status = 0
                                 $scope.loadData();
@@ -168,9 +187,12 @@ angular.module('app.business')
                             console.log(data);
                         });
 
-                    }else{
-                        alert("省级平台接收数据有误，尽快与其联系！");
+                    }else if(data.infoCode == 303){
+                        console.log(data.msg,data.status,'重复提交报错信息')
+                        alert("当前机构已提交过该月报表，请勿重复提交！");
                         // $scope.saveFlag = false ;
+                    }else if(data.infoCode == 500) {
+                      alert("服务异常")
                     }
 
                 },function(data){
@@ -217,4 +239,70 @@ angular.module('app.business')
         },"请输入大于0的数字，最多三位小数！");
 
 
+         //  计算汇总（合计）
+         $scope.subTotal = function(num1,num2,num3,category,level) {
+          // console.log('小麦:'+num1,'玉米：'+num2,'食用油：'+ num3,'类别：'+category, '级别：'+level)
+          if(category == 'plan') {
+            // 计划
+            if(level == 3) {
+              // 省级
+              $scope.reportMonthly.provincePlanTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level ==2) {
+               // 市级
+               $scope.reportMonthly.municipalPlanTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 1) {
+              // 县级 
+              $scope.reportMonthly.countyPlanTotal =Number(num1) +Number(num2) + Number(num3)
+            }
+          }else if(category == 'out') {
+            // 本周轮出
+            if(level == 3) {
+              // 省级
+              $scope.reportMonthly.provinceOutTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 2) {
+              // 市级
+              $scope.reportMonthly.municipalOutTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if (level == 1) {
+              // 县级
+              $scope.reportMonthly.countyOutTotal =Number(num1) +Number(num2) + Number(num3)
+            }
+          }else if(category == 'outCumulative') {
+            // 累计轮出
+            if(level == 3) {
+              // 省级
+              $scope.reportMonthly.provinceOutTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 2) {
+              // 市级
+              $scope.reportMonthly.municipalOutTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 1 ) {
+              // 县级
+              $scope.reportMonthly.countyOutTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }
+          }else if(category == 'in') {
+            // 本周轮入
+            if(level == 3) {
+              // 省级
+              $scope.reportMonthly.provinceInTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 2) {
+              // 市级
+              $scope.reportMonthly.municipalInTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 1) {
+              // 县级
+              $scope.reportMonthly.countyInTotal =Number(num1) +Number(num2) + Number(num3)
+            }
+          }else if(category == 'inCumulative') {
+            // 累计轮入
+            if(level == 3) {
+              // 省级
+              $scope.reportMonthly.provinceInTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 2) {
+              // 市级
+              $scope.reportMonthly.municipalInTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 1) {
+              // 县级
+              $scope.reportMonthly.countyInTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }
+          } 
+        }
+
     })

src/main/resources/static/app/business/reportWeekly/controller/reportWeeklyCtrl.js

@@ -3,13 +3,13 @@
 angular.module('app.business')
     .controller("reportWeeklyCtrl", function($scope, $state,$rootScope, $stateParams, enumService,reportWeeklyService, APP_CONFIG) {
         // 获取列表数据
-        $scope.pageInfo = {pageNum : 1, pageSize : 10};
+        $scope.pageInfo = {pageNum : 1, pageSize : 25};
         $scope.searchCondition = {reportPeriod:'',status:'',filledTime:''};
         $scope.search = {id:""};
         $scope.loadData = function () {
             reportWeeklyService.loadData($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition.reportPeriod,$scope.searchCondition.status,$scope.searchCondition.filledTime)
                 .then(function(data){
-                    console.log(data,'pageInfoData---loadData')
+                    // console.log(data,'pageInfoData---loadData')
                     
                     $scope.pageInfoData = data;
 
@@ -34,11 +34,13 @@ angular.module('app.business')
         //获取当前时间
         var nowTime=new Date();
         var date = new Date(nowTime);
-        $scope.year = nowTime.getFullYear()
-        console.log($scope.year,'years')
-        nowTime=date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() /* + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds() */; 
-
-        $scope.reportWeekly.filledTime= nowTime;
+        $scope.year = new Date().getFullYear()
+        // console.log($scope.year,'years')
+        nowTime=date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()/*  + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds() */; 
+        $scope.reportWeekly.filledTime=new Date()
+        // console.log($rootScope.now,'now')
+        // console.log($scope.reportWeekly.filledTime,'现在时间')
+        // $scope.reportWeekly.filledTime= nowTime;
 
         // 翻页
         $scope.goPage = function(pageNum) {
@@ -72,17 +74,18 @@ angular.module('app.business')
         
         // 新增提交
         $scope.saveWeeklyData = function () {
-            
-            
             if(validator.form()) {
-                console.log('校验成功')
+                // console.log('校验成功')
                 var orgId = $rootScope.userInfo.orgId;//当前登录者的库id
                 $scope.reportWeekly.companyOrgCode=$rootScope.orgInfo.companyOrgCode;//组织机构代码
                 // $scope.reportWeekly.filledTime = $("input[name='filledTime']").val();
-                $scope.reportWeekly.filledTime = new Date($scope.reportWeekly.filledTime) 
-                $scope.reportWeekly.weeklyTimeStart = new Date($('#weeklyTimeStart').val())
-                $scope.reportWeekly.weeklyTimeEnd = new Date($('#weeklyTimeEnd').val())
-                // console.log($scope.reportWeekly,'reportWeekly')
+                // $scope.reportWeekly.filledTime = new Date($scope.reportWeekly.filledTime) 
+                // 在ie中不支持‘-’格式，需要把日期转为 "/"  var date= new Date(Date.parse(a.replace(/-/g,'/' )) )
+                $scope.reportWeekly.weeklyTimeStart = new Date(Date.parse(( $('#weeklyTimeStart').val()).replace(/-/g,'/' ) ))
+                $scope.reportWeekly.weeklyTimeEnd = new Date(Date.parse(( $('#weeklyTimeEnd').val()).replace(/-/g,'/' ) ))
+                // console.log($scope.reportWeekly,'reportWeekly-查看周报表保存数据')
+                // console.log($scope.reportWeekly.weeklyTimeStart,$scope.reportWeekly.weeklyTimeEnd,'$scope.reportWeekly.weeklyTimeStart,$scope.reportWeekly.weeklyTimeEnd,')
+ 
                 reportWeeklyService.saveData(angular.toJson($scope.reportWeekly),orgId)
                     .then(function (data) {
                         // console.log(data,'data')
@@ -113,13 +116,13 @@ angular.module('app.business')
                     var reportWeeklys = angular.fromJson(angular.toJson(data));
                     reportWeeklys.orgName= $rootScope.orgInfo.orgName;
                     reportWeeklys.companyOrgCode= $rootScope.orgInfo.companyOrgCode;//组织机构代码
-                    console.log(reportWeeklys,'reportWeeklys---111--22')
+                    // console.log(reportWeeklys,'reportWeeklys---111--22')
                     reportWeeklyService.reportWeekly(reportWeeklys).then(function(data){
-                        console.log(data +"----上报结果");
+                        // console.log(data +"----上报结果");
                         if(data.status=="success"){
                             //alert("点击上报后不可再取消，确认上报");
                             reportWeeklyService.updateStatusw(id).then(function(data){
-                                console.log(data,"上报状态修改返回值");
+                                // console.log(data,"上报状态修改返回值");
                                 if(data.status=="success"){
                                     // $scope.reportWeekly.status = 0
                                     $scope.loadData();
@@ -130,9 +133,12 @@ angular.module('app.business')
                                 console.log(data);
                             });
 
-                        }else{
-                            alert("省级平台接收数据有误，尽快与其联系！");
+                        }else if(data.infoCode == 303){
+                            console.log(data.msg,data.status,'重复提交报错信息')
+                            alert("当前机构已提交过该周报表，请勿重复提交！");
                             $scope.saveFlag = false ;
+                        }else if(data.infoCode == 500){
+                          alert("服务异常")
                         }
 
                     },function(data){
@@ -164,10 +170,11 @@ angular.module('app.business')
                     $scope.reportWeekly = data;
                     // reportWeekly.weeklyTimeStart
                     // console.log(data,'data')
+                    // console.log(data.weeklyTimeStart,'datdata.weeklyTimeStarta')
                     // endDate.getFullYear() + '-' + (endDate.getMonth() + 1) + '-' + endDate.getDate()
                     $scope.reportWeekly.weeklyTimeStart = new Date(data.weeklyTimeStart).getFullYear() + '-' + (new Date(data.weeklyTimeStart).getMonth() + 1) + '-' + new Date(data.weeklyTimeStart).getDate()
                     $scope.reportWeekly.weeklyTimeEnd = new Date(data.weeklyTimeEnd).getFullYear() + '-' + (new Date(data.weeklyTimeEnd).getMonth() + 1) + '-' + new Date(data.weeklyTimeEnd).getDate()
-                    console.log($scope.reportWeekly.weeklyTimeStart,'$scope.reportWeekly.weeklyTimeStart')
+                    // console.log($scope.reportWeekly.weeklyTimeStart,'$scope.reportWeekly.weeklyTimeStart')
                     // console.log($scope.reportWeekly,'$scope.reportWeekly0000000')
                     // $scope.reportWeekly.monthlyTime = $filter('date')($scope.reportWeekly.monthlyTime, "yyyy-MM-dd");
 
@@ -226,4 +233,74 @@ angular.module('app.business')
             var checkNumber = /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,3})?$/;
             return this.optional(element)||(checkNumber.test(value));
         },"请输入大于0的数字，最多三位小数！");
+
+         //  计算汇总（小计）
+         $scope.subTotal = function(num1,num2,num3,category,level) {
+          // console.log('小麦:'+num1,'玉米：'+num2,'食用油：'+ num3,'类别：'+category, '级别：'+level)
+          if(category == 'plan') {
+            // 计划
+            if(level == 3) {
+              // 省级
+              $scope.reportWeekly.provincePlanTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level ==2) {
+               // 市级
+               $scope.reportWeekly.municipalPlanTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 1) {
+              // 县级 
+              $scope.reportWeekly.countyPlanTotal =Number(num1) +Number(num2) + Number(num3)
+            }
+          }else if(category == 'out') {
+            // 本周轮出
+            if(level == 3) {
+              // 省级
+              $scope.reportWeekly.provinceOutTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 2) {
+              // 市级
+              $scope.reportWeekly.municipalOutTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if (level == 1) {
+              // 县级
+              $scope.reportWeekly.countyOutTotal =Number(num1) +Number(num2) + Number(num3)
+            }
+          }else if(category == 'outCumulative') {
+            // 累计轮出
+            if(level == 3) {
+              // 省级
+              $scope.reportWeekly.provinceOutTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 2) {
+              // 市级
+              $scope.reportWeekly.municipalOutTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 1 ) {
+              // 县级
+              $scope.reportWeekly.countyOutTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }
+          }else if(category == 'in') {
+            // 本周轮入
+            if(level == 3) {
+              // 省级
+              $scope.reportWeekly.provinceInTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 2) {
+              // 市级
+              $scope.reportWeekly.municipalInTotal =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 1) {
+              // 县级
+              $scope.reportWeekly.countyInTotal =Number(num1) +Number(num2) + Number(num3)
+            }
+          }else if(category == 'inCumulative') {
+            // 累计轮入
+            if(level == 3) {
+              // 省级
+              $scope.reportWeekly.provinceInTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 2) {
+              // 市级
+              $scope.reportWeekly.municipalInTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }else if(level == 1) {
+              // 县级
+              $scope.reportWeekly.countyInTotalCumulative =Number(num1) +Number(num2) + Number(num3)
+            }
+          } 
+        }
+
+
         })
+
+       

src/main/resources/static/styles/css/home/home-1.css

@@ -417,4 +417,18 @@
 /*===========远程监管new======*/
 .camera-body.no-padding{ margin: -13px 0px 0px 0px;}
 .camera-body.no-padding > .row{ margin: 0px;}
-.camera-body .jarviswidget{ margin-bottom:0px;}
+.camera-body .jarviswidget{ margin-bottom:0px;}
+
+.smart-form .table .table-algin {
+  text-align: center;
+  vertical-align: middle;
+}
+#reportMonthlyTable>tbody>tr>td, #reportMonthlyTable>tbody>tr>th, #reportMonthlyTable>tfoot>tr>td, #reportMonthlyTable>tfoot>tr>th, #reportMonthlyTable>thead>tr>td, #reportMonthlyTable>thead>tr>th {
+  padding: 0;
+}
+#reportWeeklyTable>tbody>tr>td, #reportWeeklyTable>tbody>tr>th, #reportWeeklyTable>tfoot>tr>td, #reportWeeklyTable>tfoot>tr>th, #reportWeeklyTable>thead>tr>td, #reportWeeklyTable>thead>tr>th {
+  padding: 0;
+}
+
+
+