|
|
@@ -1597,13 +1597,21 @@
|
|
|
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: #ee4312;
|
|
|
+ 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;
|
|
|
@@ -1622,6 +1630,10 @@
|
|
|
.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;
|
|
|
+ }
|
|
|
.search-check .batch-operate .operate-content > div p .batch-progress {
|
|
|
width: 108px;
|
|
|
height: 5px;
|
|
|
@@ -1663,6 +1675,13 @@
|
|
|
.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;
|
|
|
}
|
|
|
@@ -1707,7 +1726,7 @@
|
|
|
<!--<a ng-click="download()">批量导出</a>-->
|
|
|
</div>
|
|
|
<div class="check fr">
|
|
|
- <div class="operate-btn" ng-show="!isBatch" ng-click="enterBatch()"><span ng-show="!isBatch">批量操作</span></div>
|
|
|
+ <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">
|
|
|
@@ -1717,41 +1736,44 @@
|
|
|
<span ng-click="deleteBatch()" name="delete-material">删除选中</span>
|
|
|
</span>
|
|
|
</div>
|
|
|
- <span class="check-btn" ng-show="isBatch">
|
|
|
+ <!--<span class="check-btn" ng-show="isBatch">
|
|
|
<a ng-click="deleteBatch()" name="delete-material">删除</a>
|
|
|
<a ng-click="exitBatch()">取消</a>
|
|
|
- </span>
|
|
|
+ </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()"><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">
|
|
|
@@ -1770,7 +1792,7 @@
|
|
|
<th width="80">序号</th>
|
|
|
<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>
|
|
|
@@ -1820,7 +1842,7 @@
|
|
|
</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>
|
|
|
+ <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>
|
|
|
@@ -1854,7 +1876,7 @@
|
|
|
</tr>
|
|
|
<!--展开内容-->
|
|
|
<tr ng-show="material.addGoodsOper || (material.exPandOper && material.goodsArr.length > 0)">
|
|
|
- <td colspan="7" style="padding: 0;">
|
|
|
+ <td colspan="8" style="padding: 0;">
|
|
|
<div class="show-content">
|
|
|
<div class="content-body">
|
|
|
<table class="public-tab table">
|
|
|
@@ -2194,7 +2216,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>
|
|
|
@@ -2335,7 +2357,7 @@
|
|
|
</tr>
|
|
|
</tbody>
|
|
|
<tr style="height: 40px;" class="no-hover">
|
|
|
- <td colspan="7" style="border-bottom: none; padding: 0;">
|
|
|
+ <td colspan="8" style="border-bottom: none; padding: 0;">
|
|
|
<div class="record-line text-right" ng-if="chooseAllPage">
|
|
|
<span class="set-count">
|
|
|
每页显示:
|
yangc