储存超期报警-添加字段

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

@@ -29,17 +29,22 @@ angular.module('app.warnAndAlarm').controller('setUpListCtrl', function ($scope,
         let tds = document.getElementById('setUpList' + index).getElementsByTagName('td');
         // 获取值
         setUp.knccnx = tds[3].innerText;
-        reservePeriodService.saveSetUpData(setUp).then(function (data) {
-            if (data.retCode === '200') {
-                alert('保存成功');
-                // 保持在已选类型列表
-                $scope.loadData();
-            } else {
-                alert(data.message);
-            }
-        }, function (data) {
-            console.log(data);
-        });
+        // 库内设置年,必须小于等于市级
+        if (parseInt(setUp.knccnx) > setUp.sptccnx) {
+            alert('库内设置年,必须小于等于市级');
+        } else {
+            reservePeriodService.saveSetUpData(setUp).then(function (data) {
+                if (data.retCode === '200') {
+                    alert('保存成功');
+                    // 保持在已选类型列表
+                    $scope.loadData();
+                } else {
+                    alert(data.message);
+                }
+            }, function (data) {
+                console.log(data);
+            });
+        }
     };
 
     // 翻页

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

@@ -31,8 +31,8 @@
                                         <tr>
                                             <th data-class="expand" style="text-align:center;">序号</th>
                                             <th data-class="expand" style="text-align:center;">品种</th>
-                                            <th data-class="expand" style="text-align:center;">市级储存年限设置</th>
-                                            <th data-class="expand" style="text-align:center;">库内储存年限设置</th>
+                                            <th data-class="expand" style="text-align:center;">市级储存年限设置(年)</th>
+                                            <th data-class="expand" style="text-align:center;">库内储存年限设置(年)</th>
                                             <th data-class="expand" style="text-align:center;">操作</th>
                                         </tr>
                                         </thead>
@@ -41,7 +41,7 @@
                                         <tr id="setUpList{{$index}}" ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
                                             <td style="text-align:center;">{{ warning.lypzmc }}</td>
-                                            <td style="text-align:center;">{{ warning.ccnx }}</td>
+                                            <td style="text-align:center;">{{ warning.sptccnx }}</td>
                                             <td style="text-align:center;">{{ warning.knccnx }}</td>
                                             <td style="text-align:center;">
                                                 <a href-void ng-click="showEdit($index)" style="margin-left: 10px;">修改&nbsp;</a>