替代

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

@@ -43,7 +43,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 				id : 'DESC'
 			},
 			isStandard : true,
-			type : "nStandard"
+			type : "all"
 		};
 
 		$scope.goods = { editBreakUp: false, editSelfSale: 2, editPrices: [{}] };
@@ -1033,11 +1033,11 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 
 		var init = function () {
 			$scope.param.keyword = '';
-			if ($scope.standard_tab == 'standard') {
-				$scope.param.type = "standard";
-			} else if ($scope.standard_tab == 'unstandard') {
-				$scope.param.type = "nStandard";
-			}
+			// if ($scope.standard_tab == 'standard') {
+			// 	$scope.param.type = "standard";
+			// } else if ($scope.standard_tab == 'unstandard') {
+			// 	$scope.param.type = "nStandard";
+			// }
 			$scope.isBatch = false;
 			$scope.param.count = 10;
 		};

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

@@ -1544,6 +1544,9 @@
 		background: #dff3fd;
 		line-height: 40px;
 	}
+	.wanted_list01 .tab table th {
+		color: #333 !important;
+	}
 </style>
 <div class="user_right fr">
 	<!--货品管理-->

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

@@ -237,6 +237,9 @@
 	.search-check .check .check-active label{
 		margin-right: 0 !important;
 	}
+	.check-input {
+		position: relative;
+	}
 	.check-input input{
 		display: none;
 	}
@@ -256,6 +259,11 @@
 	.check-input input[type="checkbox"]:checked + label{
 		background-position: -15px 0;
 	}
+	.check-input .standard {
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
 	.record-line{
 		min-height: 30px;
 		font-size: 12px;
@@ -269,6 +277,9 @@
 	.wanted_list01 .pagination{
 		margin: 0;
 	}
+	.wanted_list01 .tab table th {
+		color: #333 !important;
+	}
 	.ng-table-pager{
 		padding-bottom: 20px;
 	}
@@ -1490,6 +1501,64 @@
 		position: absolute;
 		top: 45px;
 	}
+	.replace-row:hover {
+		background: #fff !important;
+	}
+	.replace-row td {
+		padding: 0 21px !important;
+	}
+	.replace-row td > div {
+		/*height: 67px;*/
+	}
+	.replace-row td > div > p {
+		display: inline-block;
+		float: left;
+		font-size: 14px;
+		height: 32px;
+		line-height: 32px;
+		background: #f6fbfe;
+		padding-left: 10px;
+	}
+	.replace-row td > div > div {
+		display: inline-block;
+		float: left;
+		line-height: 32px;
+		width: 884px;
+	}
+	.replace-row td > div > div .replace-item {
+		display: inline-block;
+		width: 50%;
+		text-align: left;
+		background: #f6fbfe;
+		float: left;
+	}
+	.replace-row td > div > div .replace-item:nth-child(2n-1) {
+		border-right: 1px solid #dde9fc;
+	}
+	.replace-row td > div > div .replace-item:nth-child(4n-1),
+	.replace-row td > div > div .replace-item:nth-child(4n) {
+		background: #eff4fd;
+	}
+	.replace-row td > div > div .replace-item i {
+		width: 18px;
+		height: 18px;
+		display: inline-block;
+		border-radius: 100%;
+		background: #9fd4ff;
+		color: #fff;
+		text-align: center;
+		line-height: 18px;
+		margin-left: 10px;
+		font-size: 12px;
+	}
+	.replace-row td > div > div .replace-item span {
+		display: inline-block;
+		width: 200px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		vertical-align: middle;
+	}
 </style>
 <div class="user_right fr">
 	<!--货品管理-->
@@ -1502,19 +1571,19 @@
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
 			</ul>
 		</div>
-		<div class="com_tab">
-			<ul class="fl distance" style="width: 100%">
+		<!--<div class="com_tab">
+			&lt;!&ndash;<ul class="fl distance" style="width: 100%">
 				<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>
 				<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>
-			</ul>
-			<!--匹配结果导航-->
+			</ul>&ndash;&gt;
+			&lt;!&ndash;匹配结果导航&ndash;&gt;
 			<div class="match-menu" ng-if="resultFrame">
                 <span>
                     <a ng-click="toggleTab('matchResult')">匹配结果</a>
                     <i class="fa fa-remove" ng-click="closeResultFrame('unstandard')"></i>
                 </span>
 			</div>
-		</div>
+		</div>-->
 		<!--非标和标准产品列表页-->
 		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
 			<div class="search-check">
@@ -1576,6 +1645,8 @@
 							<span ng-show="isBatch"><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
 							<span
 									ng-show="!isBatch" ng-bind="(param.page - 1) * 10 + $index + 1"></span>
+							<img ng-if="!material.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>
+							<img ng-if="material.uuid" src="static/img/store/common/standard.png" alt="" class="standard"/>
 						</td>
 						<td>
 							<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>
@@ -1599,6 +1670,7 @@
 							<!--<span ng-if="material.batchCount" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="expandGoods(material)"><span>展开<i class="fa fa-angle-down" style="margin-left:2px;"></i></span></span>-->
 							<!--收起-->
 							<span ng-show="!isBatch && material.exPandOper" ng-click="disExpandGoods(material)" class="packUp"><span>收起<i class="fa fa-angle-up" style="margin-left:2px;"></i></span></span>
+							<span><span>编辑可替代型号</span></span>
 							<!--<a ng-show="!isBatch" ng-click="showShelfArea(material)"><span ng-if="!isBatch">编辑</span></a>-->
 							<!--<span ng-show="!isBatch && (material.sold == 0 && material.canSell == 1)" ng-click="publishGoods(material)"><span ng-if="!isBatch">上架</span></span>-->
 						</td>
@@ -1945,6 +2017,43 @@
 							</div>
 						</td>
 					</tr>
+					<tr class="replace-row">
+						<td colspan="6">
+							<div>
+								<p>可替代型号：</p>
+								<div class="replace-list">
+									<div class="replace-item">
+										<i>1</i>
+										<span>型号：asjfkahsfha</span>
+										<span>品牌：asjfkahsfha</span>
+									</div>
+									<div class="replace-item">
+										<i>1</i>
+										<span>型号：asjfkahsfha</span>
+										<span>品牌：asjfkahsfha</span>
+									</div>
+									<div class="replace-item">
+										<i>11</i>
+										<span>型号：asjfkahsfha</span>
+										<span>品牌：asjfkahsfha</span>
+									</div>
+									<div class="replace-item">
+										<i>12</i>
+										<span>型号：asjfkahsfha</span>
+										<span>品牌：asjfkahsfha</span>
+									</div>
+									<div class="replace-item">
+										<i>12</i>
+										<span>型号：asjfkahsfha</span>
+										<span>品牌：asjfkahsfha</span>
+									</div>
+								</div>
+								<div class="expand-operate">
+									<a href="">查看更多</a>
+								</div>
+							</div>
+						</td>
+					</tr>
 					</tbody>
 				</table>
 				<div class="empty" ng-if="currenctMaterial.length == 0">