处理物料名称

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

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

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