|
|
@@ -327,7 +327,7 @@
|
|
|
}
|
|
|
.edit-content div.content,.edit-content div.img{
|
|
|
float: left;
|
|
|
- margin: 0 5px;
|
|
|
+ margin-right: 5px;
|
|
|
}
|
|
|
.edit-content .wid36{
|
|
|
width: 36px;
|
|
|
@@ -423,6 +423,9 @@
|
|
|
.pro_management .table tr td div span.switch button.active{
|
|
|
background: url("static/img/icon/check-ok.png") no-repeat center;
|
|
|
}
|
|
|
+ .com_tab ul li.active a {
|
|
|
+ color: #1687ff;
|
|
|
+ }
|
|
|
</style>
|
|
|
<div class="user_right fr">
|
|
|
<!--货品管理-->
|
|
|
@@ -496,9 +499,10 @@
|
|
|
<span ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <a ng-show="!isBatch && standard_tab == 'standard'" ng-click="showShelfArea(material)"><span ng-show="!isBatch">编辑</span></a>
|
|
|
- <a ng-show="!isBatch && standard_tab == 'unstandard'" ng-click="match(material)"><span ng-show="!isBatch">匹配</span></a>
|
|
|
- <a ng-show="!isBatch" ng-click="deleteMaterial(material)"><span ng-show="!isBatch">删除</span></a>
|
|
|
+ <a ng-show="!material.selected&&!isBatch && standard_tab == 'standard'" ng-click="showShelfArea(material)"><span ng-show="!isBatch">去上架</span></a>
|
|
|
+ <a ng-show="!material.selected&&!isBatch && standard_tab == 'unstandard'" ng-click="match(material)"><span ng-show="!isBatch">匹配</span></a>
|
|
|
+ <a ng-show="!material.selected&&!isBatch" ng-click="deleteMaterial(material)"><span ng-show="!isBatch">删除</span></a>
|
|
|
+ <a ng-if="material.selected">取消</a>
|
|
|
</td>
|
|
|
</tr>
|
|
|
<!--编辑内容-->
|
|
|
@@ -508,6 +512,18 @@
|
|
|
<p class="title"> </p>
|
|
|
<img ng-src="{{material.img || 'static/img/store/common/default.png'}}" alt="img"/>
|
|
|
</div>
|
|
|
+ <div class="content">
|
|
|
+ <p class="title">ERP空闲库存</p>
|
|
|
+ <div class="input-list">8888</div>
|
|
|
+ <p>库存</p>
|
|
|
+ <div class="input-list">9999</div>
|
|
|
+ </div>
|
|
|
+ <div class="content">
|
|
|
+ <p class="title">上架数量</p>
|
|
|
+ <div class="input-list">
|
|
|
+ <input type="number" class="wid48 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.reserve" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMaxAmount(goods)"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div class="content">
|
|
|
<p class="title">包装/生产日期</p>
|
|
|
<div class="input-list">
|
|
|
@@ -520,22 +536,16 @@
|
|
|
<!--<option value="0">不可拆卖</option>-->
|
|
|
<!--</select>-->
|
|
|
</div>
|
|
|
- <div>
|
|
|
- <span>可拆卖:</span>
|
|
|
- <span class="switch"><button ng-class="{'active' : goods.breakUp}" ng-click="toggleIsBreadUp(goods)"></button></span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="content">
|
|
|
- <p class="title">库存</p>
|
|
|
- <div class="input-list">
|
|
|
- <input type="number" class="wid48 form-control" name="reserve" title="库存" placeholder="数量" ng-model="goods.reserve" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMaxAmount(goods)"/>
|
|
|
- </div>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
<p class="title">最小包装量</p>
|
|
|
<div class="input-list">
|
|
|
<input type="number" class="form-control" name="minPackQty" title="最小包装量" placeholder="数量" ng-model="goods.minPackQty" ng-pattern="/^(-|)[0-9]*$/" ng-blur="setPriceMinPackAmount(goods)" style="width: 70px;"/>
|
|
|
</div>
|
|
|
+ <div style="position: relative;top: 13px;left: 3px;">
|
|
|
+ <span>可拆卖:</span>
|
|
|
+ <span class="switch"><button ng-class="{'active' : goods.breakUp}" ng-click="toggleIsBreadUp(goods)"></button></span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
<p class="title">起拍</p>
|
|
|
@@ -544,16 +554,14 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
- <p class="title">交期</p>
|
|
|
+ <p class="title">交期<span style="color:#999;">（{{!store.enType || store.enType === 'HK'?'香港':!store.enType || store.enType === 'MAINLAND'?'国内':''}}）</span></p>
|
|
|
<div class="input-list">
|
|
|
<p ng-if="!store.enType || store.enType === 'HK'">
|
|
|
- <span>香港:</span>
|
|
|
<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" ng-model="goods.minDelivery" ng-blur="checkMinDelivery(goods, 'HK')"/></span>
|
|
|
<span style="margin-left: 4px;">–</span>
|
|
|
<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" ng-model="goods.maxDelivery" ng-blur="checkMaxDelivery(goods, 'HK')"/></span>
|
|
|
</p>
|
|
|
<p ng-if="!store.enType || store.enType === 'MAINLAND'">
|
|
|
- <span>国内:</span>
|
|
|
<span><input type="number" class="wid36 form-control" name="minDelivery" title="最小交期" placeholder="天数" ng-model="goods.minDelivery" ng-blur="checkMinDelivery(goods, 'DEM')"/></span>
|
|
|
<span style="margin-left: 4px;">–</span>
|
|
|
<span><input type="number" class="wid36 form-control" name="maxDelivery" title="最大交期" placeholder="天数" ng-model="goods.maxDelivery" ng-blur="checkMaxDelivery(goods, 'DEM')"/></span>
|
|
|
@@ -601,7 +609,8 @@
|
|
|
<div class="content" style="width: 56px; float: right; margin-right: 10px;">
|
|
|
<p class="title"> </p>
|
|
|
<div class="input-list">
|
|
|
- <button class="off" ng-click="closeShelArea(material)">取消</button>
|
|
|
+ <!--<button class="off" ng-click="closeShelArea(material)">取消</button>-->
|
|
|
+ <button class="ok" ng-click="publishGoods(material)" style="margin-bottom: 5px">保存</button>
|
|
|
<button class="ok" ng-click="publishGoods(material)">上架</button>
|
|
|
</div>
|
|
|
</div>
|
yangc