Merge remote-tracking branch 'origin/dev-mysql-1227' into dev-mysql-1227

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

@@ -113,9 +113,26 @@
 	.public-tab.table>tbody>tr>td a{
 		margin: 0;
 	}
+	.public-tab.table>tbody>tr>td a.brand-type{
+		display: inline-block;
+		margin: 0;
+		width: 80%;
+		color: #333;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 	.public-tab.table>tbody>tr>td span{
 		margin: 0;
 	}
+	.public-tab.table>tbody>tr>td span.brand-type{
+		display: inline-block;
+		margin: 0;
+		width: 80%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
 	.public-tab.table>tbody>tr>td span:hover span {
 		color: #fff;
 		background: #5078cb;
@@ -1520,7 +1537,7 @@
 			<div class="wanted_list01">
 			<!--在售产品-->
 			<div class="tab">
-				<table class="public-tab table" style="table-layout: auto">
+				<table class="public-tab table">
 					<thead>
 					<tr>
 						<th width="80">序号</th>
@@ -1558,8 +1575,8 @@
 							<span ng-if="!material.kind" ng-bind="material.kinden || '-'" title="{{material.kinden || '-'}}"></span>
 						</td>
 						<td>
-                            <a ng-if="material.cmpUuId" ng-href="product/component/{{material.cmpUuId}}/" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}" style="color: #333;"></a>
-                            <span ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
+                            <a class="brand-type" ng-if="material.cmpUuId" ng-href="product/component/{{material.cmpUuId}}/" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}" target="_blank"></a>
+                            <span class="brand-type" ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
 						</td>
 						<td>
 							<div class="ellipsis-div" ng-if="material.pbranden" ng-bind="material.pbranden" title="{{material.pbranden}}"></div>
@@ -1590,7 +1607,9 @@
                                         <tr id="define-content">
                                             <td colspan="10">
                                                 <div class="code">产品编码 : <span ng-bind="goods.prodNum">247823589235</span></div>
-                                                <div class="labelling"><em>*</em>自定义标签 : <input maxlength="20" type="text" ng-model="goods.editTag" ng-blur="blurTag(goods)" ng-change="changeTag(goods)" placeholder="请设置产品标签"></div>
+                                                <div class="labelling">
+													<!--<em>*</em>-->
+													自定义标签 : <input maxlength="20" type="text" ng-model="goods.editTag" ng-blur="blurTag(goods)" ng-change="changeTag(goods)" placeholder="请设置产品标签"></div>
                                             </td>
                                         </tr>
                                         <tr class="edit-content edits" >
@@ -1711,7 +1730,9 @@
 										<tr class="define defines" ng-if="!goods.edit">
 											<td colspan="10">
 												<div class="code">产品编码 : <span ng-bind="goods.prodNum || '-'">247823589235</span></div>
-												<div class="labelling"><em>*</em>自定义标签 : <span ng-bind="goods.tag">散装出售</span></div>
+												<div class="labelling">
+													<!--<em>*</em>-->
+													自定义标签 : <span ng-bind="goods.tag">散装出售</span></div>
 											</td>
 										</tr>
 										<tr class="edit-content edit-contents" ng-if="!goods.edit">
@@ -1768,7 +1789,9 @@
 										<tr id="define-content" ng-if="goods.edit">
 											<td colspan="10">
 												<div class="code">产品编码 : <span ng-bind="goods.prodNum">247823589235</span></div>
-												<div class="labelling"><em>*</em>自定义标签 : <input maxlength="20" type="text" ng-model="goods.editTag" ng-blur="blurTag(goods)" ng-change="changeTag(goods)" placeholder="请设置产品标签"></div>
+												<div class="labelling">
+													<!--<em>*</em>-->
+													自定义标签 : <input maxlength="20" type="text" ng-model="goods.editTag" ng-blur="blurTag(goods)" ng-change="changeTag(goods)" placeholder="请设置产品标签"></div>
 											</td>
 										</tr>
 										<tr class="edit-content edits" ng-if="goods.edit">

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

@@ -821,7 +821,11 @@
                     <tr class="define"
                         ng-if="!commodity.edit">
                         <td colspan="10">
-                            <div class="code">产品编码 : <span ng-bind="commodity.prodNum">247823589235</span></div><div class="labelling" ng-if="commodity.tag"><em>*</em>自定义标签 : <span ng-bind="commodity.tag">散装出售散装出售</span></div>
+                            <div class="code">产品编码 : <span ng-bind="commodity.prodNum">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"/>
                             <!--标准产品标志-->
@@ -847,10 +851,10 @@
                             </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;">类目: <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 ng-bind="commodity.code" title="{{commodity.code}}">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;">品牌: <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>
                             </div>
                         </td>
                         <td style="white-space: inherit;">
@@ -918,7 +922,9 @@
                     <tr class="define defines" ng-if="commodity.edit">
                         <td colspan="10">
                             <div class="code">产品编码 : <span ng-bind="commodity.prodNum">247823589235</span></div>
-                            <div class="labelling"><em>*</em>自定义标签 : <input type="text" ng-blur="editTag(commodity)" ng-model="commodity.editTag" ng-change="changeTag(commodity)"
+                            <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>
                             <!--非标产品标志-->