搜索框添加工作组属性

src/main/java/com/yxproject/start/api/SelectApi.java

@@ -58,7 +58,7 @@ public class SelectApi {
             resultMap.put("PRODData", PRODData);
 
         } else {
-            return null;
+//            return null;
         }
         return resultMap;
     }

src/main/resources/static/js/service.js

@@ -162,6 +162,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                         id:searchInput
                     }
                 }).then(function successCallback(response) {
+                    console.log(response.data,"------------------------")
                     success(response.data)
                 })
             },
@@ -1259,10 +1260,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            selectFilmManagement:function(success) {
+            selectFilmManagement:function(date,success) {
                 $http({
                     method: 'GET',
-                    url: "../MaterialManagementApi/selectPlasticFilm" + urlTimeStamp()
+                    url: "../MaterialManagementApi/selectPlasticFilm" + urlTimeStamp(),
+                    params:{
+                        date:date
+                    }
                 }).then(function successCallback(response) {
                     success(response.data)
                 })

src/main/resources/static/views/filmManagement/filmManagement.html

@@ -60,6 +60,22 @@
                 <strong>膜耗材操作记录</strong>
             </div>
             <div class="box box-primary">
+                <table class="table table-bordered" style="margin-bottom: 0;">
+                    <tr>
+                        <td width="15%">审核日期:</td>
+                        <td colspan="2" width="35%">
+                            <div class="input-group date" style="width: 65%">
+                                <div class="input-group-addon">
+                                    <i class="fa fa-calendar"></i>
+                                </div>
+                                <input type="text"  class="form-control pull-right" ng-model="choseDate" id="datepicker"  readonly/>
+                            </div>
+                        </td>
+                        <td style="text-align: left;">
+                            <button class="btn btn-primary" ng-click="selectMaterialManagement()">查询</button>
+                        </td>
+                    </tr>
+                </table>
                 <div ng-if="filmManagement.length==0">
                     <h4 style="padding-left: 10px;">暂无数据</h4>
                 </div>
@@ -80,14 +96,14 @@
                         <tbody>
                         <tr ng-repeat="item in filmManagement">
                             <td>{{item.plasticFilmId}}</td>
-                            <td>{{item.saveDate}}</td>
+                            <td>{{item.saveDate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.totalCount}}</td>
                             <td ng-if="item.plasticFilmType==1">出库</td>
                             <td ng-if="item.plasticFilmType==2">入库</td>
                             <td>{{item.note}}</td>
                             <td>{{item.name}}</td>
-                            <td ng-if="itam.state==0"><a ng-click="updateFilmState(item)">确认审核</a></td>
-                            <td ng-if="itam.state==1">已确认</td>
+                            <td ng-show="item.state==0"><a ng-click="updateFilmState(item)">确认审核</a></td>
+                            <td ng-show="item.state==1">已确认</td>
                         </tr>
                         </tbody>
                     </table>

src/main/resources/static/views/filmManagement/filmManagement.js

@@ -11,6 +11,16 @@ angular.module('AvatarCheck.filmManagement', ['ngRoute', 'AvatarCheck.http'])
 
     .controller('filmManagementCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
+        //Date picker
+        $('#datepicker').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-mm-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+
         $scope.insertFilm = function () {
             var totalCount = $scope.totalCount;
             var note = $scope.note;
@@ -32,7 +42,11 @@ angular.module('AvatarCheck.filmManagement', ['ngRoute', 'AvatarCheck.http'])
         }
 
         $scope.selectFilmManagement=function(){
-            HttpService.selectFilmManagement(function (data) {
+            var date =$('#datepicker').val();
+            if(date==''){
+                date =  $scope.choseDate;
+            }
+            HttpService.selectFilmManagement(date,function (data) {
                 $scope.filmManagement = data;
                 console.log($scope.filmManagement,"$scope.filmManagement")
             })

src/main/resources/static/views/searchCard/searchCard.html

@@ -25,6 +25,7 @@
                         <th>区县</th>
                         <th>制证类型</th>
                         <th>数量</th>
+                        <th>工作组</th>
                         <th>下发日期</th>
                         <th>膜打印</th>
                         <th>预定位</th>
@@ -37,6 +38,9 @@
                             <td>{{item.COUNTYNAME}}</td>
                             <td>{{item.CARD_TYPE}}</td>
                             <td>{{item.VALID_COUNT}}</td>
+                            <td ng-show="item.WORK_GROUP==1">A组</td>
+                            <td ng-show="item.WORK_GROUP==2">B组</td>
+                            <td ng-show="item.WORK_GROUP==null"></td>
                             <td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
@@ -150,7 +154,7 @@
         </div>
         <!---没查到数据-->
         <div class="box-info"
-             ng-if="searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0">
+             ng-if="(searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0) ||searchResult==null">
             <div>
                 <h4>没有查询到相关信息</h4>
             </div>