|
|
@@ -1858,9 +1858,9 @@
|
|
|
<thead>
|
|
|
<tr>
|
|
|
<th width="80">序号</th>
|
|
|
+ <th width="150">品牌</th>
|
|
|
<th width="180">类目(产品名称)</th>
|
|
|
<th width="200">型号</th>
|
|
|
- <th width="150">品牌</th>
|
|
|
<!--<th width="100">单位</th>-->
|
|
|
<th width="80">规格</th>
|
|
|
<th width="180">操作</th>
|
|
|
@@ -1893,6 +1893,10 @@
|
|
|
<img ng-if="material.standard == 0" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>
|
|
|
<img ng-if="material.standard != 0" src="static/img/store/common/standard.png" alt="" class="standard"/>
|
|
|
</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>
|
|
|
@@ -1903,10 +1907,7 @@
|
|
|
</span>
|
|
|
<span class="brand-type" ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></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 ng-bind="material.unit || 'PCS'" title="{{material.unit || 'PCS'}}"></td>-->
|
|
|
<td>
|
|
|
<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
|
|
|
@@ -2271,8 +2272,8 @@
|
|
|
<div class="replace-list" ng-class="{'Scrollactive': material.showMoreReplace} ">
|
|
|
<div class="replace-item" ng-repeat="replace in material.productReplaceList" ng-if="material.showMoreReplace || (!material.showMoreReplace && replace.detno < 5) ">
|
|
|
<i>{{replace.detno}}</i>
|
|
|
- <span title="{{replace.ptrCmpcode}}">型号：{{replace.ptrCmpcode}}</span>
|
|
|
<span title="{{replace.ptrBranden}}">品牌：{{replace.ptrBranden}}</span>
|
|
|
+ <span title="{{replace.ptrCmpcode}}">型号：{{replace.ptrCmpcode}}</span>
|
|
|
</div>
|
|
|
<div ng-if="(material.productReplaceList.length < 4 && material.productReplaceList.length % 2 !== 0) || (material.productReplaceList.length > 4 && material.showMoreReplace && material.productReplaceList.length % 2 !== 0)" class="replace-item"></div>
|
|
|
</div>
|
|
|
@@ -2515,8 +2516,8 @@
|
|
|
<div class="com-modal-wrap" ng-if="activeIndex > -1">
|
|
|
<div class="edit-replace-box">
|
|
|
<div class="title">
|
|
|
- <div>型号：<span>{{editCmp}}</span></div>
|
|
|
<div>品牌：<span>{{editBrand}}</span></div>
|
|
|
+ <div>型号：<span>{{editCmp}}</span></div>
|
|
|
<i class="fa fa-close" ng-click="setActiveIndex(-1)"></i>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
@@ -2525,18 +2526,19 @@
|
|
|
</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" ng-readonly="mate.editable == false" class="form-control" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list3_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
|
|
|
- <ul class="similar-list" ng-class="'similar-list3_'+ 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(key, sCode.code)"></li>
|
|
|
+ <span><i>{{key + 1}}</i><em>*</em>品牌：</span>
|
|
|
+ <input type="text" ng-readonly="mate.editable == false" class="form-control" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list4_'+ 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-list4_'+ 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" ng-readonly="mate.editable == false" class="form-control" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list4_'+ 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-list4_'+ 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>
|
|
|
+ <span><em>*</em>型号：</span>
|
|
|
+ <input type="text" ng-readonly="mate.editable == false" class="form-control" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list3_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
|
|
|
+ <ul class="similar-list" ng-class="'similar-list3_'+ 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(key, sCode.code)"></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>
|
shenjj