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

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;
 	}
 

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) {

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -23,7 +23,8 @@ define([ 'app/app' ], function(app) {
 			'release/product/release/excel',
 			'release/product/release/excel/pcb',
 			'release/product/batchRelease/pcb',
-			'release/product/batchRelease'
+			'release/product/batchRelease',
+      'release/product/batchRelease/person'
 		]
 		return {
 			request: function(cfg){

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 = {};
 

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

@@ -31,8 +31,9 @@ define(['app/app'], function(app) {
 			Bill.getListPersonal(null, function(data) {
 				$scope.bill = {};
 				$scope.bills = data;
-				$scope.bill.kind = '1207';
-				$scope.order.invoicetype = '1207';
+				$scope.bill.kind = '1205';
+				$scope.order.invoicetype = '1205';
+        $scope.order.paytype = '1102'
 				// angular.forEach($scope.bills, function(item) {
 				//     if(item.kind == '1205') {
 				//         $scope.bill = item;

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

@@ -298,12 +298,12 @@ define([ 'app/app' ], function(app) {
         } else {
             toaster.pop('success', '提示', '上传完成');
         }
+        $scope.showCanvas = false
 				$scope.relTableParams.page(1);
 				$scope.relTableParams.reload();
         if ($rootScope.$$productOn.tab === 'bathOnPerson') {
             publicPersonProduct();
         }
-        $scope.showCanvas = false
         }).error(function(response) {
             $scope.result = {};
             $scope.result.total = 0;
@@ -401,7 +401,20 @@ define([ 'app/app' ], function(app) {
     };
 
     function publicPersonProduct() {
+        speed = 1
+        $scope.showCanvas = true
+        $scope.AnimationCanvas = setInterval(function () {
+          if (speed > 100) clearInterval($scope.AnimationCanvas)
+          if (speed >= 98) clearInterval($scope.AnimationCanvas)
+          else {
+            speed += RandomNumber();
+            drawFrame(speed)
+          }
+        }, 30)
         ReleaseProductByBatch.batchReleasePerson({batch : $scope.result.batch}, null, function(data) {
+          speed = 100
+          clearInterval($scope.AnimationCanvas)
+          $scope.showCanvas = false
             if ($scope.needShowTip) {
                 $scope.relTableParams.page(1);
                 $scope.relTableParams.reload();

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>

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>

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>

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>

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>

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" ng-keyup="keyUpApply($e)" 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>

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>

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>

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

@@ -678,7 +678,7 @@
 							<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 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>
@@ -893,14 +893,14 @@
 			<div class="pay_com">
 				<span>发票信息详情
 					<!--<a ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<em ng-if="!bill.name">新增发票</em><em ng-if="bill.name">修改发票</em></a>-->
-					<span ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<button ng-if="!bill.name">新增发票</button><button ng-if="bill.name">修改发票</button></span>
+					<span ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&(order.status == 501 || order.status == 503 || order.status == 504)"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<button ng-if="!bill.name">新增发票</button><button ng-if="bill.name">修改发票</button></span>
 				</span>
 			</div>
-			<p class="bill-radio" ng-if="order.status == '501'">
-				<span  ng-click="selectBill('1207')">
-					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1207'"/>
-					<label></label><em>暂不开票</em>
-				</span>
+			<p class="bill-radio" ng-if="order.status == '501' || order.status == 503 || order.status == 504">
+				<!--<span  ng-click="selectBill('1207')">-->
+					<!--<input type="radio"  name="bill" ng-checked="order.invoicetype == '1207'"/>-->
+					<!--<label></label><em>暂不开票</em>-->
+				<!--</span>-->
 				<span  ng-click="selectBill('1206')" ng-hide="storeArray.length == 1 && hideNormal">
 					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1206'"/>
 					<label></label><em>增值税普通发票</em>
@@ -909,10 +909,10 @@
 					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1205'"/>
 					<label></label><em>增值税专用发票</em>
 				</span>
-				<b ng-if="order.invoicetype == '1206' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
+				<b ng-if="order.invoicetype == '1205' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
 			</p>
-			<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">
-			</div>
+			<!--<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">-->
+			<!--</div>-->
 			<div class="pay_oder_xq_list no-need-bill notice" ng-if="order.invoicetype!='1207' && !bill.name">
 				还没有对应的发票信息，请新增相应的发票信息
 			</div>
@@ -964,12 +964,20 @@
 							<input type="hidden" name="timestamp" value={{ysepayRequest.timestamp}}>
 							<input type="hidden" name="sign" value={{ysepayRequest.sign}}>
 						</form>
-						<p>
-									<span class="style01" style="width: 220px; margin-left: 610px;">付款方式:
-										<select class="select" ng-model="order.paytype">
-											<option value="1102">在线支付</option>
-											<option value="1103">线下支付</option>
-										</select>
+						<p class="payment">
+									<span class="style01 " style="width: 268px; margin-left: 590px;">付款方式:
+										<span  ng-click="order.paytype = 1102" class="bill-radio" style="width: 80px;float:none;margin-left:5px;padding: 0">
+											<input type="radio"  name="payfor" ng-checked="order.paytype == '1102'"/>
+											<label></label><em>在线支付</em>
+										</span>
+										<span ng-click="order.paytype = 1103" class="bill-radio" style="width: 80px;float:none;margin-left:5px;padding: 0">
+											<input type="radio"  name="payfor" ng-checked="order.paytype == '1103'"/>
+											<label></label><em>线下支付</em>
+										</span>
+										<!--<select class="select" ng-model="order.paytype">-->
+											<!--<option value="1102">在线支付</option>-->
+											<!--<option value="1103">线下支付</option>-->
+										<!--</select>-->
 									</span>
 							<a ng-click="confirmPay()">提交订单</a></p>
 						<p class="bulb-remind"><img src="static/img/user/bulb.png" alt="">若价格变动，请在订单提交后联系卖家改价</p>

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>

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>

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>

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

@@ -493,7 +493,7 @@
 							<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>

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>

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>

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>

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,7 +626,7 @@
                             </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>
-                        <div ng-if="$$productOn.tab == 'bathOn'">
+                        <div ng-show="$$productOn.tab == 'bathOn'">
                             <table ng-table="relTableParams" class="public-tab table">
                                 <thead>
                                 <tr>

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">

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>