Commit 898fc81c authored by liboyang's avatar liboyang

查询未审核的耗材记录和所选日期的已审核的耗材记录

parent 970805ae
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<tbody> <tbody>
<tr ng-repeat="item in materialManagement"> <tr ng-repeat="item in materialManagement">
<td>{{item.cardBodyId}}</td> <td>{{item.cardBodyId}}</td>
<td>{{item.saveDate}}</td> <td>{{item.saveDate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.totalCount}}</td> <td>{{item.totalCount}}</td>
<td ng-if="item.cardType==1">出库</td> <td ng-if="item.cardType==1">出库</td>
<td ng-if="item.cardType==2">入库</td> <td ng-if="item.cardType==2">入库</td>
......
...@@ -45,9 +45,10 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http'] ...@@ -45,9 +45,10 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
$scope.selectMaterialManagement=function(){ $scope.selectMaterialManagement=function(){
var date =$('#datepicker').val(); var date =$('#datepicker').val();
if(angular.isUndefined(date)){ if(date==''){
date = $scope.choseDate; date = $scope.choseDate;
} }
console.log(date)
HttpService.selectMaterialManagement(date,function (data) { HttpService.selectMaterialManagement(date,function (data) {
$scope.materialManagement = data; $scope.materialManagement = data;
console.log($scope.materialManagement,"$scope.materialManagement") console.log($scope.materialManagement,"$scope.materialManagement")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment