shenjj 7 years ago
parent
commit
db1a93b75f
1 changed files with 655 additions and 541 deletions
  1. 655 541
      src/main/webapp/resources/view/vendor/forstore/vendor_material.html

+ 655 - 541
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -213,14 +213,15 @@
 	}
 	.search-check{
 		width: 100%;
-		height: 54px;
+		height: auto;
 		background: #fff;
 		padding-top: 10px;
+		padding-bottom: 20px;
 		margin-bottom: 16px;
 	}
 	.search-check .search{
-		width: 628px;
-		margin-left: 52px;
+		width: auto;
+		margin-right: 52px;
 		position: relative;
 	}
 	.search-check .search .prodUserList {
@@ -378,7 +379,7 @@
 		min-height: 15px !important;
 		left: 0 !important;
 	}
-	.check-input input[type="checkbox"]:checked + label{
+	.check-input input:checked + label{
 		background-position: -15px 0;
 	}
 	.record-line{
@@ -1974,17 +1975,27 @@
 		line-height: 30px;
 	}
 
+
+	/* 第二十三期改版 */
+	.overHidden{
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 </style>
 <div class="user_right fr">
 	<!--货品管理-->
 	<div class="pro_management device">
 		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>
-				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
-				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
-				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
-				<li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
+				<!--<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>-->
+				<!--<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>-->
+				<!--<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>-->
+				<!--<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>-->
+				<!--<li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>-->
+				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
+				<li><a>出入库</a></li>
+				<li><a ui-sref="vendor_undercarriage">上下架记录</a></li>
 			</ul>
 		</div>
 		<div class="com_tab com_tab2" ng-if="!isPcbStore" style="margin-bottom: 0px">
@@ -2003,7 +2014,16 @@
 		<!--非标和标准产品列表页-->
 		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
 			<div class="search-check">
-				<div class="search fl">
+				<div class="fl" style="font-size: 14px;color: #666;margin-left: 12px;line-height: 34px;">
+					更多筛选:
+					<label class="check-input">
+						<span><input type="radio" name="radio" id="radio" /><label for="radio"></label>全部产品</span>
+					</label>
+					<label class="check-input" style="margin-left: 20px">
+						<span><input type="radio" name="radio" id="radio2" /><label for="radio2"></label>个人产品</span>
+					</label>
+				</div>
+				<div class="search fr">
 					<!-- TODO 搜索引擎实现人员过滤还待完善 -->
 					<!--<label>人员选择:</label>
 					<input type="text" class="form-control prod-name" ng-model="enUser.prodName" ng-change="onUserUUChange()" ng-search="onSearch()" placeholder="姓名"/>
@@ -2016,17 +2036,24 @@
 					<button ng-click="onSearch()">搜索</button>
 					<!--<a ng-click="download()">批量导出</a>-->
 				</div>
-				<div class="check fr">
-					<div class="operate-btn" ng-click="setAllInPerson()"><span>加入个人产品库</span></div>
+				<div style="clear:both"></div>
+				<div class="check" style="margin-left: 12px;color: #666; font-size: 14px;margin-top: 20px;">
+					更多操作:
+					<div class="operate-btn" ng-click="setAllInPerson()"><span>加入我的产品库</span></div>
+					<div class="operate-btn"><span>入库</span></div>
+					<div class="operate-btn"><span>出库</span></div>
+					<div class="operate-btn" ng-click="download()"><span>导出选中</span></div>
+					<div class="operate-btn" ng-click="modifyBatch()"><span>批量修改</span></div>
 					<div class="operate-btn" ng-show="standard_tab == 'unstandard'" ng-click="matchAll()"><span ng-show="standard_tab == 'unstandard'">匹配</span></div>
-					<div class="operate-btn more-operate">
-						<span>更多操作</span>
-						<span class="expander">
-							<span ng-click="download()">导出选中</span>
-							<span ng-click="deleteBatch()" name="delete-material">删除选中</span>
-							<span ng-click="modifyBatch()">批量修改</span>
-						</span>
-					</div>
+					<div class="operate-btn" ng-click="deleteBatch()"><span>删除选中</span></div>
+					<!--<div class="operate-btn more-operate">-->
+						<!--<span>更多操作</span>-->
+						<!--<span class="expander">-->
+							<!--<span ></span>-->
+							<!--<span ng-click="deleteBatch()" name="delete-material">删除选中</span>-->
+							<!--<span ng-click="modifyBatch()">批量修改</span>-->
+						<!--</span>-->
+					<!--</div>-->
 					<!--<a ng-show="!isBatch" ng-click="enterBatch()"><span ng-show="!isBatch">批量操作</span></a>-->
 					<span class="check-btn" ng-show="isBatch">
 						<a ng-click="deleteBatch()" name="delete-material">删除</a>
@@ -2035,539 +2062,626 @@
 				</div>
 			</div>
 			<div class="wanted_list01">
-			<!--在售产品-->
-			<div class="tab">
-				<table class="public-tab standard-tab table">
-					<thead>
-					<tr>
-						<th width="55">
-							<label class="check-active">
-								<input ng-disabled="currenctMaterial.length == 0" type="checkbox"  ng-click="chooseAllItem()" ng-checked="chooseAll || chooseAllPage" id="AllChoose"/>
-								<label for="AllChoose"></label>
-								<span>全选</span>
-							</label>
-						</th>
-						<th width="120">品牌</th>
-						<th width="130">物料名称</th>
-						<th width="150">型号</th>
-						<th width="100">规格</th>
-						<th width="100">规格书</th>
-						<th width="60">单位</th>
-						<!--<th width="80">封装</th>-->
-						<th width="280">操作</th>
-					</tr>
-					</thead>
-					<tbody class="bg-show">
-					<!--<tr style="height: 14px;" ng-show="!isBatch && standard_tab == 'standard'">-->
-					<tr style="height: 14px;">
-						<td colspan="8" class="hei18"></td>
-					</tr>
-					</tbody>
-					<tbody>
-						<tr style="height: 14px;" ng-show="currenctMaterial.length > 0 && standard_tab == 'unstandard' && showTip">
-							<td colspan="8" class="hei17">
-								<span>*匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="cancelTip()">&times;</a>
-							</td>
-						</tr>
-						<tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctMaterial.length != 0">
-							<td colspan="8">
-								<div class="batch-line" ng-if="chooseAll && !chooseAllPage">
-									已选中当前页
-									<em class="red" ng-bind="materialAll.numberOfElements"></em>个产品,
-									<a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="materialAll.totalElements"></em>个产品
-								</div>
-								<div class="batch-line" ng-if="chooseAllPage">
-									已选中所有页面
-									<em class="red" ng-bind="materialAll.totalElements"></em>个产品,
-									<a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
-								</div>
-							</td>
-						</tr>
-					</tbody>
-					<tbody ng-repeat="material in currenctMaterial | orderBy:'-id'">
-					<!--<tr ng-class="{ 'active': material.selected }" class="gre-bg">-->
-					<tr ng-class="{ 'active': material.selected, 'gre-bg' : material.exPandOper}">
-						<td class="check-input">
-							<img src="static/img/vendor/images/person-material-pc.png" ng-if="material.addProductPerson" alt="">
-							<span><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
-						</td>
-						<!--<td>-->
-							<!--<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>-->
-						<!--</td>-->
-						<td>
-							<div class="ellipsis-div" ng-if="material.pbranden" ng-bind="material.pbranden" title="{{material.pbranden}}"></div>
-							<div class="ellipsis-div" ng-if="!material.pbranden" ng-bind="material.pbrand" title="{{material.pbrand}}"></div>
-						</td>
-						<td>
-							<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>
-							<span ng-if="!material.kind" ng-bind="material.kinden || '-'" title="{{material.kinden || '-'}}"></span>
-						</td>
-						<td>
-                            <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>
-							<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
-						</td>
-						<td style="overflow: initial;">
-							<div class="Regulpic" ng-if="material.productAttachSubmit || material.attach">
-								<a href="{{material.productAttachSubmit.uploadAttach || material.attach}}" target="_blank"  class="Regulpica">
-									<span style="cursor: pointer;">
-										<img style="width:24px;height:26px;border: 0px" src="static/img/vendor/images/pdf.png"/>
-										<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="material.productAttachSubmit.uploadAttach">
-											<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
-											<div class="forAdminLook">待审核</div>
+				<!--在售产品-->
+				<div class="tab">
+					<table class="public-tab standard-tab table">
+						<thead>
+							<tr>
+								<th width="110" style="text-align: center">
+									<label class="check-active">
+										<input ng-disabled="currenctMaterial.length == 0" type="checkbox"  ng-click="chooseAllItem()" ng-checked="chooseAll || chooseAllPage" id="AllChoose"/>
+										<label for="AllChoose"></label>
+										<span>全选</span>
+									</label>
+								</th>
+								<th width="230">产品信息</th>
+								<th width="190">包装/生成日期</th>
+								<th width="140">库存/交期</th>
+								<th width="170">价格梯度(pcs)</th>
+								<th width="80">销售方式</th>
+								<th width="105">操作</th>
+								<!--<th width="120">品牌</th>-->
+								<!--<th width="130">物料名称</th>-->
+								<!--<th width="150">型号</th>-->
+								<!--<th width="100">规格</th>-->
+								<!--<th width="100">规格书</th>-->
+								<!--<th width="60">单位</th>-->
+								<!--<th width="80">封装</th>-->
+								<!--<th width="280">操作</th>-->
+							</tr>
+						</thead>
+						<tbody class="bg-show">
+						<!--<tr style="height: 14px;" ng-show="!isBatch && standard_tab == 'standard'">-->
+							<tr style="height: 14px;">
+								<td colspan="8" class="hei18"></td>
+							</tr>
+						</tbody>
+						<tbody>
+							<tr style="height: 14px;" ng-show="currenctMaterial.length > 0 && standard_tab == 'unstandard' && showTip">
+								<td colspan="8" class="hei17">
+									<span>*匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="cancelTip()">&times;</a>
+								</td>
+							</tr>
+							<tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctMaterial.length != 0">
+								<td colspan="8">
+									<div class="batch-line" ng-if="chooseAll && !chooseAllPage">
+										已选中当前页
+										<em class="red" ng-bind="materialAll.numberOfElements"></em>个产品,
+										<a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="materialAll.totalElements"></em>个产品
+									</div>
+									<div class="batch-line" ng-if="chooseAllPage">
+										已选中所有页面
+										<em class="red" ng-bind="materialAll.totalElements"></em>个产品,
+										<a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
+									</div>
+								</td>
+							</tr>
+						</tbody>
+						<tbody ng-repeat="material in currenctMaterial | orderBy:'-id'">
+						<!--<tr ng-class="{ 'active': material.selected }" class="gre-bg">-->
+							<tr ng-class="{ 'active': material.selected, 'gre-bg' : material.exPandOper}">
+								<td class="check-input">
+									<img src="static/img/vendor/images/person-material-pc.png" ng-if="material.addProductPerson" alt="">
+									<span style="float:left;margin-top:40px;margin-left:10px"><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
+									<div class="blue-bg" style="float:left;border: 1px solid #dcdcdc;border-radius: 4px;margin: 20px 0 20px 10px">
+										<div class="img" style="margin: 0;">
+											<a><img ng-src="{{material.editPic || 'static/img/store/common/default.png'}}" alt="img"/></a>
 										</div>
-									</span>
-								</a>
-							</div>
-							<div ng-if="!material.attach && !material.productAttachSubmit.uploadAttach">
-							 -
-							</div>
-						</td>
-						<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
-						<!--<td>-->
-							<!--<span ng-bind="material.encapsulation || '-'" title="{{material.encapsulation || '-'}}"></span>-->
-						<!--</td>-->
-						<td class="edit">
-							<span ng-click="editRegulPicture(material.productAttachSubmit.uploadAttach || material.attach || 'static/img/vendor/images/upload_file_icon.png', material)">
-								<span>编辑物料</span>
-							</span>
-							<!---->
-							<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)">
-								<span ng-if="material.batchCount">添加产品</span>
-								<span ng-if="!material.batchCount">编辑上架</span>
-							</span>
-							<span ng-click="lookActiveIndex($index, material)">
-								<span>替代物料</span>
-								<!--<span>查看</span></span>/<span ng-click="setActiveIndex($index,material)"><span>编辑替代物料</span>-->
-						  	</span>
-							<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
-							<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>
-							<!--<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>
-					</tr>
-					<!--展开内容-->
-					<tr ng-show="material.addGoodsOper  || (material.exPandOper && material.goodsArr.length > 0)">
-						<td colspan="8" style="padding: 0;">
-							<div class="show-content">
-								<div class="content-body">
-									<table class="public-tab table">
-                                        <tbody ng-if="material.addGoodsOper && material.selected">
-                                        <!--添加产品-->
-                                        <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>
-                                            </td>
-                                        </tr>
-                                        <tr class="edit-content edits" >
-                                            <td colspan="10" style="background:#f0f7fd;">
-                                                <div class="blue-bg">
-													<div></div>
-                                                    <div class="img">
-                                                        <a><img ng-src="{{goods.editPic || 'static/img/store/common/default.png'}}" alt="img"/></a>
-                                                        <div class="edit-img">
-                                                            <a ng-click="deleteImg(goods)" class="delete-img" title="删除" ng-if="goods.editPic"><i class="fa fa-trash"></i></a>
-                                                            <a ng-click="editGoodsPicture(goods.editPic || 'static/img/store/common/default.png', goods)" title="修改图片"><img ng-src="static/img/icon/update-img.png" /></a>
-                                                        </div>
-                                                    </div>
-                                                    <div class="content margin10">
-                                                        <!--<p class="title">包装/生产日期</p>-->
-                                                        <div class="input-list">
-                                                            <span class="tit">包装:</span><!--<input type="text" class="form-control" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
-                                                                                               ng-class="{'error' : goods.editPackagingInvalid}" ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>-->
-															<select ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'"  class="select-adder select-package" title="包装">
-																<option ng-repeat="item in packageArray" ng-click="showText(item)">{{item}}</option>
-															</select>
-															<!--<div class="dropdown">
-																<input class="btn btn-default dropdown-toggle button-select select-adder" id="dropdownMenu2" type="text" ng-model="goods.editPackaging" placeholder="包装方式" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" readonly="readonly">
-																<ul class="dropdown-menu .dropdown-menu-left button-option" aria-labelledby="dropdownMenu2">
-																	<li ng-repeat="item in packageArray" ng-click="showText(item)">{{item}}</li>
-																</ul>
-															</div>-->
-                                                        </div>
-                                                        <div class="input-list produceDate-fix">
-                                                            <span class="tit">生产日期:</span><input type="text" class="form-control" name="produceDate" ng-maxlength="12" title="生产日期" maxlength="12" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate"
-                                                                                                 ng-class="{'error' : goods.editProduceDateInvalid}"
-                                                                                                 ng-change="editProduceDateFa(goods, false)"/>
-                                                        </div>
-                                                        <div class="clearfix produceDate-fix">
-                                                            <span>可拆卖:</span>
-                                                            <span class="switch"><button ng-class="{'active' : goods.editBreakUp}"
-                                                                                           ng-click="toggleIsBreadUp(goods, false)"></button></span>
-                                                        </div>
-                                                    </div>
-                                                    <div class="content margin10">
-                                                        <!--<p class="title">库存</p>-->
-                                                        <div class="input-list">
-                                                            <span class="tit" style="width: 84px">库存:</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量"
-                                                                                               ng-model="goods.editReserve" maxlength="9" ng-blur="setPriceMaxAmount(goods, false)" ng-class="{'error' : goods.editReserveInvalid}" oninput="if(value.length>9)value=value.slice(0,9)"/>
-                                                        </div>
-                                                        <div class="input-list">
-                                                            <span class="tit" style="width: 84px">最小起订量:</span><input type="number" class="wid70 form-control" name="minBuyQty" title="最小起订量"  placeholder="数量"
-                                                                                                maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" ng-model="goods.editMinBuyQty" ng-blur="setPriceMinAmount(goods, false)" ng-change="updateStartNumber(goods)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
-                                                        </div>
-                                                        <div class="input-list">
-										                    <span class="tit" style="width: 84px">最小包装数:</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="最小包装数" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
-                                                        </div>
-														<!--<div class="input-list">-->
-															<!--<span class="tit" style="width: 84px">规格:</span><input maxlength="40" class="wid70 form-control" name="minPackQty" title="规格" placeholder="规格" ng-model="goods.spec"  style="width: 70px;"/>-->
-														<!--</div>-->
-                                                    </div>
-                                                    <div class="content">
-                                                        <p class="title height24">梯度/pcs</p>
-                                                        <div class="input-list" ng-repeat="price in goods.editPrices">
-                                                            <p>
-                                                                <span style="overflow: hidden;"><input ng-disabled="$index == 0" type="number" class="wid42 form-control fl" ng-class="{'error' : price.startInValid}"
-                                                                                   placeholder="数量" ng-model="price.start" ng-blur="editQty(goods, $index, false, price.start)" oninput="if(value.length>9)value=value.slice(0,9)"/></span><em
-																	class="up fl" ng-if="$last">以上</em>
-                                                                <span style="margin-left: 4px;" ng-if="!$last">–</span>
-                                                                <span ng-if="!$last"><input type="number" class="wid42 form-control" ng-class="{'error' : price.endInValid}"  placeholder="数量" ng-model="price.end" ng-blur="editQty(goods, $index, true, price.end)"
-                                                                                                                       oninput="if(value.length>9)value=value.slice(0,9)"/></span>
-                                                            </p>
-                                                        </div>
-                                                    </div>
-                                                    <div class="content" ng-if="!store.enType || store.enType === 'HK'">
-                                                        <p class="title height24">单价($)</p>
-                                                        <div
-                                                                class="input-list" ng-repeat="price in goods.editPrices">
-                                                                <input type="number" name="usd" class="wid92 form-control"  placeholder="单价($)" ng-blur="changePrices(goods.editPrices, price.uSDPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.uSDPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
-                                                        </div>
-                                                    </div>
-                                                    <div class="content" ng-if="!store.enType || store.enType === 'MAINLAND'">
-                                                        <p class="title height24">单价(¥)</p>
-                                                        <div
-                                                                class="input-list" ng-repeat="price in goods.editPrices">
-                                                                <input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(¥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
-                                                        </div>
-                                                    </div>
-                                                    <div class="content plusBtn">
-                                                        <p class="title height24">&nbsp;</p>
-                                                        <div class="input-list" ng-repeat="price in goods.editPrices" style="height: 24px;line-height: 24px;margin-bottom: 5px;">
-                                                            <a class="reduce" ng-disabled="goods.editPrices.length < 2" ng-click="deleteFragment(goods, $index)"><i class="fa fa-minus-circle" ng-class="{ 'restrict-color': goods.editPrices.length === 1 }"></i></a>
-                                                            <a class="add" ng-click="addFragment(goods)"  ng-disabled="goods.editPrices.length >= 3"><i class="fa fa-plus-circle"
-                                                                                                          ng-class="{ 'restrict-color': $index === 2 }"></i></a>
-                                                        </div>
-                                                    </div>
-                                                    <div class="content floatLeft">
-																											<div class="">
-                                                        <p class="title height29">交期(天):</p>
-                                                        <div class="input-list">
-                                                            <p>
-											<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)"
-                                                         ng-model="goods.editMinDelivery"
-                                                         ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, true, goods)"
-                                                         ng-class="{'error' : goods.editMinDeliveryinValid}"/></span>
-                                                                <span style="margin-left: 4px;">–</span>
-                                                                <span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMaxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
-                                                                             ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
-                                                            </p>
-                                                        </div>
-																												<div style="clear:both"></div>
-																											</div>
-
-                                                    </div>
-                                                    <div class="content margin10">
-                                                        <!--<p class="title">自营 / 寄售</p>-->
-                                                        <div class="input-list">
-                                                            <select ng-disabled="!$$nonProduct.canSelfSale" name="selfSale" class="wid56 select-adder form-control" ng-model="goods.editSelfSale">
-                                                                <option value="1">自营</option>
-                                                                <option value="2">寄售</option>
-                                                            </select>
-                                                        </div>
-                                                    </div>
-                                                    <div class="content" style="width: 56px; float: right; margin-right: 10px;">
-                                                        <p class="title">&nbsp;</p>
-                                                        <div class="input-list">
-                                                            <button class="ok" ng-mouseenter="impedeBlur()" ng-mouseleave="recoveryBlur()"
-																	ng-click="addGoods(material)">保存</button>
-                                                            <button class="off" ng-click="closeShelArea(material)">取消</button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                        </tr>
-										<tr class="hei12">
-											<td colspan="10" class="hei2"></td>
-										</tr>
-                                        </tbody>
-										<tbody ng-repeat="goods in material.goodsArr">
-										<tr class="define defines" ng-if="!goods.edit">
-											<td colspan="10">
-												<div class="code">SKU编码 : <span ng-bind="goods.batchCode || '-'">247823589235</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">
-											<td colspan="10">
-												<div class="bg">
-													<div></div>
-													<div class="img">
-														<img ng-src="{{goods.img || 'static/img/store/common/default.png'}}" alt="img"/>
-													</div>
-													<div class="content width140">
-														<p class="title"><span>包装:</span><span ng-bind="goods.packaging">盘装</span></p>
-														<p class="title"><span>生产日期:</span><span ng-bind="goods.produceDate" title="{{goods.produceDate}}">20160123</span></p>
-														<p class="title" ng-class="{'noBreak' : !goods.breakUp}" ng-if="goods.breakUp" ng-bind="goods.breakUp ? '可拆卖' : '不可拆卖'">不可拆卖</p>
-													</div>
-													<div class="content width130">
-														<p class="title"><span style="width:84px">库存:</span><span ng-bind="goods.reserve">9023492</span></p>
-														<p class="title"><span style="width:84px">最小起订量:</span><span ng-bind="goods.minBuyQty">90492</span></p>
-														<p class="title"><span style="width:84px">最小包装数:</span><span ng-bind="goods.minPackQty">980</span></p>
-														<!--<p class="title"><span style="width:84px">规格:</span><span ng-bind="goods.spec || '-'" title="{{goods.spec}}">980</span></p>-->
-													</div>
-													<div class="content width150">
-														<div class="title-price">
-															<span>梯度/pcs</span>
-															<span ng-if="goods.currencyName.indexOf('USD') > -1">单价($)</span>
-															<span ng-if="goods.currencyName.indexOf('RMB') > -1">单价(¥)</span>
-														</div>
-														<div class="list" ng-repeat="price in goods.prices">
-															<span ng-bind="price.start + '+'">1+</span><span
-																ng-bind="goods.currencyName.indexOf('RMB') > -1 ? (price.rMBPrice  | formateNumber : 6): (price.uSDPrice | formateNumber : 6)">0.356</span>
-														</div>
-													</div>
-													<div class="content" style="width: 150px;">
-														<p class="title"><span>交期(天):</span><span  ng-bind="goods.b2cMinDelivery == goods.b2cMaxDelivery ? goods.b2cMinDelivery : goods.b2cMinDelivery  + '-' + goods.b2cMaxDelivery">5-8</span></p>
-														<p class="title"><span ng-bind="(storeInfo.uuid != 'undefind' && goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'" class="text-center"></span></p>
-													</div>
-													<div class="content contents width80">
-														<p class="title" ng-if="goods.status == '612' || goods.status == '613'">未上架</p>
-														<p class="title upload" style="color: #33b401;" ng-if="goods.status == '601' || goods.status == '602'">已上架</p>
-													</div>
-													<div class="content" style="width: 56px; float: right; margin-right: 2px;margin-top: 12px;">
-														<div class="input-list">
-															<button class="off" ng-click="editGoods(material, goods)">编辑</button>
-															<button ng-if="goods.status != 601 && goods.status != 602" class="ok" ng-click="putOn(material, goods)">上架</button>
-															<button class="ok" ng-click="isRecommendGoods(goods)" name ="delete-goods">删除</button>
-														</div>
-													</div>
-												</div>
-											</td>
-										</tr>
-										<tr class="hei12">
-											<td colspan="10" class="hei2"></td>
-										</tr>
-										<!--编辑内容-->
-										<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>
-											</td>
-										</tr>
-										<tr class="edit-content edits" ng-show="goods.edit">
-											<td colspan="10" style="background:#f0f7fd;">
-                                                <div class="blue-bg">
-													<div></div>
-													<div class="img">
-														<a><img ng-src="{{goods.editPic || 'static/img/store/common/default.png'}}" alt="img"/></a>
-														<div class="edit-img">
-															<a ng-if="goods.editPic" ng-click="deleteImg(goods)" class="delete-img" title="删除"><i class="fa fa-trash"></i></a>
-															<a ng-click="editGoodsPicture(goods.editPic || 'static/img/store/common/default.png', goods)" title="修改图片"><img ng-src="static/img/icon/update-img.png" /></a>
-														</div>
-													</div>
-													<div class="content margin10">
-														<!--<p class="title">包装/生产日期</p>-->
-														<div class="input-list">
-															<span class="tit">包装:</span><!--<input type="text" class="select" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
-																							   ng-class="{'error' : goods.editPackagingInvalid}"
-																							   ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>-->
-															<select ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'" class="select-adder select-package" title="包装">
-																<option ng-repeat="item in packageArray" ng-click="showClickText(goods, item)">{{item}}</option>
-															</select>
-															<!--<div class="dropdown">
-																<input class="btn btn-default dropdown-toggle button-select select-adder" type="text" id="dropdownMenu1" ng-model="goods.editPackaging" placeholder="包装方式" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" readonly="readonly">
-																<ul class="dropdown-menu .dropdown-menu-left button-option" aria-labelledby="dropdownMenu1">
-																	<li ng-repeat="item in packageArray" ng-click="showClickText(goods, item)">{{item}}</li>
-																</ul>
-															</div>-->
-														</div>
-														<div class="input-list produceDate-fix">
-															<span class="tit">生产日期:</span><input type="text" class="form-control" name="produceDate" ng-maxlength="11" title="生产日期" maxlength="11" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate"
-																								 ng-class="{'error' : goods.editProduceDateInvalid}"
-																								 ng-change="editProduceDateFa(goods, true)"/>
-															<!--<select name="breakUp" title="breakUp" class="select-adder form-control" style="width: 108px;" ng-model="goods.breakUp">-->
-															<!--<option value="1">可拆卖</option>-->
-															<!--<option value="0">不可拆卖</option>-->
-															<!--</select>-->
-														</div>
-														<div class="clearfix produceDate-fix ">
-															<span>可拆卖:</span>
-															<span class="switch"><button ng-class="{'active' : goods.editBreakUp}"
-																						 ng-click="toggleIsBreadUp(goods, true)"></button></span>
-														</div>
-													</div>
-													<div class="content margin10">
-														<!--<p class="title">库存</p>-->
-														<div class="input-list">
-															<span class="tit"  style="width: 84px">库存:</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.editReserve" ng-blur="setPriceMaxAmount(goods, true)"
-																							   maxlength="9" oninput="if(value.length>9)value=value.slice(0,9)"
-																							   ng-class="{'error' : goods.editReserveInvalid}"/>
-														</div>
-														<div class="input-list">
-															<span class="tit" style="width: 84px">最小起订量:</span><input type="number" class="wid70 form-control" name="minBuyQty"
-																								maxlength="6"
-																								oninput="if(value.length>6)value=value.slice(0,6)"
-																								title="起订"  placeholder="数量" ng-model="goods.editMinBuyQty" ng-change="updateStartNumber(goods)"
-																								ng-blur="setPriceMinAmount(goods, true)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
-														</div>
-														<div class="input-list">
-															<span class="tit"  style="width: 84px">最小包装数:</span><input type="number" class="width70 form-control" name="minPackQty" title="最小包装数"  placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)"
-																								 maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)"
-																								 ng-class="{'error' : goods.editMinPackQtyInValid}"
-																								 style="width: 70px;"/>
-														</div>
-														<!--<div class="input-list">-->
-															<!--<span class="tit"  style="width: 84px">规格:</span><input class="width70 form-control" name="spec" title="规格"  placeholder="规格" ng-model="goods.spec"-->
-																																		<!--maxlength="50"-->
-																																		<!--style="width: 70px;"/>-->
-														<!--</div>-->
+									</div>
+									<div style="clear: both"></div>
+								</td>
+								<td style="text-align: left">
+									<div class="overHidden" ng-if="material.pbranden" title="{{material.pbranden}}">品牌:{{material.pbranden}}</div>
+									<div class="overHidden" ng-if="!material.pbranden" title="{{material.pbrand}}">品牌:{{material.pbrand}}</div>
+									<div class="overHidden" ng-if="material.kind" title="{{material.kind}}">物料名称:{{material.kind}}</div>
+									<div class="overHidden" ng-if="!material.kind" title="{{material.kinden}}">>物料名称:{{material.kinden}}</div>
+									<div class="overHidden" ng-if="material.cmpUuId" title="{{material.pcmpcode}}">型号:<a ng-href="product/component/{{material.cmpUuId}}/">{{material.pcmpcode}}</a></div>
+									<div class="overHidden" ng-if="!material.cmpUuId" title="{{material.pcmpcode}}">型号:{{material.pcmpcode}}</div>
+									<div class="overHidden" title="{{material.spec || '-'}}">规格:{{material.spec || '-'}}</div>
+								</td>
+								<td style="text-align: left">
+									<div class="overHidden">包装方式:</div>
+									<div class="overHidden">生成日期:</div>
+									<div class="overHidden">最小包装数:</div>
+									<div class="overHidden">
+										<div class="fl">规格书:</div>
+										<div class="Regulpic fl" ng-if="material.productAttachSubmit || material.attach">
+											<a href="{{material.productAttachSubmit.uploadAttach || material.attach}}" target="_blank"  class="Regulpica">
+												<span style="cursor: pointer;">
+													<img style="width:24px;height:26px;border: 0px" src="static/img/vendor/images/pdf.png"/>
+													<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="material.productAttachSubmit.uploadAttach">
+														<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>
+														<div class="forAdminLook">待审核</div>
 													</div>
-													<div class="content">
-														<p class="title height24">梯度/pcs</p>
-														<div class="input-list" ng-repeat="price in goods.editPrices">
-															<p>
-																<span  style="overflow: hidden;"><input ng-disabled="$index == 0" type="number" class="wid42 form-control fl"  placeholder="数量" ng-model="price.start" ng-blur="editQty(goods, $index, false, price.start)"
-																										oninput="if(value.length>9)value=value.slice(0,9)"/></span><em class="up fl" ng-if="$last">以上</em>
-																<span style="margin-left: 4px;" ng-if="!$last">–</span>
-																<span ng-if="!$last"><input type="number" class="wid42 form-control"  placeholder="数量" ng-model="price.end" ng-blur="editQty(goods, $index, true, price.end)"
-																														   oninput="if(value.length>9)value=value.slice(0,9)"/></span>
-															</p>
+												</span>
+											</a>
+										</div>
+										<div class="fl" ng-if="!material.attach && !material.productAttachSubmit.uploadAttach">
+											-
+										</div>
+										<div class="clearfix"></div>
+									</div>
+								</td>
+								<td style="text-align: left">
+									<div class="overHidden">成本单价:</div>
+									<div class="overHidden">库存数量:</div>
+									<div class="overHidden">最小起订量:</div>
+									<div class="overHidden">交期(天):</div>
+								</td>
+								<td>
+									<ul style="border: 1px solid #dcdcdc; width: 152px;margin: 0 auto">
+										<li style="background: #f1f3f6;font-size: 14px;color: #333;">
+											<span class="fl w50" style="width: 50%">分段数量</span>
+											<span class="fl w50" style="width: 50%">分段价格</span>
+											<div class="clearfix"></div>
+										</li>
+										<li style="font-size: 14px;color: #333;background: #fff;border-bottom:1px solid #dcdcdc">
+											<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">1+</span>
+											<span class="fl w50" style="width: 50%">¥5</span>
+											<div class="clearfix"></div>
+										</li>
+										<li style="font-size: 14px;color: #333;background: #fff">
+											<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">1000+</span>
+											<span class="fl w50" style="width: 50%">¥20</span>
+											<div class="clearfix"></div>
+										</li>
+									</ul>
+								</td>
+								<td>
+									<div>自营</div>
+									<div>可拆包</div>
+									<div>已上架</div>
+								</td>
+								<td class="edit">
+									<div style="text-align: center">
+										<span ng-click="editRegulPicture(material.productAttachSubmit.uploadAttach || material.attach || 'static/img/vendor/images/upload_file_icon.png', material)">
+											<span>编辑物料</span>
+											<!--编辑物料-->
+										</span>
+									</div>
+									<!---->
+									<div style="text-align: center">
+										<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper">
+											<span>编辑上下架</span>
+										</span>
+									</div>
+									<!--<span  style="display: block" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)">-->
+										<!--<span ng-if="material.batchCount">添加产品</span>-->
+										<!--<span ng-if="!material.batchCount">编辑上架</span>-->
+									<!--</span>-->
+									<div style="text-align: center">
+										<span ng-click="lookActiveIndex($index, material)">
+											<span>替代物料</span>
+										<!--<span>查看</span></span>/<span ng-click="setActiveIndex($index,material)"><span>编辑替代物料</span>-->
+										</span>
+									</div>
+									<div style="text-align: center">
+										<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
+									</div>
+									<!--<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>-->
+									<!--<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>
+								<!--<td>-->
+									<!--<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>-->
+								<!--</td>-->
+								<!--<td>-->
+									<!--<div class="ellipsis-div" ng-if="material.pbranden" ng-bind="material.pbranden" title="{{material.pbranden}}"></div>-->
+									<!--<div class="ellipsis-div" ng-if="!material.pbranden" ng-bind="material.pbrand" title="{{material.pbrand}}"></div>-->
+								<!--</td>-->
+								<!--<td>-->
+									<!--<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>-->
+									<!--<span ng-if="!material.kind" ng-bind="material.kinden || '-'" title="{{material.kinden || '-'}}"></span>-->
+								<!--</td>-->
+								<!--<td>-->
+																<!--<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>-->
+									<!--<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>-->
+								<!--</td>-->
+								<!--<td style="overflow: initial;">-->
+									<!--<div class="Regulpic" ng-if="material.productAttachSubmit || material.attach">-->
+										<!--<a href="{{material.productAttachSubmit.uploadAttach || material.attach}}" target="_blank"  class="Regulpica">-->
+											<!--<span style="cursor: pointer;">-->
+												<!--<img style="width:24px;height:26px;border: 0px" src="static/img/vendor/images/pdf.png"/>-->
+												<!--<div style="position: relative;display: inline-block" class="ToforAdminLook" ng-if="material.productAttachSubmit.uploadAttach">-->
+													<!--<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>-->
+													<!--<div class="forAdminLook">待审核</div>-->
+												<!--</div>-->
+											<!--</span>-->
+										<!--</a>-->
+									<!--</div>-->
+									<!--<div ng-if="!material.attach && !material.productAttachSubmit.uploadAttach">-->
+									 <!-- - -->
+									<!--</div>-->
+								<!--</td>-->
+								<!--<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>-->
+								<!--<td>-->
+									<!--<span ng-bind="material.encapsulation || '-'" title="{{material.encapsulation || '-'}}"></span>-->
+								<!--</td>-->
+
+							</tr>
+							<!--展开内容-->
+							<tr ng-show="material.addGoodsOper  || (material.exPandOper && material.goodsArr.length > 0)">
+								<td colspan="8" style="padding: 0;">
+									<div class="show-content">
+										<div class="content-body">
+											<table class="public-tab table">
+																						<tbody ng-if="material.addGoodsOper && material.selected">
+																						<!--添加产品-->
+																						<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>
+																								</td>
+																						</tr>
+																						<tr class="edit-content edits" >
+																								<td colspan="10" style="background:#f0f7fd;">
+																										<div class="blue-bg">
+															<div></div>
+																												<div class="img">
+																														<a><img ng-src="{{goods.editPic || 'static/img/store/common/default.png'}}" alt="img"/></a>
+																														<div class="edit-img">
+																																<a ng-click="deleteImg(goods)" class="delete-img" title="删除" ng-if="goods.editPic"><i class="fa fa-trash"></i></a>
+																																<a ng-click="editGoodsPicture(goods.editPic || 'static/img/store/common/default.png', goods)" title="修改图片"><img ng-src="static/img/icon/update-img.png" /></a>
+																														</div>
+																												</div>
+																												<div class="content margin10">
+																														<!--<p class="title">包装/生产日期</p>-->
+																														<div class="input-list">
+																																<span class="tit">包装:</span><!--<input type="text" class="form-control" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
+																																																	 ng-class="{'error' : goods.editPackagingInvalid}" ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>-->
+																	<select ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'"  class="select-adder select-package" title="包装">
+																		<option ng-repeat="item in packageArray" ng-click="showText(item)">{{item}}</option>
+																	</select>
+																	<!--<div class="dropdown">
+																		<input class="btn btn-default dropdown-toggle button-select select-adder" id="dropdownMenu2" type="text" ng-model="goods.editPackaging" placeholder="包装方式" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" readonly="readonly">
+																		<ul class="dropdown-menu .dropdown-menu-left button-option" aria-labelledby="dropdownMenu2">
+																			<li ng-repeat="item in packageArray" ng-click="showText(item)">{{item}}</li>
+																		</ul>
+																	</div>-->
+																														</div>
+																														<div class="input-list produceDate-fix">
+																																<span class="tit">生产日期:</span><input type="text" class="form-control" name="produceDate" ng-maxlength="12" title="生产日期" maxlength="12" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate"
+																																																		 ng-class="{'error' : goods.editProduceDateInvalid}"
+																																																		 ng-change="editProduceDateFa(goods, false)"/>
+																														</div>
+																														<div class="clearfix produceDate-fix">
+																																<span>可拆卖:</span>
+																																<span class="switch"><button ng-class="{'active' : goods.editBreakUp}"
+																																															 ng-click="toggleIsBreadUp(goods, false)"></button></span>
+																														</div>
+																												</div>
+																												<div class="content margin10">
+																														<!--<p class="title">库存</p>-->
+																														<div class="input-list">
+																																<span class="tit" style="width: 84px">库存:</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量"
+																																																	 ng-model="goods.editReserve" maxlength="9" ng-blur="setPriceMaxAmount(goods, false)" ng-class="{'error' : goods.editReserveInvalid}" oninput="if(value.length>9)value=value.slice(0,9)"/>
+																														</div>
+																														<div class="input-list">
+																																<span class="tit" style="width: 84px">最小起订量:</span><input type="number" class="wid70 form-control" name="minBuyQty" title="最小起订量"  placeholder="数量"
+																																																		maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" ng-model="goods.editMinBuyQty" ng-blur="setPriceMinAmount(goods, false)" ng-change="updateStartNumber(goods)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
+																														</div>
+																														<div class="input-list">
+																						<span class="tit" style="width: 84px">最小包装数:</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="最小包装数" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
+																														</div>
+																<!--<div class="input-list">-->
+																	<!--<span class="tit" style="width: 84px">规格:</span><input maxlength="40" class="wid70 form-control" name="minPackQty" title="规格" placeholder="规格" ng-model="goods.spec"  style="width: 70px;"/>-->
+																<!--</div>-->
+																												</div>
+																												<div class="content">
+																														<p class="title height24">梯度/pcs</p>
+																														<div class="input-list" ng-repeat="price in goods.editPrices">
+																																<p>
+																																		<span style="overflow: hidden;"><input ng-disabled="$index == 0" type="number" class="wid42 form-control fl" ng-class="{'error' : price.startInValid}"
+																																											 placeholder="数量" ng-model="price.start" ng-blur="editQty(goods, $index, false, price.start)" oninput="if(value.length>9)value=value.slice(0,9)"/></span><em
+																			class="up fl" ng-if="$last">以上</em>
+																																		<span style="margin-left: 4px;" ng-if="!$last">–</span>
+																																		<span ng-if="!$last"><input type="number" class="wid42 form-control" ng-class="{'error' : price.endInValid}"  placeholder="数量" ng-model="price.end" ng-blur="editQty(goods, $index, true, price.end)"
+																																																													 oninput="if(value.length>9)value=value.slice(0,9)"/></span>
+																																</p>
+																														</div>
+																												</div>
+																												<div class="content" ng-if="!store.enType || store.enType === 'HK'">
+																														<p class="title height24">单价($)</p>
+																														<div
+																																		class="input-list" ng-repeat="price in goods.editPrices">
+																																		<input type="number" name="usd" class="wid92 form-control"  placeholder="单价($)" ng-blur="changePrices(goods.editPrices, price.uSDPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.uSDPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
+																														</div>
+																												</div>
+																												<div class="content" ng-if="!store.enType || store.enType === 'MAINLAND'">
+																														<p class="title height24">单价(¥)</p>
+																														<div
+																																		class="input-list" ng-repeat="price in goods.editPrices">
+																																		<input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(¥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
+																														</div>
+																												</div>
+																												<div class="content plusBtn">
+																														<p class="title height24">&nbsp;</p>
+																														<div class="input-list" ng-repeat="price in goods.editPrices" style="height: 24px;line-height: 24px;margin-bottom: 5px;">
+																																<a class="reduce" ng-disabled="goods.editPrices.length < 2" ng-click="deleteFragment(goods, $index)"><i class="fa fa-minus-circle" ng-class="{ 'restrict-color': goods.editPrices.length === 1 }"></i></a>
+																																<a class="add" ng-click="addFragment(goods)"  ng-disabled="goods.editPrices.length >= 3"><i class="fa fa-plus-circle"
+																																																							ng-class="{ 'restrict-color': $index === 2 }"></i></a>
+																														</div>
+																												</div>
+																												<div class="content floatLeft">
+																													<div class="">
+																														<p class="title height29">交期(天):</p>
+																														<div class="input-list">
+																																<p>
+													<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)"
+																														 ng-model="goods.editMinDelivery"
+																														 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, true, goods)"
+																														 ng-class="{'error' : goods.editMinDeliveryinValid}"/></span>
+																																		<span style="margin-left: 4px;">–</span>
+																																		<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMaxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
+																																								 ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
+																																</p>
+																														</div>
+																														<div style="clear:both"></div>
+																													</div>
+
+																												</div>
+																												<div class="content margin10">
+																														<!--<p class="title">自营 / 寄售</p>-->
+																														<div class="input-list">
+																																<select ng-disabled="!$$nonProduct.canSelfSale" name="selfSale" class="wid56 select-adder form-control" ng-model="goods.editSelfSale">
+																																		<option value="1">自营</option>
+																																		<option value="2">寄售</option>
+																																</select>
+																														</div>
+																												</div>
+																												<div class="content" style="width: 56px; float: right; margin-right: 10px;">
+																														<p class="title">&nbsp;</p>
+																														<div class="input-list">
+																																<button class="ok" ng-mouseenter="impedeBlur()" ng-mouseleave="recoveryBlur()"
+																			ng-click="addGoods(material)">保存</button>
+																																<button class="off" ng-click="closeShelArea(material)">取消</button>
+																														</div>
+																												</div>
+																										</div>
+																								</td>
+																						</tr>
+												<tr class="hei12">
+													<td colspan="10" class="hei2"></td>
+												</tr>
+																						</tbody>
+												<tbody ng-repeat="goods in material.goodsArr">
+												<tr class="define defines" ng-if="!goods.edit">
+													<td colspan="10">
+														<div class="code">SKU编码 : <span ng-bind="goods.batchCode || '-'">247823589235</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">
+													<td colspan="10">
+														<div class="bg">
+															<div></div>
+															<div class="img">
+																<img ng-src="{{goods.img || 'static/img/store/common/default.png'}}" alt="img"/>
+															</div>
+															<div class="content width140">
+																<p class="title"><span>包装:</span><span ng-bind="goods.packaging">盘装</span></p>
+																<p class="title"><span>生产日期:</span><span ng-bind="goods.produceDate" title="{{goods.produceDate}}">20160123</span></p>
+																<p class="title" ng-class="{'noBreak' : !goods.breakUp}" ng-if="goods.breakUp" ng-bind="goods.breakUp ? '可拆卖' : '不可拆卖'">不可拆卖</p>
+															</div>
+															<div class="content width130">
+																<p class="title"><span style="width:84px">库存:</span><span ng-bind="goods.reserve">9023492</span></p>
+																<p class="title"><span style="width:84px">最小起订量:</span><span ng-bind="goods.minBuyQty">90492</span></p>
+																<p class="title"><span style="width:84px">最小包装数:</span><span ng-bind="goods.minPackQty">980</span></p>
+																<!--<p class="title"><span style="width:84px">规格:</span><span ng-bind="goods.spec || '-'" title="{{goods.spec}}">980</span></p>-->
+															</div>
+															<div class="content width150">
+																<div class="title-price">
+																	<span>梯度/pcs</span>
+																	<span ng-if="goods.currencyName.indexOf('USD') > -1">单价($)</span>
+																	<span ng-if="goods.currencyName.indexOf('RMB') > -1">单价(¥)</span>
+																</div>
+																<div class="list" ng-repeat="price in goods.prices">
+																	<span ng-bind="price.start + '+'">1+</span><span
+																		ng-bind="goods.currencyName.indexOf('RMB') > -1 ? (price.rMBPrice  | formateNumber : 6): (price.uSDPrice | formateNumber : 6)">0.356</span>
+																</div>
+															</div>
+															<div class="content" style="width: 150px;">
+																<p class="title"><span>交期(天):</span><span  ng-bind="goods.b2cMinDelivery == goods.b2cMaxDelivery ? goods.b2cMinDelivery : goods.b2cMinDelivery  + '-' + goods.b2cMaxDelivery">5-8</span></p>
+																<p class="title"><span ng-bind="(storeInfo.uuid != 'undefind' && goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'" class="text-center"></span></p>
+															</div>
+															<div class="content contents width80">
+																<p class="title" ng-if="goods.status == '612' || goods.status == '613'">未上架</p>
+																<p class="title upload" style="color: #33b401;" ng-if="goods.status == '601' || goods.status == '602'">已上架</p>
+															</div>
+															<div class="content" style="width: 56px; float: right; margin-right: 2px;margin-top: 12px;">
+																<div class="input-list">
+																	<button class="off" ng-click="editGoods(material, goods)">编辑</button>
+																	<button ng-if="goods.status != 601 && goods.status != 602" class="ok" ng-click="putOn(material, goods)">上架</button>
+																	<button class="ok" ng-click="isRecommendGoods(goods)" name ="delete-goods">删除</button>
+																</div>
+															</div>
 														</div>
-													</div>
-													<div class="content" ng-if="!store.enType || store.enType === 'HK'">
-														<p class="title height24">单价($)</p>
-														<div class="input-list" ng-repeat="price in goods.editPrices">
-															<input type="number" name="usd" class="wid83 form-control"  placeholder="单价($)" ng-blur="changePrices(goods.editPrices, price.uSDPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.uSDPrice" oninput="if(value.length>11)value=value.slice(0,11)"
-																   autocomplete="off" validata-price/>
+													</td>
+												</tr>
+												<tr class="hei12">
+													<td colspan="10" class="hei2"></td>
+												</tr>
+												<!--编辑内容-->
+												<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>
+													</td>
+												</tr>
+												<tr class="edit-content edits" ng-show="goods.edit">
+													<td colspan="10" style="background:#f0f7fd;">
+																										<div class="blue-bg">
+															<div></div>
+															<div class="img">
+																<a><img ng-src="{{goods.editPic || 'static/img/store/common/default.png'}}" alt="img"/></a>
+																<div class="edit-img">
+																	<a ng-if="goods.editPic" ng-click="deleteImg(goods)" class="delete-img" title="删除"><i class="fa fa-trash"></i></a>
+																	<a ng-click="editGoodsPicture(goods.editPic || 'static/img/store/common/default.png', goods)" title="修改图片"><img ng-src="static/img/icon/update-img.png" /></a>
+																</div>
+															</div>
+															<div class="content margin10">
+																<!--<p class="title">包装/生产日期</p>-->
+																<div class="input-list">
+																	<span class="tit">包装:</span><!--<input type="text" class="select" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
+																										 ng-class="{'error' : goods.editPackagingInvalid}"
+																										 ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>-->
+																	<select ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'" class="select-adder select-package" title="包装">
+																		<option ng-repeat="item in packageArray" ng-click="showClickText(goods, item)">{{item}}</option>
+																	</select>
+																	<!--<div class="dropdown">
+																		<input class="btn btn-default dropdown-toggle button-select select-adder" type="text" id="dropdownMenu1" ng-model="goods.editPackaging" placeholder="包装方式" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" readonly="readonly">
+																		<ul class="dropdown-menu .dropdown-menu-left button-option" aria-labelledby="dropdownMenu1">
+																			<li ng-repeat="item in packageArray" ng-click="showClickText(goods, item)">{{item}}</li>
+																		</ul>
+																	</div>-->
+																</div>
+																<div class="input-list produceDate-fix">
+																	<span class="tit">生产日期:</span><input type="text" class="form-control" name="produceDate" ng-maxlength="11" title="生产日期" maxlength="11" placeholder="生产日期" style="width: 96px;" ng-model="goods.editProduceDate"
+																										 ng-class="{'error' : goods.editProduceDateInvalid}"
+																										 ng-change="editProduceDateFa(goods, true)"/>
+																	<!--<select name="breakUp" title="breakUp" class="select-adder form-control" style="width: 108px;" ng-model="goods.breakUp">-->
+																	<!--<option value="1">可拆卖</option>-->
+																	<!--<option value="0">不可拆卖</option>-->
+																	<!--</select>-->
+																</div>
+																<div class="clearfix produceDate-fix ">
+																	<span>可拆卖:</span>
+																	<span class="switch"><button ng-class="{'active' : goods.editBreakUp}"
+																								 ng-click="toggleIsBreadUp(goods, true)"></button></span>
+																</div>
+															</div>
+															<div class="content margin10">
+																<!--<p class="title">库存</p>-->
+																<div class="input-list">
+																	<span class="tit"  style="width: 84px">库存:</span><input type="number" class="wid70 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.editReserve" ng-blur="setPriceMaxAmount(goods, true)"
+																										 maxlength="9" oninput="if(value.length>9)value=value.slice(0,9)"
+																										 ng-class="{'error' : goods.editReserveInvalid}"/>
+																</div>
+																<div class="input-list">
+																	<span class="tit" style="width: 84px">最小起订量:</span><input type="number" class="wid70 form-control" name="minBuyQty"
+																										maxlength="6"
+																										oninput="if(value.length>6)value=value.slice(0,6)"
+																										title="起订"  placeholder="数量" ng-model="goods.editMinBuyQty" ng-change="updateStartNumber(goods)"
+																										ng-blur="setPriceMinAmount(goods, true)" ng-class="{'error' : goods.editMinBuyQtyInValid}"/>
+																</div>
+																<div class="input-list">
+																	<span class="tit"  style="width: 84px">最小包装数:</span><input type="number" class="width70 form-control" name="minPackQty" title="最小包装数"  placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)"
+																										 maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)"
+																										 ng-class="{'error' : goods.editMinPackQtyInValid}"
+																										 style="width: 70px;"/>
+																</div>
+																<!--<div class="input-list">-->
+																	<!--<span class="tit"  style="width: 84px">规格:</span><input class="width70 form-control" name="spec" title="规格"  placeholder="规格" ng-model="goods.spec"-->
+																																				<!--maxlength="50"-->
+																																				<!--style="width: 70px;"/>-->
+																<!--</div>-->
+															</div>
+															<div class="content">
+																<p class="title height24">梯度/pcs</p>
+																<div class="input-list" ng-repeat="price in goods.editPrices">
+																	<p>
+																		<span  style="overflow: hidden;"><input ng-disabled="$index == 0" type="number" class="wid42 form-control fl"  placeholder="数量" ng-model="price.start" ng-blur="editQty(goods, $index, false, price.start)"
+																												oninput="if(value.length>9)value=value.slice(0,9)"/></span><em class="up fl" ng-if="$last">以上</em>
+																		<span style="margin-left: 4px;" ng-if="!$last">–</span>
+																		<span ng-if="!$last"><input type="number" class="wid42 form-control"  placeholder="数量" ng-model="price.end" ng-blur="editQty(goods, $index, true, price.end)"
+																																	 oninput="if(value.length>9)value=value.slice(0,9)"/></span>
+																	</p>
+																</div>
+															</div>
+															<div class="content" ng-if="!store.enType || store.enType === 'HK'">
+																<p class="title height24">单价($)</p>
+																<div class="input-list" ng-repeat="price in goods.editPrices">
+																	<input type="number" name="usd" class="wid83 form-control"  placeholder="单价($)" ng-blur="changePrices(goods.editPrices, price.uSDPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.uSDPrice" oninput="if(value.length>11)value=value.slice(0,11)"
+																			 autocomplete="off" validata-price/>
+																</div>
+															</div>
+															<div class="content" ng-if="!store.enType || store.enType === 'MAINLAND'">
+																<p class="title height24">单价(¥)</p>
+																<div class="input-list" ng-repeat="price in goods.editPrices">
+																	<input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(¥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
+																</div>
+															</div>
+															<div class="content content5 plusBtn">
+																<p class="title height24">&nbsp;</p>
+																<div class="input-list" ng-repeat="price in goods.editPrices" style="height: 24px;line-height: 24px;margin-bottom: 5px;">
+																	<a class="reduce" ng-disabled="goods.editPrices.length < 2" ng-click="deleteFragment(goods, $index)"><i class="fa fa-minus-circle" ng-class="{ 'restrict-color': goods.editPrices.length === 1 }"></i></a>
+																	<a class="add" ng-click="addFragment(goods)"  ng-disabled="goods.editPrices.length >= 3"><i class="fa fa-plus-circle"
+																																ng-class="{ 'restrict-color': $index === 2 }"></i></a>
+																</div>
+															</div>
+															<div class="content floatLeft">
+																<p class="title height29">交期(天):</p>
+																<div class="input-list">
+																	<p>
+																		<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMinDelivery"
+																					 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, true, goods)" ng-class="{'error' : goods.editMinDeliveryinValid}"/></span>
+																		<span style="margin-left: 4px;">–</span>
+																		<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMaxDelivery"
+																					 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)" ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
+																	</p>
+																</div>
+															</div>
+															<div class="content margin10">
+																<!--<p class="title">自营 / 寄售</p>-->
+																<div class="input-list">
+																	<select name="editSelfSale" ng-change="changeSaleMode(goods)" class="wid56 select-adder form-control" ng-model="goods.editSelfSale" ng-disabled="!$$nonProduct.canSelfSale">
+																		<option value="1">自营</option>
+																		<option value="2">寄售</option>
+																	</select>
+																</div>
+																<div class="content contents">
+																	<p class="title" ng-if="goods.status == '612'">未上架</p>
+																	<p class="title" style='color: #33b401;' ng-if="goods.status == '601' || goods.status == '602'">已上架</p>
+																</div>
+															</div>
+															<div class="content" style="width: 56px; float: right; margin-right: 10px;">
+															<p class="title">&nbsp;</p>
+															<div class="input-list">
+																<button class="ok" ng-mouseenter="impedeBlur()" ng-mouseleave="recoveryBlur()" ng-click="updateGoods(material, goods)">保存</button>
+																<button class="off" ng-click="closeEditGoods(material, goods)">取消</button>
+															</div>
 														</div>
-													</div>
-													<div class="content" ng-if="!store.enType || store.enType === 'MAINLAND'">
-														<p class="title height24">单价(¥)</p>
-														<div class="input-list" ng-repeat="price in goods.editPrices">
-															<input type="number" name="rmb" class="wid92 form-control"  placeholder="单价(¥)" ng-blur="changePrices(goods.editPrices, price.rMBPrice, $index)" ng-class="{'error' : price.priceInvalid}" ng-model="price.rMBPrice" oninput="if(value.length>11)value=value.slice(0,11)" autocomplete="off" validata-price/>
 														</div>
-													</div>
-													<div class="content content5 plusBtn">
-														<p class="title height24">&nbsp;</p>
-														<div class="input-list" ng-repeat="price in goods.editPrices" style="height: 24px;line-height: 24px;margin-bottom: 5px;">
-															<a class="reduce" ng-disabled="goods.editPrices.length < 2" ng-click="deleteFragment(goods, $index)"><i class="fa fa-minus-circle" ng-class="{ 'restrict-color': goods.editPrices.length === 1 }"></i></a>
-															<a class="add" ng-click="addFragment(goods)"  ng-disabled="goods.editPrices.length >= 3"><i class="fa fa-plus-circle"
-																														ng-class="{ 'restrict-color': $index === 2 }"></i></a>
+													</td>
+												</tr>
+												</tbody>
+												<!--空状态-->
+												<tbody ng-if="currenctMaterial.length == 0">
+												<tr style="height: 190px;">
+													<td colspan="7" style="border-bottom: none;">
+														<div class="col-xs-2"  style="margin-left: 34%; margin-top: 65px;">
+															<img src="static/img/all/empty-cart.png">
 														</div>
-													</div>
-													<div class="content floatLeft">
-														<p class="title height29">交期(天):</p>
-														<div class="input-list">
-															<p>
-																<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMinDelivery"
-																			 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, true, goods)" ng-class="{'error' : goods.editMinDeliveryinValid}"/></span>
-																<span style="margin-left: 4px;">–</span>
-																<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" oninput="if(value.length>3)value=value.slice(0,3)" ng-model="goods.editMaxDelivery"
-																			 ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)" ng-class="{'error' : goods.editMaxDeliveryinValid}"/></span>
-															</p>
+														<div class="col-xs-4">
+															<p class="grey f16" style="line-height: 80px; text-align: left; margin-top: 70px;">暂无物料资料记录</p>
 														</div>
-													</div>
-													<div class="content margin10">
-														<!--<p class="title">自营 / 寄售</p>-->
-														<div class="input-list">
-															<select name="editSelfSale" ng-change="changeSaleMode(goods)" class="wid56 select-adder form-control" ng-model="goods.editSelfSale" ng-disabled="!$$nonProduct.canSelfSale">
-																<option value="1">自营</option>
-																<option value="2">寄售</option>
-															</select>
-														</div>
-														<div class="content contents">
-															<p class="title" ng-if="goods.status == '612'">未上架</p>
-															<p class="title" style='color: #33b401;' ng-if="goods.status == '601' || goods.status == '602'">已上架</p>
-														</div>
-													</div>
-													<div class="content" style="width: 56px; float: right; margin-right: 10px;">
-													<p class="title">&nbsp;</p>
-													<div class="input-list">
-														<button class="ok" ng-mouseenter="impedeBlur()" ng-mouseleave="recoveryBlur()" ng-click="updateGoods(material, goods)">保存</button>
-														<button class="off" ng-click="closeEditGoods(material, goods)">取消</button>
-													</div>
-												</div>
-												</div>
-											</td>
-										</tr>
-										</tbody>
-										<!--空状态-->
-										<tbody ng-if="currenctMaterial.length == 0">
-										<tr style="height: 190px;">
-											<td colspan="7" style="border-bottom: none;">
-												<div class="col-xs-2"  style="margin-left: 34%; margin-top: 65px;">
-													<img src="static/img/all/empty-cart.png">
-												</div>
-												<div class="col-xs-4">
-													<p class="grey f16" style="line-height: 80px; text-align: left; margin-top: 70px;">暂无物料资料记录</p>
-												</div>
-											</td>
-										</tr>
-										</tbody>
-									</table>
-								</div>
-							</div>
-						</td>
-					</tr>
-					</tbody>
-					<tbody>
-					<!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
-					</tbody>
-				</table>
-				<div class="empty" ng-if="!currenctMaterial || currenctMaterial.length == 0">
-					<p class="empty-img">
-						<img src="static/img/all/empty-cart.png">
-					</p>
-					<div class="empty-info" ng-if="currentDataNull || param.userUU">
-						<p class="grey"> 该业务员暂时没有绑定产品</p>
+													</td>
+												</tr>
+												</tbody>
+											</table>
+										</div>
+									</div>
+								</td>
+							</tr>
+						</tbody>
+						<tbody>
+						<!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
+						</tbody>
+					</table>
+					<div class="empty" ng-if="!currenctMaterial || currenctMaterial.length == 0">
+						<p class="empty-img">
+							<img src="static/img/all/empty-cart.png">
+						</p>
+						<div class="empty-info" ng-if="currentDataNull || param.userUU">
+							<p class="grey"> 该业务员暂时没有绑定产品</p>
+						</div>
+						<div class="empty-info" ng-if="!currentDataNull && !param.userUU">
+							<p class="grey"> 暂无产品信息,赶快上传让更多人看到你的产品吧 </p>
+							<a href="vendor#/vendor_upload?type=company"><i></i>马上去上传</a>
+						</div>
 					</div>
-					<div class="empty-info" ng-if="!currentDataNull && !param.userUU">
-						<p class="grey"> 暂无产品信息,赶快上传让更多人看到你的产品吧 </p>
-						<a href="vendor#/vendor_upload?type=company"><i></i>马上去上传</a>
+					<div class="record-line text-right" ng-if="currenctMaterial && currenctMaterial.length != 0">
+						<!--<div class="prompt" ng-show="standard_tab == 'unstandard'">-->
+							<!--<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件,”原厂型号“将会显示为空且不可上架售卖,<br/>-->
+							<!--如需上架可先点击 【匹配】按钮,若匹配不成功,可前往<a ui-sref="vendor_brand_apply" target="_blank"> 品牌申请/</a><a ui-sref="vendor_component_apply" target="_blank">器件申请</a>,提出申请-->
+						<!--</div>-->
+						<div class="tip">* 上架成功30分钟后,方可被客户搜索到,并在公司产品库展示。</div>
+						<div ng-if="currenctMaterial.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
+							<span ng-if="param.currentPage == materialAll.totalPages" ng-bind="materialAll.totalElements"></span>
+							<span ng-if="param.currentPage != materialAll.totalPages" ng-bind="param.page * param.count"></span>, 共: <span ng-bind="materialAll.totalElements" style="color: #5078cb;"></span> 个</div>
 					</div>
-				</div>
-				<div class="record-line text-right" ng-if="currenctMaterial && currenctMaterial.length != 0">
-					<!--<div class="prompt" ng-show="standard_tab == 'unstandard'">-->
-						<!--<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件,”原厂型号“将会显示为空且不可上架售卖,<br/>-->
-						<!--如需上架可先点击 【匹配】按钮,若匹配不成功,可前往<a ui-sref="vendor_brand_apply" target="_blank"> 品牌申请/</a><a ui-sref="vendor_component_apply" target="_blank">器件申请</a>,提出申请-->
-					<!--</div>-->
-					<div class="tip">* 上架成功30分钟后,方可被客户搜索到,并在公司产品库展示。</div>
-					<div ng-if="currenctMaterial.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
-						<span ng-if="param.currentPage == materialAll.totalPages" ng-bind="materialAll.totalElements"></span>
-						<span ng-if="param.currentPage != materialAll.totalPages" ng-bind="param.page * param.count"></span>, 共: <span ng-bind="materialAll.totalElements" style="color: #5078cb;"></span> 个</div>
-				</div>
-				<div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px; padding-bottom: 80px;" ng-if="materialAll.totalPages>1">
-					<ul class="pagination ng-table-pagination">
-						<li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">
-							<a ng-switch-when="prev" ng-click="setPage(page.type, -1)" href="">&laquo;</a>
-							<a ng-switch-when="first" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-							<a ng-switch-when="page" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-							<a ng-switch-when="more" ng-click="setPage(page.type, -1)" href="">&#8230;</a>
-							<a ng-switch-when="last" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
-							<a ng-switch-when="next" ng-click="setPage(page.type, -1)" href="">&raquo;</a>
-						</li>
-					</ul>
-					<div class="page-go-block">
-						<input
-								class="page-number" type="text" ng-model="param.currentPage" ng-keyup="listenEnter()"/>
-						<a class="page-a"
-						   ng-click="setPage('page', param.currentPage)" href="">GO</a> {{param.currentPage}}
+					<div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px; padding-bottom: 80px;" ng-if="materialAll.totalPages>1">
+						<ul class="pagination ng-table-pagination">
+							<li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">
+								<a ng-switch-when="prev" ng-click="setPage(page.type, -1)" href="">&laquo;</a>
+								<a ng-switch-when="first" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
+								<a ng-switch-when="page" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
+								<a ng-switch-when="more" ng-click="setPage(page.type, -1)" href="">&#8230;</a>
+								<a ng-switch-when="last" ng-click="setPage(page.type, page.number)" href=""><span ng-bind="page.number"></span></a>
+								<a ng-switch-when="next" ng-click="setPage(page.type, -1)" href="">&raquo;</a>
+							</li>
+						</ul>
+						<div class="page-go-block">
+							<input
+									class="page-number" type="text" ng-model="param.currentPage" ng-keyup="listenEnter()"/>
+							<a class="page-a"
+								 ng-click="setPage('page', param.currentPage)" href="">GO</a> {{param.currentPage}}
+						</div>
 					</div>
 				</div>
 			</div>
-			</div>
 			<!--自定义标签-->
 			<div class="wanted-list02" id="wanted-list02">
 				<div class="title">