储存超期报警-添加提示

src/main/resources/static/app/business/device/controller/deviceStorageCtrl.js

@@ -124,6 +124,8 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         $scope.isNotEdit = false;
         $scope.dSbxxsjy.djr = $rootScope.userInfo.realName; // 创建人
         $scope.dSbxxsjy.createDate = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 创建时间
+        $scope.dSbxxsjy.refresher = $rootScope.userInfo.realName; // 提交人
+        $scope.dSbxxsjy.refreshTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
         $scope.changeDeviceType();
     } else if ($stateParams.isNotEdit === 'true') { // 查看
         $scope.isNotEdit = true;
@@ -149,8 +151,8 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         $scope.dSbxxsjy.fzd = Number($scope.dSbxxsjy.fzd);
         $scope.dSbxxsjy.sbazr = Number($scope.dSbxxsjy.sbazr);
         $scope.dSbxxsjy.shrmc = Number($scope.dSbxxsjy.shrmc);
-        $scope.dSbxxsjy.refresher = $rootScope.userInfo.realName; // 更新人
-        $scope.dSbxxsjy.refreshTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 更新时间
+        $scope.dSbxxsjy.refresher = $rootScope.userInfo.realName; // 提交人
+        $scope.dSbxxsjy.refreshTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
         if ($scope.dSbxxsjy.ssfl === '3') { // 器材
             $scope.ShowQCType = false;
             $scope.ShowSBType = true;

src/main/resources/static/app/business/device/views/deviceStorage-edit.html

@@ -222,6 +222,22 @@
                                                 </label>
                                             </section>
                                         </div>
+                                        <div class="row">
+                                            <section class="col col-3">
+                                                <label class="input">
+                                                    <label class="label">提交人：</label>
+                                                    <input type="text" ng-model="dSbxxsjy.refresher" ng-disabled="true">
+                                                </label>
+                                            </section>
+                                            <section class="col col-3">
+                                                <label class="label">提交时间：</label>
+                                                <label class="input">
+                                                    <input type="text" ng-model="dSbxxsjy.refreshTime" name="refreshTime"
+                                                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
+                                                           ng-disabled="true">
+                                                </label>
+                                            </section>
+                                        </div>
                                     </div>
                                     <!--器材-->
                                     <div ng-hide="ShowQCType">
@@ -347,6 +363,22 @@
                                                 </label>
                                             </section>
                                         </div>
+                                        <div class="row">
+                                            <section class="col col-3">
+                                                <label class="input">
+                                                    <label class="label">提交人：</label>
+                                                    <input type="text" ng-model="dSbxxsjy.refresher" ng-disabled="true">
+                                                </label>
+                                            </section>
+                                            <section class="col col-3">
+                                                <label class="label">提交时间：</label>
+                                                <label class="input">
+                                                    <input type="text" ng-model="dSbxxsjy.refreshTime" name="refreshTime"
+                                                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
+                                                           ng-disabled="true">
+                                                </label>
+                                            </section>
+                                        </div>
                                     </div>
                                 </fieldset>
                                 <div>

src/main/resources/static/app/warnAndAlarm/reservePeriod/controller/setUpListCtrl.js

@@ -31,7 +31,8 @@ angular.module('app.warnAndAlarm').controller('setUpListCtrl', function ($scope,
         setUp.knccnx = tds[3].innerText;
         // 库内设置年,必须小于等于市级
         if (parseInt(setUp.knccnx) > setUp.sptccnx) {
-            alert('库内设置年,必须小于等于市级');
+            alert('库内储存年限设置,必须小于等于市级储存年限设置');
+            setUp.knccnx = null;
         } else {
             reservePeriodService.saveSetUpData(setUp).then(function (data) {
                 if (data.retCode === '200') {

src/main/resources/static/app/warnAndAlarm/reservePeriod/views/setUp-list.html

@@ -15,7 +15,8 @@
                         <div class="widget-body no-padding">
                             <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
                                 <div class="dt-toolbar">
-                                    <div class="col-xs-12 col-sm-10"></div>
+                                    <div class="col-xs-12 col-sm-5"></div>
+                                    <div class="col-xs-12 col-sm-5"><span style="color: #5da8f7;text-align: right;">库内储存年限设置,必须小于等于市级储存年限设置</span></div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">
                                             <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()"