Merge remote-tracking branch 'origin/release-201826-wangcz' into release-201826-wangcz

src/main/webapp/resources/js/usercenter/controllers/forstore/bomListDetailCtrl.js

@@ -236,12 +236,12 @@ define(['app/app'], function(app) {
         $scope.onCountChange = function () {
             // 正整数且小于十万
             if (!/^[1-9][0-9]*$/.test($scope.seekObj.count)) {
-                $scope.seekObj.count = 1;
+                $scope.seekObj.count = '';
             }
             if ($scope.seekObj.count > 99999) {
                 $scope.seekObj.count = 99999;
             } else if ($scope.seekObj.count < 1) {
-                $scope.seekObj.count = 1;
+                $scope.seekObj.count = '';
             }
         }
         // 选中的物料id
@@ -302,7 +302,7 @@ define(['app/app'], function(app) {
         // bom字段校验(名字+规格)
         $scope.onTmpEditBomChange = function (key) {
             if (getRealLen($scope.tmpEditBom[key]) > 100) {
-                $scope.tmpEditBom.name = cutOutString($scope.tmpEditBom[key], 100);
+                $scope.tmpEditBom[key] = cutOutString($scope.tmpEditBom[key], 100);
             }
         }
         // 校验特定的字符
@@ -428,12 +428,12 @@ define(['app/app'], function(app) {
         // 单位用量输入
         $scope.onAmountChange = function (item) {
             if (!/^[1-9][0-9]*$/.test(item.amount)) {
-                item.amount = 1;
+                item.amount = '';
             }
             if (item.amount > 9999) {
                 item.amount = 9999;
             } else if (item.amount < 1) {
-                item.amount = 1;
+                item.amount = '';
             }
         }
 

src/main/webapp/resources/js/vendor/controllers/forstore/messagePersonalCtrl.js

@@ -284,6 +284,7 @@ define(['app/app'], function(app) {
         $scope.allReadMessCount = 0;
         //获取所有消息数量
         var getData = function () {
+            //获取所有消息数量
             InternalMessage.getUrl({}, function(data) {
                 var url = data.url;
                 if (url == "http://218.17.158.219:24000/message") {
@@ -372,6 +373,7 @@ define(['app/app'], function(app) {
                     }).error(function (err) {
                         toaster.pop('error', err || '获取未读消息数量失败');
                     })
+
                     if ($scope.tab == 'no') {
                         // $rootScope.unReadMessCount = data.totalElements;
                     } else {
@@ -398,6 +400,10 @@ define(['app/app'], function(app) {
             }, function(response) {
                 toaster.pop('error', '获取消息失败，请重新刷新界面，');
             });
+
+
+
+
         };
 
         // 批量删除

src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -595,11 +595,11 @@
                 </div>
                 <div class="clearfix" ng-hide="bomInfo.quotedAmount > 0 && bomInfo.minPriceSum === 0">
                     <div class="fl title">采购数量(套)：{{bomInfo.count || 0}}</div>
-                    <div class="title pull-right">价格分析:按价格最低<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.quotedAmount || 0}}</span>个报告,合计¥:<span style="color: #008000;margin-right: 0px;font-size: 14px">{{bomInfo.minPriceSum || 0}}</span></div>
+                    <div class="title pull-right">价格分析:按价格最低<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.quotedAmount || 0}}</span>个报价,合计¥:<span style="color: #008000;margin-right: 0px;font-size: 14px">{{bomInfo.minPriceSum || 0}}</span></div>
                 </div>
                 <div class="clearfix"  ng-hide="bomInfo.quotedAmount > 0 && bomInfo.minDeliverySum === 0">
                     <div class="fl title">发布时间：{{bomInfo.date | date:'yyyy-MM-dd HH:mm:ss'}}</div>
-                    <div class="title pull-right">按交期最短<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.quotedAmount || 0}}</span>个报告,合计¥:<span style="color: #008000;margin-right: 0px;font-size: 14px">{{bomInfo.minDeliverySum || 0}}</span></div>
+                    <div class="title pull-right">按交期最短<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.quotedAmount || 0}}</span>个报价,合计¥:<span style="color: #008000;margin-right: 0px;font-size: 14px">{{bomInfo.minDeliverySum || 0}}</span></div>
                 </div>
                 <div class="clearfix">
                     <div class="fl title">截止时间：{{bomInfo.endDate | date:'yyyy-MM-dd HH:mm:ss'}}</div>
@@ -682,7 +682,7 @@
                 <!--<th width="110">发布时间</th>-->
                 <th width="310">品牌/物料名称</th>
                 <th width="310">型号/规格</th>
-                <th width="190">求购数量(PCS)</th>
+                <th width="190">单位用量(PCS)</th>
                 <th width="190">状态</th>
                 <!--<th width="136">操作</th>-->
                     <!--

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -1532,8 +1532,8 @@
                 <td ng-click="toBomdetail(bom.id)">
                     <img src="static/img/seekPurchase/Excel.png" alt="">
                     <div style="width:300px">
-                        <p ng-bind="bom.remark || bom.name"></p>
-                        <div>规格：{{bom.spec || '-'}}</div>
+                        <p class="text-ellipse" title="{{bom.remark || bom.name}}" ng-bind="bom.remark || bom.name"></p>
+                        <div class="text-ellipse" title="{{bom.spec}}">规格：{{bom.spec || '-'}}</div>
                     </div>
                     <div ng-if="bomTab == 'seekRecord'" class="middle">
                         <div class="progress">