Kaynağa Gözat

'月周报表类型修改'

GaoYuPeng 3 yıl önce
ebeveyn
işleme
4c6ebe0443

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

@@ -119,8 +119,8 @@ angular.module('app.business')
119
                 });
119
                 });
120
             
120
             
121
             // 编辑页面获取审核列表列表
121
             // 编辑页面获取审核列表列表
122
-            var btype = 0; // 月报表,1是周报表
123
-            reportMonthlyService.getAuditList($stateParams.id,0).then(function(res) {
122
+            var btype = 0; // 月报表1   周报表0
123
+            reportMonthlyService.getAuditList($stateParams.id,1).then(function(res) {
124
                 $scope.auditList = res
124
                 $scope.auditList = res
125
                 // console.log($scope.auditList,'auditList')
125
                 // console.log($scope.auditList,'auditList')
126
                 // console.log(res,'res 获取审核列表成功')
126
                 // console.log(res,'res 获取审核列表成功')
@@ -156,7 +156,7 @@ angular.module('app.business')
156
                     console.log(data,"----上报结果");
156
                     console.log(data,"----上报结果");
157
                     if(data.status=="success"){
157
                     if(data.status=="success"){
158
                         //alert("点击上报后不可再取消,确认上报");
158
                         //alert("点击上报后不可再取消,确认上报");
159
-                        reportMonthlyService.updateStatus(id).then(function(data){
159
+                        reportMonthlyService.updateStatusm(id).then(function(data){
160
                             console.log(data,"上报状态修改返回");
160
                             console.log(data,"上报状态修改返回");
161
                             if(data.status=="success"){
161
                             if(data.status=="success"){
162
                                 // $scope.reportMonthly.status = 0
162
                                 // $scope.reportMonthly.status = 0

+ 1 - 1
src/main/resources/static/app/business/reportMonthly/service/reportMonthlyService.js

@@ -54,7 +54,7 @@ angular.module('app.business').service("reportMonthlyService", function($http, $
54
     }
54
     }
55
 
55
 
56
     //修改上报状态
56
     //修改上报状态
57
-    this.updateStatus = function(id) {
57
+    this.updateStatusm = function(id) {
58
         var d = $q.defer();
58
         var d = $q.defer();
59
         $http({
59
         $http({
60
             method: 'POST',
60
             method: 'POST',

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

@@ -118,7 +118,7 @@ angular.module('app.business')
118
                         console.log(data +"----上报结果");
118
                         console.log(data +"----上报结果");
119
                         if(data.status=="success"){
119
                         if(data.status=="success"){
120
                             //alert("点击上报后不可再取消,确认上报");
120
                             //alert("点击上报后不可再取消,确认上报");
121
-                            reportWeeklyService.updateStatus(id).then(function(data){
121
+                            reportWeeklyService.updateStatusw(id).then(function(data){
122
                                 console.log(data,"上报状态修改返回值");
122
                                 console.log(data,"上报状态修改返回值");
123
                                 if(data.status=="success"){
123
                                 if(data.status=="success"){
124
                                     // $scope.reportWeekly.status = 0
124
                                     // $scope.reportWeekly.status = 0
@@ -190,8 +190,8 @@ angular.module('app.business')
190
                 });
190
                 });
191
             
191
             
192
             // 编辑页面获取审核列表列表
192
             // 编辑页面获取审核列表列表
193
-            var btype = 0; // 月报表:1;周报表:0
194
-            reportWeeklyService.getAuditList(2,0).then(function(res) {
193
+            var btype = 0; // 月报表1   周报表0
194
+            reportWeeklyService.getAuditList($stateParams.id,0).then(function(res) {
195
                 $scope.auditList = res
195
                 $scope.auditList = res
196
                 // console.log(res,'res 获取审核列表成功')
196
                 // console.log(res,'res 获取审核列表成功')
197
                 // console.log($scope.auditList,'auditList')
197
                 // console.log($scope.auditList,'auditList')

+ 1 - 1
src/main/resources/static/app/business/reportWeekly/service/reportWeeklyService.js

@@ -54,7 +54,7 @@ angular.module('app.business').service("reportWeeklyService", function($http, $q
54
     }
54
     }
55
 
55
 
56
     //修改上报状态
56
     //修改上报状态
57
-    this.updateStatus = function(id) {
57
+    this.updateStatusw = function(id) {
58
         var d = $q.defer();
58
         var d = $q.defer();
59
         $http({
59
         $http({
60
             method: 'POST',
60
             method: 'POST',