Merge branch '蓝色' into 测试

packageA/setclient/detail.js

@@ -528,10 +528,13 @@ Page({
                 })
             }
         }
-        if (isLeader || isAdmin) tabbarList.push({
-            icon: "icon-shanchu",
-            label: "作废"
-        })
+        if (detail.agentstatus == '启用' && detail.erpagentnum) {
+        } else {
+            if (isLeader || isAdmin) tabbarList.push({
+                icon: "icon-shanchu",
+                label: "作废"
+            })
+        }
         //来自公海
         if (detail.ispublic == 1) {
             //查询到回收公海客户权限