瀏覽代碼

发布验证修改

yangc 8 年之前
父節點
當前提交
086ae3ccf1

+ 3 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -75,6 +75,7 @@ define(['app/app'], function (app) {
               toaster.pop('warning', '提示', '最短交期必须小于最长交期');
             }
             if ($scope.offer.minDay < 1 || $scope.offer.minDay > 31) {
+              $scope.offer.minDay = $scope.offer.minDay < 1 ? 1 : 31;
               toaster.pop('warning', '提示', '交期只能填写1-31之间的值');
             }
           };
@@ -90,8 +91,8 @@ define(['app/app'], function (app) {
             if ($scope.offer.minDay && $scope.offer.maxDay < $scope.offer.minDay) {
               $scope.offer.maxDay = $scope.offer.minDay;
               toaster.pop('warning', '提示', '最短交期必须小于最长交期');
-            }
-            if ($scope.offer.maxDay < 1 || $scope.offer.maxDay > 31) {
+            } else if ($scope.offer.maxDay < 1 || $scope.offer.maxDay > 31) {
+              $scope.offer.maxDay = $scope.offer.maxDay < 1 ? 1 : 31;
               toaster.pop('warning', '提示', '交期只能填写1-31之间的值');
             }
           }

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -444,7 +444,7 @@
                 <th width="92">操作</th>
             </tr>
             </thead>
-            <tbody ng-repeat="seek in $data" ng-class="{'active': seek.$active, 'hover': seek.$hover && seek.status == 201}">
+            <tbody ng-repeat="seek in $data" ng-class="{'active': seek.$active, 'hover': seek.$hover && (seek.status == 201 || seek.status == 202)}">
             <tr class="default-row" ng-mouseenter="seek.$hover = true;" ng-mouseleave="seek.$hover = false;" >
                 <td class="release-time">
                     <span ng-bind="seek.releaseDate | date:'yyyy-MM-dd'"></span>

+ 5 - 5
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -397,11 +397,11 @@
                         </div>
                     </td>
                     <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>
-                    <td ng-bind="seek.code"></td>
-                    <td ng-bind="seek.brand"></td>
-                    <td ng-bind="seek.encapsulation || '--'"></td>
-                    <td ng-bind="seek.produceDate || '--'"></td>
-                    <td ng-bind="seek.amount || '--'"></td>
+                    <td ng-bind="seek.code || '-'"></td>
+                    <td ng-bind="seek.brand || '-'"></td>
+                    <td ng-bind="seek.encapsulation || '-'"></td>
+                    <td ng-bind="seek.produceDate || '-'"></td>
+                    <td ng-bind="seek.amount || '-'"></td>
                     <td class="unit-price">
                         <span>{{seek.currency + seek.unitPrice | currencyStr}}</span>
                     </td>

+ 2 - 2
src/main/webapp/resources/view/vendor/left_nav.html

@@ -21,9 +21,9 @@
 	.disabled {
 		cursor: not-allowed;
 	}
-	#toast-container {
+	/*#toast-container {
 		top: 36px;
-	}
+	}*/
 	#toast-container > .toast-info {
 		background-color: #d88f2c;
 		font-size: 14px;