修改页面词语描述，添加出库数量校验，注释分拣任务单选择框禁用

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

@@ -122,14 +122,14 @@
                         <tbody>
                         <tr ng-repeat="item in cardBodyManagement.cardBody">
                             <td>{{item.cardBodyId}}</td>
-                            <td>{{item.saveDate}}</td>
+                            <td>{{item.saveDate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.totalCount}}</td>
                             <td ng-if="item.cardType==1">出库</td>
                             <td ng-if="item.cardType==2">入库</td>
                             <td>{{item.note}}</td>
                             <td>{{item.name}}</td>
                             <td ng-if="item.state==0" class="text-danger">未审核</td>
-                            <td ng-if="item.state==1" class="text-success">已审核</td>
+                            <td ng-if="item.state==1" class="text-success">审核通过</td>
                         </tr>
 
                         <tr class="bg-info">

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

@@ -112,7 +112,9 @@
                             <td ng-if="item.cardType==2">入库</td>
                             <td>{{item.note}}</td>
                             <td>{{item.name}}</td>
-                            <td ng-if="item.state==0"><a ng-click="updateApplyState(item)">确认审核</a></td>
+                            <td ng-if="item.state==0">
+                                <button class="btn btn-info" ng-click="updateApplyState(item)">确认审核</button>
+                            </td>
                             <td ng-if="item.state==1">已审核</td>
                         </tr>
                         </tbody>

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

@@ -23,6 +23,7 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
 
 
         $scope.insertCardBody = function () {
+
             var totalCount = $scope.totalCount;
             var note = $scope.note;
             var cardType = $scope.cardType;
@@ -32,6 +33,7 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
                 cardType="1";
             }
             console.log(totalCount,note,cardType,cardBodyType,name);
+            if (totalCount>0){
             HttpService.insertCardBody(cardType,totalCount,note,cardBodyType,name,1,function (data) {
                 $scope.totalCount="";
                 $scope.note=""
@@ -41,6 +43,10 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
                     MessageService.showAlert("添加成功")
                 }
             })
+            }else {
+                MessageService.showAlert("请输入正确的卡体耗材数量")
+            }
+
         }
 
         $scope.selectMaterialManagement=function(){

src/main/resources/static/views/task/taskListSorting.html

@@ -56,10 +56,13 @@
                             </thead>
                             <tbody ng-repeat="task in type.countyList">
                             <tr>
-                                <td ng-if="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)">
-                                    <input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}"
-                                        ng-click="updateSelection($event,task)"></td>
-                                <td ng-if="type.typeCode!='100'&&(task.faileCount>0||(task.countyValidCount-task.specialCount)!=task.eWriteCount||task.eWriteCount!=task.recheckCount)"></td>
+                                <!--<td ng-show="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)
+                                ==task.eWriteCount&&task.eWriteCount==task.recheckCount)">-->
+                                <td>
+                                    <input type="checkbox" class="checkOneBox"
+                                           ng-checked="isSelected(task)" value="{{task.taskId}}"
+                                           ng-click="updateSelection($event,task)">
+                                </td>
                                 <td class="mailbox-star"><b>{{task.taskId}}</b></td>
                                 <td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
                                 <td class="mailbox-subject">{{task.groupList.length}}</td>