Browse Source

【品牌供应商】-- 调整删除申请前端展示

wangyc 8 years ago
parent
commit
4dcf641b29

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/VendorListSubmitServiceImpl.java

@@ -144,7 +144,7 @@ public class VendorListSubmitServiceImpl implements VendorListSubmitService {
         vendorListSubmitDao.save(vendorListSubmit);
 
         // 删除申请,删除原供应商信息
-        if (Status.DELETED.value() != vendorListSubmit.getType()) {
+        if (Status.DELETED.value() == vendorListSubmit.getType()) {
             // 检测关联供应商信息有效性
             checkVendorid(vendorListSubmit);
             vendorListDao.delete(vendorListSubmit.getVendorid());

+ 3 - 2
src/main/webapp/resources/view/admin/supplier_submit_list.html

@@ -43,8 +43,9 @@
                 <tr ng-repeat="supplier in $data">
                     <td class="text-center">{{($index + 1)}}</td>
                     <td width="150" style="word-break: break-all">{{supplier.brand.nameEn}}
-                        <span class="label label-success f12" ng-if="!supplier.vendorid">新增</span>
-                        <span class="label label-warning f12" ng-if="supplier.vendorid">更新</span>
+                        <span class="label label-success f12" ng-if="supplier.type == 818">新增</span>
+                        <span class="label label-warning f12" ng-if="supplier.type == 815">更新</span>
+                        <span class="label label-danger f12" ng-if="supplier.type == 112">删除</span>
                     </td>
                     <td ng-bind="supplier.vendorName"></td>
                     <td ng-bind="supplier.updater.userName"></td>