gaodd пре 2 година
родитељ
комит
e3a001fcb8

+ 1 - 1
src/main/resources/static/app/business/deliveryStorageNotice/controller/propertyTransitionSheetAuditCtrl.js

@@ -2,7 +2,7 @@ angular.module('app.business').controller("propertyTransitionSheetAuditCtrl", fu
2
 		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
2
 		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
3
 	
3
 	
4
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
4
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
5
-	$scope.searchCondition = {auditState : 5};
5
+	$scope.searchCondition = {auditState : 5,isSheet:0};
6
      // 获取列表数据
6
      // 获取列表数据
7
      $scope.loadData = function() {
7
      $scope.loadData = function() {
8
     	 receiveNoticeService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){
8
     	 receiveNoticeService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.searchCondition).then(function(data){

+ 1 - 1
src/main/resources/static/app/business/deliveryStorageNotice/controller/propertyTransitionSheetCtrl.js

@@ -2,7 +2,7 @@ angular.module('app.business').controller("propertyTransitionSheetCtrl", functio
2
 		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
2
 		receiveNoticeService,commonUtilService,warehouseService,$rootScope,APP_CONFIG) {
3
 	
3
 	
4
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
4
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
5
-	$scope.searchCondition = {userId : $rootScope.userInfo.userId};
5
+	$scope.searchCondition = {userId : $rootScope.userInfo.userId,isSheet:0};
6
 	
6
 	
7
      // 获取列表数据
7
      // 获取列表数据
8
      $scope.loadData = function() {
8
      $scope.loadData = function() {

+ 2 - 0
src/main/resources/static/app/business/deliveryStorageNotice/service/receiveNoticeService.js

@@ -21,6 +21,7 @@ angular.module('app.business').service("receiveNoticeService", function($http,$r
21
                 userId : searchCondition == undefined ? "" : searchCondition.userId,
21
                 userId : searchCondition == undefined ? "" : searchCondition.userId,
22
                 auditState : searchCondition == undefined ? "" : searchCondition.auditState,
22
                 auditState : searchCondition == undefined ? "" : searchCondition.auditState,
23
                 isNotice : searchCondition == undefined ? "" : searchCondition.isNotice,
23
                 isNotice : searchCondition == undefined ? "" : searchCondition.isNotice,
24
+                isSheet : searchCondition == undefined ? "" : searchCondition.isSheet,
24
                 orgId : $rootScope.userInfo.orgId,
25
                 orgId : $rootScope.userInfo.orgId,
25
                 lyflag : lyflag
26
                 lyflag : lyflag
26
             }
27
             }
@@ -70,6 +71,7 @@ angular.module('app.business').service("receiveNoticeService", function($http,$r
70
                 grainGrade : searchCondition == undefined ? "" : searchCondition.grainGrade,
71
                 grainGrade : searchCondition == undefined ? "" : searchCondition.grainGrade,
71
                 grainAttribute : searchCondition == undefined ? "" : searchCondition.grainAttribute,
72
                 grainAttribute : searchCondition == undefined ? "" : searchCondition.grainAttribute,
72
                 userId : searchCondition == undefined ? "" : searchCondition.userId,
73
                 userId : searchCondition == undefined ? "" : searchCondition.userId,
74
+                isSheet : searchCondition == undefined ? "" : searchCondition.isSheet,
73
                 orgId : $rootScope.userInfo.orgId
75
                 orgId : $rootScope.userInfo.orgId
74
             }
76
             }
75
         }).then(function successCallback(response) {
77
         }).then(function successCallback(response) {