处理产品管理页面

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -116,8 +116,8 @@
 					class="fa fa-filter"></i><span> 出售中的产品</span></a></li>
 			<li class="nav-node"><a href="#product/downedGoods"><i
 					class="fa fa-filter"></i><span> 已下架的产品</span></a></li>
-			<li class="nav-node"><a href="#product/downAllGoodsByEnterprise"><i
-					class="fa fa-cloud-download"></i><span> 下架公司产品</span></a></li>
+			<!--<li class="nav-node"><a href="#product/downAllGoodsByEnterprise"><i-->
+					<!--class="fa fa-cloud-download"></i><span> 下架公司产品</span></a></li>-->
 
 			<li class="nav-header">物流管理</li>
 			<!--<li class="nav-node"><a href="#logistics/company"><i-->

src/main/webapp/resources/js/common/query/material.js

@@ -34,7 +34,7 @@ define([ 'ngResource' ], function() {
             },
             // 删除所有非标的信息
             deleteUnstandardAll: {
-                url: 'trade/products/unstandard',
+                url: 'trade/products/all',
                 method: 'DELETE'
             },
             // 删除所有非标的信息

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_materialCtrl.js

@@ -5,7 +5,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     $rootScope.active = 'buyer_material';
     document.title = '买家产品库-优软商城';
     $scope.tab = 'material';
-    $scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'unstandard';
+    // $scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'unstandard';
     $scope.choosedIds = [];
     $scope.showTip = true;
     $scope.resultTip = true;
@@ -265,7 +265,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
      * 切换标准/非标准
      * @param isStandard
      */
-    $scope.toggleStandard = function(isStandard) {
+    /*$scope.toggleStandard = function(isStandard) {
       if ($scope.standard_tab == 'matchResult') {
         $scope.lastMaterial = $scope.currenctMaterial;
       }
@@ -282,7 +282,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.param.count = 10;
       loadDataReload();
     }
-    ;
+    ;*/
 
     var updateTagCount = function(item) {
       Material.getCountOfProduct(item, {}, function(data) {
@@ -543,9 +543,9 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           selectAll: function() {
             return $scope.chooseAllPage;
           },
-          standard_tab: function() {
-            return $scope.standard_tab;
-          },
+          // standard_tab: function() {
+          //   return $scope.standard_tab;
+          // },
           message: function() {
             return $scope.$$nonProduct.deleteMessage;
           },
@@ -795,7 +795,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           $scope.repeatList = data.data.repeatList;
           $scope.haveRepeat = true;
           // loadData();
-          $scope.standard_tab = 'matchResult';
+          // $scope.standard_tab = 'matchResult';
         } else {
           $scope.haveRepeat = false;
           $scope.matchSuccess = $scope.matchSuccess + 1;
@@ -907,26 +907,26 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     }
     ;
 
-    $scope.toggleTab = function(status) {
-      $scope.param.type = 'nStandard';
-      $scope.param.count = $scope.$$nonProduct.count;
-      if (status == 'matchResult') {
-        $scope.currenctMaterial = $scope.lastMaterial;
-        $scope.materialAll = {};
-      } else {
-        loadData();
-      }
-      $scope.standard_tab = status;
-    }
-    ;
+    // $scope.toggleTab = function(status) {
+    //   $scope.param.type = 'nStandard';
+    //   $scope.param.count = $scope.$$nonProduct.count;
+    //   if (status == 'matchResult') {
+    //     $scope.currenctMaterial = $scope.lastMaterial;
+    //     $scope.materialAll = {};
+    //   } else {
+    //     loadData();
+    //   }
+    //   $scope.standard_tab = status;
+    // }
+    // ;
 
-    $scope.closeResultFrame = function(status) {
-      $scope.standard_tab = status;
-      $scope.resultFrame = false;
-      $scope.param.type = 'nStandard';
-      loadData();
-    }
-    ;
+    // $scope.closeResultFrame = function(status) {
+    //   $scope.standard_tab = status;
+    //   $scope.resultFrame = false;
+    //   $scope.param.type = 'nStandard';
+    //   loadData();
+    // }
+    // ;
 
     $scope.closeTip = function() {
       $scope.resultTip = false;
@@ -1505,11 +1505,12 @@ define(['app/app', 'jquery-uploadify'], function(app) {
 
     var init = function() {
       $scope.param.keyword = '';
-      if ($scope.standard_tab == 'standard') {
-        $scope.param.type = "standard";
-      } else if ($scope.standard_tab == 'unstandard') {
-        $scope.param.type = "nStandard";
-      }
+      // if ($scope.standard_tab == 'standard') {
+      //   $scope.param.type = "standard";
+      // } else if ($scope.standard_tab == 'unstandard') {
+      //   $scope.param.type = "nStandard";
+      // }
+        $scope.param.type = "all";
       $scope.isBatch = false;
       $scope.param.count = 10;
     };
@@ -2505,33 +2506,33 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     /**
      * 批量上架信息
      */
-    $scope.batchPutOn = function() {
-      var isFluctuateRateChange = $scope.uasBatchPutOnProperty.editFluctuateRate != $scope.uasBatchPutOnProperty.fluctuateRate * 100;
-      var isMinDeliveryChange = $scope.uasBatchPutOnProperty.editMinDelivery != $scope.uasBatchPutOnProperty.minDelivery;
-      var isMaxDeliveryChange = $scope.uasBatchPutOnProperty.editMaxDelivery != $scope.uasBatchPutOnProperty.maxDelivery;
-      if (isFluctuateRateChange || isMinDeliveryChange || isMaxDeliveryChange) {
-        toaster.pop('warning', '提示', '批量上架配置信息被修改，请保存批量上架配置信息之后再上架');
-        return;
-      }
-      $scope.choosedIds = [];
-      $scope.getChoosedInfo();
-      if (!$scope.isChoosedAll && (!$scope.choosedIds || $scope.choosedIds.length == 0)) {
-        toaster.pop('warning', '提示', '请选择要删除的信息');
-        return true;
-      }
-      var idStr = ($scope.choosedIds != null) ? $scope.choosedIds.join(',') : null;
-      var std = $scope.standard_tab == 'standard' ? 1 : 0;
-      Material.batchPutOn({
-        'standard': std,
-        ids: idStr
-      }, null, function(data) {
-        loadData();
-        toaster.pop('success', '成功', data.message);
-      }, function(response) {
-        toaster.pop('error', '失败', response.data);
-      });
-
-    }
+    // $scope.batchPutOn = function() {
+    //   var isFluctuateRateChange = $scope.uasBatchPutOnProperty.editFluctuateRate != $scope.uasBatchPutOnProperty.fluctuateRate * 100;
+    //   var isMinDeliveryChange = $scope.uasBatchPutOnProperty.editMinDelivery != $scope.uasBatchPutOnProperty.minDelivery;
+    //   var isMaxDeliveryChange = $scope.uasBatchPutOnProperty.editMaxDelivery != $scope.uasBatchPutOnProperty.maxDelivery;
+    //   if (isFluctuateRateChange || isMinDeliveryChange || isMaxDeliveryChange) {
+    //     toaster.pop('warning', '提示', '批量上架配置信息被修改，请保存批量上架配置信息之后再上架');
+    //     return;
+    //   }
+    //   $scope.choosedIds = [];
+    //   $scope.getChoosedInfo();
+    //   if (!$scope.isChoosedAll && (!$scope.choosedIds || $scope.choosedIds.length == 0)) {
+    //     toaster.pop('warning', '提示', '请选择要删除的信息');
+    //     return true;
+    //   }
+    //   var idStr = ($scope.choosedIds != null) ? $scope.choosedIds.join(',') : null;
+    //   var std = $scope.standard_tab == 'standard' ? 1 : 0;
+    //   Material.batchPutOn({
+    //     'standard': std,
+    //     ids: idStr
+    //   }, null, function(data) {
+    //     loadData();
+    //     toaster.pop('success', '成功', data.message);
+    //   }, function(response) {
+    //     toaster.pop('error', '失败', response.data);
+    //   });
+    //
+    // }
 
     /**
      * 编辑包装方式的信息
@@ -4364,70 +4365,49 @@ define(['app/app', 'jquery-uploadify'], function(app) {
   ]);
 
   //批量删除信息
-  app.register.controller('vendor_delete_ctrl', ['$scope', 'ids', 'Goods', 'Material', 'toaster', 'deleteMaterial', 'deleteGoods', 'selectAll', 'ProductServiceQuery', 'standard_tab', '$modalInstance', 'message', 'chooseTypePeople', function($scope, ids, Goods, Material, toaster, deleteMaterial, deleteGoods, selectAll, ProductServiceQuery, standard_tab, $modalInstance, message, chooseTypePeople) {
+  app.register.controller('vendor_delete_ctrl', ['$scope', 'ids', 'Goods', 'Material', 'toaster', 'deleteMaterial', 'deleteGoods', 'selectAll', 'ProductServiceQuery', '$modalInstance', 'message', 'chooseTypePeople', function($scope, ids, Goods, Material, toaster, deleteMaterial, deleteGoods, selectAll, ProductServiceQuery, $modalInstance, message, chooseTypePeople) {
     $scope.deleteModal = true;
     $scope.message = message;
-
     $scope.ids = ids;
 
     // 确认删除
     $scope.confirmDelete = function() {
       if (deleteMaterial) {
-        if (selectAll) {
-          if (standard_tab == 'standard') {
-            if (chooseTypePeople === 'all') {
-              Material.deleteStandardAll(null, null, function (data) {
-                if (data.code != 1) {
-                  toaster.pop('error', '错误', data.message);
-                } else {
-                  toaster.pop('success', '删除成功');
-                  $scope.deleteModal = false;
-                  $modalInstance.close(data);
-                }
-              }, function (response) {
-                toaster.pop('error', '错误', response.data);
-              });
-            } else {
-              Material.deleteStandardAll({isPerson: 1}, function (data) {
-                if (data.code != 1) {
-                  toaster.pop('error', '错误', data.message);
-                } else {
-                  toaster.pop('success', '删除成功');
-                  $scope.deleteModal = false;
-                  $modalInstance.close(data);
-                }
-              }, function (response) {
-                toaster.pop('error', '错误', response.data);
-              });
-            }
+          if (selectAll) {
+              if (chooseTypePeople === 'all') {
+                  Material.deleteUnstandardAll({isPerson: 0, type: 'all'}, function (data) {
+                      if (data.code != 1) {
+                          toaster.pop('error', '错误', data.message);
+                      } else {
+                          toaster.pop('success', '删除成功');
+                          $scope.deleteModal = false;
+                          $modalInstance.close(data);
+                      }
+                  }, function (response) {
+                      if (response.data.indexOf('系统') > -1 ){
+                          toaster.pop('error', '错误',response.data);
+                          return
+                      }
+                      toaster.pop('info', '提示', '信息删除中，请耐心等待！');
+                  });
+              } else {
+                  Material.deleteUnstandardAll({isPerson: 1, type: 'all'}, function (data) {
+                      if (data.code != 1) {
+                          toaster.pop('error', '错误', data.message);
+                      } else {
+                          toaster.pop('success', '删除成功');
+                          $scope.deleteModal = false;
+                          $modalInstance.close(data);
+                      }
+                  }, function (response) {
+                      if (response.data.indexOf('系统') > -1 ){
+                          toaster.pop('error', '错误',response.data);
+                          returns
+                      }
+                      toaster.pop('info', '提示', '信息删除中，请耐心等待！');
+                  });
+              }
           } else {
-            if (chooseTypePeople === 'all') {
-              Material.deleteUnstandardAll(null, null, function (data) {
-                if (data.code != 1) {
-                  toaster.pop('error', '错误', data.message);
-                } else {
-                  toaster.pop('success', '删除成功');
-                  $scope.deleteModal = false;
-                  $modalInstance.close(data);
-                }
-              }, function (response) {
-                toaster.pop('error', '错误', response.data);
-              });
-            } else {
-              Material.deleteUnstandardAll({isPerson: 1}, function (data) {
-                if (data.code != 1) {
-                  toaster.pop('error', '错误', data.message);
-                } else {
-                  toaster.pop('success', '删除成功');
-                  $scope.deleteModal = false;
-                  $modalInstance.close(data);
-                }
-              }, function (response) {
-                toaster.pop('error', '错误', response.data);
-              });
-            }
-          }
-        } else {
           if (!$scope.ids || $scope.ids.length == 0) {
             toaster.pop('warning', '提示', '请选择要删除的信息');
             return;

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -4,7 +4,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     $rootScope.active = 'vendor_material';
     document.title = '卖家产品库-优软商城';
     $scope.tab = 'material';
-    $scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'unstandard';
+    // $scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'unstandard';
     $scope.choosedIds = [];
     $scope.showTip = true;
     $scope.resultTip = true;
@@ -264,24 +264,23 @@ define(['app/app', 'jquery-uploadify'], function(app) {
      * 切换标准/非标准
      * @param isStandard
      */
-    $scope.toggleStandard = function(isStandard) {
-      if ($scope.standard_tab == 'matchResult') {
-        $scope.lastMaterial = $scope.currenctMaterial;
-      }
-      $scope.standard_tab = isStandard;
-      $scope.param.keyword = '';
-      if ($scope.chooseAllPage) {
-        $scope.chooseAllPage = false;
-      }
-      if (isStandard == 'standard')
-        $scope.param.type = "standard";
-      if (isStandard == 'unstandard')
-        $scope.param.type = "nStandard";
-      $scope.isBatch = false;
-      $scope.param.count = 10;
-      loadDataReload();
-    }
-    ;
+    // $scope.toggleStandard = function(isStandard) {
+    //   if ($scope.standard_tab == 'matchResult') {
+    //     $scope.lastMaterial = $scope.currenctMaterial;
+    //   }
+    //   $scope.standard_tab = isStandard;
+    //   $scope.param.keyword = '';
+    //   if ($scope.chooseAllPage) {
+    //     $scope.chooseAllPage = false;
+    //   }
+    //   if (isStandard == 'standard')
+    //     $scope.param.type = "standard";
+    //   if (isStandard == 'unstandard')
+    //     $scope.param.type = "nStandard";
+    //   $scope.isBatch = false;
+    //   $scope.param.count = 10;
+    //   loadDataReload();
+    // };
 
     var updateTagCount = function(item) {
       Material.getCountOfProduct(item, {}, function(data) {
@@ -542,9 +541,9 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           selectAll: function() {
             return $scope.chooseAllPage;
           },
-          standard_tab: function() {
-            return $scope.standard_tab;
-          },
+          // standard_tab: function() {
+          //   return $scope.standard_tab;
+          // },
           message: function() {
             return $scope.$$nonProduct.deleteMessage;
           },
@@ -794,7 +793,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           $scope.repeatList = data.data.repeatList;
           $scope.haveRepeat = true;
           // loadData();
-          $scope.standard_tab = 'matchResult';
+          // $scope.standard_tab = 'matchResult';
         } else {
           $scope.haveRepeat = false;
           $scope.matchSuccess = $scope.matchSuccess + 1;
@@ -903,34 +902,30 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.$$nonProduct.count = count;
       $scope.param.count = $scope.$$nonProduct.count;
       loadData();
-    }
-    ;
+    };
 
-    $scope.toggleTab = function(status) {
-      $scope.param.type = 'nStandard';
-      $scope.param.count = $scope.$$nonProduct.count;
-      if (status == 'matchResult') {
-        $scope.currenctMaterial = $scope.lastMaterial;
-        $scope.materialAll = {};
-      } else {
-        loadData();
-      }
-      $scope.standard_tab = status;
-    }
-    ;
+    // $scope.toggleTab = function(status) {
+    //   $scope.param.type = 'nStandard';
+    //   $scope.param.count = $scope.$$nonProduct.count;
+    //   if (status == 'matchResult') {
+    //     $scope.currenctMaterial = $scope.lastMaterial;
+    //     $scope.materialAll = {};
+    //   } else {
+    //     loadData();
+    //   }
+    //   $scope.standard_tab = status;
+    // };
 
-    $scope.closeResultFrame = function(status) {
-      $scope.standard_tab = status;
-      $scope.resultFrame = false;
-      $scope.param.type = 'nStandard';
-      loadData();
-    }
-    ;
+    // $scope.closeResultFrame = function(status) {
+    //   $scope.standard_tab = status;
+    //   $scope.resultFrame = false;
+    //   $scope.param.type = 'nStandard';
+    //   loadData();
+    // };
 
     $scope.closeTip = function() {
       $scope.resultTip = false;
-    }
-    ;
+    };
 
     var loadSelectedData = function() {
       $scope.materialAll = {};
@@ -950,7 +945,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
             $scope.matchTotal = data.data.total;
             $scope.matchSuccess = data.data.success;
             $scope.matchFail = data.data.fail;
-            $scope.standard_tab = 'matchResult';
+            // $scope.standard_tab = 'matchResult';
             $scope.param.type = "nStandard";
             loadData();
           } else {
@@ -971,7 +966,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
             $scope.matchTotal = data.data.total;
             $scope.matchSuccess = data.data.success;
             $scope.matchFail = data.data.fail;
-            $scope.standard_tab = 'matchResult';
+            // $scope.standard_tab = 'matchResult'
             $scope.batch = data.data.batch;
             $scope.currenctMaterial = [];
             loadSelectedData();
@@ -992,7 +987,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           $scope.matchTotal = data.data.total;
           $scope.matchSuccess = data.data.success;
           $scope.matchFail = data.data.fail;
-          $scope.standard_tab = 'matchResult';
+          // $scope.standard_tab = 'matchResult';
           $scope.param.type = "nStandard";
           loadData();
         } else {
@@ -1504,11 +1499,12 @@ define(['app/app', 'jquery-uploadify'], function(app) {
 
     var init = function() {
       $scope.param.keyword = '';
-      if ($scope.standard_tab == 'standard') {
-        $scope.param.type = "standard";
-      } else if ($scope.standard_tab == 'unstandard') {
-        $scope.param.type = "nStandard";
-      }
+      // if ($scope.standard_tab == 'standard') {
+      //   $scope.param.type = "standard";
+      // } else if ($scope.standard_tab == 'unstandard') {
+      //   $scope.param.type = "nStandard";
+      // }
+        $scope.param.type = "all";
       $scope.isBatch = false;
       $scope.param.count = 10;
     };
@@ -4156,7 +4152,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
   ]);
 
   //批量删除信息
-  app.register.controller('vendor_delete_ctrl', ['$scope', 'ids', 'Goods', 'Material', 'toaster', 'deleteMaterial', 'deleteGoods', 'selectAll', 'ProductServiceQuery', 'standard_tab', '$modalInstance', 'message', 'chooseTypePeople', function($scope, ids, Goods, Material, toaster, deleteMaterial, deleteGoods, selectAll, ProductServiceQuery, standard_tab, $modalInstance, message, chooseTypePeople) {
+  app.register.controller('vendor_delete_ctrl', ['$scope', 'ids', 'Goods', 'Material', 'toaster', 'deleteMaterial', 'deleteGoods', 'selectAll', 'ProductServiceQuery', '$modalInstance', 'message', 'chooseTypePeople', function($scope, ids, Goods, Material, toaster, deleteMaterial, deleteGoods, selectAll, ProductServiceQuery, $modalInstance, message, chooseTypePeople) {
     $scope.deleteModal = true;
     $scope.message = message;
 
@@ -4166,75 +4162,39 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     $scope.confirmDelete = function() {
       if (deleteMaterial) {
         if (selectAll) {
-          if (standard_tab == 'standard') {
-            if (chooseTypePeople === 'all') {
-              Material.deleteStandardAll(null, null, function (data) {
-                if (data.code != 1) {
-                  toaster.pop('error', '错误', data.message);
-                } else {
-                  toaster.pop('success', '删除成功');
-                  $scope.deleteModal = false;
-                  $modalInstance.close(data);
-                }
-              }, function (response) {
-                if (response.data.indexOf('系统') > -1 ){
-                  toaster.pop('error', '错误',response.data);
-                  return
-                }
-                toaster.pop('info', '提示', '信息删除中，请耐心等待！');
-              });
-            } else {
-              Material.deleteStandardAll({isPerson: 1}, function (data) {
-                if (data.code != 1) {
-                  toaster.pop('error', '错误', data.message);
-                } else {
-                  toaster.pop('success', '删除成功');
-                  $scope.deleteModal = false;
-                  $modalInstance.close(data);
-                }
-              }, function (response) {
-                if (response.data.indexOf('系统') > -1 ){
-                  toaster.pop('error', '错误',response.data);
-                  return
-                }
-                toaster.pop('info', '提示', '信息删除中，请耐心等待！');
-              });
-            }
-          } else {
             if (chooseTypePeople === 'all') {
-              Material.deleteUnstandardAll(null, null, function (data) {
-                if (data.code != 1) {
-                  toaster.pop('error', '错误', data.message);
-                } else {
-                  toaster.pop('success', '删除成功');
-                  $scope.deleteModal = false;
-                  $modalInstance.close(data);
-                }
-              }, function (response) {
-                if (response.data.indexOf('系统') > -1 ){
-                  toaster.pop('error', '错误',response.data);
-                  return
-                }
-                  toaster.pop('info', '提示', '信息删除中，请耐心等待！');
-              });
+                Material.deleteUnstandardAll({isPerson: 0, type: 'all'}, function (data) {
+                    if (data.code != 1) {
+                        toaster.pop('error', '错误', data.message);
+                    } else {
+                        toaster.pop('success', '删除成功');
+                        $scope.deleteModal = false;
+                        $modalInstance.close(data);
+                    }
+                }, function (response) {
+                    if (response.data.indexOf('系统') > -1 ){
+                        toaster.pop('error', '错误',response.data);
+                        return
+                    }
+                    toaster.pop('info', '提示', '信息删除中，请耐心等待！');
+                });
             } else {
-              Material.deleteUnstandardAll({isPerson: 1}, function (data) {
-                if (data.code != 1) {
-                  toaster.pop('error', '错误', data.message);
-                } else {
-                  toaster.pop('success', '删除成功');
-                  $scope.deleteModal = false;
-                  $modalInstance.close(data);
-                }
-              }, function (response) {
-                if (response.data.indexOf('系统') > -1 ){
-                  toaster.pop('error', '错误',response.data);
-                  return
-                }
-                toaster.pop('info', '提示', '信息删除中，请耐心等待！');
-              });
+                Material.deleteUnstandardAll({isPerson: 1, type: 'all'}, function (data) {
+                    if (data.code != 1) {
+                        toaster.pop('error', '错误', data.message);
+                    } else {
+                        toaster.pop('success', '删除成功');
+                        $scope.deleteModal = false;
+                        $modalInstance.close(data);
+                    }
+                }, function (response) {
+                    if (response.data.indexOf('系统') > -1 ){
+                        toaster.pop('error', '错误',response.data);
+                        returns
+                    }
+                    toaster.pop('info', '提示', '信息删除中，请耐心等待！');
+                });
             }
-          }
         } else {
           if (!$scope.ids || $scope.ids.length == 0) {
             toaster.pop('warning', '提示', '请选择要删除的信息');

src/main/webapp/resources/view/admin/product/productManage.html

@@ -116,7 +116,7 @@
                             <option value="">全部</option>
                             <option value="601">已上架</option>
                             <!--<option value="613">新品未上架</option>-->
-                            <option value="612">未上架</option>
+                            <option value="612">已下架</option>
                         </select>
                     </label>
                 </div>

src/main/webapp/resources/view/usercenter/forstore/buyer_material.html

@@ -1052,6 +1052,20 @@
 		overflow: hidden;
 		white-space: nowrap;
 	}
+	.img-info i{
+		position:absolute;
+		top:0;
+		left:0;
+		display:block;
+		width:30px;
+		height:30px;
+	}
+	.img-info i.icon-fei{
+		background: url('static/img/icon/icon-detail.png')no-repeat 0px -38px;
+	}
+	.img-info i.icon-biao{
+		background: url('static/img/icon/icon-detail.png')no-repeat;
+	}
 </style>
 <div class="user_right fr">
 	<!--货品管理-->
@@ -1065,21 +1079,21 @@
 				<!--<li ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2B客户出入库</a></li>-->
 			</ul>
 		</div>
-		<div class="com_tab com_tab2" ng-if="!isPcbStore" style="margin-bottom: 0px">
-			<ul class="fl distance" style="width: 100%">
-				<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>
-				<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>
-			</ul>
-			<!--匹配结果导航-->
-			<div class="match-menu" ng-if="resultFrame">
-                <span>
-                    <a ng-click="toggleTab('matchResult')">匹配结果</a>
-                    <i class="fa fa-remove" ng-click="closeResultFrame('unstandard')"></i>
-                </span>
-			</div>
-		</div>
+		<!--<div class="com_tab com_tab2" ng-if="!isPcbStore" style="margin-bottom: 0px">-->
+			<!--<ul class="fl distance" style="width: 100%">-->
+				<!--<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>-->
+				<!--<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>-->
+			<!--</ul>-->
+			<!--&lt;!&ndash;匹配结果导航&ndash;&gt;-->
+			<!--<div class="match-menu" ng-if="resultFrame">-->
+                <!--<span>-->
+                    <!--<a ng-click="toggleTab('matchResult')">匹配结果</a>-->
+                    <!--<i class="fa fa-remove" ng-click="closeResultFrame('unstandard')"></i>-->
+                <!--</span>-->
+			<!--</div>-->
+		<!--</div>-->
 		<!--非标和标准产品列表页-->
-		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
+		<div>
 			<div class="search-check">
 				<div class="fl" style="font-size: 14px;color: #666;margin-left: 12px;line-height: 34px;">
 					更多筛选：
@@ -1165,8 +1179,10 @@
 									<img src="static/img/vendor/images/person-material-pc.png" ng-if="material.addProductPerson" alt="">
 									<span style="float:left;margin-top:40px;margin-left:10px"><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
 									<div class="blue-bg" style="float:left;border: 1px solid #dcdcdc;border-radius: 4px;margin: 20px 0 20px 10px">
-										<div class="img" style="margin: 0;">
+										<div class="img img-info" style="margin: 0;">
 											<a><img ng-src="{{material.cmpImg || 'static/img/store/common/default.png'}}" alt="img"/></a>
+											<i class="icon-fei" ng-if="!material.cmpUuId"></i>
+											<i class="icon-biao" ng-if="material.cmpUuId"></i>
 										</div>
 									</div>
 									<div style="clear: both"></div>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1052,6 +1052,21 @@
 		overflow: hidden;
 		white-space: nowrap;
 	}
+
+	.img-info i{
+		position:absolute;
+		top:0;
+		left:0;
+		display:block;
+		width:30px;
+		height:30px;
+	}
+	.img-info i.icon-fei{
+		background: url('static/img/icon/icon-detail.png')no-repeat 0px -38px;
+	}
+	.img-info i.icon-biao{
+		background: url('static/img/icon/icon-detail.png')no-repeat;
+	}
 </style>
 <div class="user_right fr">
 	<!--货品管理-->
@@ -1065,21 +1080,21 @@
 				<!--<li ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2B客户出入库</a></li>-->
 			</ul>
 		</div>
-		<div class="com_tab com_tab2" ng-if="!isPcbStore" style="margin-bottom: 0px">
-			<ul class="fl distance" style="width: 100%">
-				<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>
-				<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>
-			</ul>
-			<!--匹配结果导航-->
-			<div class="match-menu" ng-if="resultFrame">
-                <span>
-                    <a ng-click="toggleTab('matchResult')">匹配结果</a>
-                    <i class="fa fa-remove" ng-click="closeResultFrame('unstandard')"></i>
-                </span>
-			</div>
-		</div>
+		<!--<div class="com_tab com_tab2" ng-if="!isPcbStore" style="margin-bottom: 0px">-->
+			<!--<ul class="fl distance" style="width: 100%">-->
+				<!--<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>-->
+				<!--<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>-->
+			<!--</ul>-->
+			<!--&lt;!&ndash;匹配结果导航&ndash;&gt;-->
+			<!--<div class="match-menu" ng-if="resultFrame">-->
+                <!--<span>-->
+                    <!--<a ng-click="toggleTab('matchResult')">匹配结果</a>-->
+                    <!--<i class="fa fa-remove" ng-click="closeResultFrame('unstandard')"></i>-->
+                <!--</span>-->
+			<!--</div>-->
+		<!--</div>-->
 		<!--非标和标准产品列表页-->
-		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
+		<div>
 			<div class="search-check">
 				<div class="fl" style="font-size: 14px;color: #666;margin-left: 12px;line-height: 34px;">
 					更多筛选：
@@ -1165,8 +1180,10 @@
 									<img src="static/img/vendor/images/person-material-pc.png" ng-if="material.addProductPerson" alt="">
 									<span style="float:left;margin-top:40px;margin-left:10px"><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>
 									<div class="blue-bg" style="float:left;border: 1px solid #dcdcdc;border-radius: 4px;margin: 20px 0 20px 10px">
-										<div class="img" style="margin: 0;">
+										<div class="img img-info" style="margin: 0;">
 											<a><img ng-src="{{material.cmpImg || 'static/img/store/common/default.png'}}" alt="img"/></a>
+											<i class="icon-fei" ng-if="!material.cmpUuId"></i>
+											<i class="icon-biao" ng-if="material.cmpUuId"></i>
 										</div>
 									</div>
 									<div style="clear: both"></div>
@@ -1234,7 +1251,7 @@
 									</div>
 									<div ng-if="material.goods" ng-bind="(storeInfo.uuid != 'undefind' && material.goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'">自营</div>
 									<div>{{material.goods.breakUp ? '可拆卖' : '不可拆卖'}}</div>
-									<div>{{material.goods.status === 601 || material.goods.status === 602 ? '已上架' : '未上架' }}</div>
+									<div>{{material.goods.status === 601 || material.goods.status === 602 || material.goods.status === 613 ? '已上架' : '未上架' }}</div>
 								</td>
 								<td class="edit">
 									<div style="text-align: center">