1：大陆交货等信息修改为单价。

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

@@ -52,10 +52,8 @@ define([ 'app/app' ], function(app) {
 		var deferred = $q.defer();
 		Enterprise.getCurrencyByRegisterAddress(null, function (data) {
 			deferred.resolve(data);
-
 		}, function (response) {
 			deferred.reject(response);
-			toaster.pop('info', '提示', '获取不到公司的币别信息');
 		});
 
 		var currencyPromise = deferred.promise;
@@ -66,7 +64,7 @@ define([ 'app/app' ], function(app) {
 			if(!$scope.store) {
 				$scope.store = {};
 			}
-			if(curData.code == 1) {
+			if((curData != null) && (curData.code == 1)) {
 				if(curData.data == 'USD') {
 					$scope.store.enType = 'HK'
 				}else {
@@ -82,7 +80,7 @@ define([ 'app/app' ], function(app) {
 				$scope.store = {};
 			}
 			var curData = error[0];
-			if(curData.code == 1) {
+			if((curData != null) && (curData.code == 1)) {
 				if(curData.data == 'USD') {
 					$scope.store.enType = 'HK';
 				}else {

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

@@ -516,10 +516,10 @@
 							<div class="content">
 								<p class="title">包装/生产日期</p>
 								<div class="input-list">
-									<input type="text" class="form-control" name="packaging" title="packaging" placeholder="包装方式" style="width: 108px;" ng-model="goods.packaging"/>
+									<input type="text" class="form-control" name="packaging" title="包装" placeholder="包装方式" style="width: 108px;" ng-model="goods.packaging"/>
 								</div>
 								<div class="input-list">
-									<input type="text" class="form-control" name="produceDate" title="produceDate" placeholder="2016.01.23" style="width: 108px;" ng-model="goods.produceDate"/>
+									<input type="text" class="form-control" name="produceDate" title="生产日期" placeholder="生产日期" style="width: 108px;" ng-model="goods.produceDate"/>
 									<!--<select name="breakUp" title="breakUp" class="select-adder form-control" style="width: 108px;" ng-model="goods.breakUp">-->
 										<!--<option value="1">可拆卖</option>-->
 										<!--<option value="0">不可拆卖</option>-->
@@ -533,19 +533,19 @@
 							<div class="content">
 								<p class="title">库存</p>
 								<div class="input-list">
-									<input type="number" class="wid48 form-control" name="reserve" title="reserve" placeholder="数量" ng-model="goods.reserve" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMaxAmount(goods)"/>
+									<input type="number" class="wid48 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.reserve" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMaxAmount(goods)"/>
 								</div>
 							</div>
 							<div class="content">
 								<p class="title">最小包装量</p>
 								<div class="input-list">
-									<input type="number" class="form-control" name="minPackQty" title="minPackQty"  placeholder="数量" ng-model="goods.minPackQty" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMinPackAmount(goods)" style="width: 70px;"/>
+									<input type="number" class="form-control" name="minPackQty" title="最小包装量"  placeholder="数量" ng-model="goods.minPackQty" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMinPackAmount(goods)" style="width: 70px;"/>
 								</div>
 							</div>
 							<div class="content">
 								<p class="title">起拍</p>
 								<div class="input-list">
-									<input type="number" class="wid48 form-control" name="minBuyQty" title="minBuyQty"  placeholder="数量" ng-model="goods.minBuyQty" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMinAmount(goods)"/>
+									<input type="number" class="wid48 form-control" name="minBuyQty" title="起拍"  placeholder="数量" ng-model="goods.minBuyQty" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMinAmount(goods)"/>
 								</div>
 							</div>
 							<div class="content">
@@ -576,13 +576,13 @@
 								</div>
 							</div>
 							<div class="content" ng-if="!store.enType || store.enType === 'HK'">
-								<p class="title">香港交货($)</p>
+								<p class="title">单价($)</p>
 								<div class="input-list" ng-repeat="price in goods.prices">
 									<input type="number" class="wid92 form-control"  placeholder="单价($) " ng-model="price.uSDPrice"/>
 								</div>
 							</div>
 							<div class="content" ng-if="!store.enType || store.enType === 'MAINLAND'">
-								<p class="title">大陆交货(￥)</p>
+								<p class="title">单价(￥)</p>
 								<div class="input-list" ng-repeat="price in goods.prices">
 									<input type="number" class="wid92 form-control"  placeholder="单价(￥)" ng-model="price.rMBPrice"/>
 								</div>

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

@@ -573,8 +573,8 @@
                         <th width="115">包装/生产日期</th>
                         <th width="140">库存</th>
                         <th width="105">数量</th>
-                        <th ng-if="onsale.currency == 'USD'" width="116">香港交货<b style="font-size: 12px;font-weight: 600">($)</b></th>
-                        <th ng-if="onsale.currency == 'RMB'" width="116">大陆交货<b style="font-size: 12px;font-weight: 600">(￥)</b></th>
+                        <th ng-if="onsale.currency == 'USD'" width="116">单价<b style="font-size: 12px;font-weight: 600">($)</b></th>
+                        <th ng-if="onsale.currency == 'RMB'" width="116">单价<b style="font-size: 12px;font-weight: 600">(￥)</b></th>
                         <th width="120">交期</th>
                         <th class="filter" width="90">
                             <a>{{selfSupport}}<i class="fa fa-angle-double-down angle-hover-up" aria-hidden="true"></i></a>
@@ -643,12 +643,12 @@
                         </td>
                         <td ng-if="onsale.currency == 'USD'">
                             <div  ng-repeat="price in commodity.prices" ng-if="price.uSDPrice" >
-                                <span ng-bind="price.uSDPrice | formateNumber : 6"></span>
+                                <span ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName"></span>
                             </div>
                         </td>
                         <td ng-if="onsale.currency == 'RMB'">
                             <div ng-repeat="price in commodity.prices" ng-if="price.rMBPrice">
-                                <span ng-bind="price.rMBPrice | formateNumber : 6" style="margin-left: 10px;"></span>
+                                <span ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName" style="margin-left: 10px;"></span>
                             </div>
                         </td>
                         <td>