Przeglądaj źródła

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

shenjj 7 lat temu
rodzic
commit
0763b0a05b
82 zmienionych plików z 145 dodań i 1864 usunięć
  1. 2 1
      src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java
  2. BIN
      src/main/resources/jxls-tpl/trade/goods.xls
  3. BIN
      src/main/resources/jxls-tpl/trade/goodsImportHist-error.xls
  4. BIN
      src/main/resources/jxls-tpl/trade/releaseByBatch-person.xls
  5. BIN
      src/main/resources/jxls-tpl/trade/releaseByBatch-rmb.xls
  6. BIN
      src/main/resources/jxls-tpl/trade/releaseByBatchError-person.xls
  7. BIN
      src/main/resources/jxls-tpl/trade/releaseByBatchError-rmb.xls
  8. BIN
      src/main/resources/jxls-tpl/trade/releaseByBatchError-usd.xls
  9. BIN
      src/main/resources/jxls-tpl/trade/releasePCBByBatch-rmb.xls
  10. BIN
      src/main/resources/jxls-tpl/trade/releasePCBByBatchError-rmb.xls
  11. BIN
      src/main/resources/jxls-tpl/trade/releasePCBByBatchError-usd.xls
  12. BIN
      src/main/resources/jxls-tpl/trade/releasePCBbyBatch-usd.xls
  13. BIN
      src/main/resources/jxls-tpl/trade/releasebyBatch-usd.xls
  14. BIN
      src/main/resources/jxls-tpl/trade/seekPurchaseByBatch.xls
  15. BIN
      src/main/resources/jxls-tpl/trade/upAndDown.xls
  16. 2 2
      src/main/webapp/resources/js/admin/controllers/checkMoney/SettlementCtrl.js
  17. 9 2
      src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js
  18. 1 1
      src/main/webapp/resources/view/admin/disable_component.html
  19. 1 1
      src/main/webapp/resources/view/admin/modal/product_kindContrast_modal.html
  20. 1 1
      src/main/webapp/resources/view/admin/product/crawl_task_component_list.html
  21. 3 3
      src/main/webapp/resources/view/admin/product/kindContrast.html
  22. 2 2
      src/main/webapp/resources/view/admin/product/productManage.html
  23. 3 3
      src/main/webapp/resources/view/admin/product/productManageDetail.html
  24. 2 2
      src/main/webapp/resources/view/admin/search/search_See.html
  25. 1 1
      src/main/webapp/resources/view/admin/trade/trade-afSaleApplyDetails.html
  26. 1 1
      src/main/webapp/resources/view/admin/trade/trade-supExProcessDetails.html
  27. 1 1
      src/main/webapp/resources/view/admin/trade/trade_exceptionProcessing.html
  28. 1 1
      src/main/webapp/resources/view/common/componentsGoodsCommon.html
  29. 1 1
      src/main/webapp/resources/view/common/store_header.html
  30. 1 1
      src/main/webapp/resources/view/prod/compare.html
  31. 1 1
      src/main/webapp/resources/view/prod/my_cart.html
  32. 1 1
      src/main/webapp/resources/view/prod/order_ensure.html
  33. 1 1
      src/main/webapp/resources/view/prod/order_ensure_with_multi_currency.html
  34. 1 1
      src/main/webapp/resources/view/prod/product_brand_detail.html
  35. 1 1
      src/main/webapp/resources/view/prod/product_component_view.html
  36. 1 1
      src/main/webapp/resources/view/prod/product_home.html
  37. 1 1
      src/main/webapp/resources/view/prod/product_kind_edit.html
  38. 1 1
      src/main/webapp/resources/view/search/search_component.html
  39. 1 1
      src/main/webapp/resources/view/sso/staffManagement.html
  40. 1 1
      src/main/webapp/resources/view/usercenter/exceptionNotify.html
  41. 1 1
      src/main/webapp/resources/view/usercenter/exceptionProcessing.html
  42. 1 1
      src/main/webapp/resources/view/usercenter/exceptionProcessingDetail.html
  43. 1 1
      src/main/webapp/resources/view/usercenter/forstore/add_rate.html
  44. 1 1
      src/main/webapp/resources/view/usercenter/forstore/bomDetail.html
  45. 2 2
      src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html
  46. 1 1
      src/main/webapp/resources/view/usercenter/forstore/buyer_order.html
  47. 1 1
      src/main/webapp/resources/view/usercenter/forstore/first_rate.html
  48. 2 2
      src/main/webapp/resources/view/usercenter/forstore/order_detail.html
  49. 2 2
      src/main/webapp/resources/view/usercenter/forstore/order_pay.html
  50. 1 1
      src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html
  51. 5 5
      src/main/webapp/resources/view/usercenter/forstore/seek_purchase.html
  52. 1 1
      src/main/webapp/resources/view/usercenter/forstore/show_rate.html
  53. 18 4
      src/main/webapp/resources/view/usercenter/forstore/store_focus.html
  54. 1 1
      src/main/webapp/resources/view/vendor/exceptionApply.html
  55. 1 1
      src/main/webapp/resources/view/vendor/exceptionApplyDetails.html
  56. 1 1
      src/main/webapp/resources/view/vendor/exceptionNotify.html
  57. 1 1
      src/main/webapp/resources/view/vendor/exceptionProcessing.html
  58. 3 3
      src/main/webapp/resources/view/vendor/forstore/erp/vendor_onSale_erp.html
  59. 1 1
      src/main/webapp/resources/view/vendor/forstore/erp/vendor_undercarriage_erp.html
  60. 1 1
      src/main/webapp/resources/view/vendor/forstore/product_file.html
  61. 3 3
      src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html
  62. 3 3
      src/main/webapp/resources/view/vendor/forstore/purchase_detail.html
  63. 1 1
      src/main/webapp/resources/view/vendor/forstore/seekPurchase.html
  64. 1 1
      src/main/webapp/resources/view/vendor/forstore/showRate.html
  65. 1 1
      src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html
  66. 1 1
      src/main/webapp/resources/view/vendor/forstore/vendor_goods.html
  67. 1 1
      src/main/webapp/resources/view/vendor/forstore/vendor_material.html
  68. 1 1
      src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html
  69. 0 1743
      src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html
  70. 1 1
      src/main/webapp/resources/view/vendor/forstore/vendor_order.html
  71. 3 3
      src/main/webapp/resources/view/vendor/forstore/vendor_proRepository.html
  72. 3 3
      src/main/webapp/resources/view/vendor/forstore/vendor_repository.html
  73. 3 3
      src/main/webapp/resources/view/vendor/forstore/vendor_standard_putOn.html
  74. 1 1
      src/main/webapp/resources/view/vendor/forstore/vendor_undercarriage.html
  75. 22 20
      src/main/webapp/resources/view/vendor/forstore/vendor_upload.html
  76. 1 1
      src/main/webapp/resources/view/vendor/goods_detail.html
  77. 1 1
      src/main/webapp/resources/view/vendor/modal/discharge_commodity_modal.html
  78. 1 1
      src/main/webapp/resources/view/vendor/modal/discharge_goods_modal.html
  79. 2 2
      src/main/webapp/resources/view/vendor/modal/recommend_product_modal.html
  80. 4 4
      src/main/webapp/resources/view/vendor/modal/uploadProduct.html
  81. 2 2
      src/main/webapp/resources/view/vendor/publishByBatch.html
  82. 1 1
      src/main/webapp/resources/view/vendor/putOn.html

+ 2 - 1
src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -610,12 +610,13 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User switchEnterprise(Long enUU) {
-		User user = SystemSession.getUser();
+		User user = userDao.findUserByUserUU(SystemSession.getUser().getUserUU()).get(0);
 		if ( enUU == 0L) {
 			user.setEnterprise(null);
 		} else {
 			user.setCurrentEnterprise(enUU);
 		}
+		SystemSession.setUser(user);
 		return user;
 	}
 

BIN
src/main/resources/jxls-tpl/trade/goods.xls


BIN
src/main/resources/jxls-tpl/trade/goodsImportHist-error.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatch-person.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatch-rmb.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatchError-person.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatchError-rmb.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatchError-usd.xls


BIN
src/main/resources/jxls-tpl/trade/releasePCBByBatch-rmb.xls


BIN
src/main/resources/jxls-tpl/trade/releasePCBByBatchError-rmb.xls


BIN
src/main/resources/jxls-tpl/trade/releasePCBByBatchError-usd.xls


BIN
src/main/resources/jxls-tpl/trade/releasePCBbyBatch-usd.xls


BIN
src/main/resources/jxls-tpl/trade/releasebyBatch-usd.xls


BIN
src/main/resources/jxls-tpl/trade/seekPurchaseByBatch.xls


BIN
src/main/resources/jxls-tpl/trade/upAndDown.xls


+ 2 - 2
src/main/webapp/resources/js/admin/controllers/checkMoney/SettlementCtrl.js

@@ -136,7 +136,7 @@ define(['app/app'], function(app) {
 			bankInfoService.getAdminEnterAccount('', function(data) {
 				$scope.b2cAccountInfos = resolveData(data);
 				angular.forEach($scope.b2cAccountInfos, function(b2cAccountInfos) {
-					b2cAccountInfos.filterAccount = hideBankFilter(b2cAccountInfos.number);
+					b2cAccountInfos.filterAccount = b2cAccountInfos.number;
 				});
 				$scope.b2cAccount = getOriginalData($scope.b2cAccountInfos);
 			}, function(res) {
@@ -150,7 +150,7 @@ define(['app/app'], function(app) {
 			bankInfoService.getVenderBank({venduu:venduu},null, function(data) {
 				$scope.venderAccountInfos = resolveData(data);
 				angular.forEach($scope.venderAccountInfos, function(venderAccountInfos) {
-					venderAccountInfos.filterAccount = hideBankFilter(venderAccountInfos.number);
+					venderAccountInfos.filterAccount = venderAccountInfos.number;
 				});
 				$scope.venderAccount = getOriginalData($scope.venderAccountInfos);
 			}, function(res) {

+ 9 - 2
src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -103,7 +103,14 @@ define(['app/app'], function (app) {
                 $scope.totalPages = 0;
                 toaster.pop('error', '数据获取失败,请重新刷新页面!');
             });
-        }
+        };
+
+        $scope.keyUpApply = function () {
+            var keycode = window.event ? event.keyCode : event.which;
+            if (keycode == 13) {
+                $scope.searchApply();
+            }
+        };
 
         $scope.searchApply = function () {
             applyToEnterpriseTableParams();
@@ -210,7 +217,7 @@ define(['app/app'], function (app) {
             if (event && event.keyCode == 13) {
                 $scope.onSearch(keyword, filterRole);
             }
-        }
+        };
 
         $scope.newUser = {};
 

+ 1 - 1
src/main/webapp/resources/view/admin/disable_component.html

@@ -12,7 +12,7 @@
 				<table ng-table="componentsTableParams" class="table table-condensed table-bordered table-striped">
 			        <tr ng-repeat="component in $data">
 			          <td data-title="'原厂型号'">{{component.code}}</td>
-			          <td data-title="'类目'">{{component.kind.nameCn}}</td>
+			          <td data-title="'物料名称'">{{component.kind.nameCn}}</td>
 			          <td data-title="'唯一标识符(UUID)'">{{component.uuid}}</td>
 			          <td data-title="'操作'"> <button ng-click="disable(component)" class="btn btn-danger btn-sm" ng-if="!isDisable"><i class="fa fa-check"></i> 禁用</button>  <button ng-click="" class="btn btn-danger btn-sm" ng-if="isDisable")><i class="fa fa-check"></i> 解除禁用</button></td>
 			        </tr>

+ 1 - 1
src/main/webapp/resources/view/admin/modal/product_kindContrast_modal.html

@@ -33,7 +33,7 @@
 						<th width="30">序号</th>
 						<th width="100">来源</th>
 						<th width="100">商城品牌</th>
-						<th width="100">类目</th>
+						<th width="100">物料名称</th>
 						<th width="100">商城类目</th>
 						<th width="100">创建人</th>
 						<th width="100">更新人</th>

+ 1 - 1
src/main/webapp/resources/view/admin/product/crawl_task_component_list.html

@@ -30,7 +30,7 @@
 						<th width="30">序号</th>
 						<th width="100">原厂型号</th>
 						<th width="100">品牌</th>
-						<th width="100">类目</th>
+						<th width="100">物料名称</th>
 						<th width="100" ng-bind="properties[0].labelCn"></th>
 						<th width="100" ng-bind="properties[1].labelCn"></th>
 						<th width="100" ng-bind="properties[2].labelCn"></th>

+ 3 - 3
src/main/webapp/resources/view/admin/product/kindContrast.html

@@ -71,7 +71,7 @@
 				<div class="col-sm-3 search-input" ng-show="searchMore">
 					<div class="input-group">
 						<input type="search" class="form-control ng-pristine ng-valid ng-touched" ng-model="kiName" 
-							ng-search="onSearch()" placeholder="按官网类目搜索">
+							ng-search="onSearch()" placeholder="按官网物料名称搜索">
 						<div class="input-group-btn">
 							<button ng-click="onSearch()" class="btn btn-primary" type="button">搜索</button>
 						</div>
@@ -80,7 +80,7 @@
 				<div class="col-sm-3 search-input" ng-show="searchMore">
 					<div class="input-group">
 						<input type="search" class="form-control ng-pristine ng-valid ng-touched" ng-model="b2cKind" 
-							ng-search="onSearch()" placeholder="按商城类目搜索">
+							ng-search="onSearch()" placeholder="按商城物料名称搜索">
 						<div class="input-group-btn">
 							<button ng-click="onSearch()" class="btn btn-primary" type="button">搜索</button>
 						</div>
@@ -107,7 +107,7 @@
 						<th width="30">序号</th>
 						<th width="100">来源</th>
 						<th width="100">商城品牌</th>
-						<th width="100">类目</th>
+						<th width="100">物料名称</th>
 						<th width="100">商城类目</th>
 						<th width="100">创建人</th>
 						<th width="100">更新人</th>

+ 2 - 2
src/main/webapp/resources/view/admin/product/productManage.html

@@ -60,7 +60,7 @@
                 <div class="form-inline">
                     <div class="form-group form-group-sm">
                         <label class="control-label">
-                            类目
+                            物料名称
                         </label>
                         <div class="mar-rt0 row checkbox">
                             <div class="col-md-3">
@@ -208,7 +208,7 @@
                        <span ng-bind="list.storeName || '-'">商家名称</span>
                    </td>
                    <td>
-                       <p>类目:<span ng-bind="list.kindNameCn || '-'">****</span></p>
+                       <p>物料名称:<span ng-bind="list.kindNameCn || '-'">****</span></p>
                        <p>型号:<span ng-bind="list.code || '-'">****</span></p>
                        <p>品牌:<span ng-bind="list.brandNameEn || '-'">****</span></p>
                    </td>

+ 3 - 3
src/main/webapp/resources/view/admin/product/productManageDetail.html

@@ -27,7 +27,7 @@
                     <div class="col-xs-4">
                         <div class="info-text">
                             <p>型号:<span ng-bind="goods.code"></span></p>
-                            <p>产品名称(类目):<span ng-bind="goods.kindNameCn"></span></p>
+                            <p>物料名称:<span ng-bind="goods.kindNameCn"></span></p>
                             <p>品牌:<span ng-bind="goods.brandNameEn"></span></p>
                             <p>封装:<span ng-bind="goods.encapsulation || '-'"></span></p>
                         </div>
@@ -121,7 +121,7 @@
                 <table class="table">
                     <tr>
                         <th>产品编号</th>
-                        <th>产品名称(类目)</th>
+                        <th>物料名称</th>
                         <th>型号</th>
                         <th>封装</th>
                         <th>品牌</th>
@@ -145,7 +145,7 @@
                 <table class="table">
                     <tr>
                         <th>产品编号</th>
-                        <th>产品名称(类目)</th>
+                        <th>物料名称</th>
                         <th>型号</th>
                         <th>品牌</th>
                         <th>封装</th>

+ 2 - 2
src/main/webapp/resources/view/admin/search/search_See.html

@@ -15,13 +15,13 @@
                 </p>
                 <p style="margin-top: 8px; font-weight: bold;">
                     共耗时<span class="totalNum">{{searchtime}}</span>ms  <br><br>
-                    类目统计共耗时 {{kindtime}} ms <br><br>
+                    物料名称统计共耗时 {{kindtime}} ms <br><br>
                     品牌统计共耗时 {{brandtime}} ms
                 </p>
             </div>
             <div class="col-xs-offset-4 col-xs-7">
                 <div class="input-group">
-                    <input type="search" style="width:80%;" class="form-control" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="型号/类目/品牌">
+                    <input type="search" style="width:80%;" class="form-control" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="型号/物料名称/品牌">
                     <span class="input-group-btn">
 					<button ng-click="search()" class="btn btn-primary" type="button">搜索</button>
 				</span>

+ 1 - 1
src/main/webapp/resources/view/admin/trade/trade-afSaleApplyDetails.html

@@ -317,7 +317,7 @@
                             <th>序号</th>
                             <th>产品型号</th>
                             <th>品牌</th>
-                            <th>类目</th>
+                            <th>物料名称</th>
                             <th>采购数量</th>
                             <th>采购金额</th>
                             <th>单价</th>

+ 1 - 1
src/main/webapp/resources/view/admin/trade/trade-supExProcessDetails.html

@@ -303,7 +303,7 @@
                             <th>序号</th>
                             <th>产品型号</th>
                             <th>品牌</th>
-                            <th>类目</th>
+                            <th>物料名称</th>
                             <th>采购数量</th>
                             <th>采购金额</th>
                             <th>单价</th>

+ 1 - 1
src/main/webapp/resources/view/admin/trade/trade_exceptionProcessing.html

@@ -206,7 +206,7 @@ table th, table td {
 						<th>序号</th>
 						<th>产品型号</th>
 						<th>品牌</th>
-						<th>类目</th>
+						<th>物料名称</th>
 						<th>采购<br/>数量</th>
 						<th>采购<br/>金额</th>
 						<th>商城<br/>要求</th>

+ 1 - 1
src/main/webapp/resources/view/common/componentsGoodsCommon.html

@@ -319,7 +319,7 @@
 	<thead>
 	<tr style="height: 40px;">
 		<th width="80"></th>
-		<th width="160">品牌/型号/类目</th>
+		<th width="160">品牌/型号/物料名称</th>
 		<th width="90">店铺名称</th>
 		<th width="100">封装/生产日期</th>
 		<th width="110">库存</th>

+ 1 - 1
src/main/webapp/resources/view/common/store_header.html

@@ -362,7 +362,7 @@
 			<div id="search-group" style="margin-left: 450px;" ng-controller="SearchCtrl">
 				<div style="width: 100%;">
 					<div class="input-group">
-						<input id="search_input" ng-model="keyword" ng-change="onChange()" type="text" class="form-control" placeholder="型号/类目/品牌" ng-search="search()" 							ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()" autocomplete="off"/>
+						<input id="search_input" ng-model="keyword" ng-change="onChange()" type="text" class="form-control" placeholder="型号/物料名称/品牌" ng-search="search()" 							ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()" autocomplete="off"/>
 						<span class="input-group-btn">
 							<button type="button" class="btn" id="search_btn" ng-click="search()">&nbsp;搜&nbsp;索&nbsp;</button>
 						</span>

+ 1 - 1
src/main/webapp/resources/view/prod/compare.html

@@ -52,7 +52,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>产品类目</td>
+				<td>物料名称</td>
 				<td width="200px" ng-repeat="i in indexes">
 					<div ng-if="components[i]">
 						<div><a href="">{{components[i].kind.nameCn}}</a></div>

+ 1 - 1
src/main/webapp/resources/view/prod/my_cart.html

@@ -625,7 +625,7 @@ span.search:HOVER {
 						<th class="text-center sumMoneyWidth">产品<br/>总金额</th>
 						<th class="blank blankWidth"></th>
 						<th class="text-center cmpWidth">产品</th>
-						<th class="text-center kindWidth">类目</th>
+						<th class="text-center kindWidth">物料名称</th>
 						<th class="text-center brandWidth">品牌</th>
 						<th class="text-center reserveWidth">库存<br/>数量</th>
 						<th class="text-center unitpriceWidth color-black">

+ 1 - 1
src/main/webapp/resources/view/prod/order_ensure.html

@@ -540,7 +540,7 @@ table .before-blank, .table-bordered>tbody>tr>td.before-blank, .table-bordered>t
 						<tr class="">
 					        <th>序号</th>
 					        <th>产品型号</th>
-					        <th>类目</th>
+					        <th>物料名称</th>
 					        <th>品牌</th>
 					        <th>库存数量</th>
 					        <th class="select-currency">

+ 1 - 1
src/main/webapp/resources/view/prod/order_ensure_with_multi_currency.html

@@ -669,7 +669,7 @@
 						<tr class="">
 					        <th>序号</th>
 					        <th>产品型号</th>
-					        <th>类目</th>
+					        <th>物料名称</th>
 					        <th>品牌</th>
 					        <th>库存数量</th>
 					        <th class="selectCurrency">

+ 1 - 1
src/main/webapp/resources/view/prod/product_brand_detail.html

@@ -677,7 +677,7 @@
 						</li>
 					</ul>
 					<div ng-if="!kinds" class="no-record">
-						暂无类目信息
+						暂无物料名称信息
 					</div>
 				</div>
 			</div>

+ 1 - 1
src/main/webapp/resources/view/prod/product_component_view.html

@@ -622,7 +622,7 @@ div.zoomMask {
 				<div class="hr-grey"></div>
 				<div class="row">
 					<div class="form-group row">
-						<div class="message-item">类目</div>
+						<div class="message-item">物料名称</div>
 						<div class="colon">:</div>
 						<div><a href="product#/kinds/{{component.kind.id}}" class="message-body blue" ng-bind="component.kind.nameCn" target="_blank"></a></div>
 					</div>

+ 1 - 1
src/main/webapp/resources/view/prod/product_home.html

@@ -202,7 +202,7 @@
 <div class="container" style="width:1190px;padding: 0;">
 	<div style="background: #fff; z-index:10;">
 		<div class="box-first">
-			<div class="box-item">类目:</div>
+			<div class="box-item">物料名称:</div>
 			<div class="box-kind">
 				<ul id="letter-nav">
 					<li class="text-num" ng-repeat="kind in kinds | orderBy : 'namelength'"  ng-click="scrollTo(kind.id)">

+ 1 - 1
src/main/webapp/resources/view/prod/product_kind_edit.html

@@ -1,4 +1,4 @@
-<!-- 类目修改模态框,修改类目名称 -->
+<!-- 物料名称修改模态框,修改类目名称 -->
 <div class="modal-header">
 	<h3 class="modal-title">
 		<i class="fa fa-fw fa-sitemap text-default"></i>

+ 1 - 1
src/main/webapp/resources/view/search/search_component.html

@@ -77,7 +77,7 @@
 	<!--<div class="no-record" ng-if="!total"><i class="fa fa-smile-o fa-lg"></i>很抱歉,我们没有找到相关的产品型号!</div>-->
 	<div class="selector" ng-if="productTableParams.total()" style="border: #e8e8e8 1px solid;border-bottom: none;">
 		<div class="sl-wrap">
-			<div class="sl-key f14">类目:</div>
+			<div class="sl-key f14">物料名称:</div>
 			<div class="sl-value">
                 <span ng-repeat="ck in componentKinds" >
                     <div  ng-if="contains(filter.kind,ck.ki_id)" class="sl-filter" ng-click="selectKind(ck,false)">

+ 1 - 1
src/main/webapp/resources/view/sso/staffManagement.html

@@ -1058,7 +1058,7 @@
         <!-- 申请绑定 -->
         <div class="clearfix bind-en" ng-if="tab=='bind'">
             <div class="rt_menu">
-                <span class="pull-right"><input type="text" ng-model="searchParams.keyword" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>
+                <span class="pull-right"><input type="text" ng-model="searchParams.keyword" ng-keyup="keyUpApply()" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>
             </div>
             <table class="bind-enter-tab" ng-table="applyToEnterpriseTableParams">
                 <thead>

+ 1 - 1
src/main/webapp/resources/view/usercenter/exceptionNotify.html

@@ -257,7 +257,7 @@
                         <th>序号</th>
                         <th>产品型号</th>
                         <th>品牌</th>
-                        <th>类目</th>
+                        <th>物料名称</th>
                         <th>数量</th>
                         <th>金额</th>
                         <th>单价</th>

+ 1 - 1
src/main/webapp/resources/view/usercenter/exceptionProcessing.html

@@ -306,7 +306,7 @@
                             <th>序号</th>
                             <th>产品型号</th>
                             <th>品牌</th>
-                            <th>类目</th>
+                            <th>物料名称</th>
                             <th>采购数量</th>
                             <th>采购金额</th>
                             <th>单价</th>

+ 1 - 1
src/main/webapp/resources/view/usercenter/exceptionProcessingDetail.html

@@ -297,7 +297,7 @@
                             <th>序号</th>
                             <th>产品型号</th>
                             <th>品牌</th>
-                            <th>类目</th>
+                            <th>物料名称</th>
                             <th>采购数量</th>
                             <th>采购金额</th>
                             <th>单价</th>

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

@@ -380,7 +380,7 @@
             <td>
                 <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目:<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">物料名称:<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号:<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌:<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>

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

@@ -631,7 +631,7 @@
             <thead>
             <tr>
                 <th width="110">发布时间</th>
-                <th width="260">品牌/类目</th>
+                <th width="260">品牌/物料名称</th>
                 <th width="260">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
                 <th width="120">截止时间</th>

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -664,8 +664,8 @@
 									<div class="car_pro_xq" style="padding-top: 10px">
 											<i class="text-hidden" ng-if="!cart.uuid">品牌:<a ng-bind="::cart.goods.brandNameEn || '-'" title="{{::cart.goods.brandNameEn}}" class="unstand"></a></i>
 									   <i class="text-hidden" ng-if="cart.uuid">品牌:<a href="product/brand/{{::cart.goods.branduuid}}/" target="_blank" ng-bind="::cart.goods.brandNameEn" title="{{::cart.goods.brandNameEn}}"></a></i>
-									    <i class="text-hidden" ng-if="!cart.uuid">类目:<a ng-bind="::cart.kiName || '-'" title="{{::cart.kiName}}" class="unstand"></a></i>
-									    <i class="text-hidden" ng-if="cart.uuid">类目:<a href="product/kind/{{cart.goods.kindUuid}}" target="_blank" ng-bind="::cart.kiName" title="{{::cart.kiName}}"></a></i>
+									    <i class="text-hidden" ng-if="!cart.uuid">物料名称:<a ng-bind="::cart.kiName || '-'" title="{{::cart.kiName}}" class="unstand"></a></i>
+									    <i class="text-hidden" ng-if="cart.uuid">物料名称:<a href="product/kind/{{cart.goods.kindUuid}}" target="_blank" ng-bind="::cart.kiName" title="{{::cart.kiName}}"></a></i>
 									    <i class="text-hidden">型号:<a href="store/productDetail/{{::cart.batchCode}}" target="_blank" ng-bind="::cart.code || '-'" title="{{::cart.code}}"></a></i>
 											<i class="text-hidden">规格:<a ng-bind="::cart.goods.spec || '-'" title="{{::cart.goods.spec}}" class="unstand"></a></i>
 									   </div>

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

@@ -912,7 +912,7 @@
 									品牌:<a href="product/brand/{{::detail.branduuid}}/" target="_blank" ng-if="detail.uuid">
 									<em ng-bind="::detail.brName || '-'" title="{{::detail.brName}}"></em></a><br ng-if="detail.uuid"/>
 									<a class="unstand" ng-if="!detail.uuid"><em ng-bind="::detail.brName || '-'" title="{{::detail.brName}}"></em></a><br ng-if="!detail.uuid"/>
-									类目:<a href="product/kind/{{::detail.kindUuid}}" target="_blank" ng-if="detail.uuid"><em ng-bind="::detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="detail.uuid"/>
+									物料名称:<a href="product/kind/{{::detail.kindUuid}}" target="_blank" ng-if="detail.uuid"><em ng-bind="::detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="detail.uuid"/>
 									<a class="unstand" ng-if="!detail.uuid"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="!detail.uuid"/>
 									型号:<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a>
 									<br/>

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

@@ -306,7 +306,7 @@
                     <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
 
                     <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目:<a href="product#/kinds/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">物料名称:<a href="product#/kinds/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/></span></span>
                         <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号:<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/></span></span>
                         <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌:<a href="product#/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a></span></span>
                     </div>

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -434,10 +434,10 @@
 							<p class="style01" ng-if="!detail.uuid" style="margin-top: 10px;">品牌:
 								<a ng-bind="detail.brName || '-'" title="{{detail.brName}}" class="unstand"></a>
 							</p>
-                            <p class="style01" ng-if="detail.uuid">类目
+                            <p class="style01" ng-if="detail.uuid">物料名称
 								<a ng-bind="detail.kiName || '-'" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
-							 <p class="style01" ng-if="!detail.uuid">类目
+							 <p class="style01" ng-if="!detail.uuid">物料名称
 								<a ng-bind="detail.kiName || '-'"  title="{{detail.kiName}}" class="unstand"></a>
 							</p>
 							<p class="style01">型号:

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -675,8 +675,8 @@
 							<div class="style-type">
 								<p  ng-if="detail.uuid"><a href="product/brand/{{detail.branduuid}}/" target="_blank" style="color: #323232">品牌:<b ng-bind="detail.brName || '-'" style="color: #323232" title="{{detail.brName}}"></b></a></p>
 								<p ng-if="!detail.uuid"><a style="color: #323232" class="unstand">品牌:<b ng-bind="detail.brName || '-'" style="color: #323232" title="{{detail.brName}}"></b></a></p>
-								<p title="{{detail.kiName}}" ng-if="detail.uuid"><a href="product/kind/{{detail.goodsHistory.kindUuid}}" target="_blank" style="color: #323232">类目:<b ng-bind="detail.kiName || '-'"></b></a></p>
-								<p title="{{detail.kiName}}" ng-if="!detail.uuid"><a style="color: #323232" class="unstand">类目:<b ng-bind="detail.kiName || '-'"></b></a></p>
+								<p title="{{detail.kiName}}" ng-if="detail.uuid"><a href="product/kind/{{detail.goodsHistory.kindUuid}}" target="_blank" style="color: #323232">物料名称:<b ng-bind="detail.kiName || '-'"></b></a></p>
+								<p title="{{detail.kiName}}" ng-if="!detail.uuid"><a style="color: #323232" class="unstand">物料名称:<b ng-bind="detail.kiName || '-'"></b></a></p>
 								<p><a href="store/productDetail/{{::detail.batchCode}}" target="_blank" style="color: #323232">型号:<b ng-bind="detail.cmpCode || '-'" title="{{detail.cmpCode}}"></b></a></p>
 								<p><a style="color: #323232">规格:<b ng-bind="detail.spec || '-'" title="{{detail.spec}}"></b></a></p>
 								</div>

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

@@ -1062,7 +1062,7 @@
             <thead>
             <tr>
                 <th width="110">发布时间</th>
-                <th width="260">品牌/类目</th>
+                <th width="260">品牌/物料名称</th>
                 <th width="260">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
                 <th width="120">状态/截止时间</th>

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

@@ -19,7 +19,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>
@@ -68,7 +68,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>
@@ -106,7 +106,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>
@@ -155,7 +155,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>
@@ -193,7 +193,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>

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

@@ -364,7 +364,7 @@
             <td>
                 <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目:<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">物料名称:<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号:<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌:<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>

+ 18 - 4
src/main/webapp/resources/view/usercenter/forstore/store_focus.html

@@ -32,6 +32,7 @@
 		width : 1026px;
 		height: 230px;
 		border-bottom: 1px dashed #dadada;
+		clear: both;
 	}
 	.store-item > div{
 		float:left;
@@ -374,7 +375,7 @@
 		<!-- 店铺关注具体信息 -->
 		<div class="store-container" ng-if="store.length != 0">
 			<ul>
-				<li ng-repeat="item in store" class="store-item">
+				<li ng-repeat="item in store" class="store-item clearfix">
 					<div class="img-div" ng-click="setActive(item)" ng-class="{'isSelected-background': isBatch &&item.active}">
 						<a name="imgDetail" href="store/{{item.storeInfo.uuid}}" target="_blank">
 							<img src="{{item.storeInfo.logoUrl}}" class="store-img"/>
@@ -386,11 +387,11 @@
 							<div ng-bind=item.storeName class="item-storeName"></div>
 						</a>
 						<i class="fa fa-trash fa-2x item-delete" ng-click="deleteById(item.id)" ng-hide="isBatch" title="取消关注" style="cursor: pointer"></i>
-						<div class="item-seller" style="position: relative;">
+						<div class="item-seller" style="position: relative;" ng-controller="ChatContactCtrl as chat">
 							<img src="static/img/common/songguo.png">
-							<a href="javascript:void(0)" class="item-contact" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(item.storeInfo.enterprise.enTel, item.storeInfo.enterprise.uu, chat.UserType.STORE)">联系卖家</a>
+							<a href="javascript:void(0)" class="item-contact" title="联系卖家" ng-click="chat.contactWithOther(item.storeInfo.enterprise.enTel, item.storeInfo.enterprise.uu, chat.UserType.STORE)">联系卖家</a>
 							<!--<a class="item-contact" ng-click="contactSeller(item)">联系卖家</a>-->
-							<div class="contact-box" ng-if="item.contactBNox">
+							<!--<div class="contact-box" ng-if="item.contactBNox">
 								<div class="title"><i class="fa fa-close fa-lg" ng-click="item.contactBNox = false"></i></div>
 								<div class="content">
 									<div class="company-title" ng-bind="item.storeInfo.enterprise.enName">深圳市优软科技</div>
@@ -406,8 +407,21 @@
 										<em ng-bind="item.storeInfo.enterprise.address || '暂无地址信息'">1212314531455</em>
 									</div>
 								</div>
+							</div>-->
+							<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
+								<div class="title">
+									<i ng-click="setShowLinkBox(false)"></i>
+								</div>
+								<div class="content">
+									<p><i class="fa fa-exclamation-circle"></i>抱歉,暂时无法与卖家在线沟通!</p>
+									<p>卖家联系电话:<span ng-bind="phone"></span></p>
+									<div>
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
+									</div>
+								</div>
 							</div>
 						</div>
+						</div>
 						<div class="item-mark">
 							<div>公司介绍:
 								<span ng-bind="item.storeInfo.description"></span>

+ 1 - 1
src/main/webapp/resources/view/vendor/exceptionApply.html

@@ -275,7 +275,7 @@
                         <th>序号</th>
                         <th>产品型号</th>
                         <th>品牌</th>
-                        <th>类目</th>
+                        <th>物料名称</th>
                         <th>数量</th>
                         <th>金额</th>
                         <th>单价</th>

+ 1 - 1
src/main/webapp/resources/view/vendor/exceptionApplyDetails.html

@@ -282,7 +282,7 @@
                         <th>序号</th>
                         <th>产品型号</th>
                         <th>品牌</th>
-                        <th>类目</th>
+                        <th>物料名称</th>
                         <th>数量</th>
                         <th>金额</th>
                         <th>单价</th>

+ 1 - 1
src/main/webapp/resources/view/vendor/exceptionNotify.html

@@ -232,7 +232,7 @@
                         <th>序号</th>
                         <th>产品型号</th>
                         <th>品牌</th>
-                        <th>类目</th>
+                        <th>物料名称</th>
                         <th>数量</th>
                         <th>金额</th>
                         <th>单价</th>

+ 1 - 1
src/main/webapp/resources/view/vendor/exceptionProcessing.html

@@ -39,7 +39,7 @@
                 <th>序号</th>
                 <th>编号</th>
                 <th>品牌</th>
-                <th>类目</th>
+                <th>物料名称</th>
                 <th>采购数量</th>
                 <th>采购金额</th>
                 <th>单价</th>

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/erp/vendor_onSale_erp.html

@@ -968,8 +968,8 @@
                                 </div>
                             </div>
                             <div class="fr wid135">
-                                <p ng-if="!commodity.uuid">类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
-                                <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
+                                <p ng-if="!commodity.uuid">物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
+                                <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
                                 <p>型号: <em class="href" ng-bind="commodity.code" title="{{commodity.code}}"  ng-click="goToBatchDetail($event, commodity)">LPC1112</em></p>
                                 <p ng-if="!commodity.uuid">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
                                 <p ng-if="commodity.uuid" name="brand-a"><a href="product/brand/{{commodity.branduuid}}" style="margin: 0; color: #333;" target="_blank">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
@@ -1067,7 +1067,7 @@
                                         </div>
                                     </div>
                                     <div class="fr wid135">
-                                        <p>类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>
+                                        <p>物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>
                                         <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>
                                         <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>
                                     </div>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/erp/vendor_undercarriage_erp.html

@@ -647,7 +647,7 @@
                                  </div>-->
                             </div>
                             <div class="fr wid135">
-                                <p>类目: <em ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}"></em></p>
+                                <p>物料名称: <em ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}"></em></p>
                                 <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}"></em></p>
                                 <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}"></em></p>
                             </div>

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

@@ -368,7 +368,7 @@
             <div class="no-batch" ng-if="style == 'single'">
                 <div class="row">
                     <div class="row-line">
-                        <span class="title">产品名称(类目)</span>
+                        <span class="title">物料名称</span>
                         <input type="text" class="form-control" ng-change="inputCategory()"/>
                     </div>
                     <div class="row-line">

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

@@ -686,7 +686,7 @@
             <thead>
             <tr>
                 <th width="180">买家/发布时间</th>
-                <th width="245">品牌/类目</th>
+                <th width="245">品牌/物料名称</th>
                 <th width="245">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
                 <th width="130">剩余时间</th>
@@ -707,8 +707,8 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.inbrand}}" style="width: 100%" class="fl item size-middle"><span>品牌:</span><div class="content" style="width:135px">{{seek.inbrand || '-'}}</div></div>
-                            <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%" class="fl item bottom size-middle"><span>物料名称:</span><div class="content" style="width:135px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
+                            <div title="{{seek.inbrand}}" style="width: 100%" class="fl item size-middle"><span>品牌:</span><div class="content" style="width:134px">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%" class="fl item bottom size-middle"><span>物料名称:</span><div class="content" style="width:134px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                         </div>
                     </div>
                 </td>

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -484,16 +484,16 @@
 							<p class="style01" ng-if="!detail.uuid" style="margin-top: 10px;">品牌:
 								<a ng-bind="detail.brName || '-'" title="{{detail.brName}}" class="unstand"></a>
 							</p>
-							<p class="style01"  ng-if="detail.uuid">类目
+							<p class="style01"  ng-if="detail.uuid">物料名称
 								<a ng-bind="detail.kiName || '-'" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
-							<p class="style01"  ng-if="!detail.uuid">类目
+							<p class="style01"  ng-if="!detail.uuid">物料名称
 								<a ng-bind="detail.kiName || '-'" title="{{detail.kiName}}" class="unstand"></a>
 							</p>
 							<p class="style01">型号:
 								<a ng-bind="detail.cmpCode || '-'" href="store/productDetail/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
-							<p class="style01">型号
+							<p class="style01">规格
 								<a ng-bind="detail.spec || '-'" title="{{detail.spec}}" target="_blank"></a>
 							</p>
 						</span>

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

@@ -852,7 +852,7 @@
             <thead>
                 <tr>
                     <th width="180">买家/发布时间</th>
-                    <th width="245">品牌/类目</th>
+                    <th width="245">品牌/物料名称</th>
                     <th width="245">型号/规格</th>
                     <th width="110">采购数量(PCS)</th>
                     <th width="130">剩余时间</th>

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

@@ -531,7 +531,7 @@
             <td>
                 <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目:<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">物料名称:<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号:<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌:<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>

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

@@ -620,7 +620,7 @@
                         <dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">
 						<span class="wd02">
 							<a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/store/common/default.png'}}"/></a>
-							<p class="style01" style="margin-top: 10px;">类目
+							<p class="style01" style="margin-top: 10px;">物料名称
 								<a ng-bind="detail.kiName" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
 							<p class="style01">型号:

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

@@ -589,7 +589,7 @@
 							<tr ng-repeat="batchCommodity in pageParams.content" class="batch-commodity">
 								<td style="padding-left: 10px;">
 									<div style="width: 190px;" class="text-more">品牌:&nbsp;<em title="{{batchCommodity.brandNameEn || '空'}}" ng-bind="batchCommodity.brandNameEn || '空'"></em></div>
-									<div style="width: 190px;" class="text-more">类目:&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
+									<div style="width: 190px;" class="text-more">物料名称:&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
 									<div style="width: 190px;" class="text-more">型号:&nbsp;<em title="{{batchCommodity.code || '空'}}" ng-bind="batchCommodity.code || '空'"></em></div>
 								</td>
 								<td>

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

@@ -2609,7 +2609,7 @@
 					<div class="apply"><em>*</em> 以下部分产品商城暂未收录,可前往<a href="vendor#/brand/apply/">品牌中心/</a><a href="vendor#/component/apply"> 器件申请</a>中提出申请</div>
 				</div>
 				<div class="search fr">
-					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/品牌/型号">
+					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号">
 					<button ng-click="onSearch()">搜索</button>
 				</div>
 			</div>

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

@@ -2395,7 +2395,7 @@
 					<div class="apply"><em>*</em> 以下部分产品商城暂未收录,可前往<a href="vendor#/brand/apply/">品牌中心/</a><a href="vendor#/component/apply"> 器件申请</a>中提出申请</div>
 				</div>
 				<div class="search fr">
-					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/品牌/型号">
+					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号">
 					<button ng-click="onSearch()">搜索</button>
 				</div>
 			</div>

+ 0 - 1743
src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -1,1743 +0,0 @@
-<!--右侧主体部分-->
-<style>
-    .tab.active {
-        display: inline-block !important;
-    }
-    *{-webkit-box-sizing: border-box;  -moz-box-sizing: border-box;  box-sizing: border-box;}
-    div.wanted_list01 dt.paging-bar>span {
-        float: right;
-        width: 322px;
-        height: 40px;
-        font-weight: normal;
-    }
-    div.wanted_list01 dt.paging-bar>span button.paging-button {
-        padding: 0;
-        height: 40px;
-        line-height: 40px;
-        border: none;
-        background: #FFFFFF;
-    }
-    div.wanted_list01 dt.paging-bar>span button.paging-button:hover {
-        color: #0C3894;
-    }
-    div.wanted_list01 dt.paging-bar>span input.page-num {
-        width: 25px;
-        height: 25px;
-        line-height: 40px;
-        border: 1px #C7BEBE solid;
-        text-align: center;
-    }
-    label[disabled] {
-        cursor: not-allowed;
-    }
-    .com_tab ul li.down-goods span:hover {
-        cursor: pointer;
-        text-decoration: underline;
-    }
-    .materrial-list span.length01{
-        width: 10% !important;
-    }
-    .materrial-list span{
-        width: 20% !important;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-    ul.pagination.ng-table-pagination > li > a > span {
-        height: 17px;
-        line-height: 17px;
-    }
-
-    div.ng-table-pager  input.page-number {
-        vertical-align: inherit;
-        display: inline-block;
-        width: 40px;
-        height: 31px;
-        padding: 6px 6px;
-        font-size: 14px;
-        line-height: 1.42857143;
-        color: #9B9792;
-        text-align: center;
-        background-color: #F6F5F4;
-        background-image: none;
-        border: 1px solid #ccc;
-        border-top-left-radius: 4px;
-        border-bottom-left-radius: 4px;
-        box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-        transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-    }
-
-    div.ng-table-pager a.page-a {
-        color: #fff;
-        cursor: pointer;
-        background-color: #4574E8;
-        border-color: #4574E8;
-        padding: 6px 6px;
-        font-size: 14px;
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
-        text-decoration: none;
-        height: 31px;
-    }
-
-    div.ng-table-pager div.page-go-block {
-        float: right;
-        margin-left: 20px;
-        margin-top: 15px;
-        font-size: 0px;
-        height: 31px;
-        line-height: 31px;
-    }
-    .filter:hover .hover-show {
-        display: inline-block;
-        z-index: 1000;
-    }
-    .filter:hover .angle-hover-up {
-        -webkit-transform: rotateZ(180deg);
-        -moz-transform: rotateZ(180deg);
-        -o-transform: rotateZ(180deg);
-        -ms-transform: rotateZ(180deg);
-        transform: rotateZ(180deg);
-    }
-    .filter .hover-show{
-        width: 100%;
-        height: auto;
-        position: absolute;
-        background-color: #fff;
-        margin-top: -1px;
-        border: 1px solid #e8e8e8;
-        border-top: none;
-        display: none;
-        left: 0;
-        top: 40px;
-    }
-    .filter .hover-show a{
-        width: 100%;
-        height: 40px;
-        display: inline-block;
-        line-height: 40px;
-        text-align: center;
-        font-size: 14px;
-        font-weight: normal;
-    }
-    .filter .hover-show a:hover{
-        background: #ecf2fd;
-        color: #5078cb !important;
-    }
-    .wid02 .fr .hidden-ellipsis-110 {
-        width: 110px;
-        overflow: hidden;
-        word-break: normal;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
-    .com-out-box{
-        position: fixed;
-        z-index: 2;
-        height: 152px;
-        opacity: 1;
-        background-color: white;
-        width: 310px;
-        -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
-        box-shadow: 0 5px 15px rgba(0,0,0,.5);
-        margin: -155px 0 0 -75px;
-        top: 55%;
-        left: 50%;
-    }
-    .com-out-box .title{
-        height: 30px;
-        background-color: #5078cb;
-        text-align: right;
-        padding-right: 15px;
-        line-height: 30px;
-    }
-    .com-out-box .title a{
-        color: white;
-        font-size: 16px;
-    }
-    .pay_record .ticket_record_list dl dd{
-        position: relative;
-    }
-    .com-out-box .content{
-        width: 100%;
-        text-align: center;
-        margin: 0 auto;
-    }
-    .com-out-box .content p{
-        line-height: 50px;
-        font-size: 14px;
-        padding-top: 10px;
-    }
-    .com-out-box .content p i{
-        color: #5078cb;
-        font-size: 16px;
-        margin-right: 10px;
-    }
-    .com-out-box .content div{
-        width: 100%;
-        text-align: center;
-        margin: 0 auto;
-    }
-    .com-out-box .content div.red {
-        position: relative;
-        top: -10px;
-    }
-    .com-out-box .content div a{
-        width: 55px;
-        height: 26px;
-        line-height: 26px;
-        display: inline-block;
-        text-align: center;
-        font-size: 14px;
-    }
-    .com-out-box .content div a:first-child{
-        background: #b4b5b9;
-        color: #333;
-        margin-right: 10px;
-    }
-    .com-out-box .content div a:last-child{
-        background: #5078cb;
-        color: #fff;
-    }
-    .com-out-box .content div a:hover{
-        background: #3f7ae3;
-        color: #fff;
-    }
-    .com_tab ul li.down-goods {
-        float: right;
-        margin-right: 24px;
-        font-size: 14px;
-        color: #5078cb;
-    }
-
-    .com_tab ul li.down-goods span:hover {
-        cursor: pointer;
-        text-decoration: underline;
-    }
-    .check-input{
-        position: relative;
-        padding-left: 15px;
-    }
-    .check-input .check-show{
-        position: absolute;
-        top: 21px;
-        height: 15px;
-        line-height: 15px;
-        left: 18px;
-    }
-    .check-input input{
-        display: none;
-    }
-    .check-input > span {
-        padding-left: 10px;
-    }
-    .check-input label {
-        width: 15px;
-        height: 15px;
-        display: inline-block;
-        background: url(static/img/user/images/check.png) no-repeat;
-        position: relative;
-        padding-left: 0 !important;
-        overflow: hidden;
-        margin-bottom: 0 !important;
-        vertical-align: sub;
-        min-height: 15px !important;
-        left: 0 !important;
-    }
-    .check-input input[type="checkbox"]:checked + label{
-        background-position: -15px 0;
-    }
-    .pro_management .product_off dd:last-of-type{
-        border-bottom: #cfcfcf 1px solid;
-    }
-    .record-line{
-        /*height: 30px;*/
-        font-size: 12px;
-        line-height: 35px;
-        /* margin-top: 5px; */
-        padding-right: 22px
-    }
-    .wanted_list01 .pagination{
-        margin: 0;
-    }
-    .ng-table-pager{
-        padding-bottom: 20px;
-    }
-
-    /*编辑*/
-    .vendor-tab .img{
-        width: 60px;
-        height: 60px;
-        border: #e8e8e8 1px solid;
-        overflow: hidden;
-        line-height: 60px;
-        margin-top: 0;
-        border-radius: 3px;
-    }
-    .vendor-tab .img img{
-        width: 60px;
-        height: 60px;
-    }
-    .vendor-tab .img a{
-        margin: 0 !important;
-    }
-    .public-tab.table>tbody>tr>td{
-        font-size: 14px !important;
-        text-align: left !important;
-        border-bottom: #d0e8fd 1px dashed !important ;
-    }
-    .vendor-tab.table td .wid135{
-        width: 143px;
-        margin-left: 7px;
-        position: relative;
-        top: -10px;
-    }
-    .filter a{
-        color: #333 !important;
-    }
-    .vendor-tab.table td .wid135 p{
-        display: block;
-        width: 100%;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-    .vendor-tab.table td .wid135 p em.href {
-        cursor: pointer;
-    }
-    .vendor-tab.table td p{
-        font-size: 14px;
-        text-align: left;
-    }
-    /*.vendor-tab.table>tbody>tr{*/
-    /*height: 252px;*/
-    /*}*/
-    .public-tab.table tbody.bottom-no tr td{
-        border-bottom: none!important ;
-    }
-    .edit-form .form-control{
-        height: 24px;
-        padding: 0;
-        text-align: center;
-        font-size: 12px;
-        border-radius: 3px;
-    }
-    .edit-form select.form-control{
-        padding-left: 10px;
-    }
-    .edit-form div{
-        text-align: left;
-    }
-    .wid88{
-        width: 88px;
-    }
-    .wid48{
-        width: 48px;
-    }
-    .wid85{
-        width: 75px;
-    }
-    .wid68{
-        width: 68px;
-    }
-    .wid40{
-        width: 40px;
-    }
-    .wid25{
-        width: 25px;
-        text-align: center !important;
-        padding-left: 0 !important;
-    }
-    .wid56{
-        width: 56px;
-    }
-    .wid90{
-        width: 90px;
-    }
-    .edit-form td div{
-        float: left;
-        height: 24px;
-        margin-top: 5px;
-        line-height: 24px;
-        width: 100%;
-    }
-    .edit-form td div.margin0{
-        margin-top: 0;
-    }
-    .edit-form td div.margin0 .width45{
-       width: 45px;
-    }
-    .edit-form td div span{
-        float: left;
-    }
-    .edit-form td div span:first-child{
-        margin-right: 2px;
-    }
-    .filter{
-        position: relative;
-    }
-    .edit-form button {
-        width: 56px;
-        height: 24px;
-        border: none;
-        color: #fff;
-        float: left;
-    }
-    .edit-form button.ok {
-        background: #33b401;
-    }
-    .edit-form button.off {
-        background: #f15601;
-        margin-bottom: 5px;
-    }
-    .edit-form button:hover{
-        background: #5078cb;
-    }
-    .public-tab.table>tbody>tr>td.padding0{
-        padding: 8px 0;
-    }
-    .public-tab.table tbody .padding0 div{
-        text-align: center;
-        width: 50px;
-    }
-    .public-tab.table tbody .padding0 div.edit-a{
-        margin-top: -4px;
-    }
-    .public-tab.table tbody .padding0 div.down-a{
-        margin-top: 0;
-    }
-    .public-tab.table tbody .padding0 div.marginL10{
-        margin-left: -10px;
-    }
-    .edit-form .reduce{
-        color: #faa002 !important;
-        margin: 0 !important;
-        margin-left: 2px !important;
-    }
-    .edit-form .add{
-        color: #2ea001 !important;
-        margin: 0 !important;
-    }
-    .public-tab.table tr td{
-        vertical-align: top !important;
-    }
-    .public-tab.table tr td.middle{
-        vertical-align: middle !important;
-        padding-left: 0;
-        position: relative;
-    }
-    .record-line{
-        min-height: 30px;
-        font-size: 12px;
-        line-height: 35px;
-    }
-    .text-center{
-        margin-top: 30px;
-    }
-    .text-center .col-xs-2 img{
-        margin-left: 95px;
-    }
-    .text-center .col-xs-4 p{
-        margin-top: 33px;
-        font-size: 14px;
-    }
-    /*查看大图*/
-    .vendor-tab .img{
-        position: relative;
-    }
-    .vendor-tab .img a{
-        width: 60px;
-        height: 60px;
-        display: inline-block;
-    }
-    .vendor-tab .img .hover-show,.vendor-tab .img .edit-img{
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        background: rgba(0,0,0,.5);
-        left: 0;
-        top: 0;
-        font-size: 12px;
-        margin-top: 0;
-    }
-    .vendor-tab .img .hover-show{
-        top: 60px;
-    }
-    .vendor-tab .img:hover .hover-show{
-        top: 0;
-    }
-    .vendor-tab .img .hover-show a, .vendor-tab .img .edit-img a{
-        width: 100%;
-        height: 100%;
-        display: inline-block;
-        text-align: center;
-        line-height: 55px;
-        color: #fff !important;
-    }
-    .vendor-tab .img .hover-show i{
-        margin-right: 3px;
-    }
-    .vendor-tab .img .edit-img{
-
-    }
-    .vendor-tab .img .edit-img a img{
-        width: 38px;
-        height: 38px;
-    }
-    .vendor-tab .middle .prompt{
-        position: absolute;
-        bottom: 4px;
-        left: 0;
-        font-size: 10px;
-        /*color: #999;*/
-    }
-    .vendor-tab .middle .prompt em{
-        color: #ff0000;
-    }
-    .public-tab.table tr td.middle{
-        overflow: inherit;
-    }
-
-    .public-tab.table tr td.middle .img,.vendor-tab.table td .wid135{
-        margin-top: 15px;
-    }
-    .public-tab.table tr td.middle .img{
-        margin-top: 10px;
-    }
-    .public-tab.table tr td.middle div.marginL20{
-        margin-left: -20px;
-    }
-    .edit-form .error{
-        border: #f00 1px solid !important;
-    }
-
-    .edit-form .error:focus{
-        box-shadow: none;
-    }
-    .public-tab.table>tbody>tr>td div:last-child a.add[disabled], .public-tab.table>tbody>tr>td div:last-child a.reduce[disabled]{
-        color: #c7c7c7 !important;
-    }
-     .pro_management .table>tbody>tr>td div.img a.delete-img {
-         position: absolute;
-         top: 2px;
-         right: 0;
-         z-index: 20;
-         width: 20px;
-         height: 20px;
-         line-height: 16px;
-         border: none;
-     }
-    .pro_management .table>tbody>tr>td div.img a.delete-img i {
-        color: #fff;
-        font-size: 12px;
-    }
-    .public-tab.table tr td div span.switch{
-        width:39px;
-        height: 14px;
-        display: inline-block;
-    }
-    .public-tab.table tr td div span.switch button{
-        border: none;
-        position: relative;
-        top: 6px;
-        left: 5px;
-        width: 39px;
-        height: 14px;
-        background: url(static/img/icon/check-off.png) no-repeat center;
-    }
-    .public-tab.table tr td div span.switch button.active{
-        background: url("static/img/icon/check-ok.png") no-repeat center;
-    }
-
-    .text-overflow {
-        text-overflow: ellipsis;
-        overflow: hidden;
-        width: 100%;
-        white-space: nowrap;
-    }
-    .fa-minus-circle{
-        color: #faa002;
-    }
-    /*表格鼠标悬停效果*/
-    .wanted_list01 .tab table tbody.edit-border:hover{
-        background: #c7ebfd;
-        z-index: 10;
-    }
-
-    /*非编辑状态自定义标签*/
-    /*.wanted_list01 .tab table tr.define:hover{*/
-        /*background: none;*/
-    /*}*/
-    .wanted_list01 .tab table tr.define{
-        width: 100%;
-        height: 20PX;
-        line-height: 20px;
-    }
-    .wanted_list01 .tab table tr.define td{
-        position: relative;
-        width: 100%;
-        height: 20PX;
-        line-height: 20px;
-        overflow: hidden;
-        border-bottom: none!important ;
-    }
-    .wanted_list01 .tab table tr.define td img.standard{
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 27px;
-        height: 27px;
-    }
-    .wanted_list01 .tab table tr.define td .code{
-        padding: 4px 0 0 43px;
-        float: left;
-        font-size:14px;
-        color: #333;
-    }
-    .wanted_list01 .tab table tr.define td .code span{
-        font-size:14px;
-        color: #333;
-    }
-    .wanted_list01 .tab table tr.define td .labelling{
-        float: left;
-        padding-top: 4px;
-        margin-left: 40px;
-        font-size: 14px;
-        color: #333;
-    }
-    .wanted_list01 .tab table tr.define td .labelling span{
-        padding: 0 10px;
-        width: 124px;
-        height: 19px;
-        font-size: 12px;
-        color: #5078cb;
-        border-radius: 9px;
-        border: 1px solid #5078cb ;
-        background: #fff;
-
-    }
-    .device .wanted_list01 span.edits{
-        display: inline-block;
-        width: 56px;
-        height: 24px;
-        line-height: 24px;
-        font-size: 12px;
-        color: #5078cb;
-        cursor: pointer;
-    }
-    .device .wanted_list01 span.edits:hover{
-        color: #fff;
-        background: #5078cb;
-    }
-    /*非编辑状态自定义标签*/
-    .wanted_list01 .tab table tr.defines{
-        background: #ebf5fe;
-    }
-    .wanted_list01 .tab table tr.defines td .labelling input{
-        padding-left: 10px;
-        width: 157px;
-        height: 24px;
-        border: 1px solid #c9c9c9;
-        background: #fff;
-        border-radius: 4px;
-    }
-    .wanted_list01 .tab table tr.define td .labelling em{
-        color: #f00;
-    }
-    .wanted_list01 .tab table tr.edit-forms{
-        background: #ebf5fe;
-        padding: 0 8px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td{
-        background: #fff;
-    }
-    /*批量导出按钮*/
-    .search-check .search a.down-goods-btn{
-        margin-top: 0!important;
-    }
-    .edit-form td div span em.margin5{
-        margin-left: 5px;
-    }
-    /*编辑状态*/
-    .wanted_list01 .tab table tr.edit-forms td{
-        background: #ebf5fe;
-        padding: 0 10px 10px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show{
-        width: 100%;
-        height: 124px;
-        background: #fff;
-        overflow: hidden;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .content-show{
-        margin-top: 4px;
-        float: left;
-    }
-    .content-show .select-item{
-        width: 88px;
-        height: 24px;
-        border: 1px solid #a9a9a9;
-        font-size: 12px;
-        text-align: center;
-        border-radius: 3px;
-        padding-left: 6px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width20{
-        width: 20px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width20 div{
-        height: 96px;
-        line-height: 96px;
-        padding-left: 3px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width200{
-        width: 235px;
-        margin-top: 10px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width200 .img{
-        margin-top: 10px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width120{
-        width: 110px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width130{
-        width: 145px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width135{
-        width: 110px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width130 div span:first-child{
-        width: 73px;
-        text-align: right;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width100{
-        width: 140px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width90{
-        width: 90px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width70{
-        width: 85px;
-    }
-    .wanted_list01 .tab table tr.edit-forms td .bg-show .width60{
-        width: 60px;
-    }
-    /*.wanted_list01 .tab table tbody.edit-border{*/
-        /*border: 1px solid #84c5fb;*/
-    /*}*/
-    .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{
-        padding: 0 0 9px;
-    }
-    .edit-form td div span.marginL40{
-        margin-left: 45px;
-    }
-    .edit-form td div span.marginL27{
-        margin-left: 27px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        width: 92px;
-    }
-    .edit-form td div span.marginL10{
-        margin-left: 10px;
-    }
-    .edit-form td div span.marginL5{
-        margin-left: 5px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        width: 100%;
-    }
-    .filter i {
-        font-size: 16px;
-        font-weight: bold;
-    }
-    .filter:hover .fa-angle-up {
-        -webkit-transform: rotateZ(180deg);
-        -moz-transform: rotateZ(180deg);
-        -o-transform: rotateZ(180deg);
-        -ms-transform: rotateZ(180deg);
-        transform: rotateZ(180deg);
-        color: #5078cb !important;
-    }
-    .modal-open {
-        overflow-y: auto;
-        overflow-x: hidden;
-    }
-    .device .wanted_list01 a:hover {
-        border-bottom: 1px solid #ddd !important ;
-    }
-    .device .wanted_list01 a.page-a{
-        color: #fff !important ;
-    }
-    .search-check .check {
-        width: 100%;
-    }
-    .search-check .check > .operate-btn{
-        font-size: 14px;
-        margin-right: 20px;
-        color: #fff !important;
-        background: #5078cb;
-        position: relative;
-        display: inline-block;
-        height: 30px;
-        line-height: 30px;
-        padding: 0 10px;
-        cursor: pointer;
-    }
-    .search-check .check > .operate-btn .expander {
-        position: absolute;
-        color: #333;
-        right: 0;
-        display: none;
-        height: 108px;
-        line-height: 26px;
-        text-align: center;
-        background: #fff;
-        bottom: -108px;
-        width: 98px;
-        z-index: 10;
-        border: 1px solid #e4e5e5;
-    }
-    .search-check .check > .operate-btn.more-operate {
-        padding: 0;
-        width: 98px;
-        height: 30px;
-        line-height: 30px;
-        text-align: center;
-        display: inline-block;
-        margin-left: 300px;
-        background: #5078cb
-    }
-    .search-check .check > .operate-btn.more-operate:hover .expander {
-        display: block;
-    }
-    .search-check .check > .operate-btn.more-operate .expander span {
-        display: block;
-    }
-    .search-check .check > .operate-btn.more-operate .expander span:hover {
-        color: #5078cb;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr {
-        height: 40px;
-        text-align: center;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr td {
-        border-bottom: none;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr.active {
-        position: fixed;
-        bottom: 0;
-        z-index: 2000;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr.active td {
-        width: 1029px;
-        border-top: 0;
-    }
-    .wanted_list01 .tab table > tbody > tr.batch-tr td {
-        padding: 0;
-        border-top: #dff3fd 1px solid;
-    }
-    .wanted_list01 .tab table>tbody>tr>td .batch-line {
-        width: 100%;
-        height: 40px;
-        background: #dff3fd;
-        line-height: 40px;
-        text-align: center;
-    }
-    .com_tab ul li{
-        margin-left: 0px;
-        position: relative;
-    }
-    .pro_management .com_tab ul li.active a{
-        border-bottom: #fff;
-        background: #5078cb;
-        color: #fff;
-    }
-    .pro_management .com_tab ul li::after{
-        background: url('static/img/vendor/images/downicon.png');
-        width: 11px;
-        height: 6px;
-        position: absolute;
-        bottom: 0px;
-        left: 50%;
-        content: ' ';
-        margin-left: -5px;
-        display: none;
-    }
-    .pro_management .com_tab ul li.active:after{
-        display: block
-    }
-
-    .import-product {
-        border-radius: 3px;
-        width: 330px;
-        height: 170px;
-        left: 44%;
-    }
-    .import-product .content > i {
-        font-size: 12px;
-        float: right;
-        margin: 5px 5px 0 0;
-        color: #ddd;
-        cursor: pointer;
-    }
-    .import-product .content p a {
-        color: #5078cb;
-    }
-    .import-product .upload-content {
-        position: relative;
-        left: -29px;
-        margin-bottom: 10px !important;
-    }
-    .import-product .upload-content #upload_text {
-        width: 157px;
-        height: 25px;
-        border: #ccc 1px solid;
-        padding-left: 10px;
-        line-height: 25px;
-        font-size: 14px;
-    }
-    .import-product .upload-content i {
-        background: #5078cb;
-        width: 62px;
-        height: 25px;
-        display: inline-block;
-        text-align: center;
-        color: #fff;
-        line-height: 25px;
-        font-size: 12px;
-        position: absolute;
-        left: 232px;
-        top: 0;
-        border-left: #ccc 1px solid;
-        cursor: pointer;
-    }
-    .import-product .upload-content #uploadCommodity {
-        width: 218px;
-        height: 25px;
-        filter: alpha(opacity=0);
-        -moz-opacity: 0;
-        opacity: 0;
-        position: absolute;
-        left: 77px;
-        top: 0px;
-    }
-    .import-product h5 {
-        margin-bottom: 25px;
-    }
-    .import-result .content p {
-        padding: 0;
-    }
-    .import-result .content p span {
-        color: #5078cb;
-    }
-    .import-result .content h5 {
-        font-size: 14px;
-        margin-bottom: 10px;
-        margin-top: -10px;
-    }
-    .import-result .content h5 span {
-        color: red;
-    }
-    .import-result .content div a {
-        color: #fff !important;
-        background: #5078cb !important;
-    }
-
-    .import-result .content div span {
-        color: #4290f7;
-        cursor: pointer;
-    }
-
-    .wanted_list01 .tab table tr {
-        height: 104px;
-    }
-    .Regulpic img {
-        width: 24px;
-        height: 27px;
-    }
-    .edit-form td div.forAdminLook {
-        width: 70px;
-        height: 25px;
-        color: #333;
-        font-size: 14px;
-        border: 1px solid #5078cb;
-        border-radius: 3px;
-        text-align: center;
-        margin-top: 4px;
-    }
-    div.forAdminLook {
-        margin: 0 auto;
-        width: 70px;
-        height: 25px;
-        color: #333;
-        font-size: 14px;
-        border: 1px solid #5078cb;
-        border-radius: 3px;
-        text-align: center;
-        line-height: 25px;
-        margin-top: 4px;
-        position: absolute;
-        background: #fff;
-        display: none
-    }
-    .ToforAdminLook .nopass:hover ~.forAdminLook {
-        display: block;
-    }
-
-    .search-check .search .form-control{
-        width: 340px;
-        float: left;
-        height: 34px;
-        border-radius: 2px;
-        box-shadow: none;
-        border:1px solid #5078cb;
-    }
-
-    .search-check .search button{
-        background: #5078cb;
-        border-radius: 0;
-        border: #5078cb 1px solid;
-        border-left: none;
-        color: #fff;
-        border-radius: 2px;
-    }
-
-</style>
-<div class="user_right fr">
-    <!--货品管理-->
-    <div class="pro_management device">
-        <div class="com_tab">
-            <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>
-                <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
-                <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
-                <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
-                <li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
-                <li class="down-goods">
-                    <!--<span ng-click="downGoods()">
-                        <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
-                    </span>
-                    <form style="display: none;" id="down-load-goods" method="get">
-                        <input type="hidden" name="ids" ng-value="localInfo.ids">
-                    </form>-->
-                </li>
-            </ul>
-        </div>
-        <div class="search-check">
-            <div class="search fl check">
-                <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch()" placeholder="品牌/产品型号/编码"/>
-                <button ng-click="onSearch()" style="float: left;">搜索</button>
-                <!--<a ng-click="downGoods()" class="down-goods-btn">批量导出</a>-->
-                <div class="operate-btn more-operate">
-                    <span>更多操作</span>
-                    <span class="expander">
-                        <span ng-click="download()">导出选中</span>
-                        <span ng-click="batchOperation(1)" name="delete-material">删除选中</span>
-                        <span ng-click="batchOperation(2)">下架选中</span>
-                        <span ng-click="modifyBatch()">批量修改</span>
-                    </span>
-                </div>
-                <form style="display: none;" id="down-load-goods" method="get">
-                    <input type="hidden" name="ids" ng-value="localInfo.ids">
-                </form>
-            </div>
-            <!--<div class="check fr">-->
-            <!--<a  ng-click="">批量操作</a>-->
-            <!--<span class="check-btn">-->
-            <!--<label class="check-active">-->
-            <!--<input type="checkbox" id="AllChoose"/>-->
-            <!--<label for="AllChoose"></label>-->
-            <!--<span>全选</span>-->
-            <!--</label>-->
-            <!--<a href="#">下架</a>-->
-            <!--<a href="#">取消</a>-->
-            <!--<a href="#">确定</a>-->
-            <!--</span>-->
-            <!--</div>-->
-        </div>
-        <!--搜索 批量操作-->
-        <!--<div class="search-check">
-            <div class="search fl">
-                <input type="text" class="form-control" placeholder="型号/品牌"/>
-                <button>搜索产品</button>
-                <a ng-click="">批量导出</a>
-            </div>
-            <div class="check fr">
-                <a  ng-click="">批量操作</a>
-                <span class="check-btn">
-                    <label class="check-active">
-                        <input type="checkbox" id="AllChoose"/>
-                        <label for="AllChoose"></label>
-                        <span>全选</span>
-                    </label>
-                    <a href="#">下架</a>
-                    <a href="#">取消</a>
-                    <a href="#">确定</a>
-                </span>
-            </div>
-        </div>-->
-        <div class="wanted_list01">
-            <!--在售产品-->
-            <div class="tab">
-                <table class="vendor-tab public-tab table">
-                    <thead>
-                    <tr>
-                        <th width="60" style="padding:8px 0;">
-                            <label class="check-active">
-                                <input ng-disabled="currenctGoods.length == 0" type="checkbox"  ng-click="chooseAllItem()" ng-checked="chooseAll || chooseAllPage" id="AllChoose"/>
-                                <label for="AllChoose"></label>
-                                <span>全选</span>
-                            </label>
-                        </th>
-                        <th width="220">产品信息</th>
-                        <th width="105">包装/生产日期</th>
-                        <th width="140">库存</th>
-                        <th width="105">梯度/pcs</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="110">交期(天)</th>
-                        <th class="filter" width="100">
-                            <!--<a>{{selfSupport}}<i class="fa fa-angle-double-down angle-hover-up" aria-hidden="true"></i></a>-->
-                            <a ng-bind="selfSupport">销售方式</a> <i class="fa fa-angle-down fa-angle-up"></i>
-                            <div class="hover-show">
-                                <a ng-click="changeSupportType(selfSupportType.ALL)" title="销售方式">销售方式</a>
-                                <a ng-click="changeSupportType(selfSupportType.SELF_SUPPORT)" title="自营">自营</a>
-                                <a ng-click="changeSupportType(selfSupportType.CONSIGNMENT)" title="寄售">寄售</a>
-                            </div>
-                        </th>
-                        <th width="70" class="padding0">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody class="bottom-no">
-                    <tr style="height: 14px;">
-                        <td colspan="10" class="hei16"></td>
-                    </tr>
-                    </tbody>
-                    <tbody ng-repeat="commodity in currenctGoods" ng-click="chooseOne(null, commodity)" class="edit-border">
-                    <!--非编辑状态自定义标签-->
-                    <tr class="define" ng-if="!commodity.edit">
-                        <td colspan="10">
-                            <div class="code">SKU编码 : <span ng-bind="commodity.batchCode">247823589235</span></div>
-                            <div class="labelling" ng-if="commodity.tag">
-                            <!--<em>*</em>-->
-                                自定义标签 : <span ng-bind="commodity.tag">散装出售散装出售</span>
-                            </div>
-                            <!--非标产品标志-->
-                            <img ng-if="!commodity.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>
-                            <!--标准产品标志-->
-                            <img ng-if="commodity.uuid" src="static/img/store/common/standard.png" alt="" class="standard"/>
-                        </td>
-                    </tr>
-                    <tr class="edit-form" ng-if="!commodity.edit">
-                        <td class="middle padding0 check-input">
-                            <!-- <span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
-                            <span name="check-one"><input type="checkbox" ng-checked="commodity.isChoosed" fid="{{$index+1}}"/><label for="{{$index+1}}"></label></span>
-                            <!--&lt;!&ndash;非标产品标志&ndash;&gt;-->
-                            <!--<img ng-if="!commodity.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>-->
-                            <!--&lt;!&ndash;标产品标志&ndash;&gt;-->
-                            <!--<img ng-if="commodity.uuid" src="static/img/store/common/standard.png" alt="" class="standard"/>-->
-                        </td>
-                        <td class="middle"  style="vertical-align: top !important;">
-                            <div class="fl img marginL20">
-                                <a><img ng-src="{{commodity.img ? commodity.img : 'static/img/store/common/default.png'}}"/></a>
-                                <div class="hover-show" name="img-a">
-                                    <a ng-click="showImg(commodity.img || 'static/img/store/common/default.png')" title="查看大图"><i class="fa fa-search"></i>查看</a>
-                                </div>
-                            </div>
-                            <div class="fr wid135">
-                                <p ng-if="!commodity.uuid">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
-                                <p ng-if="commodity.uuid" name="brand-a"><a href="product/brand/{{commodity.branduuid}}" style="margin: 0; color: #333;" target="_blank">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
-                                <p ng-if="!commodity.uuid">物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
-                                <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
-                                <p>型号: <em class="href" ng-bind="commodity.code" title="{{commodity.code}}"  ng-click="goToBatchDetail($event, commodity)">LPC1112</em></p>
-                                <p>规格: <em ng-bind="commodity.spec  || '-'" title="{{commodity.spec}}">LPC1112</em></p>
-                                <!--<div class="margin0">-->
-                                    <!--<span class="marginL10">规格: </span>-->
-                                    <!--<span ng-bind="commodity.spec  || '-'" title="{{commodity.spec}}" class="width45" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></span>-->
-                                <!--</div>-->
-                            </div>
-                        </td>
-                        <td style="white-space: inherit;">
-                            <div>
-                                <span class="text-overflow marginL5" ng-bind="commodity.packaging || '无包装信息'" title="{{commodity.packaging}}"></span><br/>
-                            </div>
-                            <div class="margin0">
-                                <span ng-bind="commodity.produceDate || '-'" title="{{commodity.produceDate}}" class="marginL5"></span>
-                            </div>
-                            <div class="margin0">
-                                <span ng-if="commodity.breakUp" class="marginL5">可拆卖</span>
-                            </div>
-                        </td>
-                        <td>
-                            <div>
-                                <span class="marginL10">库存: </span>
-                                <span ng-bind="commodity.reserve" title="{{commodity.reserve}}"style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 80px;" ></span>
-                            </div>
-                            <div class="margin0">
-                                <span class="marginL10">最小起订量: </span>
-                                <span ng-bind="commodity.minBuyQty" title="{{commodity.minBuyQty}}" class="width45" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"></span>
-                            </div>
-                            <div class="margin0">
-                                <span class="marginL10">最小包装数: </span>
-                                <span ng-bind="commodity.minPackQty" title="{{commodity.minPackQty}}" class="width45" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"></span>
-                            </div>
-                        </td>
-                        <td>
-                            <div ng-repeat="price in commodity.prices" >
-                                <span title="{{price.start + '+'}}" ng-bind="price.start + '+'" class="marginL40" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:60px;"></span>
-                            </div>
-                        </td>
-                        <td ng-if="onsale.currency == 'USD'">
-                            <div  ng-repeat="price in commodity.prices" ng-if="price.uSDPrice" >
-                                <span title="{{price.uSDPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName}}" ng-bind="price.uSDPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName" class="marginL27"></span>
-                            </div>
-                        </td>
-                        <td ng-if="onsale.currency == 'RMB'">
-                            <div ng-repeat="price in commodity.prices" ng-if="price.rMBPrice">
-                                <span title="{{price.rMBPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName}}" ng-bind="price.rMBPrice | formateNumber : 6 | currencySysmbol : commodity.currencyName" class="marginL27"></span>
-                            </div>
-                        </td>
-                        <td style="overflow: inherit;">
-                            <div ng-if="onsale.currency == 'RMB'" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery != commodity.b2cMinDelivery)" ng-bind=" commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery" class="marginL40" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:60px;"></span>
-                                <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMaxDelivery == commodity.b2cMinDelivery)" ng-bind=" commodity.b2cMinDelivery" class="marginL40" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:60px;"></span>
-                            </div>
-                            <div ng-if="onsale.currency == 'USD'" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMinDelivery != commodity.b2cMaxDelivery)" ng-bind=" commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery" class="marginL40"></span>
-                                <span ng-if="commodity.b2cMaxDelivery && (commodity.b2cMinDelivery == commodity.b2cMaxDelivery)" ng-bind=" commodity.b2cMinDelivery" class="marginL40"></span>
-                            </div>
-                            <div class="Regulpic">
-                                <span>规格书:</span>
-                                <!--<span ng-if="!commodity.Regulpic">-</span>-->
-                                <div ng-if="commodity.attach || commodity.productAttachSubmit" style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
-                                    <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.attach || commodity.productAttachSubmit.uploadAttach}}" class="Regulpica">
-                                        <div style="width:24px;height:26px;position: relative">
-                                            <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
-                                            <div class="zhezhaodang" ng-if="commodity.productAttachSubmit.uploadAttach"></div>
-                                        </div>
-                                    </a>
-                                    <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
-                                    <div class="forAdminLook">待审核</div>
-                                </div>
-                                <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" ng-if="!commodity.attach && !commodity.productAttachSubmit">-</div>
-                                <!--<div class="forAdminLook" style="margin-left: 35px;">待审核</div>-->
-                            </div>
-                        </td>
-                        <td>
-                            <div>
-                                <span ng-bind="(storeInfo.uuid != 'undefind' && commodity.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营' : '寄售'"  style="text-align: center; width: 100%;"></span>
-                            </div>
-                        </td>
-                        <td class="padding0">
-                            <div ng-if="!commodity.sourceId" name="edit-a" class="edit-a"><span class="edit edits" ng-click="editCommodity(commodity, $event)">编辑</span></div><!--updateCommodityInfo(commodity, false)-->
-                            <div ng-if="commodity.sourceId"><a style="margin: 0;">来源UAS</a></div>
-                            <div ng-if="!commodity.sourceId" name="down-a" class="down-a"><span class='edits' ng-click="soldOut($event, commodity)">下架</span></div>
-                        </td>
-                    </tr>
-                    <!--编辑状态自定义标签-->
-                    <tr class="define defines" ng-if="commodity.edit">
-                        <td colspan="10">
-                            <div class="code">SKU编码 : <span ng-bind="commodity.batchCode">247823589235</span></div>
-                            <div class="labelling">
-                                <!--<em>*</em>-->
-                                自定义标签 : <input type="text" ng-blur="editTag(commodity)" ng-model="commodity.editTag" ng-change="changeTag(commodity)"
-                                                                            ng-class="{'error' : commodity.editTagInvalid}" maxlength="20"
-                                                                            placeholder="请设置产品标签"></div>
-                            <!--非标产品标志-->
-                            <img ng-if="!commodity.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>
-                            <!--标准产品标志-->
-                            <img ng-if="commodity.uuid" src="static/img/store/common/standard.png" alt="" class="standard"/>
-                        </td>
-                    </tr>
-                    <tr class="edit-form edit-forms" ng-if="commodity.edit">
-                        <td colspan="9">
-                            <div class="bg-show">
-                                <div class="content-show width20">
-                                   <!--<div> {{$index + 1}}</div>-->
-                                </div>
-                                <div class="content-show width200">
-                                    <div class="fl img">
-                                        <a><img ng-src="{{commodity.editPic ? commodity.editPic : 'static/img/store/common/default.png'}}"/></a>
-                                        <div class="edit-img">
-                                            <a ng-click="commodity.editPic = null" class="delete-img" title="删除" ng-if="commodity.editPic"><i class="fa fa-trash"></i></a>
-                                            <a ng-click="editGoodsPicture(commodity.editPic || 'static/img/store/common/default.png', commodity)" title="修改图片"><img src="static/img/icon/update-img.png" /></a>
-                                        </div>
-                                    </div>
-                                    <div class="fr wid135" style="margin-top: 0px">
-                                        <p style="margin-top: 5px">
-                                            品牌:
-                                            <input style="border-radius: 3px;border: 1px solid #a9a9a9;height: 24px;line-height: 24px;width: 107px" type="text" ng-model="commodity.brandNameEn" style="width:106px" maxlength="25" ng-change="onBrandChange(commodity.brandNameEn)"/>
-                                        </p>
-                                        <p style="margin-top: 5px">
-                                            物料名称:
-                                            <input style="border-radius: 3px;border: 1px solid #a9a9a9;height: 24px;line-height: 24px;width: 79px" type="text" ng-model="commodity.kindNameCn" style="width:78px" maxlength="20" ng-change="onCodeChange(commodity.kindNameCn)"/>
-                                        </p>
-                                        <p style="margin-top: 5px">
-                                            型号:
-                                            <input style="border-radius: 3px;border: 1px solid #a9a9a9;height: 24px;line-height: 24px;width: 107px" type="text" ng-model="commodity.code" style="width:106px" maxlength="100" />
-                                        </p>
-                                        <p style="margin-top: 5px">
-                                            规格:
-                                            <input style="border-radius: 3px;border: 1px solid #a9a9a9;height: 24px;line-height: 24px;width: 107px" type="text" ng-model="commodity.spec" maxlength="50" style="width:106px"/>
-                                        </p>
-                                        <!--<p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>-->
-                                        <!--<p>物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>-->
-                                        <!--<p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>-->
-                                        <!--<p>规格: <em ng-bind="commodity.spec || '-'" title="{{commodity.spec}}">LPC1112</em></p>-->
-                                        <!--<p>-->
-                                            <!--<span style="width: 32px;">规格: </span>-->
-                                            <!--<span><input style="width:90px" type="text"-->
-                                                         <!--placeholder="请输入规格" maxlength="50" ng-model="commodity.spec" class="wid48 form-control"/></span>-->
-                                        <!--</p>-->
-                                    </div>
-                                </div>
-                                <div class="content-show width120">
-                                    <div>
-                                        <span><!--<input type="text" ng-blur="editPackaging(commodity, true)" ng-change="changePackaging(commodity)" placeholder="包装方式" maxlength="10" ng-model="commodity.editPackaging" ng-class="{'error' : commodity.editPackagingInvalid}" class="wid88 form-control"/>-->
-                                            <select ng-model="commodity.editPackaging" class="select-adder select-item" title="包装">
-                                                <option ng-repeat="item in packageArray" ng-click="showText(goods, item)">{{item}}</option>
-                                            </select>
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <span><input type="text" ng-change="editProduceDateFa(commodity)" placeholder="生产日期" maxlength="12" ng-model="commodity.editProduceDate" ng-class="{'error' : commodity.editProduceDateInvalid}" class="wid88 form-control"/></span>
-                                    </div>
-                                    <div>
-                                        <span>可拆卖:</span>
-                                        <span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>
-                                    </div>
-                                </div>
-                                <div class="content-show width130">
-                                    <div>
-                                        <span>库存: </span>
-                                        <span><input type="text" ng-blur="changeReserve(commodity)" ng-class="{'error' : commodity.editReserveInvalid}"
-                                                     placeholder="数量" maxlength="9" ng-model="commodity.editReserve" class="wid48 form-control"/></span>
-                                    </div>
-                                    <div>
-                                        <span>最小起订量: </span>
-                                        <span><input type="text" ng-change="updateStartNumber(commodity)" ng-blur="changeMinBuyQty(commodity)" ng-class="{'error' : commodity.editMinBuyQtyInValid}" placeholder="数量" maxlength="6" ng-model="commodity.editMinBuyQty" class="wid48 form-control"/></span>
-                                    </div>
-                                    <div>
-                                        <span>最小包装数: </span>
-                                        <span><input type="text" ng-blur="changeMinPackQty(commodity)"
-                                                     ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="数量" maxlength="6" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>
-                                    </div>
-                                </div>
-                                <div class="content-show width135">
-                                    <div ng-repeat="price in commodity.editPrices">
-                                        <span style="margin-right: 0;overflow: hidden;"><input type="text" ng-disabled="$index == 0" ng-blur="editQty(commodity, $index, false, price.start)" ng-class="{'error' : price.startInValid}" placeholder="数量"  ng-model="price.start" class="wid40 form-control fl"/><em class="fl margin5" ng-if="$last">以上</em></span>
-                                        <span ng-if="!$last">-</span>
-                                        <span ng-if="!$last"><input type="text" ng-blur="editQty(commodity, $index, true, price.end)" ng-class="{'error' : price.endInValid}" placeholder="数量" ng-model="price.end" class="wid40 form-control"/></span>
-                                    </div>
-                                </div>
-                                <div class="content-show width135" ng-if="onsale.currency == 'USD'">
-                                    <div style="width: 99px;" ng-repeat="price in commodity.editPrices">
-                                    <span ng-if="commodity.currencyName.indexOf('USD') > -1">
-                                        <form name="usdForm">
-                                            <input type="text" name="usd" ng-class="{'error' : price.priceInvalid}" placeholder="单价($)" autocomplete="off" ng-blur="changePrices(commodity.editPrices, price.uSDPrice, $index)" ng-model="price.uSDPrice" class="wid85 form-control" validata-price/>
-                                        </form>
-                                    </span>
-                                        <a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>
-                                        <a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>
-                                    </div>
-                                </div>
-                                <div class="content-show width100"  ng-if="onsale.currency == 'RMB'">
-                                    <div style="width: 99px;" ng-repeat="price in commodity.editPrices">
-                                    <span ng-if="commodity.currencyName.indexOf('RMB') > -1">
-                                        <form name="rmbForm">
-                                            <input type="text" name="rmb" ng-class="{'error' : price.priceInvalid}" placeholder="单价(¥)" autocomplete="off" ng-blur="changePrices(commodity.editPrices, price.rMBPrice, $index)" ng-model="price.rMBPrice" class="wid85 form-control" validata-price/>
-                                        </form>
-                                    </span>
-                                        <a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>
-                                        <a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>
-                                    </div>
-                                </div>
-                                <div class="content-show width90">
-                                    <div ng-if="onsale.currency == 'RMB'">
-                                        <!--<span>大陆:</span>-->
-                                        <span><input type="text" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editMinDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
-                                        <span>-</span>
-                                        <span><input type="text" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editMaxDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
-                                    </div>
-                                    <div ng-if="onsale.currency == 'USD'">
-                                        <!--<span>香港:</span>-->
-                                        <span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, true, commodity)" ng-model="commodity.editMinDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
-                                        <span>-</span>
-                                        <span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control" oninput="if(value.length>3)value=value.slice(0,3)"/></span>
-                                    </div>
-                                    <div class="Regulpic">
-                                        <span>规格书:</span>
-                                        <div style="position: relative;display: inline-block;width: auto;margin-top: 0px" class="ToforAdminLook">
-                                            <a style="text-decoration: none;margin: 0px;border-bottom:0px" target="_blank" href="{{commodity.attach}}" class="Regulpica" ng-if="commodity.attach">
-                                                <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
-                                            </a>
-                                            <a class="Regulpica" ng-click="editRegulPicture(commodity.productAttachSubmit.uploadAttach || 'static/img/vendor/images/upload_file_icon.png', commodity)" ng-if="!commodity.attach" style="margin: 0px">
-                                                <div style="width:24px;height:26px;position: relative">
-                                                    <img style="width:24px;height:26px" src="static/img/vendor/images/pdf.png"/>
-                                                    <div class="zhezhaodang"></div>
-                                                </div>
-                                            </a>
-                                                <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
-                                            <div class="forAdminLook">待审核</div>
-                                        </div>
-                                    </div>
-                                    <!--<div class="Regulpic">-->
-                                        <!--<span>规格书:</span>-->
-                                        <!--<img style="width:24px;height:26px;cursor: pointer" src="static/img/vendor/images/pdf.png" ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)"/>-->
-                                        <!--<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>-->
-                                        <!--<div class="forAdminLook">待审核</div>-->
-                                    <!--</div>-->
-                                </div>
-                                <div class="content-show width70">
-                                    <div>
-                                        <span>
-                                            <select ng-change="changeSaleMode(commodity)" class="wid68 select-adder form-control" ng-model="commodity.editSelfSale">
-                                                <option value="1">自营</option>
-                                                <option value="2">寄售</option>
-                                            </select>
-                                        </span>
-                                    </div>
-                                </div>
-                                <div class="content-show width60">
-                                    <div>
-                                    <span name="save-a"><button class="ok" ng-mouseleave="recoveryBlur()" ng-mouseenter="impedeBlur()" ng-click="updateGoods(commodity, $index)">保存</button></span>
-                                    </div>
-                                    <div>
-                                    <span name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                        <!--<td class="middle padding0 check-input">-->
-                            <!--<div>{{$index + 1}}</div>-->
-                        <!--</td>-->
-                        <!--<td class="middle"  style="vertical-align: top !important;">-->
-                            <!--<div class="fl img">-->
-                                <!--<a><img ng-src="{{commodity.editPic ? commodity.editPic : 'static/img/store/common/default.png'}}"/></a>-->
-                                <!--<div class="edit-img">-->
-                                    <!--<a ng-click="commodity.editPic = null" class="delete-img" title="删除" ng-if="commodity.editPic"><i class="fa fa-trash"></i></a>-->
-                                    <!--<a ng-click="editGoodsPicture(commodity.editPic || 'static/img/store/common/default.png', commodity)" title="修改图片"><img src="static/img/icon/update-img.png" /></a>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div class="fr wid135">-->
-                                <!--<p>类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>-->
-                                <!--<p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>-->
-                                <!--<p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>-->
-                            <!--</div>-->
-                        <!--</td>-->
-                        <!--<td>-->
-                            <!--<div>-->
-                                <!--<span><input type="text" ng-blur="editPackaging(commodity)" placeholder="包装方式" maxlength="10" ng-model="commodity.editPackaging" ng-class="{'error' : commodity.editPackagingInvalid}" class="wid88 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span><input type="text" ng-blur="editProduceDateFa(commodity)" placeholder="生产日期" maxlength="11" ng-model="commodity.editProduceDate" ng-class="{'error' : commodity.editProduceDateInvalid}" class="wid88 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span>可拆卖:</span>-->
-                                <!--<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>-->
-                            <!--</div>-->
-                        <!--</td>-->
-                        <!--<td>-->
-                            <!--<div>-->
-                                <!--<span>库存: </span>-->
-                                <!--<span><input type="text" ng-blur="changeReserve(commodity)" ng-class="{'error' : commodity.editReserveInvalid}" placeholder="库存" ng-model="commodity.editReserve" class="wid48 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span>起订量: </span>-->
-                                <!--<span><input type="text" ng-blur="changeMinBuyQty(commodity)" ng-class="{'error' : commodity.editMinBuyQtyInValid}" placeholder="起拍" ng-model="commodity.editMinBuyQty" class="wid48 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span>包装数量: </span>-->
-                                <!--<span><input type="text" ng-blur="changeMinPackQty(commodity)" ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="倍数" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--&lt;!&ndash;<div>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<span>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<select class="wid85 select-adder form-control" style="width: 81px;">&ndash;&gt;-->
-                            <!--&lt;!&ndash;<option value="1">可拆卖</option>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<option value="2">不可拆卖</option>&ndash;&gt;-->
-                            <!--&lt;!&ndash;</select>&ndash;&gt;-->
-                            <!--&lt;!&ndash;</span>&ndash;&gt;-->
-                            <!--&lt;!&ndash;</div>&ndash;&gt;-->
-                        <!--</td>-->
-                        <!--<td>-->
-                            <!--<div ng-repeat="price in commodity.editPrices">-->
-                                <!--<span style="margin-right: 0;overflow: hidden;"><input type="text" ng-blur="editQty(commodity, $index, false, price.start)" ng-class="{'error' : price.startInValid}" placeholder="数量"  ng-model="price.start" class="wid40 form-control fl"/><em class="fl margin5" ng-if="$index == (commodity.editPrices.length-1)">以上</em></span>-->
-                                <!--<span ng-if="$index != (commodity.editPrices.length-1)">-</span>-->
-                                <!--<span ng-if="$index != (commodity.editPrices.length-1)"><input type="text" ng-blur="editQty(commodity, $index, true, price.end)" ng-class="{'error' : price.endInValid}" placeholder="数量" ng-model="price.end" class="wid40 form-control"/></span>-->
-                            <!--</div>-->
-                        <!--</td>-->
-                        <!--<td ng-if="onsale.currency == 'USD'">-->
-                            <!--<div style="width: 99px;" ng-repeat="price in commodity.editPrices">-->
-                                <!--<span ng-if="commodity.currencyName.indexOf('USD') > -1">-->
-                                    <!--<form name="usdForm">-->
-                                        <!--<input type="text" name="usd" ng-blur="priceBlur(price, true)" ng-keyup="priceValid(price, true)" ng-class="{'error' : price.usdPriceInvalid}" placeholder="香港交货($)" autocomplete="off" ng-model="price.uSDPrice" ng-model-options="{debounce : 100}" class="wid85 form-control"/>-->
-                                    <!--</form>-->
-                                <!--</span>-->
-                                <!--<a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>-->
-                                <!--<a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>-->
-                            <!--</div>-->
-                        <!--</td>-->
-                        <!--<td ng-if="onsale.currency == 'RMB'">-->
-                            <!--<div style="width: 99px;" ng-repeat="price in commodity.editPrices">-->
-                                <!--<span ng-if="commodity.currencyName.indexOf('RMB') > -1">-->
-                                    <!--<form name="rmbForm">-->
-                                        <!--<input type="text" name="rmb" ng-blur="priceBlur(price, false)" ng-keyup="priceValid(price, false)" ng-class="{'error' : price.rmbPriceInvalid}" placeholder="大陆交货(¥)" autocomplete="off" ng-model="price.rMBPrice" ng-model-options="{debounce : 100}" class="wid85 form-control"/>-->
-                                    <!--</form>-->
-                                <!--</span>-->
-                                <!--<a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>-->
-                                <!--<a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>-->
-                            <!--</div>-->
-                        <!--</td>-->
-                        <!--<td>-->
-                            <!--<div ng-if="onsale.currency == 'RMB'">-->
-                                <!--&lt;!&ndash;<span>大陆:</span>&ndash;&gt;-->
-                                <!--<span><input type="text" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>-->
-                                <!--<span>-</span>-->
-                                <!--<span><input type="text" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div ng-if="onsale.currency == 'USD'">-->
-                                <!--&lt;!&ndash;<span>香港:</span>&ndash;&gt;-->
-                                <!--<span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, true, commodity)" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>-->
-                                <!--<span>-</span>-->
-                                <!--<span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>-->
-                            <!--</div>-->
-
-                        <!--</td>-->
-                        <!--<td>-->
-                            <!--<div>-->
-                                    <!--<span>-->
-                                        <!--<select ng-change="changeSaleMode(commodity)" class="wid68 select-adder form-control" ng-model="commodity.editSelfSale">-->
-                                            <!--<option value="1">自营</option>-->
-                                            <!--<option value="2">寄售</option>-->
-                                        <!--</select>-->
-                                    <!--</span>-->
-                            <!--</div>-->
-                        <!--</td>-->
-                        <!--<td class="padding0">-->
-                            <!--<div>-->
-                                <!--<span-->
-                                        <!--name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span-->
-                                        <!--name="save-a"><button class="ok" ng-click="updateGoods(commodity, $index)">保存</button></span>-->
-                            <!--</div>-->
-                        <!--</td>-->
-                    </tr>
-                    </tbody>
-                    <tbody ng-if="!currenctGoods || currenctGoods.length <= 0">
-                    <tr style="height: 252px;">
-                        <td colspan="12">
-                            <div class="empty">
-                                <p class="empty-img">
-                                    <img src="static/img/all/empty-cart.png">
-                                </p>
-                                <div class="empty-info">
-                                    <p class="grey"> 暂无产品信息,赶快上传让更多人看到你的产品吧 </p>
-                                    <a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
-                                </div>
-                            </div>
-                        </td>
-                        <!--<td colspan="10" style="padding: 74px 0;">-->
-                            <!--<div style="line-height: 106px;">-->
-                                <!--<div class="col-xs-2" style="margin-left: 35%;">-->
-                                    <!--<img src="static/img/all/empty-cart.png">-->
-                                <!--</div>-->
-                                <!--<div class="col-xs-4 text-right" style="line-height: 124px;">-->
-                                    <!--<p class="grey f14">-->
-                                        <!--暂无产品信息,赶快上传让更多人看到你的产品吧!-->
-                                        <!--<a href="vendor#/vendor_upload" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a>-->
-                                    <!--</p>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                        <!--</td>-->
-                    </tr>
-                    </tbody>
-                    <tbody>
-                    <tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctGoods.length != 0">
-                        <td colspan="9">
-                            <div class="batch-line" ng-if="chooseAll && !chooseAllPage">
-                                已选中当前页
-                                <em class="red" ng-bind="goodsAll.numberOfElements"></em>个产品,
-                                <a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="goodsAll.totalElements"></em>个产品
-                            </div>
-                            <div class="batch-line" ng-if="chooseAllPage">
-                                已选中所有页面
-                                <em class="red" ng-bind="goodsAll.totalElements"></em>个产品,
-                                <a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
-                            </div>
-                        </td>
-                    </tr>
-                    <!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
-                    </tbody>
-                </table>
-                <div class="record-line text-right" ng-if="currenctGoods.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
-                    <span ng-bind="endNumber"></span>, 共: <span ng-bind="goodsAll.totalElements" style="color: #5078cb;"></span> 个</div>
-                <div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px;" ng-if="goodsAll.totalPages>1">
-                    <ul class="pagination ng-table-pagination">
-                        <li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">
-                            <a ng-switch-when="prev" ng-click="setPage(page.type, -1)" href="">&laquo;</a>
-                            <a ng-switch-when="first" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-                            <a ng-switch-when="page" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-                            <a ng-switch-when="more" ng-click="setPage(page.type, -1)" href="">&#8230;</a>
-                            <a ng-switch-when="last" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-                            <a ng-switch-when="next" ng-click="setPage(page.type, -1)" href="">&raquo;</a>
-                        </li>
-                    </ul>
-                    <div class="page-go-block">
-                        <input class="page-number" type="number" ng-model="param.currentPage" ng-keyup="listenEnter()"/>
-                        <a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!--下架操作-->
-<div class="com-modal-wrap" ng-if="isSoldOut" ng-click="cancleSoldOut($event)">
-    <div class="com-out-box">
-        <div class="title">
-            <a ng-click="cancleSoldOut()"><i class="fa fa-close fa-lg"></i></a>
-        </div>
-        <div class="content">
-            <p><i class="fa fa-exclamation-circle"></i>确认下架?</p>
-            <div><a ng-click="cancleSoldOut()">取消</a><a ng-click="updateCommodityInfo(soldOutCommodity)">确认</a></div>
-        </div>
-    </div>
-</div>
-<div class="com-modal-wrap" ng-if="batchStatus" ng-click="cancelBatch($event)">
-    <div class="com-out-box">
-        <div class="title">
-            <a ng-click="cancelBatch()"><i class="fa fa-close fa-lg"></i></a>
-        </div>
-        <div class="content">
-            <p><i class="fa fa-exclamation-circle"></i>{{batchTitle}}</p>
-            <div class="red" ng-if="batchType==1">*<i ng-if="batchType==1">已有交易记录的产品无法删除</i>
-            </div>
-            <div>
-                <a ng-click="cancelBatch()">取消</a>
-                <a ng-if="batchType==1" ng-click="batchDelete()">确认</a>
-                <a ng-if="batchType==2" ng-click="batchDown()">确认</a>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!--查看大图-->
-<div id="image-box"
-     style="display: none">
-    <div class="x-floating-wrap"></div>
-    <div class="x-floating">
-        <div id="item-content">
-            <div class="x-close-wrap"><a href="javascript:void(0);">×</a></div>
-            <div class="img"><img/></div>
-        </div>
-    </div>
-</div>
-
-<div class="com-modal-wrap" ng-show="batchModify">
-    <div class="com-mall-del-box import-product">
-        <div class="content">
-            <i class="fa fa-close" ng-click="batchModify=false"></i>
-            <p><i class="fa fa-exclamation-circle"></i>请先<a ng-click="download()">导出产品信息</a>,将内容修改后重新导入</p>
-            <div class="upload-content">
-                <input type="text" name="txt" id="upload_text">
-                <i>选择文件</i>
-                <input type="file" id="uploadCommodity" ng-file-select="" ng-change="selectFile()" accept="*.xls,*.xlsx" ng-model="myFile" ng-multiple="false" />
-                <!--<input type="file" id="uploadCommodity">-->
-            </div>
-            <h5>温馨提示:仅修改现有产品信息</h5>
-            <div>
-                <a ng-click="batchModify=false">取消</a>
-                <a ng-click="importExcel()">导入</a>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<div class="com-modal-wrap" ng-show="modifyResult">
-    <div class="com-mall-del-box import-result">
-        <div class="title" ng-click="modifyResult=false">
-            <i></i>
-        </div>
-        <div class="content">
-            <p><i class="fa fa-exclamation-circle"></i><span ng-bind="modifyData.success">583</span>个产品修改成功,</p>
-            <h5><span class="red" ng-bind="modifyData.filter">5</span>个产品修改失败!</h5>
-            <div>
-                <a ng-click="modifyResult=false">确定</a>
-                <span ng-if="modifyData.filter" ng-click="downloadExcel()">下载失败列表</span>
-                <form id="load-error" style="display: none;" method="get">
-                    <input type="hidden" name="batch" ng-value="modifyData.batch">
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
-<style>
-    /**/
-    .wanted_list01 .empty{
-        overflow: hidden;
-        width:100%;
-        display:inline-flex;
-        justify-content:center;
-        align-items: center;
-        height:360px;
-    }
-    .wanted_list01 .empty-info{
-        line-height: 28px;
-        padding-top:10px;
-        margin-left:10px;
-        text-align:left;
-    }
-    .wanted_list01 .empty-info .grey{
-        color: #999;
-        font-size: 14px;
-    }
-    .wanted_list01 .empty .empty-info>a{
-        font-size: 14px;
-        color: #5078cb;
-    }
-    .wanted_list01 .empty .empty-info i{
-        display: inline-block;
-        width: 18px;
-        height: 18px;
-        margin-right: 5px;
-        background: url('static/img/vendor/images/upload-icon.png')no-repeat 0px 0px;
-        position: relative;
-        top: 7px;
-    }
-    .device .wanted_list01 a.Regulpica:hover{
-        border-bottom: 0 !important;
-    }
-    .zhezhaodang {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 24px !important;
-        height: 26px !important;
-        background: url('static/img/vendor/images/upload_file_no_pass.png') no-repeat 0px 0px;
-        background-size: 100% 100%;
-        margin-top: 0px !important;;
-    }
-</style>
-<script>
-    $(function(){
-        $(document).on('click', function () {
-            if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
-                $('.wanted_list01 .tab table>tbody>tr.batch-tr').addClass('active')
-            } else {
-                $('.wanted_list01 .tab table>tbody>tr.batch-tr').removeClass('active')
-            }
-        })
-        $(window).bind("scroll",function() {
-            if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
-                $('.wanted_list01 .tab table>tbody>tr.batch-tr').addClass('active')
-            } else {
-                $('.wanted_list01 .tab table>tbody>tr.batch-tr').removeClass('active')
-            }
-        });
-    })
-</script>

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

@@ -1393,7 +1393,7 @@
                                 <p class="componet-info">
 																		品牌:<a href="product/brand/{{::detail.branduuid}}/" target="_blank" ng-if="detail.uuid"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a>
                                     <a ng-if="!detail.uuid" class="unstand"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a><br/>
-                                    类目:<a href="product/kind/{{::detail.kindUuid}}" target="_blank" ng-if="detail.uuid"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="detail.uuid"/>
+                                    物料名称:<a href="product/kind/{{::detail.kindUuid}}" target="_blank" ng-if="detail.uuid"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="detail.uuid"/>
                                     <a ng-if="!detail.uuid" class="unstand"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="!detail.uuid"/>
 																	  型号:<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><em ng-bind="detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a><br />
 																		规格:<a><em ng-bind="detail.spec || '-'" title="{{::detail.spec}}"></em></a>

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/vendor_proRepository.html

@@ -264,7 +264,7 @@
         </div>
         <div class="search-check" ng-if="$$productRepository.status == 'all' || $$productRepository.status == 'standard' || $$productRepository.status == 'nStandard'">
             <div class="search fl">
-                <input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="$$productRepository.keyword" ng-search="onSearch()" placeholder="类目/品牌/型号">
+                <input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="$$productRepository.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号">
                 <button ng-click="onSearch()">搜索</button>
                 <a ng-click="download()" class="down-goods-btn">批量导出</a>
             </div>
@@ -278,7 +278,7 @@
                         <thead>
                             <tr>
                                 <th width="40">序号</th>
-                                <th width="200">产品名称(类目)</th>
+                                <th width="200">物料名称</th>
                                 <th width="180">品牌</th>
                                 <th width="100">型号</th>
                                 <th width="100">封装</th>
@@ -343,7 +343,7 @@
                                 <td ng-bind="nProduct.encapsulation || '-'" title="{{nProduct.encapsulation}}">BGA</td>
                                 <td class="more-list" colspan="2">
                                     <div class="type-brand" ng-repeat="item in nProduct.matchresults">
-                                        <p>类目:<span ng-bind="item.kindcn" title="{{item.kindcn}}">LPC1112</span></p>
+                                        <p>物料名称:<span ng-bind="item.kindcn" title="{{item.kindcn}}">LPC1112</span></p>
                                         <p> 品牌:<span ng-bind="item.branden" title="{{item.branden}}">LPC1112</span></p>
                                         <div class="check">
                                             <input type="checkbox" id="{{item.id}}" ng-model="item.checked" name="item.id" ng-click="chooseThisComponet(item, nProduct)"><label for="{{item.id}}"></label>

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/vendor_repository.html

@@ -655,7 +655,7 @@
         <!--搜索-->
         <div class="search-check">
             <div class="search fl">
-                <input type="text" class="form-control ng-pristine ng-untouched ng-valid" ng-model="keyword" ng-search="onSearch()" placeholder="类目/品牌/型号" style="text-align: left;
+                <input type="text" class="form-control ng-pristine ng-untouched ng-valid" ng-model="keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号" style="text-align: left;
     padding-left: 15px;">
                 <button ng-click="onSearch()">搜索</button>
                 <a ng-click="download()">批量导出</a>
@@ -681,7 +681,7 @@
                     <thead>
                     <tr>
                         <th width="60">序号</th>
-                        <th width="140">产品名称(类目)</th>
+                        <th width="140">物料名称</th>
                         <th width="100">品牌</th>
                         <th width="100">型号</th>
                         <th width="100">封装</th>
@@ -840,7 +840,7 @@
                     <thead>
                     <tr>
                         <th width="60">序号</th>
-                        <th width="140">产品名称(类目)</th>
+                        <th width="140">物料名称</th>
                         <th width="100">品牌</th>
                         <th width="100">型号</th>
                         <th width="100">封装</th>

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/vendor_standard_putOn.html

@@ -408,7 +408,7 @@
         </div>
         <div class="search-check">
             <div class="search fl">
-                <input type="text" class="form-control" ng-model="$$putOn.keyword" ng-search="onSearch()" placeholder="类目/品牌/型号"/>
+                <input type="text" class="form-control" ng-model="$$putOn.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号"/>
                 <button ng-click="onSearch()">搜索</button>
                 <a ng-click="downGoods()" class="down-goods-btn">批量导出</a>
                 <form style="display: none;" id="down-load-goods" method="get">
@@ -448,7 +448,7 @@
                                 <a href="#"><img ng-src="{{standard.img || 'static/img/store/common/default.png'}}"/></a>
                             </div>
                             <div class="content">
-                                <p>类目:<span ng-bind="standard.kindCn" title="{{standard.kindCn || ''}}">Panasonic</span></p>
+                                <p>物料名称:<span ng-bind="standard.kindCn" title="{{standard.kindCn || ''}}">Panasonic</span></p>
                                 <p>型号:<span ng-bind="standard.cmpCode" title="{{standard.cmpCode || ''}}">LPC1112</span></p>
                                 <p>品牌:<span ng-bind="standard.brandEn" title="{{standard.brandEn || ''}}">CPU</span></p>
                                 <p>封装:<span ng-bind="standard.encapsulation || '-'" title="{{standard.encapsulation || ''}}">BGA</span></p>
@@ -541,7 +541,7 @@
                                 </div>
                             </div>
                             <div class="content">
-                                <p>类目:<span ng-bind="standard.kindCn" title="{{standard.kindCn}}">Panasonic</span></p>
+                                <p>物料名称:<span ng-bind="standard.kindCn" title="{{standard.kindCn}}">Panasonic</span></p>
                                 <p>型号:<span ng-bind="standard.cmpCode" title="{{standard.cmpCode}}">LPC1112</span></p>
                                 <p>品牌:<span ng-bind="standard.brandEn" title="{{standard.brandEn}}">CPU</span></p>
                                 <p>封装:<span ng-bind="standard.encapsulation || '-'" title="{{standard.encapsulation || ''}}">BGA</span></p>

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

@@ -697,7 +697,7 @@
                             </div>
                             <div class="fr wid135">
                                 <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}"></em></p>
-                                <p>类目: <em ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}"></em></p>
+                                <p>物料名称: <em ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}"></em></p>
                                 <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}"></em></p>
                             </div>
                         </td>

+ 22 - 20
src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -596,11 +596,11 @@
                                 <label for="forIgnore"></label>
                                 <span>忽略不导入</span>
                             </label>
-                            <label class="sellType">
-                                <input type="radio" name="import" id="forImport" ng-model="repeatImport" value="1" ng-click="switchImport(1)">
-                                <label for="forImport"></label>
-                                <span>作为新产品继续导入</span>
-                            </label>
+                            <!--<label class="sellType">-->
+                                <!--<input type="radio" name="import" id="forImport" ng-model="repeatImport" value="1" ng-click="switchImport(1)">-->
+                                <!--<label for="forImport"></label>-->
+                                <!--<span>作为新产品继续导入</span>-->
+                            <!--</label>-->
                         </div>
                         <div><span ng-if="$$productOn.tab == 'bathOn'">3、</span>请上传已经编辑好的库存表格,选择好上传的文件之后,点击确认上传</div>
                         <div class="upload">
@@ -626,8 +626,9 @@
                             </div>-->
                         </div>
                         <div class="txt-info" ng-if="result && result.total != 0 && !hadImport && $$productOn.tab != 'bathOnPerson'">成功导入 <span ng-bind="result.success + result.failure">600</span> 个产品(其中标准产品 <span ng-bind="result.success">200</span> 个,非标产品 <span ng-bind="result.failure">400</span> 个)<b class="success-hidden" ng-if="result.filter != 0">,下载 <a ng-click="downloadExcel()">导入失败产品</a></b></div>
-                        <table ng-table="relTableParams" class="public-tab table" ng-show="$$productOn.tab == 'bathOn'">
-                            <thead>
+                        <div ng-if="$$productOn.tab == 'bathOn'">
+                            <table ng-table="relTableParams" class="public-tab table">
+                                <thead>
                                 <tr>
                                     <th width="60">序号</th>
                                     <th width="150" style="padding-left: 10px;">器件属性</th>
@@ -637,8 +638,8 @@
                                     <th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '¥' : '$'"></em>)</th>
                                     <th width="70">操作</th>
                                 </tr>
-                            </thead>
-                            <tbody>
+                                </thead>
+                                <tbody>
                                 <tr ng-repeat="batchCommodity in pageParams.content">
                                     <td class="check-input">
                                         <!--<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
@@ -668,13 +669,13 @@
                                         <div>最小起订量:&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>
                                         <div>最小包装数:&nbsp;<span ng-bind="batchCommodity.minPackage | number"></span></div>
                                         <!--<div>倍数/价格:&nbsp;-->
-                                            <!--<span ng-bind="batchCommodity.minBuyQty | number"></span>-->
-                                            <!--<span ng-if="batchCommodity.usdMinPackPrice">-->
-                                                    <!--/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>-->
-                                                <!--</span>-->
-                                            <!--<span ng-if="batchCommodity.rmbMinPackPrice">-->
-                                                    <!--/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>-->
-                                                <!--</span>-->
+                                        <!--<span ng-bind="batchCommodity.minBuyQty | number"></span>-->
+                                        <!--<span ng-if="batchCommodity.usdMinPackPrice">-->
+                                        <!--/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>-->
+                                        <!--</span>-->
+                                        <!--<span ng-if="batchCommodity.rmbMinPackPrice">-->
+                                        <!--/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>-->
+                                        <!--</span>-->
                                         <!--</div>-->
                                         <!--<div>样品:&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>-->
                                         <div>
@@ -699,13 +700,14 @@
                                         <div>显示 <i ng-bind="pageParams.start"></i>- <i ng-bind="pageParams.end">10</i> 个,共:<i style="color: #5078cb;" ng-bind="pageParams.totalElements"></i> 个</div>
                                     </td>
                                 </tr>
-                            </tbody>
-                            <tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
+                                </tbody>
+                                <tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
                                 <tr class="height200">
                                     <td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span class="f14">暂无产品信息,赶快上传让更多人看到你的产品吧</span></td>
                                 </tr>
-                            </tbody>
-                        </table>
+                                </tbody>
+                            </table>
+                        </div>
                         <div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'">3、如核对信息无误之后,点击确认发布</div>
                         <div>
                             <span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></span>

+ 1 - 1
src/main/webapp/resources/view/vendor/goods_detail.html

@@ -60,7 +60,7 @@ h4 {
 				<span ng-bind="comp.code"></span>
 			</div>
 			<div class="col-xs-4">
-				<span>类目名称:</span>
+				<span>物料名称:</span>
 				<span ng-bind="comp.kind.nameCn"></span>
 			</div>
 			<div class="col-xs-4">

+ 1 - 1
src/main/webapp/resources/view/vendor/modal/discharge_commodity_modal.html

@@ -89,7 +89,7 @@
 <div class="modal-body" style="padding-top: 0px;">
 	<form name="myForm">
 		<div class="row line-height-30">
-				<label class="col-xs-2">产品类目:</label>
+				<label class="col-xs-2">物料名称:</label>
 				<span  class="col-xs-3" ng-bind="goods.kindNameCn"></span>
 				<label class="col-xs-2">产品品牌:</label>
 				<span class="col-xs-3" ng-bind="goods.brandNameCn"></span>

+ 1 - 1
src/main/webapp/resources/view/vendor/modal/discharge_goods_modal.html

@@ -43,7 +43,7 @@ label {
 <div class="modal-body">
 	<form name="myForm">
 		<div class="row">
-				<label class="col-xs-2">类目:</label>
+				<label class="col-xs-2">物料名称:</label>
 				<span  class="col-xs-4" ng-bind="goods.kindNameCn"></span>
 				<label class="col-xs-2">品牌:</label>
 				<span class="col-xs-4" ng-bind="goods.brandNameCn"></span>

+ 2 - 2
src/main/webapp/resources/view/vendor/modal/recommend_product_modal.html

@@ -335,7 +335,7 @@ input[type="number"] {
                     <td style="padding-right: 0;"><div class="img"><img ng-src="{{ commodity.img || 'static/img/store/common/default.png'}}"  alt="器件图片"/></div></td>
                     <td>
                         <div>
-                            <span>类目:</span>
+                            <span>物料名称:</span>
                             <span class="more-text-span" ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}">LPC1112</span>
                         </div>
                         <div>
@@ -406,7 +406,7 @@ input[type="number"] {
                     <td style="padding-right: 0;"><div class="img"><img ng-src="{{ goods.img || 'static/img/store/common/default.png'}}"  alt="器件图片"/></div></td>
                     <td>
                         <div>
-                            <span>类目:</span>
+                            <span>物料名称:</span>
                             <span class="more-text-span" ng-bind="goods.kindNameCn" title="{{goods.kindNameCn}}" >LPC1112</span>
                         </div>
                         <div>

+ 4 - 4
src/main/webapp/resources/view/vendor/modal/uploadProduct.html

@@ -294,7 +294,7 @@
                         <span>LPC1112</span>
                     </div>
                     <div>
-                        <span>类目:</span>
+                        <span>物料名称:</span>
                         <span>LPC1112</span>
                     </div>
                 </td>
@@ -357,7 +357,7 @@
                             <span>LPC1112</span>
                         </div>
                         <div>
-                            <span>类目:</span>
+                            <span>物料名称:</span>
                             <span>LPC1112</span>
                         </div>
                     </td>
@@ -420,7 +420,7 @@
                             <span>LPC1112</span>
                         </div>
                         <div>
-                            <span>类目:</span>
+                            <span>物料名称:</span>
                             <span>LPC1112</span>
                         </div>
                     </td>
@@ -483,7 +483,7 @@
                             <span>LPC1112</span>
                         </div>
                         <div>
-                            <span>类目:</span>
+                            <span>物料名称:</span>
                             <span>LPC1112</span>
                         </div>
                     </td>

+ 2 - 2
src/main/webapp/resources/view/vendor/publishByBatch.html

@@ -145,7 +145,7 @@
 								<div class="row">
 									<div class="col-xs-10">
 										<span class="f16">{{c.code}}</span> 
-										<span class="text-muted"><strong>类目:</strong>{{c.kind.nameCn}}</span>
+										<span class="text-muted"><strong>物料名称:</strong>{{c.kind.nameCn}}</span>
 										<span class="text-muted"><strong>品牌:</strong>{{c.brand.nameCn}}</span>
 									</div>
 									<div class="col-xs-2 text-right">
@@ -171,7 +171,7 @@
 			<table class="table table-striped table-bordered">
 				<thead>
 					<tr>
-						<th>产品类目</th>
+						<th>物料名称</th>
 						<th>产品品牌</th>
 						<th>产品型号</th>
 						<th>单位</th>

+ 1 - 1
src/main/webapp/resources/view/vendor/putOn.html

@@ -210,7 +210,7 @@
 	<div class="box-item" ng-hide="box2Closed">
 		<ng-form class="form-horizontal" name="putOnForm">
 			<div class="form-group row">
-				<label for="kind" class="col-sm-2 control-label">产品类目</label>
+				<label for="kind" class="col-sm-2 control-label">物料名称</label>
 				<div class="col-sm-6">
 					<input type="text" class="form-control input-sm" id="kind" ng-model="component.kind.nameCn" readonly="readonly">
 				</div>