shenjj 7 лет назад
Родитель
Сommit
5bc7d0a823

+ 25 - 7
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -3190,6 +3190,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         $scope.setActiveIndex(-1);
         // loadDataReload();
         toaster.pop('success', '保存成功');
+        $scope.clearCheckBox();
       }, function(response) {
         toaster.pop('error', '保存失败');
       })
@@ -3213,6 +3214,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           id: material.id
         }, function(data) {
           getChangeList(data, material)
+          material.editChangeProduct = true
         })
         // }
       } else {
@@ -3562,7 +3564,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       }
       $scope._material = material
       $scope.lookCmp = material.pcmpcode;
-      $scope.lookBrand = material.pbranden;
+      $scope.lookBrand = material.pbranden
 
       // if ($scope.resultDatalistArray[material.id]) {
       //   $scope.resultDatalist = $scope.resultDatalistArray[material.id].arr
@@ -3596,7 +3598,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.inputEl = $event
       key += 1
       $scope.inputkey = key
-      caleUllist($scope.inputEl, $scope.ultype, $scope.inputkey, $scope.ulEl)
+      // caleUllist($scope.inputEl, $scope.ultype, $scope.inputkey, $scope.ulEl)
     }
     // 针对当前人员权限重组list
     var normalChangeArr = function(arr) {
@@ -3622,7 +3624,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       if (!$scope.inputEl) {
         return false
       }
-      caleUllist($scope.inputEl, $scope.ultype, $scope.inputkey, $scope.ulEl)
+      // caleUllist($scope.inputEl, $scope.ultype, $scope.inputkey, $scope.ulEl)
     })
 
     function caleUllist($event, type, key, el) {
@@ -3673,7 +3675,6 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.Regul.iniUrlImg = 'static/img/vendor/images/upload.png'
       $scope.Regul.Regulpic =  (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach) || ChooseItem.attach || 'static/img/vendor/images/upload.png'; // 图片
       $scope.Regul.Ischange = (ChooseItem.productAttachSubmit && ChooseItem.productAttachSubmit.uploadAttach || ChooseItem.attach) ? true : false // 是否存在规格书
-      $scope.Regul.showAction = true  // 个人产品库和企业产品 还是在售产品
       $scope.Regul.IsLookOrUpdate = ChooseItem.standard === 1 ? 'look' : 'update' // 编辑还是查看
       $scope.Regul.brandcode = ChooseItem.pbranden || ChooseItem.pbrand || ($scope.Regul.IsLookOrUpdate === 'update' ? '' : '-') // 品牌
       $scope.Regul.BrandList = [] // 品牌数组
@@ -3684,9 +3685,8 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.Regul.RegulChange = (ChooseItem.standard === 1 && $scope.Regul.Ischange) ? false : true // 规格书是否可以编辑
       $scope.Regul.ChooseItem = ChooseItem
       $scope.Regul.Productpic = 'static/img/vendor/images/upload.png' // 物料图片
-      $scope.Regul.Packinfo = '' // 包装信息
-      $scope.Regul.minPackNumber = 1 // 最小包装数
-      $scope.Regul.productData = '' // 生产日期
+      $scope.Regul.Packinfo = ChooseItem.packaging || '其他' // 包装信息
+      $scope.Regul.minPackNumber = ChooseItem.minPackQty ?  ChooseItem.minPackQty : ChooseItem.goods.minBuyQty // 最小包装数
     }
 
     // 修改规格书
@@ -3739,6 +3739,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       for (var i = 0; i < $scope.currenctMaterial.length; i++) {
         $scope.currenctMaterial[i].editProductUpOff = false
         $scope.currenctMaterial[i].editRegulShow = false
+        $scope.currenctMaterial[i].editChangeProduct = false
       }
     }
     // 选择寄售还是自营
@@ -3829,6 +3830,23 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       goods.push({count: '', price: ''})
 
     }
+
+    /**
+     * 分段失去焦点。
+     * @param commodity
+     */
+    $scope.productPriceInfoBlur = function(index, val) {
+      if (index > 0) {
+        if ($scope.productUpOff.priceInfo[index].count <= $scope.productUpOff.priceInfo[index - 1].count) {
+          toaster.pop('warning', '提示', '输入值会导致梯度重叠,请重新修改')
+          $scope.productUpOff.priceInfo[index].count = ''
+          return
+        }
+        $scope.productUpOff.priceInfo[index].count = val
+      } else {
+        $scope.productUpOff.priceInfo[index].count = val
+      }
+    }
     // 对象深度拷贝
     function _deepCopy(target) {
       if (typeof target !== 'object') return

Разница между файлами не показана из-за своего большого размера
+ 25 - 945
src/main/webapp/resources/view/vendor/forstore/vendor_material.html


+ 3583 - 0
src/main/webapp/resources/view/vendor/forstore/vendor_material_old.html

@@ -0,0 +1,3583 @@
+<!--右侧主体部分-->
+<style>
+	.tab.active {
+		display: inline-block !important;
+	}
+	*{-webkit-box-sizing: border-box;  -moz-box-sizing: border-box;  box-sizing: border-box;}
+	div.wanted_list01 dt.paging-bar>span {
+		float: right;
+		width: 322px;
+		height: 40px;
+		font-weight: normal;
+	}
+	div.wanted_list01 dt.paging-bar>span button.paging-button {
+		padding: 0;
+		height: 40px;
+		line-height: 40px;
+		border: none;
+		background: #FFFFFF;
+	}
+	div.wanted_list01 dt.paging-bar>span button.paging-button:hover {
+		color: #0C3894;
+	}
+	div.wanted_list01 dt.paging-bar>span input.page-num {
+		width: 25px;
+		height: 25px;
+		line-height: 40px;
+		border: 1px #C7BEBE solid;
+		text-align: center;
+	}
+	label[disabled] {
+		cursor: not-allowed;
+	}
+
+	.pro_management .com_tab ul li {
+		margin-left: 0px;
+		position: relative;
+		width: auto
+	}
+	.pro_management .com_tab:nth-of-type(1) ul li::after{
+		background: url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.pro_management .com_tab ul li.active:after{
+		display: block
+	}
+	.pro_management .com_tab ul li.active a {
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff
+	}
+	.pro_management .com_tab2 ul li.active a {
+		background: #fff;
+		color: #666
+	}
+	.pro_management .com_tab ul.distance li {
+		margin-left: 0px;
+		color: #fff
+	}
+	.pro_management .com_tab ul.distance li a{
+		padding: 0 5px;
+	}
+	.com_tab ul li.down-goods span:hover {
+		cursor: pointer;
+		text-decoration: underline;
+	}
+	.materrial-list span.length01{
+		width: 10% !important;
+	}
+	.materrial-list span{
+		width: 20% !important;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	ul.pagination.ng-table-pagination > li > a > span {
+		height: 17px;
+		line-height: 17px;
+	}
+
+	div.ng-table-pager  input.page-number {
+		vertical-align: inherit;
+		display: inline-block;
+		width: 40px;
+		height: 31px;
+		padding: 6px 6px;
+		font-size: 14px;
+		line-height: 1.42857143;
+		color: #9B9792;
+		text-align: center;
+		background-color: #F6F5F4;
+		background-image: none;
+		border: 1px solid #ccc;
+		border-top-left-radius: 4px;
+		border-bottom-left-radius: 4px;
+		box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+		transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+	}
+
+	div.ng-table-pager a.page-a {
+		color: #fff;
+		cursor: pointer;
+		background-color: #4574E8;
+		border-color: #4574E8;
+		padding: 6px 6px;
+		font-size: 14px;
+		border-top-right-radius: 4px;
+		border-bottom-right-radius: 4px;
+		text-decoration: none;
+		height: 31px;
+	}
+
+	div.ng-table-pager div.page-go-block {
+		float: right;
+		margin-left: 20px;
+		margin-top: 15px;
+		font-size: 0px;
+		height: 31px;
+		line-height: 31px;
+	}
+	/*公用table*/
+	.public-tab{
+		margin-bottom: 0;
+	}
+	.public-tab.table tr td, .public-tab.table tr th {
+		font-size: 14px;
+		vertical-align: middle !important;
+	}
+	.public-tab.table>tbody+tbody{
+		border-top: none;
+	}
+	.public-tab.table>thead>tr{
+		height: 40px !important;
+	}
+	.public-tab.table>thead>tr>th,.public-tab.table>tbody>tr>td{
+		border-bottom: #e8e8e8 1px solid;
+		text-align: center;
+	}
+	.public-tab.table>thead>tr>th:first-child{
+		text-align:right;
+	}
+	.public-tab.table>tbody>tr>td{
+		border-top: none;
+		border-bottom: #e8e8e8 1px solid;
+	}
+	.public-tab.table>tbody>tr>td a{
+		margin: 0;
+	}
+	.public-tab.table>tbody>tr>td a.brand-type{
+		display: inline-block;
+		margin: 0;
+		width: 80%;
+		color: #333;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	.public-tab.table>tbody>tr>td span{
+		margin: 0;
+	}
+	.public-tab.table>tbody>tr>td span.brand-type{
+		display: inline-block;
+		margin: 0;
+		width: 80%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	.public-tab.table>tbody>tr>td span:hover span {
+		color: #fff;
+		background: #5078cb;
+		border-radius: 2px;
+	}
+	.public-tab.table>tbody>tr>td.edit {
+		color: #5078cb;
+	}
+	.public-tab.table>tbody>tr>td.edit span span{
+		padding: 0 5px;
+		display: inline-block;
+		/*width: 50px;*/
+		height: 24px;
+		line-height: 24px;
+		text-align: center;
+		font-size: 12px;
+		color: #5078cb;
+		cursor: pointer;
+	}
+	.public-tab.table>tbody>tr>td.edit span span:hover{
+		color: #fff;
+	}
+	/*展开收起按钮同一位置显示*/
+	.public-tab.table>tbody>tr>td.edit span.packUp{
+		margin-left: 100px;
+	}
+		/*已上架*/
+	.public-tab.table>tbody>tr>td span.has-on{
+		font-size: 14px;
+		color: #33b401;
+	}
+	/*未上架*/
+	.public-tab.table>tbody>tr>td span.not-on{
+		font-size: 14px;
+		color: #666;
+	}
+	.grey{
+		color: #999;
+	}
+	.search-check{
+		width: 100%;
+		height: auto;
+		background: #fff;
+		padding-top: 10px;
+		padding-bottom: 20px;
+		margin-bottom: 16px;
+	}
+	.search-check .search{
+		width: auto;
+		margin-right: 52px;
+		position: relative;
+	}
+	.search-check .search .prodUserList {
+		position: absolute;
+		left: 27px;
+		top: 35px;
+		font-size: 14px;
+		width: 155px;
+		max-height: 200px;
+		color: #666;
+		-webkit-box-shadow: 0 1px 6px 1px #323232a3;
+		-moz-box-shadow: 0 1px 6px 1px #323232a3;
+		box-shadow: 0 1px 6px 1px #323232;
+        z-index: 999;
+	}
+	.search-check .search .prodUserList li {
+		height: 25px;
+		line-height: 25px;
+		text-align: center;
+		background: #fff;
+	}
+	.search-check .search .prodUserList li:hover {
+		background: #e8e8e8;
+        cursor: default;
+	}
+	.search-check .search .form-control{
+		width: 340px;
+		float: left;
+		height: 34px;
+		border-radius: 0;
+		box-shadow: none;
+		border-right: none;
+	}
+	.search-check .search label {
+		position: absolute;
+		left: 5px;
+		font-size: 14px;
+		color: #666;
+		font-weight: normal;
+		height: 34px;
+		line-height: 34px;
+	}
+	.search-check .search .prod-name {
+		width: 183px;
+		padding: 0 5px 0 75px;
+	}
+	.search-check .search .keyword-material {
+		width: 260px;
+		border: #5078cb 1px solid;
+		border-radius: 2px;
+	}
+	.search-check .search button,.search-check .search a{
+		display: inline-block;
+		width: 94px;
+		height: 34px;
+		line-height: 34px;
+		text-align: center;
+		font-size: 14px;
+	}
+	.search-check .search button{
+		background: #5078cb;
+		border: #e2dbdb 1px solid;
+		border-left: none;
+		border-radius: 2px;
+		color: #fff;
+	}
+	.search-check .search a{
+		background: #5078cb;
+		color: #fff;
+		float: right;
+	}
+	.search-check .search button:hover,.search-check .search a:hover{
+		color: #fff;
+		background: #3f7ae3;
+	}
+	.search-check .check{
+		font-size: 14px;
+		line-height: 35px;
+	}
+	.search-check .check > .operate-btn{
+		font-size: 14px;
+		margin-right: 20px;
+		color: #fff !important;
+		background: #4290f7;
+		position: relative;
+		display: inline-block;
+		height: 30px;
+		line-height: 30px;
+		padding: 0 10px;
+		cursor: pointer;
+		border-radius: 2px;
+	}
+	.search-check .check > .operate-btn .expander {
+		position: absolute;
+		color: #333;
+		right: 0;
+		display: none;
+		height: 82px;
+		line-height: 26px;
+		text-align: center;
+		background: #fff;
+		bottom: -82px;
+		width: 98px;
+		z-index: 10;
+		border: 1px solid #e4e5e5;
+	}
+	.search-check .check > .operate-btn.more-operate {
+		padding: 0;
+		width: 98px;
+		height: 30px;
+		line-height: 30px;
+		text-align: center;
+		display: inline-block;
+	}
+	.search-check .check > .operate-btn.more-operate:hover .expander {
+		display: block;
+	}
+	.search-check .check > .operate-btn.more-operate .expander span {
+		display: block;
+	}
+	.search-check .check > .operate-btn.more-operate .expander span:hover {
+		color: #5078cb;
+	}
+	.pro_management .table .check-active {
+		/*margin-right: 15px;*/
+		user-select: none;
+	}
+	.pro_management .table .check-active span {
+		color: #333 !important;
+	}
+	.pro_management .table .check-active label {
+		margin-right: 0 !important;
+	}
+	.check-input {
+		position: relative;
+	}
+	.check-input img {
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
+	.check-input input{
+		display: none;
+	}
+	.check-input label {
+		width: 15px;
+		height: 15px;
+		display: inline-block;
+		background: url(static/img/user/images/check.png) no-repeat;
+		position: relative;
+		padding-left: 0 !important;
+		overflow: hidden;
+		margin-bottom: 0 !important;
+		vertical-align: sub;
+		min-height: 15px !important;
+		left: 0 !important;
+	}
+	.check-input input:checked + label{
+		background-position: -15px 0;
+	}
+	.record-line{
+		min-height: 30px;
+		font-size: 12px;
+		line-height: 35px;
+		/* margin-top: 5px; */
+		padding-right: 22px;
+		overflow: hidden;
+	}
+	.device .tab{
+		padding-bottom: 20px;
+	}
+	.wanted_list01 .pagination{
+		margin: 0;
+	}
+	.ng-table-pager{
+		padding-bottom: 20px;
+	}
+
+	.record-line .prompt{
+		text-align: left;
+		width: 495px;
+		float: left;
+		line-height: 16px;
+		padding-left: 25px;
+		padding-top: 10px;
+	}
+	.record-line .prompt a{
+		color: #5078cb;
+	}
+	/*   编辑*/
+	.edit-content td{
+		background: #daecfb;
+		padding-bottom: 20px !important;
+	}
+	.edit-content img{
+		width: 60px;
+		border: #dfdfdf 1px solid;
+		height: 60px;
+	}
+	.edit-content .form-control{
+		height: 24px;
+		padding: 0;
+		text-align: center;
+		margin-bottom: 5px;
+		line-height: 24px;
+		font-size: 12px;
+		border-radius: 3px;
+	}
+	.edit-content select.form-control{
+		margin-top: -3px;
+		padding-left: 10px;
+		line-height: 23px;
+	}
+	.edit-content p{
+		font-size: 14px;
+	}
+	.edit-content select{
+		-webkit-appearance: inherit;
+		appearance: inherit;
+	}
+	.edit-content select option{
+		text-align: center;
+	}
+	.edit-content div.content,.edit-content div.img{
+		float: left;
+		margin: 0 7px;
+	}
+	.edit-content div.content .clearfix span:first-child {
+		text-align: right;
+		width: 64px;
+		float: left;
+	}
+	.edit-content div.content .clearfix span.switch {
+		float: left;
+	}
+	.edit-content div.width140{
+		width: 156px;
+	}
+	.edit-content div.width130{
+		width: 185px;
+	}
+	.edit-content div.width150{
+		margin-right: 53px;
+		margin-top: 6px;
+		width: 157px;
+	}
+	.edit-content div.width80{
+		width: 80px;
+	}
+	.edit-content div.width80 p.upload{
+		color: #33b401;
+	}
+	.edit-content div.content5{
+		margin: 0 5px;
+	}
+	.edit-content div.floatLeft {
+		overflow: hidden;
+		padding-top: 22px;
+	}
+	.edit-content div.floatLeft .title.height29{
+		float: left;
+		height: 29px;
+		line-height: 26px;
+	}
+	.edit-content div.floatLeft .input-list{
+		float: left;
+	}
+	.edit-content .input-list .dropdown{
+		position: relative;
+	}
+	.edit-content .input-list .button-select{
+		width: 96px;
+		height: 24px;
+		border: 1px solid #a9a9a9;
+		font-size: 12px;
+		text-align: center;
+	    padding: 0;
+	}
+	.edit-content .input-list .select-package{
+		width: 96px;
+		height: 24px;
+		border: 1px solid #a9a9a9;
+		font-size: 12px;
+		text-align: center;
+		border-radius: 3px;
+		padding-left: 6px;
+	}
+	.edit-content .input-list .button-option{
+		position: absolute;
+		top: 22px;
+		left: 69px;
+		height: 63px;
+		min-width: 119px;
+		overflow: auto;
+	}
+	.edit-content .input-list .button-option li{
+		height: 30px;
+		line-height: 30px;
+		padding: 0;
+	}
+	.edit-content .produceDate-fix{
+		position: relative;
+		top: 4px;
+	}
+	.edit-content div.margin10{
+		padding-top: 24px;
+	}
+	.edit-content .wid36{
+		width: 36px;
+	}
+	.edit-content .wid48{
+		width: 48px;
+	}
+	.edit-content .wid42{
+		width: 42px;
+	}
+	.edit-content .wid92{
+		width: 92px;
+	}
+	.edit-content .wid70{
+		width: 70px;
+	}
+	.edit-content .wid83{
+		width: 83px;
+	}
+	.edit-content .wid56{
+		width: 56px;
+	}
+	.edit-content div .input-list p span{
+		float: left;
+		line-height: 24px;
+		color: #999;
+	}
+	.edit-content div .input-list p span input:first-child{
+		margin-left: 5px;
+	}
+	.edit-content div .input-list span.tit{
+		float: left;
+		width: 70px;
+		text-align: right;
+	}
+	.edit-content div .input-list input{
+		float: left;
+	}
+	.edit-content .title{
+		height: 40px;
+		line-height: 40px;
+	}
+	.edit-content .height24{
+		height: 24px;
+		line-height: 24px;
+	}
+	.edit-content .reduce{
+		color: #faa002 !important;
+		margin: 0 !important;
+	}
+	.edit-content .add{
+		color: #2ea001 !important;
+		margin: 0 !important;
+	}
+	.edit-content button{
+		width: 56px;
+		height: 24px;
+		border: none;
+		color: #fff;
+		float: left;
+	}
+	.edit-content button.off{
+		background: #f15601;
+		margin-bottom: 5px;
+	}
+	.edit-content button.ok{
+		background: #33b401;
+		margin-bottom: 3px;
+	}
+	.edit-content button:hover{
+		background: #5078cb;
+	}
+	.wanted_list01 .tab table tr.active{
+		height: 35px;
+	}
+    .wanted_list01 .tab table tr.hei12{
+        height: 2px;
+        background: #fff
+    }
+	.wanted_list01 .tab table tr.active td{
+		background: #c2dff7;
+	}
+	.wanted_list01 .tab table tbody tr.allLine:hover{
+		background: #c7ebfd;
+	}
+    .user_content .user_right {
+        position: relative ;
+    }
+	div.user_right input::-webkit-outer-spin-button,
+	div.user_right input::-webkit-inner-spin-button{
+		-webkit-appearance: none !important;
+		margin: 0;
+	}
+	div.user_right input[type="number"]{
+		-moz-appearance:textfield;
+	}
+	.public-tab td>div.ellipsis-div {
+		white-space:nowrap;
+		overflow:hidden;
+		text-overflow:ellipsis;
+	}
+	.restrict-color {
+		color: #faa002;
+	}
+	a:focus {
+		text-decoration: none;
+	}
+	.col-xs-4 .f16{
+		font-size: 14px;
+	}
+	.pro_management .table tr td div span.switch{
+		width:39px;
+		height: 14px;
+		display: inline-block;
+	}
+	.pro_management .table tr td div span.switch button{
+		border: none;
+		position: relative;
+		top: 2px;
+		left: 5px;
+		width: 39px;
+		height: 14px;
+		background: url(static/img/icon/check-off.png) no-repeat center;
+	}
+	.pro_management .table tr td div span.switch button.active{
+		background: url("static/img/icon/check-ok.png") no-repeat center;
+	}
+	/*分页鼠标悬停效果*/
+	.device .wanted_list01 a:hover {
+		 border-bottom: 1px solid #ddd!important;
+	}
+	.device .wanted_list01 a.page-a:hover{
+		color: #fff!important;
+	}
+	/*非标产品文案提示 */
+	.public-tab.table>tbody>tr>td.hei17{
+		padding:0;
+		width: 100%;
+		height: 30px;
+		line-height: 30px;
+		text-align: center;
+		font-size: 14px;
+		color: #f15601;
+		background: #fef6f2;
+		border: 1px solid #ec854d;
+		overflow: hidden;
+	}
+	.public-tab.table>tbody>tr>td.hei17 span{
+		font-size: 14px;
+		color: #f15601;
+	}
+	.public-tab.table>tbody>tr>td.hei17 a{
+		padding-right: 10px;
+		float: right;
+		font-size: 20px;
+		font-weight: bold;
+		color: #ef1d1d;
+	}
+	.public-tab.table>tbody>tr>td.hei17 a:hover{
+		color: #a10606!important;
+	}
+	.public-tab.table>tbody>tr>td.edit{
+		text-align: left;
+		padding: 8px 0;
+		overflow: visible;
+	}
+	/*如果没有展开就添加*/
+	.public-tab.table>tbody>tr>td.edit span.first{
+		margin-left: -39px;
+	}
+	.public-tab.table>tbody>tr>td a span{
+		padding: 0 5px;
+		display: inline-block ;
+		/*width: 50px;*/
+		height: 24px!important ;
+		line-height: 24px;
+		text-align: center;
+		font-size: 12px;
+		color: #5078cb;
+	}
+	.public-tab.table>tbody>tr>td a span.add{
+		width: 60px;
+	}
+	.public-tab.table>tbody>tr>td a:hover span{
+		color: #fff;
+		background: #5078cb;
+		border-radius: 2px;
+	}
+
+	/*匹配结果页*/
+	.com_tab{
+		position: relative;
+	}
+	.com_tab ul.line{
+		border-bottom: 1px solid #82d2fa;
+	}
+	.match-menu{
+		width: 100%;
+		height: 23px;
+		line-height: 23px;
+		position: absolute;
+		top: 40px;
+		/*border-top: 1px solid #82d2fa;*/
+	}
+	.match-menu span{
+		display: inline-block;
+		text-align: center;
+		width: 102px;
+		height: 23px;
+		background: #fff;
+		border-top-left-radius: 3px;
+		border-top-right-radius: 3px;
+		margin-left: 390px;
+		line-height: 23px;
+		border: 1px solid #f15601;
+		border-bottom: none;
+		position: relative;
+		bottom: 23px;
+	}
+	.match-menu span a{
+		font-size: 12px;
+		color: #999;
+		display: inline-block;
+		height: 20px;
+		width: 60px;
+	}
+	.match-menu span.active{
+		background: #fff;
+		border: #82d2fa 1px solid;
+		border-bottom: #fff 1px solid;
+	}
+	.match-menu span.active a{
+		color: #333;
+	}
+	.match-menu span i{
+		font-size: 14px;
+		color: #999;
+	}
+	.match-menu span i:hover,.match-menu span a:hover{
+		color: #5078cb;
+	}
+	.search-checks{
+		padding: 16px 25px 25px 50px;
+		background: #fff;
+		overflow: hidden;
+	}
+	.search-checks .tip .count{
+		font-size: 14px;
+		color: #333;
+	}
+	.search-checks .tip .count span{
+		font-size: 14px;
+		color: #5078cb;
+	}
+	.search-checks .tip .count em{
+		font-size: 14px;
+		font-style: normal ;
+		color: #f01a1a;
+	}
+	.search-checks .tip .apply{
+		margin-top: 5px;
+		font-size: 12px;
+		color: #333;
+	}
+	.search-checks .tip .apply a{
+		font-size: 12px;
+		color: #5078cb;
+	}
+	.search-checks .tip .apply em{
+		font-size: 12px;
+		font-style: normal ;
+		color: #e80b0b;
+	}
+	.search-checks .search{
+		position: relative;
+	}
+	.search-checks .search input{
+		width: 390px;
+		height: 36px;
+		border: 1px solid #82d2fa;
+		border-radius: 0;
+	}
+	.search-checks .search button{
+		position: absolute ;
+		right:0;
+		top: 0;
+		width: 72px;
+		height: 36px;
+		font-size: 16px;
+		text-align: center;
+		color: #fff;
+		background: #82d2fa;
+		border: none;
+	}
+	.tab-head{
+		width: 100%;
+		height: 40px;
+		text-align: center;
+		line-height: 40px;
+		font-size: 14px;
+		background: #83d2fb;
+		color: #fff;
+		min-height: 40px;
+	}
+
+	.public-tab.table>tbody>tr>td.choose{
+		position: relative;
+		text-align: center;
+	}
+	.choose input{
+		margin: 0 auto;
+		width: 147px;
+		height: 26px;
+		background: url(static/img/vendor/images/angle-down.png) no-repeat 125px center;
+		border: 1px solid #5078cb;
+		border-radius: 0;
+		cursor: pointer;
+	}
+	.choose select.choose-brand {
+		margin: 0 auto;
+		width: 147px;
+		height: 26px;
+		border-color: #5078cb;
+		border-radius: 0;
+        background-color: #eee;
+        opacity: 1;
+		-webkit-appearance: menulist;
+		appearance: menulist;
+		-o-appearance: menulist;
+		-moz-appearance: menulist;
+		-ms-appearance: menulist;
+	}
+	/*.choose ul{*/
+		/*position: absolute;*/
+		/*top: 34px;*/
+		/*left: 52px;*/
+		/*width: 147px;*/
+		/*background: #fff;*/
+		/*box-shadow: 2px 2px 5px rgba(0,0,0,.5);*/
+		/*-moz-box-shadow: 2px 2px 5px rgba(0,0,0,.5);*/
+		/*-o-box-shadow: 2px 2px 5px rgba(0,0,0,.5);*/
+		/*-webkit-box-shadow: 2px 2px 5px rgba(0,0,0,.5);*/
+		/*!*display: none;*!*/
+	/*}*/
+	/*.choose ul li{*/
+		/*padding-left:12px;*/
+		/*width: 100%;*/
+		/*height: 28px;*/
+		/*line-height: 28px;*/
+		/*text-align: left;*/
+		/*font-size: 14px;*/
+		/*color: #333;*/
+		/*cursor: pointer;*/
+	/*}*/
+	/*.choose ul li:hover,.choose ul li.active{*/
+		/*color: #fff;*/
+		/*background: #5078cb;*/
+	/*}*/
+	.public-tab.table>tbody>tr>td.confirm span{
+		display: inline-block;
+		width: 55px ;
+		height: 24px;
+		line-height: 24px;
+		text-align: center;
+		font-size: 12px;
+		color: #5078cb;
+		border: 1px solid #5078cb;
+        cursor: pointer;
+	}
+	.public-tab.table>tbody>tr>td.confirm span:hover,.public-tab.table>tbody>tr>td.confirm span.active{
+		background: #5078cb;
+		color: #fff!important;
+	}
+	.record-line .set-count{
+		position: relative;
+	}
+	.record-line .set-count input{
+		padding-left: 5px;
+		display: inline-block;
+		width: 45px;
+		height: 22px;
+		line-height: 22px;
+		border: 1px solid #dcdcdc;
+		background: url(static/img/vendor/images/angle-down.png) no-repeat 30px center;
+		cursor: pointer ;
+	}
+	.record-line .set-count ul{
+		position: absolute;
+		top: 22px;
+		left: 61px;
+		background: #fff;
+		width: 45px;
+		box-shadow: 2px 2px 5px rgba(0,0,0,.5);
+		-moz-box-shadow: 2px 2px 5px rgba(0,0,0,.5);
+		-o-box-shadow: 2px 2px 5px rgba(0,0,0,.5);
+		-webkit-box-shadow: 2px 2px 5px rgba(0,0,0,.5);
+		display: none;
+	}
+	.record-line .set-count ul li{
+		padding-left:6px;
+		width: 100%;
+		height: 22px;
+		line-height: 22px;
+		text-align: left;
+		font-size: 12px;
+		color: #333;
+		cursor: pointer;
+	}
+	.record-line .set-count select{
+		width: 45px;
+		height: 22px;
+		border-radius: 3px;
+		-webkit-appearance: menulist;
+		appearance: menulist;
+		-o-appearance: menulist;
+		-moz-appearance: menulist;
+		-ms-appearance: menulist;
+	}
+	.public-tabs.table>tbody.hover-table>tr{
+		height: 40px;
+		border-bottom: none!important;
+	}
+	.public-tabs.table>tbody.hover-table>tr:nth-child(even){
+		background: #f4f4f4;
+	}
+	.public-tabs.table>tbody.hover-table>tr>td{
+		border-bottom: none!important;
+	}
+	.public-tabs.table>tbody.hover-table>tr:nth-child(even){
+		background: #f4f4f4;
+	}
+	.public-tabs.table>tbody.hover-table>tr:hover{
+		/*background: #c7ebfd*/
+	}
+	/*限制非标和标准数量显示过多换行的问题*/
+	.com_tab2 ul.distance li {
+		min-width: 120px;
+		height: 40px;
+		line-height: 12px;
+		text-align: center;
+		color: #5078cb;
+		float: left;
+		margin-left: 25px;
+	}
+	.com_tab ul.distance li:first-child {
+		margin-right: 0px;
+	}
+	.com_tab ul li a {
+		min-width: 110px;
+		width: auto;
+	}
+	.com_tab ul.distance li a.standard{
+		min-width: 120px;
+		color: #666;
+		line-height: 40px;
+		border-top: 3px solid #fff
+	}
+	.com_tab ul.distance li a.standard em{
+		max-width: 45px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		color: #666;
+	}
+	.com_tab ul.distance li:hover a.standard em.count{
+		color: #f15601;
+	}
+	.com_tab ul.distance li.active a.standard em.count,.com_tab ul.distance li.active a.standard{
+		color: #fff;
+	}
+	.com_tab2 ul.distance li.active a.standard em.count, .com_tab2 ul.distance li.active a.standard{
+		color: #f15601
+	}
+	.com_tab2 ul.distance li.active a.standard{
+		border-top: 3px solid #f15601;
+		border-left: 1px solid #f15601;
+		border-right: 1px solid #f15601;
+	}
+	.com_tab ul.distance li.active:hover a.standard{
+		color: #f15601;
+
+	}
+	.com_tab2 ul.distance li a.standard{
+		transition: 0s all;
+	}
+	.com_tab2 ul.distance{
+		/*border-top: 3px solid #f15601;*/
+		border-bottom: 1px solid #f15601;
+	}
+	.com_tab ul.distance li:hover a.standard{
+		/*padding-top: 15px;*/
+		/*width: 112px;*/
+		color: #f15601;
+	}
+	.wanted_list01 .tab table tr.gre-bg{
+		width: 100%;
+		height: 35px;
+		line-height: 35px;
+		background: #c8e6fe;
+		border: 1px solid #84c5fb;
+	}
+	.wanted_list01 .tab table tr.gre-bg td{
+		border-top: 1px solid #84c5fb;
+	}
+	.wanted_list01 .tab table tr.gre-bg:hover{
+		background: #c8e6fe;
+	}
+	.show-content{
+		width: 100%;
+		/*height: 520px;*/
+		border: 1px solid #84c5fb;
+		border-top: none;
+		overflow: hidden;
+	}
+	.show-content .content-top{
+		width: 100%;
+		height: 35px;
+		line-height: 35px;
+		background: #c8e6fe;
+	}
+	.show-content .content-top table tr:hover{
+		background: none;
+	}
+	.show-content .content-top table tr th{
+		font-size: 14px;
+		color: #333;
+		font-weight: normal;
+	}
+	.show-content .content-body{
+		max-height: 523px;
+		overflow-y: auto ;
+	}
+	.show-content .content-body .public-tab tr.defines{
+		overflow: hidden;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
+		background: #f0f7fd;
+	}
+	.show-content .content-body .public-tab tr.defines td{
+		border-bottom: none;
+	}
+	.show-content .content-body .public-tab tr.defines .code{
+		padding-left: 20px;
+		float: left;
+		font-size:14px;
+		color: #333;
+	}
+	.show-content .content-body .public-tab tr.defines .code span{
+		font-size:14px;
+		color: #333;
+	}
+	.show-content .content-body .public-tab tr.defines .labelling{
+		float: left;
+		margin-left: 40px;
+		font-size: 14px;
+		color: #333;
+	}
+	.show-content .content-body .public-tab tr.defines .labelling span{
+		padding: 0 10px;
+		/*width: 124px;*/
+		height: 19px;
+		font-size: 12px;
+		color: #5078cb;
+		border-radius: 9px;
+        background: #fff;
+		border: 1px solid #5078cb ;
+	}
+	.show-content .content-body .public-tab tr.defines .labelling em{
+		color: #f00;
+	}
+	.show-content .content-body .public-tab tr.edit-contents td{
+		border-bottom: none;
+		padding-bottom: 10px !important;
+	}
+	.edit-contents td{
+		background: #f0f7fd;
+	}
+	.edit-contents td .bg{
+		background: #fff;
+		width: 100%;
+		height: 100px;
+	}
+	.edit-contents .content{
+		text-align: left;
+	}
+	.edit-contents div.contents p{
+		margin-top: 33px;
+	}
+	.edit-contents .bg .img{
+		padding-left: 15px;
+	}
+	.edit-contents .bg .img img{
+		margin-top: 20px;
+		border-radius: 3px;
+	}
+	.edit-contents .content .title{
+		/*margin-right: 40px;*/
+		height: 33px;
+		line-height: 33px;
+	}
+	.edit-contents .content .title span:first-child {
+		float: left;
+		width: 78px;
+		text-align: right;
+	}
+	.edit-contents .content .title span:last-child {
+		float: left;
+		width: 74px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	.edit-contents .content p.noBreak{
+		color: #f15601;
+	}
+	.edit-contents .content .list{
+		width: 170px;
+		height: 20px;
+		line-height: 20px;
+	}
+	.edit-contents .content .list:nth-child(even){
+		background: #eeeeee;
+	}
+	.edit-contents .content .list:nth-child(odd){
+		background: #f5f5f5;
+	}
+	.edit-contents .content .list span{
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+	}
+	.edit-contents .content .title-price{
+		width: 170px;
+		height: 20px;
+		line-height: 20px;
+		background: #fff;
+	}
+	.edit-contents .content .title-price span{
+		float: left;
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+	}
+	.edit-contents .content button{
+		color: #5078cb;
+		background: none;
+	}
+	.edit-contents .content button:hover{
+		background: #5078cb;
+		color: #fff;
+	}
+	.show-content .content-body .public-tab tr td.hei2{
+		padding: 0;
+		height: 5px;
+		width: 100%;
+		background: #fff;
+		border-bottom: none;
+	}
+	/*键匹配弹出框*/
+	.matchPop{
+		position: fixed;
+		z-index: 2;
+		opacity: 1;
+		background-color: white;
+		margin: -268px 0 0 -340px;
+		top: 50%;
+		left: 50%;
+		width: 680px;
+		height: 536px;
+		box-shadow: 2px 2px 5px rgba(0,0,0,.5);
+		-webkit-box-shadow: 2px 2px 5px rgba(0,0,0,.5);
+		-o-box-shadow: 2px 2px 5px rgba(0,0,0,.5);
+		-moz-box-shadow: 2px 2px 5px rgba(0,0,0,.5);
+		border-radius: 5px;
+	}
+	.matchPop .title{
+		padding-left: 55px;
+		width: 100%;
+		height:  77px;
+		overflow: hidden;
+		border-bottom: 1px solid #dcdcdc;
+	}
+	.matchPop .title .title-product{
+		padding-top: 20px;
+		float: left;
+		overflow: hidden;
+		width: 570px;
+	}
+	.matchPop .title .title-product i.fa-exclamation-circle{
+		float: left;
+		margin-top: 2px;
+		font-size: 20px;
+		color: #5078cb;
+	}
+	.matchPop .title .title-product span{
+		display: inline-block;
+		margin-left: 15px;
+		width: 530px;
+		font-size: 14px;
+		color: #333;
+		line-height: 21px;
+	}
+	.matchPop .title .close{
+		padding: 10px;
+		float: right;
+		font-size: 30px;
+		color: #9c9c9c;
+	}
+	.matchPop .content {
+		padding: 0 10px;
+		width: 100%;
+	}
+	.matchPop .content .content-box{
+		padding: 8px;
+		width: 100%;
+		max-height: 378px;
+		overflow-y: auto;
+		background: #f8f7f7;
+	}
+	.matchPop .content .content-box .content-choose{
+		margin-bottom: 5px;
+		padding-top: 8px;
+		background: #fff;
+		border: 1px dashed #5078cb;
+	}
+	.matchPop .content .content-box .content-choose .list{
+		overflow: hidden;
+		margin-bottom: 5px;
+	}
+	.matchPop .content .content-box .content-choose .fl{
+		width: 46px;
+		height: 120px;
+		line-height: 120px;
+		background: #fff;
+		text-align: center;
+	}
+	.product-detail{
+		padding: 10px 12px;
+		float:  left;
+		width: 580px;
+		height: 120px;
+		background: #f4fafd;
+		border-radius: 5px;
+		/*overflow: hidden;*/
+	}
+	.product-detail .detail{
+		float: left;
+		margin-right: 30px;
+	}
+	.product-detail .width100{
+		width: 100px;
+	}
+    .product-detail .distance {
+        margin-right: 20px !important ;
+    }
+	.product-detail .detail:last-child {
+		margin-top: -3px;
+		margin-right: 0;
+	}
+	.product-detail .detail .detail-title{
+		margin-bottom: 15px;
+		font-size: 12px;
+		color: #333;
+	}
+	.product-detail .detail .detail-title span{
+		font-size: 12px;
+		color: #333;
+	}
+	.product-detail .detail .title-price{
+		width: 170px;
+		height: 20px;
+		line-height: 20px;
+	}
+	.product-detail .detail .title-price span{
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+	}
+	.product-detail .detail .detail-price{
+		width: 170px;
+		height: 20px;
+		line-height: 20px;
+	}
+	.product-detail .detail .detail-price:nth-child(even){
+		background: #eeeeee;
+	}
+	.product-detail .detail .detail-price:nth-child(odd){
+		background: #f5f5f5;
+	}
+	.product-detail .detail .detail-price span{
+		float: left;
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+	}
+	.product-number{
+		/*overflow: hidden;*/
+		margin-bottom: 13px;
+	}
+	.product-number .code:first-child {
+		margin-right:90px;
+		float: left;
+	}
+	.product-number div.code{
+		font-size: 14px;
+		color: #323232;
+	}
+	.product-number div.code span{
+		font-size: 14px;
+		color: #323232;
+	}
+	.product-number div.code em{
+		font-size: 14px;
+		color: #f00;
+		font-style: normal;
+	}
+	.product-number div.code span.define{
+		padding: 0 10px;
+		height: 19px;
+		font-size: 12px;
+		color: #5078cb;
+		border-radius: 9px;
+		border: 1px solid #5078cb;
+	}
+	.matchPop .footer{
+		margin: 0 auto;
+		width: 100%;
+		height: 79px;
+		line-height: 79px;
+		text-align: center;
+	}
+	.matchPop .footer a{
+		display: inline-block;
+		width: 65px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 14px;
+		color: #fff;
+		text-align: center;
+		cursor: pointer;
+	}
+	.matchPop .footer a:first-child {
+		margin-right: 10px;
+		background: #5078cb;
+	}
+	.matchPop .footer a:last-child {
+		background: #bcbcbd;
+	}
+	.matchPop .footer a:hover{
+		background: #337ab7!important ;
+	}
+	.clearfix{
+		overflow: hidden;
+	}
+	#define-content {
+		width: 100%;
+		height: 30px;
+		line-height: 30px;
+		background: #ebf5fe;
+	}
+	#define-content td{
+		border-bottom: none;
+	}
+	#define-content .code{
+		padding-left: 20px;
+		float: left;
+		font-size:14px;
+		color: #333;
+	}
+	#define-content .code span{
+		font-size:14px;
+		color: #333;
+	}
+	#define-content .labelling{
+		float: left;
+		margin-left: 40px;
+		font-size: 14px;
+		color: #333;
+	}
+	#define-content .labelling span{
+		padding: 0 10px;
+		height: 19px;
+		font-size: 12px;
+		color: #5078cb;
+		border-radius: 9px;
+		border: 1px solid #5078cb ;
+	}
+	#define-content .labelling em{
+		color: #f00;
+	}
+	#define-content .labelling input{
+		padding-left: 10px;
+		width: 157px;
+		height: 24px;
+		border: 1px solid #c9c9c9;
+		background: #fff;
+		border-radius: 4px;
+	}
+	.wanted_list01 .tab table tr.edits td{
+		padding-bottom: 10px !important;
+		background: #fff;
+		border-bottom: none;
+	}
+	.wanted_list01 .tab table tr td .blue-bg{
+		overflow: hidden;
+		background: #fff!important;
+	}
+	/*图片可编辑*/
+	.wanted_list01 .tab table tr td .blue-bg .img{
+		position: relative;
+		margin: 29px 0 0 24px;
+		width: 60px;
+		height: 60px;
+	}
+	.wanted_list01 .tab table tr td .blue-bg .img img{
+		width: 60px;
+		height: 60px;
+	}
+	.wanted_list01 .tab table tr td .blue-bg .img .edit-img{
+		position: absolute;
+		left: 0;
+		top: 0;
+		margin-top: 0;
+		width: 60px;
+		height: 60px;
+		font-size: 12px;
+		background: rgba(0,0,0,.5);
+		border-radius: 3px;
+
+	}
+	.wanted_list01 .tab table tr td .blue-bg .img .edit-img a {
+		width: 100%;
+		height: 100%;
+		display: inline-block;
+		text-align: center;
+		line-height: 55px;
+		color: #fff !important;
+	}
+	.wanted_list01 .tab table tr td .blue-bg .img a.delete-img {
+		position: absolute;
+		top: 2px;
+		right: 0;
+		z-index: 20;
+		width: 20px;
+		height: 20px;
+		line-height: 16px;
+		border: none;
+	}
+	.wanted_list01 .tab table tr td .blue-bg .img .edit-img a img {
+		width: 38px;
+		height: 38px;
+	}
+	/*自定义标签*/
+	.wanted-list02{
+		padding-top: 19px;
+		margin-top: 10px;
+		width: 100%;
+		background: #fff;
+	}
+	.wanted-list02 .title{
+		overflow: hidden;
+		height: 40px;
+		line-height: 40px;
+	}
+	.wanted-list02 .title div.fl{
+        position: absolute;
+        left: -5px;
+	}
+	.wanted-list02 .title .fl img{
+		width: 105px;
+		height: 40px;
+	}
+	.wanted-list02 .title .fl span{
+		position: absolute;
+		top: 0px;
+		left: 13px;
+		font-size: 14px;
+		color: #fff;
+	}
+	.wanted-list02 .title .fr span{
+		padding-right: 73px;
+		font-size: 14px;
+		color: #5078cb;
+		cursor: pointer ;
+	}
+	.wanted-list02 .content{
+		position: relative;
+		padding-left: 15px;
+		min-height: 160px;
+	}
+	.wanted-list02 .content .hover-show {
+		position: absolute;
+		top: 21px;
+		width: 95%;
+		height: 90px;
+		background: rgba(255,255,255,.9);
+		box-shadow: 0 -15px 4px rgba(255, 255, 255, 0.8);
+		-o-box-shadow: 0 -15px 4px rgba(255, 255, 255, 0.8);
+		-moz-box-shadow: 0 -15px 4px rgba(255, 255, 255, 0.8);
+		-webkit-box-shadow: 0 -15px 4px rgba(255, 255, 255, 0.8);
+	}
+	.wanted-list02 .content h3{
+		margin: 17px 0;
+		font-size: 16px;
+		color: #333;
+	}
+	.wanted-list02 .content h3 span{
+		font-size: 16px;
+		font-weight: bold;
+		color: #fa2929;
+	}
+	.wanted-list02 .content h3 em{
+		font-size: 16px;
+		font-weight: bold;
+		color: #333;
+	}
+	.wanted-list02 .content p{
+		font-size: 14px;
+		color: #333;
+		line-height: 24px;
+	}
+	.wanted-list02 .content p span{
+		font-size:14px;
+		color: #fa2929;
+	}
+	.wanted-list02 .content .img{
+		margin: 34px auto 0;
+		padding-bottom: 40px;
+		width: 100%;
+		text-align: center ;
+		overflow: hidden;
+	}
+	.wanted-list02 .content .img div{
+		float: left;
+	}
+	.wanted-list02 .content .img div:first-child {
+		margin-right: 185px;
+		margin-left: 155px;
+	}
+	.wanted-list02 .content .img img{
+		width: 184px;
+		height: 218px;
+		margin-bottom: 19px;
+	}
+	.wanted-list02 .content .img p{
+		font-size: 14px;
+		color: #333;
+	}
+	.wanted-list02 .content .img p span{
+		font-size: 14px;
+		color: #f30a0b;
+	}
+	.public-tab.table>tbody>tr>td p em.up{
+		display: inline-block;
+		font-size: 12px;
+		margin-left: 3px;
+		margin-top: 4px;
+	}
+	/*批量导出按钮*/
+	.search-check .search a.down-goods-btn{
+		margin-top: 0!important;
+	}
+	.clearfix {
+		clear: both;
+	}
+	.public-tab.table>tbody.bg-show>tr>td.hei18{
+		height: 14px;
+		background: #f4f4f4;
+		border-bottom: none;
+	}
+
+	.edit-content .error {
+		border: 1px solid #f00!important;
+	}
+	/*一键匹配结果页头图背景色*/
+	.wanted_list01 table.fail-tab thead tr{
+		background: #dff3fd;
+	}
+	/*增加价格超过三个按钮变灰*/
+	div.plusBtn a.add[disabled] i, div.plusBtn a.reduce[disabled] i{
+		color: #c7c7c7 !important;
+		cursor: not-allowed;
+	}
+	/*删除弹出框*/
+	.modal{
+		bottom: unset!important ;
+	}
+	.modal-content{
+		-webkit-box-shadow: none;
+		box-shadow: none;
+	}
+	.com-del-box{
+		box-shadow: none;
+	}
+	.com-del-box .title i.fa-close{
+		font-size: 16px;
+	}
+	/*输入错误提示*/
+	.user_right input.error{
+		border: 1px solid red!important;
+	}
+	input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
+		background-color: #fff!important ;
+		border-color: #CCC!important ;
+	}
+	.table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{
+		padding: 0;
+	}
+	/*隐藏自定义标签说明*/
+	#wanted-list02{
+		display: none;
+	}
+    /*.modal-backdrop {
+        background-color: transparent ;
+        bottom: unset!important;
+    }*/
+    .modal{
+        bottom: unset!important;
+    }
+	.com-del-box .content{
+		position: relative;
+	}
+	.com-del-box .content .red{
+		position: absolute;
+		top: 45px;
+	}
+
+	.no-hover:hover {
+		background: none !important;
+	}
+	.standard-tab.table > tbody > tr.batch-tr {
+		height: 30px;
+	}
+	.standard-tab.table > tbody > tr.batch-tr.active {
+		position: fixed;
+		bottom: 0;
+		z-index: 2000;
+	}
+	.standard-tab.table > tbody > tr.batch-tr.active td {
+		width: 1029px;
+		border-top: 0;
+	}
+	.standard-tab.table > tbody > tr.batch-tr td {
+		padding: 0;
+		border-top: #dff3fd 1px solid;
+	}
+	.standard-tab.table>tbody>tr>td .batch-line {
+		width: 100%;
+		height: 30px;
+		background: #fdd6d6;
+		line-height: 30px;
+	}
+	.wanted_list01 .tab table th {
+		color: #333 !important;
+	}
+	.import-product {
+		border-radius: 3px;
+		width: 330px;
+		height: 170px;
+		left: 44%;
+	}
+	.import-product .content > i {
+		font-size: 12px;
+		float: right;
+		margin: 5px 5px 0 0;
+		color: #ddd;
+		cursor: pointer;
+	}
+	.import-product .content p a {
+		color: #5078cb;
+	}
+	.import-product .upload-content {
+		position: relative;
+		left: -29px;
+		margin-bottom: 10px !important;
+	}
+	.import-product .upload-content #upload_text {
+		width: 157px;
+		height: 25px;
+		border: #ccc 1px solid;
+		padding-left: 10px;
+		line-height: 25px;
+		font-size: 14px;
+	}
+	.import-product .upload-content i {
+		background: #5078cb;
+		width: 62px;
+		height: 25px;
+		display: inline-block;
+		text-align: center;
+		color: #fff;
+		line-height: 25px;
+		font-size: 12px;
+		position: absolute;
+		left: 232px;
+		top: 0;
+		border-left: #ccc 1px solid;
+		cursor: pointer;
+	}
+	.import-product .upload-content #uploadCommodity {
+		width: 218px;
+		height: 25px;
+		filter: alpha(opacity=0);
+		-moz-opacity: 0;
+		opacity: 0;
+		position: absolute;
+		left: 77px;
+		top: 0px;
+	}
+	.import-product h5 {
+		margin-bottom: 25px;
+	}
+	.import-result .content p {
+		padding: 0;
+	}
+	.import-result .content p span {
+		color: #5078cb;
+	}
+	.import-result .content h5 {
+		font-size: 14px;
+		margin-bottom: 10px;
+		margin-top: -10px;
+	}
+	.import-result .content h5 span {
+		color: red;
+	}
+	.import-result .content div a {
+		color: #fff !important;
+		background: #5078cb !important;
+	}
+
+	.import-result .content div span {
+		color: #4290f7;
+		cursor: pointer;
+	}
+
+	.edit-replace-box {
+		position: static;
+		/*width: 510px;*/
+		/*top: 20%;*/
+		/*left: 50%;*/
+		/*margin-left: -255px;*/
+		/*-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);*/
+		/*-moz-box-shadow: 0 5px 15px rgba(0,0,0,.5);*/
+		/*box-shadow: 0 5px 15px rgba(0,0,0,.5);*/
+		z-index: 1;
+		font-size: 14px;
+		/*margin: 0 auto;*/
+	}
+	.edit-replace-box .title {
+		position: relative;
+		height: 44px;
+		background: #5078cb;
+		line-height: 44px;
+		color: #fff;
+		border-top-right-radius: 5px;
+		border-top-left-radius: 5px;
+	}
+	.edit-replace-box .title > div {
+		display: inline-block;
+		padding-left: 57px;
+		width: 47%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+	.edit-replace-box .title i {
+		position: absolute;
+		right: 10px;
+		top: 8px;
+		cursor: pointer;
+	}
+	.edit-replace-box .content {
+		padding: 9px 0;
+		background: #fff;
+		/*overflow-y: scroll;*/
+    max-height: 280px;
+		position: relative;
+		z-index: 11
+	}
+  .edit-replace-box .content2 {
+    /*overflow-y: scroll;*/
+    /*max-height: 240px;*/
+		width: 550px;
+		margin: 0 auto;
+  }
+	.edit-replace-box .content .content-line {
+		margin: 0 0 14px 0;
+		position: relative;
+	}
+	.edit-replace-box .content .content-line p {
+		margin-left: 16px;
+		font-size: 14px;
+	}
+	.edit-replace-box .content .content-line .form-item {
+		display: inline-block;
+		width: 49%;
+		position: relative;
+	}
+	.edit-replace-box .content .content-line .form-item span em {
+		color: #e30e16
+	}
+	/*.edit-replace-box .content .content-line .form-item > span i {*/
+	/*color: #fd2637;*/
+	/*margin-right: 4px;*/
+	/*}*/
+	.edit-replace-box .content .content-line .form-item input {
+		border: 1px solid #bfbfbf;
+		border-radius: 2px;
+		height: 28px;
+		padding: 0 8px;
+		display: inline-block;
+		width: 140px;
+		padding: 0 8px;
+	}
+	.edit-replace-box .content .content-line .form-item.form-left span {
+		display: inline-block;
+		width: 85px;
+		text-align: right;
+	}
+	.edit-replace-box .content .content-line .form-item.form-left span 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;
+		margin-right: 4px;
+	}
+	/*.edit-replace-box .content .content-line .form-item.form-left input {
+		width: 140px;
+		padding: 0 8px;
+	}*/
+	.edit-replace-box .content .content-line .form-item.form-right {
+		padding-left: 13px;
+		position: relative;
+	}
+	/*.edit-replace-box .content .content-line .form-item.form-right input {*/
+	/*width: 101px;*/
+	/*padding: 0 8px;*/
+	/*}*/
+	.edit-replace-box .content .content-line .form-item.form-right i {
+		cursor: pointer;
+	}
+	.edit-replace-box .reminfo {
+		font-size: 12px;
+		color: #999;
+		text-align: center;
+		text-indent: 12px;
+		/*margin-bottom: 12px;*/
+	}
+	.edit-replace-box .reminfo a {
+		color: #fa4701
+	}
+	.edit-replace-box .operate {
+		background: #fff;
+		text-align: center;
+		padding-top: 15px;
+		border-bottom: 1px solid #dcdcdc;
+		border-bottom-left-radius: 5px;
+		border-bottom-right-radius: 5px;
+		/*padding-bottom: 20px;*/
+	}
+	.edit-replace-box .operate span {
+		display: inline-block;
+		width: 64px;
+		height: 28px;
+		line-height: 28px;
+		text-align: center;
+		background: #5078cb;
+		color: #fff;
+		cursor: pointer;
+	}
+	.edit-replace-box .operate span:last-child {
+		margin-left: 15px;
+		background: #acabab;
+	}
+
+	.edit-replace-box .content .content-line .form-item ul.similar-list {
+		position: absolute;
+		background: #fff;
+		border: 1px solid #b5b5b5;
+		max-height: 120px;
+		overflow-y: auto;
+		overflow-x: hidden;
+		border-radius: 3px;
+		width: 141px;
+		font-size: 14px;
+		z-index: 10;
+		right: 17px;
+	}
+	.edit-replace-box .content .content-line .form-item.form-right ul.similar-list {
+		width: 140px;
+		/*left: 65px;*/
+	}
+	.edit-replace-box .content .content-line .form-item ul.similar-list li {
+		height: 30px;
+		line-height: 30px;
+		cursor: pointer;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		padding: 0 5px;
+	}
+	.edit-replace-box .content .content-line .form-item ul.similar-list li:hover {
+		background: #5078cb;
+		color: #fff;
+	}
+	.edit-replace-box .content .content-line .form-item input.error {
+		border-color: #e30e16;
+	}
+	/*上架30分钟提示*/
+	.record-line .tip {
+		padding-left: 30px;
+		float: left;
+		font-size: 14px;
+		color: #f60e0e;
+	}
+	.Regulpic img {
+		width: 24px;
+		height: 27px;
+	}
+	div.forAdminLook {
+		margin: 0 auto;
+		width: 70px;
+		height: 25px;
+		color: #333;
+		font-size: 14px;
+		border: 1px solid #5078cb;
+		border-radius: 3px;
+		text-align: center;
+		line-height: 25px;
+		margin-top: 4px;
+		position: absolute;
+		background: #fff;
+		display: none
+	}
+	.ToforAdminLook:hover .forAdminLook {
+		display: block;
+	}
+	.com-mall-del-box .content div a {
+		width: 70px;
+		display: inline-block;
+		height: 30px;
+		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><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">
+			<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>
+			<!--匹配结果导航-->
+			<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 ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
+			<div class="search-check">
+				<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="姓名"/>
+					<ul ng-if="showSimilarUser" class="prodUserList" ng-mouseenter="similarUserObj.isInSimilarUser = true" ng-search="onSearch()" ng-mouseleave="similarUserObj.isInSimilarUser = false">
+						<li ng-repeat="item in similarUser.content" ng-click="setProdName(item)">
+							{{item.userName}}({{item.userUU}})
+						</li>
+					</ul>-->
+					<input type="text" class="form-control keyword-material" ng-model="param.keyword" ng-search="onSearch()" placeholder="品牌/型号"/>
+					<button ng-click="onSearch()">搜索</button>
+					<!--<a ng-click="download()">批量导出</a>-->
+				</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" 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>
+						<a ng-click="exitBatch()">取消</a>
+					</span>
+				</div>
+			</div>
+			<div class="wanted_list01">
+				<!--在售产品-->
+				<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 class="allLine" 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>
+									</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">包装方式:{{material.packaging || '-'}}</div>
+									<div class="overHidden">最小包装数:{{material.minPackQty || '-'}}</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>
+												</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">成本单价:{{material.price}}</div>
+									<div class="overHidden">库存数量:{{material.erpReserve}}</div>
+									<div class="overHidden">最小起订量:{{material.goods.minBuyQty || '-'}}</div>
+									<div class="overHidden" ng-if="material.goods.b2cMinDelivery === material.goods.b2cMaxDelivery">交期(天):{{material.goods.b2cMinDelivery}}</div>
+									<div class="overHidden" ng-if="material.goods.b2cMinDelivery !== material.goods.b2cMaxDelivery">交期(天):{{material.goods.b2cMinDelivery}} - {{material.goods.b2cMaxDelivery}}</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.png', material)">
+											<span>编辑物料</span>
+											<!--编辑物料-->
+										</span>
+									</div>
+									<!---->
+									<div style="text-align: center">
+										<span ng-click="editProductUpOff(material, $index)">
+											<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="clearCheckBox();setActiveIndex($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 style="height: auto" ng-show="material.editRegulShow">
+								<td colspan="7">
+									<div style="border: 1px solid #5078cb;margin: 0 10px;">
+										<div style="background: #f8f8f8;height: 39px;line-height: 39px;">编辑物料</div>
+										<div style="padding: 20px 0px;">
+											<ul style="padding-bottom: 10px;border-bottom: 1px solid #dcdcdc">
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left"><em style="color: #f01414">*</em>品牌:</div>
+														<div class="pull-left" style="position: relative;">
+															<div ng-show="Regul.IsLookOrUpdate === 'update'">
+																<!-- 可编辑状态 -->
+																<input type="text"
+																			 ng-change="onBrandChange(Regul.brandcode)"
+																			 placeholder="请输入品牌名称"
+																			 ng-blur="RegulonBrandBlur(Regul.brandcode)"
+																			 ng-model="Regul.brandcode"
+																			 class="form-control inputText" maxlength="25"/>
+																<ul class="listUl" ng-show="Regul.BrandList.value.length > 0">
+																	<li ng-repeat="item in Regul.BrandList.value" ng-click="setCode(item.nameEn)">
+																		{{item.nameEn}}
+																	</li>
+																</ul>
+															</div>
+															<div ng-show="Regul.IsLookOrUpdate === 'look'" style="width: 165px;height: 28px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+																{{brandcode}}
+															</div>
+														</div>
+													</div>
+													<div class="pull-left clearboth">
+														<div class="name pull-left"><em style="color: #f01414">*</em>物料名称:</div>
+														<div class="pull-left" style="position: relative;">
+															<div ng-show="Regul.IsLookOrUpdate === 'update'">
+																<!-- 可编辑状态 -->
+																<input type="text"
+																			 placeholder="请输入物料名称"
+																			 ng-model="Regul.kind"
+																			 class="form-control inputText" maxlength="20"/>
+															</div>
+															<div ng-show="Regul.IsLookOrUpdate === 'look'" style="width: 165px;height: 28px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+																{{Regul.kind}}
+															</div>
+														</div>
+													</div>
+													<div class="pull-left clearboth">
+														<div class="name pull-left"><em style="color: #f01414">*</em>型号:</div>
+														<div class="pull-left" style="position: relative;">
+															<div ng-show="Regul.IsLookOrUpdate === 'update'">
+																<!-- 可编辑状态 -->
+																<input type="text"
+																			 ng-change="onCodeChange(Regul.cmpcode)"
+																			 placeholder="请输入型号"
+																			 ng-blur="RegulonCodeBlur(Regul.cmpcode)"
+																			 ng-model="Regul.cmpcode"
+																			 class="form-control inputText" maxlength="100"/>
+																<ul class="listUl" ng-show="Regul.CodeList.value.length > 0">
+																	<li ng-repeat="item in Regul.CodeList.value" ng-click="setCode(item.nameEn)">
+																		{{item.code}}
+																	</li>
+																</ul>
+															</div>
+															<div ng-show="Regul.IsLookOrUpdate === 'look'" style="width: 165px;height: 28px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+																{{Regul.cmpcode}}
+															</div>
+														</div>
+													</div>
+													<div class="pull-left clearboth">
+														<div class="name pull-left">规格:</div>
+														<div class="pull-left">
+															<!-- 可编辑状态 -->
+															<input type="text"
+																		 placeholder="请输入规格参数"
+																		 ng-model="Regul.spec"
+																		 class="form-control inputText" maxlength="50"/>
+														</div>
+													</div>
+												</li>
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left">最小包装数:</div>
+														<div class="pull-left">
+															<!-- 可编辑状态 -->
+															<input type="text"
+																		 oninput="if(value.length>6)value=value.slice(0,6)"
+																		 placeholder="请输入最小包装数"
+																		 ng-model="Regul.minPackNumber"
+																		 ng-blur="setPriceMinPackAmount(Regul.minPackNumber)"
+																		 class="form-control inputText" maxlength="50"/>
+														</div>
+													</div>
+													<!--<div class="pull-left clearboth">-->
+														<!--<div class="name pull-left">生产日期:</div>-->
+														<!--<div class="pull-left">-->
+															<!--&lt;!&ndash; 可编辑状态 &ndash;&gt;-->
+															<!--<input type="text"-->
+																		 <!--placeholder="请输入生产日期"-->
+																		 <!--ng-model="Regul.productData"-->
+																		 <!--class="form-control inputText" maxlength="12"/>-->
+														<!--</div>-->
+													<!--</div>-->
+													<div class="pull-left clearboth">
+														<div class="name pull-left">包装方式:</div>
+														<div class="pull-left">
+															<!-- 可编辑状态 -->
+															<select style="text-indent: 12px" ng-model="Regul.Packinfo" ng-init="Regul.Packinfo='请选择'" class="select-adder select-package inputText" title="包装">
+																<option style="text-indent: 12px" ng-repeat="item in packageArray" ng-click="showClickText(Regul, item)">{{item}}</option>
+															</select>
+														</div>
+													</div>
+												</li>
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left">规格书:</div>
+														<div class="pull-left">
+															<div class="update-big-img clearboth">
+																<div class="previewImage">
+																	<input ng-show="!Regul.Ischange" type="file" image-upload class="uploadImage" accept=".pdf"  on-success="onUploadSuccess($data, $file)" max-size="20971520" errorSizeMsg="'文件大小不能超过20M'">
+																	<img ng-src="{{Regul.Ischange ? 'static/img/vendor/images/pdf.png' : Regul.Regulpic}}" alt="商品图片" style="height: 78px;width: 78px;">
+																	<div class="cover" style="background: rgba(0,0,0,0)">
+																		<i class="fa fa-trash" style="z-index: 98" ng-click="deleteImg()"></i>
+																	</div>
+																	<a href="{{Regul.Regulpic}}" target="_blank" ng-if="Regul.Regulpic != Regul.iniUrlImg">
+																		<div class="cover">
+																			<div class="look"><i class="fa fa-search"></i>查看</div>
+																		</div>
+																	</a>
+																</div>
+																<div class="prompt">
+																	<div><em style="color: #f00;">*</em>仅允许上传PDF格式文件,大小不超过20M</div>
+																	<div><em style="color: #f00;">*</em>规格书上传后,将在两个工作日完成审核</div>
+																	<div><em style="color: #f00;">*</em>如审核不通过,将会以消息的形式通知您</div>
+																	<div><em style="color: #f00;">*</em>已有原厂规格书的器件暂不开放上传</div>
+																	<div><em style="color: #f00;">*</em>更新规格书需重新审核</div>
+																</div>
+															</div>
+														</div>
+													</div>
+													<div class="pull-left clearboth" style="margin-left: 60px">
+														<div class="name pull-left">物料图片:</div>
+														<div class="pull-left">
+															<div class="update-big-img clearboth">
+																<div class="previewImage">
+																	<input type="file" image-upload class="uploadImage" on-success="onUploadSuccessProduct($data, $file)" max-size="1048576" error-size-msg="文件大小不能超过1M">
+																	<img ng-src="{{Regul.Productpic}}" alt="商品图片" style="height: 78px;width: 78px;">
+																	<div class="cover" style="background: rgba(0,0,0,0)">
+																		<i class="fa fa-trash" style="z-index: 98" ng-click="deleteImg()"></i>
+																	</div>
+																	<a ng-if="Regul.Regulpic != Regul.iniUrlImg">
+																		<div class="cover">
+																			<div class="look"><i class="fa fa-search"></i>查看</div>
+																		</div>
+																	</a>
+																</div>
+																<div class="prompt">
+																	<div><em style="color: #f00;">*</em>支持JPG、PNG格式文件,大小不超过1M</div>
+																</div>
+															</div>
+														</div>
+													</div>
+												</li>
+											</ul>
+											<div class="editRegulControll">
+												<div>确定</div>
+												<div ng-click="clearCheckBox()">取消</div>
+											</div>
+										</div>
+									</div>
+								</td>
+							</tr>
+							<!-- 编辑上下架  todo 单价的地方记得判断香港店铺 -->
+							<tr style="height: auto" ng-show="material.editProductUpOff">
+								<td colspan="7">
+									<div style="border: 1px solid #5078cb;margin: 0 10px;padding-bottom: 10px">
+										<div style="background: #f8f8f8;height: 39px;line-height: 39px;">编辑上下架</div>
+										<div style="padding:10px 20px 0px;border-bottom: 1px solid #dcdcdc" >
+											<ul class="pull-left">
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left">最小起订量:</div>
+														<div class="pull-left">
+															<!-- 可编辑状态 -->
+															<input type="text"
+																		 placeholder="请输入最小起订量"
+																		 maxlength="6"
+																		 class="form-control inputText"
+																		 oninput="if(value.length>6)value=value.slice(0,6)"
+																		 ng-model="productUpOff.MinBuyQty"
+																		 ng-change="ProductupdateStartNumber(productUpOff.MinBuyQty)"
+																		 ng-blur="ProductblurMinBuyQty(productUpOff.MinBuyQty)"
+																		 ng-class="{'error' : productUpOff.EditMinBuyQty}"
+															/>
+														</div>
+													</div>
+													<div class="pull-left clearboth">
+														<div class="name pull-left">交期(天):</div>
+														<input type="text"
+																	 placeholder="天数"
+																	 maxlength="3"
+																	 class="form-control inputText"
+																	 oninput="if(value.length>3)value=value.slice(0,3)"
+																	 ng-model="productUpOff.MinDelivery"
+																	 ng-blur="changeDelivery(productUpOff.MinDelivery,productUpOff.MaxDelivery, true, productUpOff)"
+																	 ng-class="{'error' : productUpOff.editMinDeliveryinValid}"
+																	 style="width: 80px;display: inline-block;"
+														/>&nbsp;-&nbsp;<input type="text"
+																	 style="width: 80px;display: inline-block;"
+																	 placeholder="天数"
+																	 maxlength="3"
+																	 class="form-control inputText"
+																	 oninput="if(value.length>3)value=value.slice(0,3)"
+																	 ng-model="productUpOff.MaxDelivery"
+																	 ng-blur="changeDelivery(productUpOff.MinDelivery, productUpOff.MaxDelivery, true, productUpOff)"
+																	 ng-class="{'error' : productUpOff.editMaxDeliveryinValid}"
+														/>
+													</div>
+												</li>
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left">可拆卖:</div>
+														<span class="switch"><button ng-class="{'active' : productUpOff.BreakUp}" ng-click="productToggleIsBreadUp('BreakUp', false)"></button></span>
+													</div>
+													<div class="pull-left clearboth" style="margin-left: 101px;">
+														<div class="name pull-left">销售方式:</div>
+														<div class="pull-left">
+															<label class="com-check-radio">
+																<input type="radio" id="{{'autoMonth' + $index}}" ng-click="productChangeSelfType(1, 'formMe')" name="date" ng-checked="material.dateArea === 'formMe'">
+																<label style="vertical-align: top" for="{{'autoMonth' + $index}}"></label>
+																自营
+															</label>
+															<label class="com-check-radio">
+																<input type="radio" id="{{'autoMonth_' + $index}}" ng-click="productChangeSelfType(2, 'autoMonth')" name="date" ng-checked="material.dateArea === 'autoMonth'">
+																<label style="vertical-align: top" for="{{'autoMonth_' + $index}}"></label>
+																寄售
+															</label>
+														</div>
+													</div>
+												</li>
+												<li class="wuliao_list clearboth">
+													<div class="pull-left clearboth">
+														<div class="name pull-left">上架:</div>
+														<span class="switch"><button ng-class="{'active' : productUpOff.GrounDing}" ng-click="productToggleIsBreadUp('GrounDing', false)"></button></span>
+													</div>
+												</li>
+											</ul>
+											<ul class="pull-left" style="margin-left: 20px;">
+												<li class="wuliao_list clearboth">
+													<div class="name pull-left">价格梯度:</div>
+													<div class="list pull-left" style="width: 280px;border: 1px solid #dcdcdc;">
+														<div 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>
+														</div>
+														<div class="plusBtn" style="font-size: 14px;color: #333;background: #fff;border-top: 1px solid #dcdcdc;position:relative" ng-repeat="price in productUpOff.priceInfo">
+															<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">
+																<input text="text" style="width: 100%;outline: 0;border: 0;text-align: center" ng-model="price.count" ng-blur="productPriceInfoBlur($index, price.count)" />
+															</span>
+															<span class="fl w50" style="width: 50%">
+																<input text="text" style="width: 100%;outline: 0;border: 0;text-align: center" ng-model="price.price" />
+															</span>
+															<div class="clearfix"></div>
+															<div class="input-list ng-scope" style="height: 24px;line-height: 24px;margin-bottom: 5px;position: absolute;right: -38px;top: 0px">
+																<a class="reduce" ng-disabled="productUpOff.priceInfo.length < 2" ng-click="productDeleteFragment(productUpOff.priceInfo, $index)" disabled="disabled"><i class="fa fa-minus-circle restrict-color" ng-class="{ 'restrict-color': productUpOff.priceInfo.length === 1 }"></i></a>
+																<a class="add" ng-click="productAddFragment(productUpOff.priceInfo)" ng-disabled="productUpOff.priceInfo.length >= 3"><i class="fa fa-plus-circle" ng-class="{ 'restrict-color': $index === 2 }"></i></a>
+															</div>
+														</div>
+													</div>
+												</li>
+											</ul>
+											<div style="clear:both"></div>
+										</div>
+										<div class="editRegulControll">
+											<div ng-click="productSave()">确定</div>
+											<div ng-click="clearCheckBox()">取消</div>
+										</div>
+									</div>
+								</td>
+							</tr>
+
+							<!-- 编辑 替换代物料 -->
+							<tr style="height: auto" ng-show="material.editChangeProduct">
+								<td colspan="7">
+									<div style="border: 1px solid #5078cb;margin: 0 10px;">
+										<div style="background: #f8f8f8;height: 39px;line-height: 39px;text-align: left;text-indent: 12px;">替代物料</div>
+										<div style="padding: 20px 0px;" class="edit-replace-box">
+											<div class="content content2">
+												<div class="content-line" ng-repeat="(key, mate) in replaceMaterialList" on-finish-render="ngRepeatFinished">
+													<div class="form-item form-left">
+														<span><i>{{key + 1}}</i><em>*</em>品牌:</span>
+
+														<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list1_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">
+														<ul class="similar-list" ng-class="'similar-list1_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
+															<li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>
+														</ul>
+
+													</div>
+													<div class="form-item form-right" style="text-align: left">
+														<span><em>*</em>型号:</span>
+														<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list2_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key, $event)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
+														<ul style="right: 64px;" class="similar-list" ng-class="'similar-list2_'+ key" ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">
+															<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(sCode.code, key)"></li>
+														</ul>
+														<i class="fa fa-minus-circle" ng-if="replaceMaterialList.length >= 1 && mate.editable != false" ng-click="setReplies('sub', key)"></i>
+														<i class="fa fa-plus-circle" ng-if="key == linearLength - 1 && mate.editable != false" ng-click="setReplies('add', key)"></i>
+													</div>
+
+												</div>
+											</div>
+											<div class="operate" style="text-align: center;color: #999;font-size: 12px;">
+												<div class="reminfo">
+													<a>*</a>您无权编辑和删除的替代型号,请联系贵公司管理员进行处理。
+												</div>
+											</div>
+											<div class="editRegulControll">
+												<div ng-click="setProductReplacesByPerson(replaceMaterialList);">确定</div>
+												<div ng-click="clearCheckBox();setActiveIndex(-1)">取消</div>
+											</div>
+										</div>
+									</div>
+
+								</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 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>
+													</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>
+						</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="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>
+					</div>
+				</div>
+			</div>
+			<!--自定义标签-->
+			<div class="wanted-list02" id="wanted-list02">
+				<div class="title">
+					<div class="fl">
+						<img src="static/img/vendor/images/label.png" alt=""/>
+						<span>自定义标签</span>
+					</div>
+					<div class="fr">
+						<span ng-click="selfTagTaggle(false)" ng-if="$$nonProduct.selfTagNoticeShow">收起 <i class="fa fa-angle-up"></i></span>
+						<span ng-click="selfTagTaggle(true)" ng-if="!$$nonProduct.selfTagNoticeShow">展开 <i class="fa fa-angle-down"></i></span>
+					</div>
+				</div>
+				<div class="content">
+					<h3>什么是自 <span>定义标签</span> <em>?</em></h3>
+					<p>自定义标签是可以让买家快速判断同一个型号品牌产品主要属性区别的标识。
+					</p>
+					<p>未填写的情况下会自动显示为 <span>“类型A”</span>、<span>“类型B"</span>,以此类推。填写后在产品详情页的展示效果如下:</p>
+					<div class="hover-show" ng-if="!$$nonProduct.selfTagNoticeShow"></div>
+					<div class="show-up" ng-if="$$nonProduct.selfTagNoticeShow">
+						<div class="img">
+							<div>
+								<img src="static/img/vendor/images/detail.png" alt=""/>
+								<p>只有一种类型的情况,<span>不显示</span>小标签</p>
+							</div>
+							<div>
+								<img src="static/img/vendor/images/detail.png" alt=""/>
+								<p>存在2种及以上类型的情况,<span>显示</span>小标签</p>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!--匹配结果列表页-->
+		<div ng-if="standard_tab == 'matchResult'" style="margin-top: -15px;">
+			<div class="search-checks">
+				<div class="tip fl">
+					<div class="count">共 <span ng-bind="matchTotal">1000</span> 个产品进行匹配,成功 <span ng-bind="matchSuccess">500</span> 个,失败 <em ng-bind="matchFail">500</em> 个</div>
+					<div class="apply"><em>*</em> 以下部分产品商城暂未收录,可前往<a href="vendor#/brand/apply/">品牌中心/</a><a href="vendor#/component/apply"> 器件申请</a>中提出申请</div>
+				</div>
+				<div class="search fr">
+					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号">
+					<button ng-click="onSearch()">搜索</button>
+				</div>
+			</div>
+			<div class="wanted_list01">
+				<div style="width: 96%; margin: 0 auto">
+					<div class="com-result-line" ng-if="resultTip"><span class="fl"><em>*</em>匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="closeTip()" class="fr">&times;</a></div>
+					<div class="tab-head">匹配失败的产品</div>
+					<table class="fail-tab public-tab table public-tabs">
+						<thead>
+						<tr>
+							<th width="60">序号</th>
+							<th width="120">物料名称</th>
+							<th width="120">品牌</th>
+							<th width="100">型号</th>
+							<!--<th width="100">封装</th>-->
+							<th width="80"></th>
+						</tr>
+						</thead>
+						<tbody class="hover-table">
+						<tr  ng-repeat="product in currenctMaterial">
+							<td>{{$index+1}}</td>
+							<td title="{{product.kind}}" ng-bind="product.kind || '-'">继电器</td>
+							<td ng-show="product.matchresults.length == 0" title="{{product.pbranden}}" ng-bind="product.pbranden">Pionhhkhnkkkkkguf</td>
+							<td class="choose" ng-show="product.matchresults.length != 0">
+								<!--<input type="text" class="form-control" ng-model="product.editBrandEn" ng-focus="onFocus(product)" ng-blur="onItemBlur()" readonly="readonly">-->
+								<!--<p>{{product.isFocus}}</p>-->
+								<!--<ul ng-if="showBrand && product.isFocus">-->
+									<!--<li ng-click="fitBrandToProduct(product, product.pbranden, null)" class="active" ng-bind="product.pbranden">主控管道</li>-->
+									<!--<li ng-click="fitBrandToProduct(product, item.branden, item.id)" ng-repeat="item in product.matchresults">{{item.branden}}</li>-->
+								<!--</ul>-->
+                                <select ng-model="product.selectBrandId" class="choose-brand" ng-init="product.selectBrandId=product.pbranden" ng-change="fitBrandToProduct(product)">
+                                    <option ng-value="product.pbranden" selected="selected">{{product.pbranden}}</option>
+                                    <option ng-value="item.id" ng-repeat="item in product.matchresults">{{item.branden}}</option>
+                                </select>
+							</td>
+							<td title="{{product.pcmpcode}}" ng-bind="product.pcmpcode || '-'">Lhhjhj-3</td>
+							<!--<td title="{{product.encapsulation}}" ng-bind="product.encapsulation  || '-'">BGA</td>-->
+							<td class="confirm"><span ng-if="product.matchresults.length != 0 && product.canMatch" ng-click="updateNStandardOne(product)">确认</span></td>
+						</tr>
+						</tbody>
+						<tr style="height: 40px;" class="no-hover">
+							<td colspan="7" style="border-bottom: none; padding: 0;">
+								<div class="record-line text-right" ng-if="chooseAllPage">
+									<span class="set-count">
+										每页显示:
+										<select ng-model="$$nonProduct.count" ng-change="fitCountToTable($$nonProduct.count)">
+											<option value="10">10</option>
+											<option value="15">15</option>
+											<option value="20">20</option>
+										</select>
+									</span>
+									显示<span>{{(param.currentPage - 1) * param.count + 1}}</span>-
+									<span ng-if="param.currentPage != materialAll.totalPages">{{param.currentPage * param.count}}</span>
+									<span ng-if="param.currentPage == materialAll.totalPages">{{materialAll.totalElements}}</span>
+									,共:<span style="color: #5078cb;">{{materialAll.totalElements}}</span>个
+								</div>
+								<div class="record-line text-right" ng-if="!chooseAllPage">
+									显示<span>1</span>-
+									<span ng-bind="currenctMaterial.length"></span>
+									,共:<span style="color: #5078cb;">{{currenctMaterial.length}}</span>个
+								</div>
+							</td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+				<div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px;" 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="number" ng-model="param.currentPage" ng-keydown="listenEnter()"/>
+						<a class="page-a" ng-click="setPage('page', param.currentPage)" href="">GO</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<!--一键匹配弹出框-->
+<div class="matchPop" ng-if="haveRepeat">
+	<div class="title">
+		<div class="title-product">
+			<i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+			<span>标准产品(型号:{{backData.brandAndCode.code}},品牌:{{backData.brandAndCode.brandEn}})已存在属性相同的子产品,请选择您需要保留的其中一条产品信息</span>
+		</div>
+		<div class="close" ng-click="cancelChoose()">&times;</div>
+	</div>
+	<div class="content">
+		<div class="content-box">
+			<div class="content-choose" ng-repeat="(key, goodsList) in repeatList">
+				<div class="list" ng-repeat="goods in goodsList">
+					<div class="fl"><input type="radio" ng-model="goodsList.selected" value="{{goods.id}}" name="{{key}}"></div>
+					<div class="product-detail">
+						<div class="product-number">
+							<div class="code">产品编号 :<span ng-bind="goods.prodNum">234353646546</span></div>
+							<div class="code"><em>*</em>自定义标签 :<span class="define" ng-bind="goods.tag">散装出售</span></div>
+						</div>
+						<div class="clearfix">
+							<div class="detail">
+								<div class="detail-title">包装:<span ng-bind="goods.packaging">盘装</span></div>
+								<div class="detail-title">库存:<span ng-bind="goods.reserve">9023492</span></div>
+								<div class="detail-title">最小起订量:<span ng-bind="goods.minBuyQty">90492</span></div>
+							</div>
+							<div class="detail distance">
+								<div class="detail-title">交期(天):
+									<span ng-if="goods.maxDelivery == goods.minDelivery">{{goods.minDelivery}}</span>
+									<span ng-if="goods.maxDelivery != goods.minDelivery">{{goods.minDelivery}}-{{goods.maxDelivery}}</span>
+								</div>
+								<div class="detail-title">最小包装数:<span ng-bind="goods.minPackQty">980</span></div>
+								<div class="detail-title">生产日期:<span ng-bind="goods.produceDate">20160123</span></div>
+							</div>
+							<div class="detail">
+								<div class="detail-title">销售方式:<span ng-bind="goods.selfSale">寄售</span></div>
+								<div class="detail-title" ng-bind="goods.breakUp ? '可拆卖':'不可拆卖'"></div>
+							</div>
+							<div class="detail width100">
+								<div class="title-price"><span>梯度/pcs</span><span>单价(<i ng-bind="goods.currencyName == 'RMB' ? '¥':'$'"></i>)</span></div>
+								<div class="detail-price" ng-repeat="price in goods.prices">
+									<span>{{price.start}}+</span>
+									<span ng-bind="goods.currencyName == 'RMB' ? price.rMBPrice : price.uSDPrice">0.356</span>
+								</div>
+								<!--<div class="detail-price"><span>200+</span><span>0.256</span></div>-->
+								<!--<div class="detail-price"><span>800+</span><span>0.156</span></div>-->
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="footer">
+		<a ng-click="cancelChoose()">取消</a><a ng-click="ensureDeleteRepeat()">确认</a>
+	</div>
+</div>
+<!--<div class="edit-replace-box" ng-if="setShowActive > -1">-->
+	<!--<div class="title">-->
+		<!--<div>型号:<span>{{lookCmp}}</span></div>-->
+		<!--<div>品牌:<span>{{lookBrand}}</span></div>-->
+		<!--<i class="fa fa-close" ng-click="lookActiveIndex(-1)"></i>-->
+	<!--</div>-->
+	<!--<div class="content content3">-->
+		<!--<div class="content-line content-line2">-->
+			<!--<div class="leftline"></div>-->
+			<!--<p class="toptitle">替代物料:</p>-->
+			<!--<div class="rightline"></div>-->
+		<!--</div>-->
+		<!--<div class="no-resulte" ng-if="resultDatalist.length == 0">暂无替代物料,赶快去<a ng-click="updateIndex()">编辑</a>吧</div>-->
+		<!--<div class="content_top" ng-if="resultDatalist.length > 0">-->
+			<!--<div class="content_toptitle">型号</div>-->
+			<!--<div class="content_toptitle">品牌</div>-->
+			<!--<div class="line"></div>-->
+		<!--</div>-->
+		<!--<ul ng-if="resultDatalist.length > 0">-->
+			<!--<li ng-repeat="list in resultDatalist">-->
+				<!--<div class="sort">{{list.detno}}</div>-->
+				<!--<div class="text">{{list.ptrCmpcode}}</div>-->
+				<!--<div class="text">{{list.ptrBranden}}</div>-->
+			<!--</li>-->
+		<!--</ul>-->
+	<!--</div>-->
+
+	<!--<div class="reminfo" style="background: #fff;text-align: right;margin: 0px;padding-right: 20px;padding-top:5px;padding-bottom: 10px" ng-if="resultDatalist.length > 0">共<span style="color: #5078cb">{{resultDatalist.length}}</span>个替代物料</div>-->
+	<!--<div class="operate">-->
+		<!--<span ng-if="resultDatalist.length >= 0" ng-click="setActiveIndex(setShowActive, _material)">编辑</span>-->
+		<!--<span ng-click="lookActiveIndex(-1)" style="background: #5078cb">关闭</span>-->
+	<!--</div>-->
+<!--</div>-->
+<!--<div class="edit-replace-box" ng-if="activeIndex > -1">-->
+	<!--<div class="title">-->
+		<!--<div>型号:<span>{{editCmp}}</span></div>-->
+		<!--<div>品牌:<span>{{editBrand}}</span></div>-->
+		<!--<i class="fa fa-close" ng-click="setActiveIndex(-1)"></i>-->
+	<!--</div>-->
+	<!--<div class="content content2">-->
+		<!--<div class="content-line">-->
+			<!--<p>替代物料:</p>-->
+		<!--</div>-->
+		<!--<div class="content-line" ng-repeat="(key, mate) in replaceMaterialList" on-finish-render="ngRepeatFinished">-->
+			<!--<div class="form-item form-left">-->
+				<!--<span><i>{{key + 1}}</i><em>*</em>品牌:</span>-->
+
+				<!--<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list1_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">-->
+				<!--<ul class="similar-list" ng-class="'similar-list1_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">-->
+					<!--<li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>-->
+				<!--</ul>-->
+
+			<!--</div>-->
+			<!--<div class="form-item form-right">-->
+				<!--<span><em>*</em>型号:</span>-->
+				<!--<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list2_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key, $event)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">-->
+				<!--<ul class="similar-list" ng-class="'similar-list2_'+ key" ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">-->
+					<!--<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(sCode.code, key)"></li>-->
+				<!--</ul>-->
+				<!--<i class="fa fa-minus-circle" ng-if="replaceMaterialList.length >= 1 && mate.editable != false" ng-click="setReplies('sub', key)"></i>-->
+				<!--<i class="fa fa-plus-circle" ng-if="key == linearLength - 1 && mate.editable != false" ng-click="setReplies('add', key)"></i>-->
+			<!--</div>-->
+
+		<!--</div>-->
+	<!--</div>-->
+
+	<!--<div class="operate">-->
+		<!--<div class="reminfo">-->
+			<!--<a>*</a>您无权编辑和删除的替代型号,请联系贵公司管理员进行处理。-->
+		<!--</div>-->
+		<!--<span ng-click="setProductReplacesByPerson(replaceMaterialList)">确定</span>-->
+		<!--<span ng-click="setActiveIndex(-1)">取消</span>-->
+	<!--</div>-->
+<!--</div>-->
+<div class="com-modal-wrap" ng-show="batchModify">
+	<div class="com-mall-del-box import-product">
+		<div class="content">
+			<i class="fa fa-close" ng-click="batchModify=false"></i>
+			<p><i class="fa fa-exclamation-circle"></i>请先<a ng-click="download()">导出产品信息</a>,将内容修改后重新导入</p>
+			<div class="upload-content">
+				<input type="text" name="txt" id="upload_text">
+				<i>选择文件</i>
+				<input type="file" id="uploadCommodity" ng-file-select="" ng-change="selectFile()" accept="*.xls,*.xlsx" ng-model="myFile" ng-multiple="false" />
+				<!--<input type="file" id="uploadCommodity">-->
+			</div>
+			<h5>温馨提示:仅修改现有产品信息</h5>
+			<div>
+				<a ng-click="batchModify=false">取消</a>
+				<a ng-click="importExcel()">导入</a>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="com-modal-wrap" ng-show="modifyResult">
+	<div class="com-mall-del-box import-result">
+		<div class="title" ng-click="modifyResult=false">
+			<i></i>
+		</div>
+		<div class="content">
+			<p><i class="fa fa-exclamation-circle"></i><span ng-bind="modifyData.success">583</span>个产品修改成功,</p>
+			<h5><span class="red" ng-bind="modifyData.filter">5</span>个产品修改失败!</h5>
+			<div>
+				<a ng-click="modifyResult=false">确定</a>
+				<span ng-if="modifyData.filter" ng-click="downloadExcel()">下载失败列表</span>
+				<form id="load-error" style="display: none;" method="get">
+					<input type="hidden" name="batch" ng-value="modifyData.batch">
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
+
+<style>
+		.wuliao_list {
+			line-height: 28px;
+			margin-bottom: 10px;
+			font-size: 14px;
+		}
+		.wuliao_list .name {
+			margin-right: 5px;
+			width: 100px;
+			text-align: right;
+			color: #666;
+		}
+		.clearboth:after, .clearboth:before{
+			content: ' ';
+			display: block;
+			visibility: hidden;
+			height: 100%;
+			clear: both;
+			zoom: 1;
+		}
+		.pull-left {
+			float: left
+		}
+		.listUl {
+			position: absolute;
+			top: 28px;
+			left: 0px;
+			width: 140px;
+			max-height: 180px;
+			overflow-y: auto;
+			background: #fff;
+			border: 1px solid #dcdcdc;
+			z-index: 100;
+		}
+		.listUl li {
+			font-size: 14px;
+			color: #666;
+			line-height: 24px;
+			text-indent: 12px;
+		}
+		.listUl li:hover {
+			background: #dcdcdc;
+			cursor: pointer;
+		}
+		.editRegulControll div {
+			width: 120px;
+			height: 36px;
+			line-height: 36px;
+			font-size: 16px;
+			color: #fff;
+			border-radius: 3px;
+			text-align: center;
+			background: #5078cb;
+			margin-right: 20px;
+			display: inline-block;
+			margin-top: 20px;
+			cursor: pointer;
+		}
+		.editRegulControll div:hover {
+			background: #4290f7
+		}
+		.editRegulControll div:last-child:hover {
+			background: #6b6b6b
+		}
+		.editRegulControll div:last-child {
+			background: #aaaaaa;
+		}
+		.wuliao_list .inputText {
+			width: 140px;
+			height: 28px;
+			border-radius: 2px;
+			color: #333;
+		}
+		.wanted_list01 .tab table td {
+			overflow: inherit;
+		}
+		.uploadImage {
+			width: 100%;
+			height: 100%;
+			z-index: 10;
+			position: absolute;
+			left: 0;
+			top: 0;
+			opacity: 0;
+		}
+		.update-big-img .previewImage {
+			height: 78px;
+			width: 78px;
+			line-height: 78px;
+			text-align: center;
+			position: relative;
+			border: 1px solid #dcdcdc;
+			float: left
+		}
+		.update-big-img .prompt {
+			float: left;
+			font-size: 12px;
+			color: #999;
+			margin-left: 12px;
+			text-align: left
+		}
+		.update-big-img .prompt div {
+			line-height: 18px;
+		}
+
+		.update-big-img .previewImage img {
+			overflow: hidden;
+			line-height: 78px;
+			margin-bottom: 5px;
+			position: relative;
+			width: 100%;
+			height: 100%;
+		}
+		.cover {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			left: 0px;
+			top: 0px;
+			background: rgba(0,0,0,0.5);
+		}
+		.cover .fa-trash {
+			color: #fff;
+			font-size: 18px;
+			position: absolute;
+			right: 5px;
+			top: 5px;
+			cursor: pointer;
+		}
+    /**/
+    .wanted_list01 .empty{
+        overflow: hidden;
+        width:100%;
+        display:inline-flex;
+        justify-content:center;
+        align-items: center;
+        height:305px;
+    }
+    .wanted_list01 .empty-info{
+        line-height: 28px;
+        padding-top:10px;
+        margin-left:10px;
+        text-align:left;
+    }
+    .wanted_list01 .empty-info .grey{
+        color: #999;
+        font-size: 14px;
+    }
+    .wanted_list01 .empty .empty-info>a{
+        font-size: 14px;
+        color: #5078cb;
+    }
+    .wanted_list01 .empty .empty-info i{
+        display: inline-block;
+        width: 18px;
+        height: 18px;
+        margin-right: 5px;
+        background: url('static/img/vendor/images/upload-icon.png') no-repeat 0px 0px;
+        position: relative;
+        top: 7px;
+    }
+    .edit-replace-box .content .content-line2{
+      width: 409px;
+      margin: 0 auto
+    }
+    .edit-replace-box .content .content-line .leftline, .edit-replace-box .content .content-line .rightline{
+      height: 1px;
+      width: 150px;
+      background: #5078cb;
+      display: inline-block;
+      vertical-align: top;
+      margin-top: 8px;
+    }
+    .edit-replace-box .content .content-line p.toptitle{
+      text-align: center;
+      display: inline-block;
+      vertical-align: top;
+    }
+    .edit-replace-box .content .content_top {
+      font-size: 0;
+      margin: 0 20px;
+      position: relative;
+    }
+    .edit-replace-box .content .content_top div.content_toptitle {
+      font-size: 14px;
+      color: #333333;
+      text-align: center;
+      width: 50%;
+      display: inline-block;
+      margin-top: 12px;
+      height: 32px;
+      line-height: 32px;
+      background: #d9e3fa
+    }
+    .edit-replace-box .content .content_top div.line {
+      background: #bdd1fc;
+      width: 1px;
+      height: 24px;
+      position: absolute;
+      left: 50%;
+      top: 17px
+    }
+    .edit-replace-box .content3 ul{
+      margin: 0 20px;
+      overflow-y: auto;
+      max-height: 160px
+    }
+    .edit-replace-box .content3 ul li {
+      height: 32px;
+      line-height: 32px;
+      color: #333333;
+      font-size: 0;
+    }
+    .edit-replace-box .content3 ul li:nth-child(odd){
+      background: #eef2fd
+    }
+    .edit-replace-box .content3 ul li:nth-child(even) {
+      background: #f8f9fe
+    }
+    .edit-replace-box .content3 ul li .text{
+      font-size: 14px;
+      display: inline-block;
+      width: 40%;
+      text-align: center;
+    }
+    .edit-replace-box .content3 ul li div:nth-child(3){
+      width: 50%;
+    }
+    .edit-replace-box .content3 ul li .sort{
+      font-size: 14px;
+      display: inline-block;
+      width: 10%;
+      text-align: center;
+    }
+	  .edit-replace-box .content3 .no-resulte {
+			text-align: center;
+			padding: 15px 0;
+			color: #666
+		}
+		.edit-replace-box .content3 .no-resulte a {
+			color: #5078cb
+		}
+		.edit-replace-box .content3 .no-resulte a:hover {
+			text-decoration: underline !important;
+		}
+		.device .wanted_list01 a.Regulpica:hover {
+			text-decoration: none;
+			border-bottom: 0 !important;
+		}
+		.Regulpica:hover span{
+			background: rgba(0,0,0,0) !important;
+		}
+</style>
+
+<!--
+<script>
+	$(function(){
+		$(document).on('click', function () {
+			if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
+				$('.standard-tab.table>tbody>tr.batch-tr').addClass('active')
+			} else {
+				$('.standard-tab.table>tbody>tr.batch-tr').removeClass('active')
+			}
+		})
+		$(window).bind("scroll",function() {
+			if ($(document).scrollTop() + $(window).height() < $('.record-line').offset().top + $('.record-line').height()) {
+				$('.standard-tab.table>tbody>tr.batch-tr').addClass('active')
+			} else {
+				$('.standard-tab.table>tbody>tr.batch-tr').removeClass('active')
+			}
+		});
+	})
+</script>-->

Некоторые файлы не были показаны из-за большого количества измененных файлов