|
|
@@ -2121,11 +2121,6 @@
|
|
|
<!--<span ng-bind="material.encapsulation || '-'" title="{{material.encapsulation || '-'}}"></span>-->
|
|
|
<!--</td>-->
|
|
|
<td class="edit">
|
|
|
- <span ng-click="lookActiveIndex($index, material)">
|
|
|
- <span>可替代型号</span>
|
|
|
- <!--<span>查看</span></span>/<span ng-click="setActiveIndex($index,material)"><span>编辑可替代型号</span>-->
|
|
|
- </span>
|
|
|
- <span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
|
|
|
<span ng-click="editRegulPicture(material.productAttachSubmit.uploadAttach || material.attach || 'static/img/vendor/images/upload_file_icon.png', material)">
|
|
|
<span>编辑物料</span>
|
|
|
</span>
|
|
|
@@ -2134,6 +2129,11 @@
|
|
|
<span ng-if="material.batchCount">添加产品</span>
|
|
|
<span ng-if="!material.batchCount">编辑上架</span>
|
|
|
</span>
|
|
|
+ <span ng-click="lookActiveIndex($index, material)">
|
|
|
+ <span>替代物料</span>
|
|
|
+ <!--<span>查看</span></span>/<span ng-click="setActiveIndex($index,material)"><span>编辑替代物料</span>-->
|
|
|
+ </span>
|
|
|
+ <span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
|
|
|
<span ng-if="material.batchCount" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="expandGoods(material)"><span>展开<i class="fa fa-angle-down" style="margin-left:2px;"></i></span></span>
|
|
|
<!--收起-->
|
|
|
<span ng-show="!isBatch && material.exPandOper" ng-click="disExpandGoods(material)" class="packUp"><span>收起<i class="fa fa-angle-up" style="margin-left:2px;"></i></span></span>
|
|
|
@@ -2696,10 +2696,10 @@
|
|
|
<div class="content content3">
|
|
|
<div class="content-line content-line2">
|
|
|
<div class="leftline"></div>
|
|
|
- <p class="toptitle">可替代型号：</p>
|
|
|
+ <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="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>
|
|
|
@@ -2714,7 +2714,7 @@
|
|
|
</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="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>
|
|
|
@@ -2730,7 +2730,7 @@
|
|
|
</div>
|
|
|
<div class="content content2">
|
|
|
<div class="content-line">
|
|
|
- <p>可替代型号：</p>
|
|
|
+ <p>替代物料：</p>
|
|
|
</div>
|
|
|
<div class="content-line" ng-repeat="(key, mate) in replaceMaterialList" on-finish-render="ngRepeatFinished">
|
|
|
<div class="form-item form-left">
|
Administrator