物料名称（类目）改物料名称

src/main/webapp/resources/view/admin/modal/auditRegulpicpass_modal.html

@@ -73,7 +73,7 @@
       <div class="col-sm-9">{{item.product.pbranden || item.product.brand || '-'}}</div>
     </div>
     <div class="form-group">
-      <div class="col-sm-3 name">物料名称(类目)：</div>
+      <div class="col-sm-3 name">物料名称：</div>
       <div class="col-sm-9">{{item.product.prodName || item.product.kind || '-'}}</div>
     </div>
     <div class="form-group">

src/main/webapp/resources/view/search/search_component.html

@@ -216,7 +216,7 @@
 	<div id="notFound" ng-if="componentDatas.total == 0">
 		<div>很抱歉，我们没有找到相关的产品型号！</div>
 		<div>
-			您可以选择 <a href="product#/home">按物料名称(类目)查找产品</a> 或 <a href="product#/brandList">按品牌查找产品</a>。
+			您可以选择 <a href="product#/home">按物料名称查找产品</a> 或 <a href="product#/brandList">按品牌查找产品</a>。
 		</div>
 	</div>
 </div>

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

@@ -663,7 +663,7 @@
                     <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 bottom item size-middle"><span>物料名称(类目)：</span><div class="content" style="width:135px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%"  class="fl bottom item size-middle"><span>物料名称：</span><div class="content" style="width:135px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                         </div>
                     </div>
                 </td>

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

@@ -944,7 +944,7 @@
                     </ul>
                 </div>
                 <div class="form-block">
-                    <span><i>*</i>物料名称(类目)</span>
+                    <span><i>*</i>物料名称</span>
                     <input type="text" class="form-group" ng-model="applyObj.prodTitle" ng-class="{'error': !validObj.prodTitle}" ng-change="onProdTitleInput()" ng-blur="checkProdTitle()">
                 </div>
                 <div class="form-block">
@@ -1081,7 +1081,7 @@
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
                             <div title="{{seek.inbrand}}" class="fl item size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl bottom item size-middle"><span>物料名称(类目)：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl bottom item size-middle"><span>物料名称：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                         </div>
                     </div>
                 </td>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -1789,7 +1789,7 @@
 									</a>
 								</div>
 							</th>
-							<th width="140">产品名称(类目)</th>
+							<th width="140">物料名称</th>
 							<th width="180">产品型号</th>
 							<th width="130">品牌</th>
 							<th width="100">单位</th>
@@ -2319,7 +2319,7 @@
 						<thead>
 						<tr>
 							<th width="60">序号</th>
-							<th width="120">产品名称(类目)</th>
+							<th width="120">物料名称</th>
 							<th width="120">品牌</th>
 							<th width="100">型号</th>
 							<!--<th width="100">封装</th>-->

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_person_erp.html

@@ -1821,7 +1821,7 @@
 								</label>
 							</th>
 							<th width="80">序号</th>
-							<th width="180">产品名称(类目)</th>
+							<th width="180">物料名称</th>
 							<th width="200">产品型号</th>
 							<th width="150">品牌</th>
 							<!--<th width="100">单位</th>-->
@@ -2345,7 +2345,7 @@
 						<thead>
 						<tr>
 							<th width="60">序号</th>
-							<th width="120">产品名称(类目)</th>
+							<th width="120">物料名称</th>
 							<th width="120">品牌</th>
 							<th width="100">型号</th>
 							<th width="100">封装</th>

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

@@ -180,7 +180,7 @@
   <div class="seek-purchase-content">
     <div class="search-check">
       <div class="search fl">
-        <input type="text" class="form-control ng-pristine ng-untouched ng-valid" ng-model="keyWord" placeholder="请输入您要搜索的物料名称(类目)">
+        <input type="text" class="form-control ng-pristine ng-untouched ng-valid" ng-model="keyWord" placeholder="请输入您要搜索的物料名称">
         <button ng-click="onSearch()">搜索</button>
       </div>
       <div class="check fr">
@@ -193,7 +193,7 @@
           <th width="80" class="onCheckBoxClick" ng-click="onCheckBoxClick()">
             <input ng-checked="checkBoxAll" type="checkbox" class="checkbox">{{checkBoxAll ? '取消全选': '全选'}}</th>
           <th width="80">序号</th>
-          <th width="556">物料名称(类目)</th>
+          <th width="556">物料名称</th>
           <th width="310">操作</th>
         </tr>
       </thead>

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

@@ -708,7 +708,7 @@
                     <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.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>
                     </div>
                 </td>

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

@@ -874,7 +874,7 @@
                         <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:134px">{{seek.inbrand || '-'}}</div></div>
-                                <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%" class="fl item size-middle bottom"><span>物料名称(类目)：</span><div class="content" style="width:134px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
+                                <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%" class="fl item size-middle bottom"><span>物料名称：</span><div class="content" style="width:134px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                             </div>
                         </div>
                     </td>
@@ -971,7 +971,7 @@
                 </div>
                 <div class="content-line">
                     <div class="form-item form-left text-line">
-                        <span>物料名称(类目)：</span><span class="text" ng-bind="inquiryItem.prodTitle || '-'" title="{{inquiryItem.prodTitle || '-'}}"></span>
+                        <span>物料名称：</span><span class="text" ng-bind="inquiryItem.prodTitle || '-'" title="{{inquiryItem.prodTitle || '-'}}"></span>
                     </div>
                 </div>
                 <div class="content-line">

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

@@ -2048,7 +2048,7 @@
 							</label>
 						</th>
 						<th width="120">品牌</th>
-						<th width="130">物料名称(类目)</th>
+						<th width="130">物料名称</th>
 						<th width="150">型号</th>
 						<th width="100">规格</th>
 						<th width="100">规格书</th>
@@ -2621,7 +2621,7 @@
 						<thead>
 						<tr>
 							<th width="60">序号</th>
-							<th width="120">物料名称(类目)</th>
+							<th width="120">物料名称</th>
 							<th width="120">品牌</th>
 							<th width="100">型号</th>
 							<!--<th width="100">封装</th>-->

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

@@ -1862,7 +1862,7 @@
 					<tr>
 						<th width="80">序号</th>
 						<th width="150">品牌</th>
-						<th width="180">物料名称(类目)</th>
+						<th width="180">物料名称</th>
 						<th width="190">型号</th>
 						<!--<th width="100">单位</th>-->
 						<th width="60">规格</th>
@@ -2407,7 +2407,7 @@
 						<thead>
 						<tr>
 							<th width="60">序号</th>
-							<th width="120">物料名称(类目)</th>
+							<th width="120">物料名称</th>
 							<th width="120">品牌</th>
 							<th width="100">型号</th>
 							<th width="100">封装</th>

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

@@ -1149,8 +1149,8 @@
                             <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 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">-->
@@ -1283,7 +1283,7 @@
                                             <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.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>-->

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

@@ -646,7 +646,7 @@
                                     </td>
                                     <td style="padding-left: 10px;">
                                         <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>
-                                        <div class="text-more">物料名称(类目)：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
+                                        <div class="text-more">物料名称：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
                                         <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>
                                         <div class="text-more">规格：&nbsp;<em title="{{batchCommodity.spec || '空'}}" ng-bind="batchCommodity.spec || '空'"></em></div>
                                     </td>

src/main/webapp/resources/view/vendor/modal/edit_regul_modal.html

@@ -307,12 +307,12 @@
           </div>
           </div>
           <div class="pull-left clearboth">
-            <div class="name pull-left"><em style="color: #f01414">*</em>物料名称(类目)：</div>
+            <div class="name pull-left"><em style="color: #f01414">*</em>物料名称：</div>
             <div class="pull-left" style="position: relative;">
               <div ng-show="IsLookOrUpdate === 'update'">
                 <!-- 可编辑状态 -->
                 <input type="text"
-                       placeholder="请输入物料名称(类目)"
+                       placeholder="请输入物料名称"
                        style="width: 165px;height: 28px;border-radius: 2px;color: #333"
                        ng-model="kind"
                        class="form-control" maxlength="20"/>