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

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

@@ -57,7 +57,7 @@
         </div>
         <div class="box box-default">
             <div class="box-header">
-                <strong>查询未审核膜耗材统计数据</strong>
+                <strong>膜耗材操作记录</strong>
             </div>
             <div class="box box-primary">
                 <div ng-if="filmManagement.length==0">
@@ -86,7 +86,8 @@
                             <td ng-if="item.plasticFilmType==2">入库</td>
                             <td>{{item.note}}</td>
                             <td>{{item.name}}</td>
-                            <td><a ng-click="updateFilmState(item)">确认</a></td>
+                            <td ng-if="itam.state==0"><a ng-click="updateFilmState(item)">确认审核</a></td>
+                            <td ng-if="itam.state==1">已确认</td>
                         </tr>
                         </tbody>
                     </table>