Browse Source

规格字段测试bug修改

yangc 7 years ago
parent
commit
7efb091f5e

+ 7 - 1
src/main/webapp/resources/css/common.css

@@ -1020,11 +1020,17 @@ select {
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap.il-content .il-box.il-box-small .item {
 	color: #020202;
 	width: 128px;
-	margin-bottom: 16px;
+	margin-bottom: 8px;
 }
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap .remain {
 	margin-top: 24px;
 }
+.seek-purchase .seek-purchase-content >table >tbody >tr.default-row td .row-wrap .en-name {
+	width: 190px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row .operate-seek .row-wrap >span {
 	color: #4290f7;
 	cursor: pointer;

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -380,7 +380,7 @@ define(['app/app'], function (app) {
               inquiryItem.userTel = $scope.userInfo.userTel;
               inquiryItem.needquantity = $scope.applyObj.amount;
               inquiryItem.inbrand = $scope.applyObj.brand;
-              inquiryItem.currency = $scope.applyObj.currency;
+              inquiryItem.currency = $scope.applyObj.unitPrice ? $scope.applyObj.currency : null;
               inquiryItem.cmpCode = ($scope.applyObj.code).toUpperCase();
               inquiryItem.unitPrice = $scope.applyObj.unitPrice;
               inquiryItem.produceDate = $scope.applyObj.produceDate;

+ 1 - 0
src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -548,6 +548,7 @@
                         </div>
                         <div class="il-box-small il-box">
                             <div title="{{seek.encapsulation}}" class="item"><span>封装:</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="{{seek.produceDate}}" class="item"><span>生产日期:</span>{{seek.produceDate || '-'}}</div>
                             <div title="{{seek.needquantity}}" class="item"><span>采购数量:</span>{{seek.needquantity || '-'}}</div>
                             <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算:</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                         </div>

+ 1 - 0
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -830,6 +830,7 @@
                         </div>
                         <div class="il-box-small il-box">
                             <div title="{{seek.encapsulation}}" class="item"><span>封装:</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="{{seek.produceDate}}" class="item"><span>生产日期:</span>{{seek.produceDate || '-'}}</div>
                             <div title="{{seek.needquantity}}" class="item"><span>采购数量:</span>{{seek.needquantity || '-'}}</div>
                             <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算:</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                         </div>

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

@@ -649,7 +649,7 @@
             <tr class="default-row" ng-mouseenter="seek.$hover = true;" ng-mouseleave="seek.$hover = false;" >
                 <td class="user-name">
                     <div class="row-wrap">
-                        <div>
+                        <div class="en-name">
                             <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
                             <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
                         </div>
@@ -666,6 +666,7 @@
                         </div>
                         <div class="il-box-small il-box">
                             <div title="{{seek.encapsulation}}" class="item"><span>封装:</span>{{seek.encapsulation || '-'}}</div>
+                            <div title="{{seek.produceDate}}" class="item"><span>生产日期:</span>{{seek.produceDate || '-'}}</div>
                             <div title="{{seek.needquantity}}" class="item"><span>采购数量:</span>{{seek.needquantity || '-'}}</div>
                             <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算:</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                         </div>

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

@@ -674,7 +674,7 @@
                 <tr class="default-row">
                     <td class="user-name">
                         <div class="row-wrap">
-                            <div>
+                            <div class="en-name">
                                 <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
                                 <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
                             </div>
@@ -691,6 +691,7 @@
                             </div>
                             <div class="il-box-small il-box">
                                 <div title="{{seek.encapsulation}}" class="item"><span>封装:</span>{{seek.encapsulation || '-'}}</div>
+                                <div title="{{seek.produceDate}}" class="item"><span>生产日期:</span>{{seek.produceDate || '-'}}</div>
                                 <div title="{{seek.needquantity}}" class="item"><span>采购数量:</span>{{seek.needquantity || '-'}}</div>
                                 <div title="{{seek.currency + seek.unitPrice | currencyStr}}" class="item"><span>单价预算:</span>{{seek.currency + seek.unitPrice | currencyStr}}</div>
                             </div>