Merge remote-tracking branch 'origin/dev' into dev

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

@@ -37,7 +37,7 @@
                     <tr>
                         <td>数量:</td>
                         <td>
-                            <input  type="text" class="form-control" ng-model="totalCount" placeholder="数量" required>
+                            <input  type="number" ng-model="totalCount" placeholder="数量" required>
                         </td>
                         <td>操作:</td>
                         <td>
@@ -102,7 +102,9 @@
                             <td ng-if="item.plasticFilmType==2">入库</td>
                             <td>{{item.note}}</td>
                             <td>{{item.name}}</td>
-                            <td ng-show="item.state==0"><a ng-click="updateFilmState(item)">确认审核</a></td>
+                            <td ng-show="item.state==0">
+                                <button class="btn btn-info" ng-click="updateFilmState(item)">确认审核</button>
+                            </td>
                             <td ng-show="item.state==1">已确认</td>
                         </tr>
                         </tbody>

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

@@ -30,15 +30,19 @@ angular.module('AvatarCheck.filmManagement', ['ngRoute', 'AvatarCheck.http'])
                 plasticFilmType="1";
             }
             console.log(totalCount, plasticFilmType, note, name)
-            HttpService.insertFilm(totalCount, plasticFilmType, note, name,1,function (data) {
-                $scope.totalCount="";
-                $scope.note=""
-                if(data==false){
-                    MessageService.showAlert("添加失败")
-                }else{
-                    MessageService.showAlert("添加成功")
-                }
-            })
+            if (!totalCount){
+                MessageService.showAlert("输入耗材数量格式不正确")
+            }else {
+                HttpService.insertFilm(totalCount, plasticFilmType, note, name,1,function (data) {
+                    $scope.totalCount="";
+                    $scope.note=""
+                    if(data==false){
+                        MessageService.showAlert("添加失败")
+                    }else{
+                        MessageService.showAlert("添加成功")
+                    }
+                })
+            }
         }
 
         $scope.selectFilmManagement=function(){

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

@@ -33,18 +33,18 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
                 cardType="1";
             }
             console.log(totalCount,note,cardType,cardBodyType,name,"---",totalCount>=1,"---");
-            if (totalCount>=1){
-            HttpService.insertCardBody(cardType,totalCount,note,cardBodyType,name,1,function (data) {
-                $scope.totalCount="";
-                $scope.note=""
-                if(data==false){
-                    MessageService.showAlert("添加失败")
-                }else{
-                    MessageService.showAlert("添加成功")
-                }
-            })
-            }else {
+            if (!totalCount){
                 MessageService.showAlert("输入耗材数量格式不正确")
+            }else {
+                HttpService.insertCardBody(cardType,totalCount,note,cardBodyType,name,1,function (data) {
+                    $scope.totalCount="";
+                    $scope.note=""
+                    if(data==false){
+                        MessageService.showAlert("添加失败")
+                    }else{
+                        MessageService.showAlert("添加成功")
+                    }
+                })
             }
 
         }