yangc 7 лет назад
Родитель
Сommit
0308658d7f

+ 7 - 6
src/main/webapp/resources/js/usercenter/controllers/forstore/bomListDetailCtrl.js

@@ -232,15 +232,16 @@ define(['app/app'], function(app) {
                 $scope.seekObj.endTime = $scope.seekObj.endTime.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000;
             }
         }
-        // 采购数量临时变量
-        $scope.oldCount = 1;
         // 采购数量输入校验
         $scope.onCountChange = function () {
             // 正整数且小于十万
-            if (!/^[1-9][0-9]*$/.test($scope.seekObj.count) || $scope.seekObj.count >= 100000) {
-                $scope.seekObj.count = $scope.oldCount;
-            } else {
-                $scope.oldCount = $scope.seekObj.count;
+            if (!/^[1-9][0-9]*$/.test($scope.seekObj.count)) {
+                $scope.seekObj.count = 1;
+            }
+            if ($scope.seekObj.count > 99999) {
+                $scope.seekObj.count = 99999;
+            } else if ($scope.seekObj.count < 1) {
+                $scope.seekObj.count = 1;
             }
         }
         // 选中的物料id

+ 5 - 5
src/main/webapp/resources/view/usercenter/forstore/bomListDetail.html

@@ -277,7 +277,7 @@
                         <div class="inline-block title">
                             <i class="must">*</i>品牌:
                         </div>
-                        <div class="inline-block similar-wrap">
+                        <div class="inline-block" ng-class="{'similar-wrap': tmpEditBom.seekPurchaseByBatchs[$index].showSimilarBrandList}" title="{{detail.brand}}">
                             <span ng-show="!editBom || !detail.$checked" ng-bind="detail.brand || '-'"></span>
                             <input ng-show="editBom && detail.$checked"
                                    ng-model="tmpEditBom.seekPurchaseByBatchs[$index].brand"
@@ -296,7 +296,7 @@
                         <div class="inline-block title">
                             <i class="must">*</i>物料名称:
                         </div>
-                        <div class="inline-block">
+                        <div class="inline-block" title="{{detail.kind}}">
                             <span ng-show="!editBom || !detail.$checked" ng-bind="detail.kind || '-'"></span>
                             <input ng-show="editBom && detail.$checked"
                                    ng-model="tmpEditBom.seekPurchaseByBatchs[$index].kind"
@@ -311,7 +311,7 @@
                         <div class="inline-block title">
                             <i class="must">*</i>型号:
                         </div>
-                        <div class="inline-block similar-wrap">
+                        <div class="inline-block" ng-class="{'similar-wrap': tmpEditBom.seekPurchaseByBatchs[$index].showSimilarCodeList}" title="{{detail.code}}">
                             <span ng-show="!editBom || !detail.$checked" ng-bind="detail.code || '-'"></span>
                             <input ng-show="editBom && detail.$checked"
                                    ng-model="tmpEditBom.seekPurchaseByBatchs[$index].code"
@@ -330,7 +330,7 @@
                         <div class="inline-block title">
                             规格:
                         </div>
-                        <div class="inline-block">
+                        <div class="inline-block" title="{{detail.spec}}">
                             <span ng-show="!editBom || !detail.$checked" ng-bind="detail.spec || '-'"></span>
                             <input ng-show="editBom && detail.$checked"
                                    ng-model="tmpEditBom.seekPurchaseByBatchs[$index].spec"
@@ -345,7 +345,7 @@
                         <div class="inline-block title">
                             单位用量:
                         </div>
-                        <div class="inline-block">
+                        <div class="inline-block" title="{{detail.amount}}">
                             <span ng-show="!editBom || !detail.$checked" ng-bind="detail.amount || '-'"></span>
                             <input ng-show="editBom && detail.$checked"
                                    ng-model="tmpEditBom.seekPurchaseByBatchs[$index].amount"