|
|
@@ -171,16 +171,15 @@
|
|
|
}
|
|
|
.search-check{
|
|
|
width: 100%;
|
|
|
- min-height: 54px;
|
|
|
height: auto;
|
|
|
+ min-height: 54px;
|
|
|
background: #fff;
|
|
|
padding-top: 10px;
|
|
|
margin-bottom: 16px;
|
|
|
}
|
|
|
.search-check .search{
|
|
|
- width: 550px;
|
|
|
+ width: 438px;
|
|
|
margin-left: 150px;
|
|
|
- margin-bottom: 10px;
|
|
|
}
|
|
|
.search-check .search .form-control{
|
|
|
width: 340px;
|
|
|
@@ -217,103 +216,58 @@
|
|
|
font-size: 14px;
|
|
|
line-height: 35px;
|
|
|
}
|
|
|
- .search-check .check a{
|
|
|
+ .search-check .check > .operate-btn{
|
|
|
font-size: 14px;
|
|
|
- margin-right: 20px;
|
|
|
- color: #333;
|
|
|
- }
|
|
|
- .search-check .check a:hover{
|
|
|
- color: #5078cb;
|
|
|
- }
|
|
|
- .search-check .check .check-active{
|
|
|
- margin-right: 15px;
|
|
|
- }
|
|
|
- .search-check .check .check-active span{
|
|
|
- font-weight: normal;
|
|
|
- color: #333;
|
|
|
- }
|
|
|
- .search-check .check .check-active span:hover{
|
|
|
- color: #5078cb;
|
|
|
- cursor: pointer;
|
|
|
- }
|
|
|
- .search-check .check .check-active label{
|
|
|
- margin-right: 0 !important;
|
|
|
- }
|
|
|
- .search-check .batch-operate {
|
|
|
- clear: both;
|
|
|
- background: #99FFFF;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-head {
|
|
|
- height: 40px;
|
|
|
- line-height: 40px;
|
|
|
- margin: 0 10px;
|
|
|
- border-bottom: 1px solid;
|
|
|
- padding: 0 20px;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-head .check-active {
|
|
|
- font-weight: normal;
|
|
|
- height: 40px;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-head .red-text {
|
|
|
- color: #ee4312;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-content {
|
|
|
- height: 70px;
|
|
|
- line-height: 30px;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-content > div {
|
|
|
+ margin-right: 12px;
|
|
|
+ color: #fff !important;
|
|
|
+ background: #5078cb;
|
|
|
+ position: relative;
|
|
|
display: inline-block;
|
|
|
+ height: 30px;
|
|
|
+ line-height: 30px;
|
|
|
+ padding: 0 10px;
|
|
|
+ cursor: pointer;
|
|
|
}
|
|
|
- .search-check .batch-operate .operate-content > div:first-child {
|
|
|
- margin-right: 111px;
|
|
|
- margin-left: 28px;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-content > div p {
|
|
|
- font-weight: bold;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-content > div p .batch-price-title {
|
|
|
- margin-right: 91px;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-content > div p .batch-progress {
|
|
|
- width: 108px;
|
|
|
- height: 5px;
|
|
|
+ .search-check .check > .operate-btn .expander {
|
|
|
+ position: absolute;
|
|
|
+ color: #333;
|
|
|
+ right: 0;
|
|
|
+ display: none;
|
|
|
+ height: 57px;
|
|
|
+ line-height: 26px;
|
|
|
+ text-align: center;
|
|
|
background: #fff;
|
|
|
- display: inline-block;
|
|
|
- position: relative;
|
|
|
+ bottom: -57px;
|
|
|
+ width: 98px;
|
|
|
+ z-index: 10;
|
|
|
+ border: 1px solid #e4e5e5;
|
|
|
}
|
|
|
- .search-check .batch-operate .operate-content > div p .batch-progress i {
|
|
|
- width: 5px;
|
|
|
- height: 10px;
|
|
|
- background: #169BD5;
|
|
|
+ .search-check .check > .operate-btn.more-operate {
|
|
|
+ padding: 0;
|
|
|
+ width: 98px;
|
|
|
+ height: 30px;
|
|
|
+ line-height: 30px;
|
|
|
+ text-align: center;
|
|
|
display: inline-block;
|
|
|
- position: absolute;
|
|
|
- top: -3px;
|
|
|
}
|
|
|
- .search-check .batch-operate .operate-content > div p em {
|
|
|
- margin: 0 5px;
|
|
|
+ .search-check .check > .operate-btn.more-operate:hover .expander {
|
|
|
+ display: block;
|
|
|
}
|
|
|
- .search-check .batch-operate .operate-content > div > div input {
|
|
|
- padding: 0 5px;
|
|
|
- height: 25px;
|
|
|
+ .search-check .check > .operate-btn.more-operate .expander span {
|
|
|
+ display: block;
|
|
|
}
|
|
|
- .search-check .batch-operate .operate-content .batch-sale input {
|
|
|
- width: 60px;
|
|
|
- margin-right: 10px;
|
|
|
- padding-right: 12px;
|
|
|
- }
|
|
|
- .search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
|
|
|
- margin-right: 10px;
|
|
|
+ .search-check .check > .operate-btn.more-operate .expander span:hover {
|
|
|
+ color: #5078cb;
|
|
|
}
|
|
|
- .search-check .batch-operate .operate-content .batch-sale > div {
|
|
|
- position: relative;
|
|
|
+ .pro_management .table .check-active {
|
|
|
+ margin-right: 15px;
|
|
|
+ user-select: none;
|
|
|
}
|
|
|
- .search-check .batch-operate .operate-content .batch-sale div i {
|
|
|
- position: absolute;
|
|
|
- left: 234px;
|
|
|
- top: 2px;
|
|
|
+ .pro_management .table .check-active span {
|
|
|
+ color: #333 !important;
|
|
|
}
|
|
|
- .search-check .batch-operate .operate-content .batch-date input {
|
|
|
- width: 56px;
|
|
|
+ .pro_management .table .check-active label {
|
|
|
+ margin-right: 0 !important;
|
|
|
}
|
|
|
.check-input input{
|
|
|
display: none;
|
|
|
@@ -440,6 +394,43 @@
|
|
|
.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;
|
|
|
}
|
|
|
@@ -1045,7 +1036,7 @@
|
|
|
}
|
|
|
.edit-contents .content .title span:first-child {
|
|
|
float: left;
|
|
|
- width: 80px;
|
|
|
+ width: 70px;
|
|
|
text-align: right;
|
|
|
}
|
|
|
.edit-contents .content .title span:last-child {
|
|
|
@@ -1558,10 +1549,10 @@
|
|
|
#wanted-list02{
|
|
|
display: none;
|
|
|
}
|
|
|
- .modal-backdrop {
|
|
|
- background-color: transparent ;
|
|
|
- bottom: unset!important;
|
|
|
- }
|
|
|
+ /*.modal-backdrop {
|
|
|
+ background-color: transparent ;
|
|
|
+ bottom: unset!important;
|
|
|
+ }*/
|
|
|
.modal{
|
|
|
bottom: unset!important;
|
|
|
}
|
|
|
@@ -1572,6 +1563,141 @@
|
|
|
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;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate {
|
|
|
+ clear: both;
|
|
|
+ background: #99FFFF;
|
|
|
+ position: relative;
|
|
|
+ z-index: 1;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-head {
|
|
|
+ height: 40px;
|
|
|
+ line-height: 40px;
|
|
|
+ margin: 0 10px;
|
|
|
+ border-bottom: 1px solid;
|
|
|
+ padding: 0 20px;
|
|
|
+ text-align: right;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-head .check-active {
|
|
|
+ font-weight: normal;
|
|
|
+ height: 40px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-head .red-text {
|
|
|
+ color: #008000;
|
|
|
+ float: left;
|
|
|
+ font-size: 14px;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-head .red-text i {
|
|
|
+ font-size: 20px;
|
|
|
+ color: #e07d34;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content {
|
|
|
+ height: 70px;
|
|
|
+ line-height: 30px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div {
|
|
|
+ display: inline-block;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div:first-child {
|
|
|
+ margin-right: 111px;
|
|
|
+ margin-left: 28px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div p {
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div p .batch-price-title {
|
|
|
+ margin-right: 91px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div p input[type=range] {
|
|
|
+ padding: 0;
|
|
|
+ display: inline-block;
|
|
|
+ width: 108px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div p input[type=range]::-webkit-slider-runnable-track {
|
|
|
+ background: #4054ff;
|
|
|
+ height: 5px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div p input[type=range]::-webkit-slider-thumb {
|
|
|
+ position: relative;
|
|
|
+ bottom: 7px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div p .batch-progress {
|
|
|
+ width: 108px;
|
|
|
+ height: 5px;
|
|
|
+ background: #fff;
|
|
|
+ display: inline-block;
|
|
|
+ position: relative;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div p .batch-progress i {
|
|
|
+ width: 5px;
|
|
|
+ height: 10px;
|
|
|
+ background: #169BD5;
|
|
|
+ display: inline-block;
|
|
|
+ position: absolute;
|
|
|
+ top: -3px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div p em {
|
|
|
+ margin: 0 5px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content > div > div input {
|
|
|
+ padding: 0 5px;
|
|
|
+ height: 25px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content .batch-sale input {
|
|
|
+ width: 60px;
|
|
|
+ margin-right: 10px;
|
|
|
+ padding-right: 12px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
|
|
|
+ margin-right: 10px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content .batch-sale > div {
|
|
|
+ position: relative;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content .batch-sale div i {
|
|
|
+ position: absolute;
|
|
|
+ left: 234px;
|
|
|
+ top: 2px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate .operate-content .batch-date input {
|
|
|
+ width: 56px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate > .fr {
|
|
|
+ margin-right: 30px;
|
|
|
+ }
|
|
|
+ .search-check .batch-operate > .fr .com-btn-level1 {
|
|
|
+ display: block;
|
|
|
+ margin-top: 8px;
|
|
|
+ }
|
|
|
.pro_management .table tr th .erp-reserve {
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
@@ -1588,109 +1714,151 @@
|
|
|
<div class="pro_management device">
|
|
|
<div class="com_tab">
|
|
|
<ul class="fl" style="width: 100%">
|
|
|
- <li><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">非标产品</a></li>
|
|
|
- <li class="active"><a ui-sref="vendor_material_erp({standardParam:'standard'})">标准产品</a></li>
|
|
|
+ <li class="active"><a ui-sref="vendor_material_erp">企业产品库</a></li>
|
|
|
+ <li><a ui-sref="vendor_material_person_erp">个人产品库</a></li>
|
|
|
<li><a ui-sref="vendor_onSale_erp">在售产品</a></li>
|
|
|
<li><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
+ <div class="com_tab">
|
|
|
+ <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="search fl">
|
|
|
<input type="text" class="form-control" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/型号/品牌"/>
|
|
|
<button ng-click="onSearch()">搜索</button>
|
|
|
- <a ng-click="download()">批量导出</a>
|
|
|
+ <!--<a ng-click="download()">批量导出</a>-->
|
|
|
</div>
|
|
|
<div class="check fr">
|
|
|
- <a ng-show="!isBatch && standard_tab == 'unstandard'" ng-click="matchAll()"><span ng-show="!isBatch && standard_tab == 'unstandard'">一键匹配</span></a>
|
|
|
- <a ng-show="!isBatch" ng-click="enterBatch()"><span ng-show="!isBatch">批量操作</span></a>
|
|
|
+ <div class="operate-btn" ng-click="enterBatch()"><span>批量上架</span></div>
|
|
|
+ <div class="operate-btn" ng-click="setAllInPerson()"><span>加入个人产品库</span></div>
|
|
|
+ <div class="operate-btn" ng-show="standard_tab == 'unstandard'" ng-click="matchAll()"><span ng-show="standard_tab == 'unstandard'">匹配</span></div>
|
|
|
+ <div class="operate-btn more-operate">
|
|
|
+ <span>更多操作</span>
|
|
|
+ <span class="expander">
|
|
|
+ <span ng-click="download()">导出选中</span>
|
|
|
+ <span ng-click="deleteBatch()" name="delete-material">删除选中</span>
|
|
|
+ </span>
|
|
|
+ </div>
|
|
|
<!--<span class="check-btn" ng-show="isBatch">
|
|
|
- <label class="check-active">
|
|
|
- <input type="checkbox" ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
|
|
|
- <label for="AllChoose"></label>
|
|
|
- <span>全选</span>
|
|
|
- </label>
|
|
|
- <a
|
|
|
- ng-click="deleteBatch()" name="delete-material">删除</a>
|
|
|
+ <a ng-click="deleteBatch()" name="delete-material">删除</a>
|
|
|
<a ng-click="exitBatch()">取消</a>
|
|
|
</span>-->
|
|
|
</div>
|
|
|
<div class="batch-operate" ng-show="isBatch">
|
|
|
- <div class="operate-head">
|
|
|
- <label class="check-active fl">
|
|
|
- <input type="checkbox" ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
|
|
|
- <label for="AllChoose"></label>
|
|
|
- <span>全选</span>
|
|
|
- </label>
|
|
|
- <div class="fr">
|
|
|
- <span class="red-text">批量上架仅作用于未上架的产品，已上架的不再重复上架！</span>
|
|
|
- <span class="com-btn-level1 com-btn-submit" ng-click="batchPutOn()">批量上架</span>
|
|
|
- <span class="com-btn-level1 com-btn-submit" ng-mouseenter="enterBatchPutOnPropertySaveButton()" ng-mouseleave="leaveBatchPutOnPropertySaveButton()" ng-click="saveBatchPutOnProperty()">保存</span>
|
|
|
- <span class="com-btn-level1 com-btn-red" ng-click="deleteBatch()">删除</span>
|
|
|
- <span class="com-btn-level1 com-btn-cancel" ng-click="exitBatch()">取消</span>
|
|
|
+ <div class="fl">
|
|
|
+ <div class="operate-head">
|
|
|
+ <!--<label class="check-active fl">
|
|
|
+ <input type="checkbox" ng-click="chooseAll()" ng-checked="isChoosedAll" id="AllChoose"/>
|
|
|
+ <label for="AllChoose"></label>
|
|
|
+ <span>全选</span>
|
|
|
+ </label>-->
|
|
|
+ <span class="red-text"><i class="fa fa-warning"></i> 批量上架仅作用于未上架的产品，已上架的不再重复上架！</span>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div class="operate-content">
|
|
|
- <div class="batch-sale">
|
|
|
- <p><span class="batch-price-title">批量设置销售价：</span><em>1</em><span class="batch-progress"><i style="left: {{uasBatchPutOnProperty.editFluctuateRate ? uasBatchPutOnProperty.editFluctuateRate > 200 ? '100%' : uasBatchPutOnProperty.editFluctuateRate / 2 + '%' : 0}}"></i></span><em>200</em></p>
|
|
|
- <div><span>销售价 = 近一个月的平均销售价 X </span><input type="number" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onSalePriceChange()"><i>%</i>
|
|
|
- <span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(100)">100%</span>
|
|
|
- <span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(120)">120%</span>
|
|
|
- <span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(130)">130%</span>
|
|
|
- <span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(150)">150%</span>
|
|
|
+ <div class="operate-content">
|
|
|
+ <div class="batch-sale">
|
|
|
+ <!--<p><span class="batch-price-title">批量设置销售价：</span><em>1</em><span class="batch-progress"><i style="left: {{uasBatchPutOnProperty.editFluctuateRate ? uasBatchPutOnProperty.editFluctuateRate > 200 ? '100%' : uasBatchPutOnProperty.editFluctuateRate / 2 + '%' : 0}}"></i></span><em>200</em></p>-->
|
|
|
+ <p><span class="batch-price-title">批量设置销售价：</span><em>1</em><input type="range" min="1" max="200" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onProgress()" class="form-control"><em>200</em></p>
|
|
|
+ <div><span>销售价 = 近一个月的平均销售价 X </span><input type="number" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onSalePriceChange()"><i>%</i>
|
|
|
+ <span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(100)">100%</span>
|
|
|
+ <span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(120)">120%</span>
|
|
|
+ <span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(130)">130%</span>
|
|
|
+ <span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(150)">150%</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="batch-date">
|
|
|
+ <p>批量设置交期：</p>
|
|
|
+ <div><span>交期（天）= </span><input type="number" ng-model="uasBatchPutOnProperty.editMinDelivery" ng-blur="uasBatchChangeDeliver(uasBatchPutOnProperty.editMinDelivery, uasBatchPutOnProperty.editMaxDelivery, false)"> - <input type="number" ng-model="uasBatchPutOnProperty.editMaxDelivery" ng-blur="uasBatchChangeDeliver(uasBatchPutOnProperty.editMinDelivery, uasBatchPutOnProperty.editMaxDelivery, true)"></div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div class="batch-date">
|
|
|
- <p>批量设置交期：</p>
|
|
|
- <div><span>交期（天）= </span><input type="number" ng-model="uasBatchPutOnProperty.editMinDelivery" ng-blur="uasBatchChangeDeliver(uasBatchPutOnProperty.editMinDelivery, uasBatchPutOnProperty.editMaxDelivery, false)"> - <input type="number" ng-model="uasBatchPutOnProperty.editMaxDelivery" ng-blur="uasBatchChangeDeliver(uasBatchPutOnProperty.editMinDelivery, uasBatchPutOnProperty.editMaxDelivery, true)"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="fr">
|
|
|
+ <span class="com-btn-level1 com-btn-submit" ng-click="batchPutOn()">提交</span>
|
|
|
+ <span class="com-btn-level1 com-btn-red" ng-mouseenter="enterBatchPutOnPropertySaveButton()" ng-mouseleave="leaveBatchPutOnPropertySaveButton()" ng-click="saveBatchPutOnProperty()">保存</span>
|
|
|
+ <span class="com-btn-level1 com-btn-cancel" ng-click="exitBatch()">取消</span>
|
|
|
+ </div>
|
|
|
+ <div style="clear: both;"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="wanted_list01">
|
|
|
<!--在售产品-->
|
|
|
<div class="tab">
|
|
|
- <table class="public-tab table">
|
|
|
+ <table class="public-tab standard-tab table">
|
|
|
<thead>
|
|
|
<tr>
|
|
|
+ <th width="80">
|
|
|
+ <label class="check-active">
|
|
|
+ <input ng-disabled="currenctMaterial.length == 0" type="checkbox" ng-click="chooseAllItem()" ng-checked="chooseAll || chooseAllPage" id="AllChoose12"/>
|
|
|
+ <label for="AllChoose12"></label>
|
|
|
+ <span>全选</span>
|
|
|
+ </label>
|
|
|
+ </th>
|
|
|
<th width="80">序号</th>
|
|
|
- <th width="100">
|
|
|
+ <th width="120">
|
|
|
<div class="erp-reserve" ng-click="sortByERPReserve()">
|
|
|
- ERP空闲库存
|
|
|
+ 闲置库存
|
|
|
<a class="sort-area" href="javascript:void(0)">
|
|
|
<i class=" fa fa-long-arrow-up" ng-class="{'active': sortByERP == 'ASC'}"></i>
|
|
|
<i class=" fa fa-long-arrow-down" ng-class="{'active': sortByERP == 'DESC'}"></i>
|
|
|
</a>
|
|
|
</div>
|
|
|
</th>
|
|
|
- <th width="180">产品名称(类目)</th>
|
|
|
- <th width="200">产品型号</th>
|
|
|
- <th width="150">品牌</th>
|
|
|
+ <th width="140">产品名称(类目)</th>
|
|
|
+ <th width="180">产品型号</th>
|
|
|
+ <th width="130">品牌</th>
|
|
|
<th width="100">单位</th>
|
|
|
+ <!--<th width="80">封装</th>-->
|
|
|
<th width="180">操作</th>
|
|
|
</tr>
|
|
|
</thead>
|
|
|
<tbody class="bg-show">
|
|
|
<!--<tr style="height: 14px;" ng-show="!isBatch && standard_tab == 'standard'">-->
|
|
|
<tr style="height: 14px;">
|
|
|
- <td colspan="7" class="hei18"></td>
|
|
|
+ <td colspan="8" class="hei18"></td>
|
|
|
</tr>
|
|
|
</tbody>
|
|
|
<tbody>
|
|
|
<tr style="height: 14px;" ng-show="currenctMaterial.length > 0 && standard_tab == 'unstandard' && showTip">
|
|
|
- <td colspan="7" class="hei17">
|
|
|
+ <td colspan="8" class="hei17">
|
|
|
<span>*匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="cancelTip()">×</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">
|
|
|
<!--<tr ng-class="{ 'active': material.selected }" class="gre-bg">-->
|
|
|
<tr ng-class="{ 'active': material.selected, 'gre-bg' : material.exPandOper}">
|
|
|
<td class="check-input">
|
|
|
- <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>
|
|
|
+ <span><input type="checkbox" ng-checked="material.isChoosed" ng-click="chooseOne(material)" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <!--<span ng-show="isBatch"><input type="checkbox" ng-checked="material.isChoosed" ng-click="chooseOne(material)" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
|
|
|
+ <span ng-bind="(param.page - 1) * 10 + $index + 1"></span>
|
|
|
</td>
|
|
|
<td><span ng-bind="material.erpReserve ? material.erpReserve : 0" title="{{material.erpReserve}}"></span></td>
|
|
|
<td>
|
|
|
@@ -1706,12 +1874,15 @@
|
|
|
<div class="ellipsis-div" ng-if="!material.pbranden" ng-bind="material.pbrand" title="{{material.pbrand}}"></div>
|
|
|
</td>
|
|
|
<td ng-bind="material.unit || 'PCS'" title="{{material.unit || 'PCS'}}"></td>
|
|
|
+ <!--<td>-->
|
|
|
+ <!--<span ng-bind="material.encapsulation || '-'" title="{{material.encapsulation || '-'}}"></span>-->
|
|
|
+ <!--</td>-->
|
|
|
<td class="edit">
|
|
|
<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
|
|
|
<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)">
|
|
|
- <span ng-if="material.batchCount">添加产品</span>
|
|
|
- <span ng-if="!material.batchCount">编辑上架</span>
|
|
|
- </span>
|
|
|
+ <span ng-if="material.batchCount">添加产品</span>
|
|
|
+ <span ng-if="!material.batchCount">编辑上架</span>
|
|
|
+ </span>
|
|
|
<span ng-if="material.batchCount" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="expandGoods(material)"><span>展开<i class="fa fa-angle-down" style="margin-left:2px;"></i></span></span>
|
|
|
<!--收起-->
|
|
|
<span ng-show="!isBatch && material.exPandOper" ng-click="disExpandGoods(material)" class="packUp"><span>收起<i class="fa fa-angle-up" style="margin-left:2px;"></i></span></span>
|
|
|
@@ -1720,8 +1891,8 @@
|
|
|
</td>
|
|
|
</tr>
|
|
|
<!--展开内容-->
|
|
|
- <tr ng-if="material.addGoodsOper || (material.exPandOper && material.goodsArr.length > 0)">
|
|
|
- <td colspan="7" style="padding: 0;">
|
|
|
+ <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">
|
|
|
@@ -1741,7 +1912,7 @@
|
|
|
<div class="blue-bg">
|
|
|
<div></div>
|
|
|
<div class="img">
|
|
|
- <a><img ng-src="{{goods.editPic || material.cmpImg || 'static/img/store/common/default.png'}}" alt="img"/></a>
|
|
|
+ <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>
|
|
|
@@ -1750,15 +1921,24 @@
|
|
|
<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)"/>
|
|
|
+ <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">
|
|
|
+ <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, false)"/>
|
|
|
</div>
|
|
|
- <div class="clearfix">
|
|
|
+ <div class="clearfix produceDate-fix">
|
|
|
<span>可拆卖:</span>
|
|
|
<span class="switch"><button ng-class="{'active' : goods.editBreakUp}"
|
|
|
ng-click="toggleIsBreadUp(goods, false)"></button></span>
|
|
|
@@ -1767,8 +1947,8 @@
|
|
|
<div class="content margin10">
|
|
|
<!--<p class="title">库存</p>-->
|
|
|
<div class="input-list">
|
|
|
- <span class="tit">上架数量：</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)"/>
|
|
|
+ <span class="tit">库存：</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">起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty" title="起拍" placeholder="数量"
|
|
|
@@ -1817,12 +1997,12 @@
|
|
|
<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>2)value=value.slice(0,2)"
|
|
|
+ <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>2)value=value.slice(0,2)" ng-model="goods.editMaxDelivery" ng-blur="changeDelivery(goods.editMinDelivery, goods.editMaxDelivery, false, goods)"
|
|
|
+ <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>
|
|
|
@@ -1870,12 +2050,10 @@
|
|
|
<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">20160123</span></p>
|
|
|
- <p class="title" ng-class="{'noBreak' : !goods.breakUp}">
|
|
|
- <span ng-bind="goods.breakUp ? '可拆卖' : '不可拆卖'"></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>已上架数量：</span><span ng-bind="goods.reserve">9023492</span></p>
|
|
|
+ <p class="title"><span>库存：</span><span ng-bind="goods.reserve">9023492</span></p>
|
|
|
<p class="title"><span>起订量：</span><span ng-bind="goods.minBuyQty">90492</span></p>
|
|
|
<p class="title"><span>包装数量：</span><span ng-bind="goods.minPackQty">980</span></p>
|
|
|
</div>
|
|
|
@@ -1902,9 +2080,7 @@
|
|
|
<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>
|
|
|
+ <button class="ok" ng-click="isRecommendGoods(goods)" name ="delete-goods">删除</button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1923,7 +2099,7 @@
|
|
|
<span>近一个月的销售平均价：<em ng-bind="material.averMonthSalePrice | formateNumber : 6"></em></span>
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr class="edit-content edits" ng-if="goods.edit">
|
|
|
+ <tr class="edit-content edits" ng-show="goods.edit">
|
|
|
<td colspan="10" style="background:#f0f7fd;">
|
|
|
<div class="blue-bg">
|
|
|
<div></div>
|
|
|
@@ -1931,18 +2107,26 @@
|
|
|
<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>
|
|
|
+ <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)"/>
|
|
|
+ <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">
|
|
|
+ <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)"/>
|
|
|
@@ -1951,7 +2135,7 @@
|
|
|
<!--<option value="0">不可拆卖</option>-->
|
|
|
<!--</select>-->
|
|
|
</div>
|
|
|
- <div class="clearfix">
|
|
|
+ <div class="clearfix produceDate-fix ">
|
|
|
<span>可拆卖:</span>
|
|
|
<span class="switch"><button ng-class="{'active' : goods.editBreakUp}"
|
|
|
ng-click="toggleIsBreadUp(goods, true)"></button></span>
|
|
|
@@ -1960,9 +2144,9 @@
|
|
|
<div class="content margin10">
|
|
|
<!--<p class="title">库存</p>-->
|
|
|
<div class="input-list">
|
|
|
- <span class="tit">上架数量：</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}"/>
|
|
|
+ <span class="tit">库存：</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">起订量：</span><input type="number" class="wid70 form-control" name="minBuyQty"
|
|
|
@@ -2015,10 +2199,10 @@
|
|
|
<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>2)value=value.slice(0,2)" ng-model="goods.editMinDelivery"
|
|
|
+ <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>2)value=value.slice(0,2)" ng-model="goods.editMaxDelivery"
|
|
|
+ <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>
|
|
|
@@ -2026,7 +2210,7 @@
|
|
|
<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">
|
|
|
+ <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>
|
|
|
@@ -2050,7 +2234,7 @@
|
|
|
<!--空状态-->
|
|
|
<tbody ng-if="currenctMaterial.length == 0">
|
|
|
<tr style="height: 190px;">
|
|
|
- <td colspan="7" style="border-bottom: none;">
|
|
|
+ <td colspan="8" 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>
|
|
|
@@ -2066,6 +2250,9 @@
|
|
|
</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.length == 0">
|
|
|
<p class="empty-img">
|
|
|
@@ -2073,7 +2260,7 @@
|
|
|
</p>
|
|
|
<div class="empty-info">
|
|
|
<p class="grey"> 暂无产品信息，赶快上传让更多人看到你的产品吧 </p>
|
|
|
- <a href="/vendor#/vendor_upload"><i></i>马上去上传</a>
|
|
|
+ <a href="vendor#/vendor_upload?type=company"><i></i>马上去上传</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="record-line text-right" ng-if="currenctMaterial.length != 0">
|
|
|
@@ -2161,7 +2348,7 @@
|
|
|
<th width="120">产品名称(类目)</th>
|
|
|
<th width="120">品牌</th>
|
|
|
<th width="100">型号</th>
|
|
|
- <th width="100">封装</th>
|
|
|
+ <!--<th width="100">封装</th>-->
|
|
|
<th width="80"></th>
|
|
|
</tr>
|
|
|
</thead>
|
|
|
@@ -2183,30 +2370,31 @@
|
|
|
</select>
|
|
|
</td>
|
|
|
<td title="{{product.pcmpcode}}" ng-bind="product.pcmpcode || '-'">Lhhjhj-3</td>
|
|
|
- <td title="{{product.encapsulation}}" ng-bind="product.encapsulation || '-'">BGA</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">
|
|
|
- <span class="set-count">
|
|
|
- 每页显示:
|
|
|
- <!--<input type="text" value="10" class="form-control">-->
|
|
|
- <!--<ul>-->
|
|
|
- <!--<li>15</li>-->
|
|
|
- <!--</ul>-->
|
|
|
- <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>
|
|
|
+ <td colspan="8" 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>
|
|
|
@@ -2254,7 +2442,7 @@
|
|
|
<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.reserve">9023492</span></div>
|
|
|
<div class="detail-title">起订量：<span ng-bind="goods.minBuyQty">90492</span></div>
|
|
|
</div>
|
|
|
<div class="detail distance">
|
|
|
@@ -2267,7 +2455,7 @@
|
|
|
</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 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>
|
|
|
@@ -2322,4 +2510,24 @@
|
|
|
position: relative;
|
|
|
top: 7px;
|
|
|
}
|
|
|
-</style>
|
|
|
+</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>-->
|
yangc