修改库存管理bug

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

@@ -147,6 +147,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     var deferred = $q.defer();
     Enterprise.getCurrencyByRegisterAddress(null, function(data) {
       deferred.resolve(data);
+      console.log(deferred)
     }, function(response) {
       deferred.reject(response);
     });

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1135,8 +1135,8 @@
 									<div class="overHidden" title="{{material.spec || '-'}}">规格：{{material.spec || '-'}}</div>
 								</td>
 								<td style="text-align: left">
-									<div class="overHidden">包装方式：{{material.packaging || '-'}}</div>
-									<div class="overHidden">最小包装数：{{material.minPackQty || '-'}}</div>
+									<div class="overHidden" title="{{material.packaging || '-'}}">包装方式：{{material.packaging || '-'}}</div>
+									<div class="overHidden" title="{{material.minPackQty || '-'}}">最小包装数：{{material.minPackQty || '-'}}</div>
 									<div class="">
 										<div class="fl">规格书：</div>
 										<div class="Regulpic fl" ng-if="material.productAttachSubmit || material.attach">
@@ -1157,11 +1157,11 @@
 									</div>
 								</td>
 								<td style="text-align: left">
-									<div class="overHidden">成本单价：{{material.price || '-'}}</div>
-									<div class="overHidden">库存数量：{{material.erpReserve || '-'}}</div>
-									<div class="overHidden">最小起订量：{{material.goods.minBuyQty || '-'}}</div>
-									<div class="overHidden" ng-if="material.goods.b2cMinDelivery === material.goods.b2cMaxDelivery">交期(天)：{{material.goods.b2cMinDelivery || '-'}}</div>
-									<div class="overHidden" ng-if="material.goods.b2cMinDelivery !== material.goods.b2cMaxDelivery">交期(天)：{{material.goods.b2cMinDelivery}} - {{material.goods.b2cMaxDelivery}}</div>
+									<div class="overHidden" title="{{material.price || '-'}}">成本单价：{{material.price || '-'}}</div>
+									<div class="overHidden" title="{{material.erpReserve || '-'}}">库存数量：{{material.erpReserve || '-'}}</div>
+									<div class="overHidden" title="{{material.goods.minBuyQty || '-'}}">最小起订量：{{material.goods.minBuyQty || '-'}}</div>
+									<div class="overHidden" title="{{material.goods.b2cMinDelivery || '-'}}" ng-if="material.goods.b2cMinDelivery === material.goods.b2cMaxDelivery">交期(天)：{{material.goods.b2cMinDelivery || '-'}}</div>
+									<div class="overHidden" title="{{material.goods.b2cMinDelivery + '-' +  material.goods.b2cMaxDelivery || '-'}}" ng-if="material.goods.b2cMinDelivery !== material.goods.b2cMaxDelivery">交期(天)：{{material.goods.b2cMinDelivery}} - {{material.goods.b2cMaxDelivery}}</div>
 								</td>
 								<td>
 									<ul style="border: 1px solid #dcdcdc; width: 152px;margin: 0 auto">
@@ -1172,7 +1172,9 @@
 										</li>
 										<li style="font-size: 14px;color: #333;background: #fff;" class='priceInfoList' ng-repeat="price in material.goods.prices">
 											<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">{{price.start}}+</span>
-											<span class="fl w50" style="width: 50%;overflow: hidden" title="{{price.rMBPrice}}">¥{{price.rMBPrice}}</span>
+											<span class="fl w50" style="width: 50%;overflow: hidden" title="{{price.rMBPrice}}">
+												{{!store.enType || store.enType === 'HK' ? '$' : '¥'}}
+												{{price.rMBPrice}}</span>
 											<div class="clearfix"></div>
 										</li>
 									</ul>