From 0603524725d09c4b34ded0c2e236066c21be3f39 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Fri, 17 Jul 2020 16:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/deployment-info.vue    |  2 +-
 src/components/table/table-filter.vue | 25 +++++------
 src/pages/workbench/fwgl/fwglList.vue | 60 +++++++++++++++++++++------
 3 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/src/components/deployment-info.vue b/src/components/deployment-info.vue
index e15ba3d..6ac9150 100644
--- a/src/components/deployment-info.vue
+++ b/src/components/deployment-info.vue
@@ -96,7 +96,7 @@ export default {
 </script>
 
 <style scoped>
-. {
+deployment_info. {
   display: flex;
   justify-content: space-between;
   align-items: stretch;
diff --git a/src/components/table/table-filter.vue b/src/components/table/table-filter.vue
index 2a04fdd..2b04316 100644
--- a/src/components/table/table-filter.vue
+++ b/src/components/table/table-filter.vue
@@ -18,19 +18,20 @@
             'margin-top': i < filterLength ? '0' : '10px',
           }"
         >
-          <el-tooltip
-            class="item"
-            effect="dark"
-            :content="v.name"
-            placement="top"
+          <a
+            class="text_clip"
+            :class="{ current: isCurrentFilter(item.prop, v) }"
+            @click.prevent="selectFilter(item.prop, v)"
           >
-            <a
-              class="text_clip"
-              :class="{ current: isCurrentFilter(item.prop, v) }"
-              @click.prevent="selectFilter(item.prop, v)"
-              v-text="v.name"
-            ></a>
-          </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="v.name"
+              placement="top"
+            >
+              <span v-text="v.name"></span>
+            </el-tooltip>
+          </a>
         </li>
 
         <div
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index 4d0a3f7..058e7b7 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -260,7 +260,11 @@ export default {
               },
               {
                 getLabel(item) {
-                  return ["申请上架", "申请下架", "审核中", "审核中"][item.state] || "-";
+                  return (
+                    ["申请上架", "申请下架", "上架审核中", "下架审核中"][
+                      item.state
+                    ] || "-"
+                  );
                 },
                 callback(item) {
                   if (item.state == 0) {
@@ -270,7 +274,7 @@ export default {
                   }
                 },
                 disabledRule(item) {
-                  return item.state == 2;
+                  return item.state == 2 || item.state == 3;
                 },
               },
               {
@@ -308,13 +312,21 @@ export default {
             prop: "state",
             data: [
               {
-                name: "审核中",
+                name: "已下架",
+                value: 0,
+              },
+              {
+                name: "已上架",
                 value: 1,
               },
               {
-                name: "已下架",
+                name: "上架审核中",
                 value: 2,
               },
+              {
+                name: "下架审核中",
+                value: 3,
+              },
             ],
           },
         ];
@@ -618,7 +630,9 @@ export default {
             label: "服务状态",
             prop: "state",
             getText(item) {
-              return ["已下架", "已上架", "审核中"][item.state];
+              return ["已下架", "已上架", "上架审核中", "下架审核中"][
+                item.state
+              ];
             },
             align: "center",
           },
@@ -647,13 +661,21 @@ export default {
             prop: "state",
             data: [
               {
-                name: "审核中",
+                name: "已下架",
+                value: 0,
+              },
+              {
+                name: "已上架",
                 value: 1,
               },
               {
-                name: "已下架",
+                name: "上架审核中",
                 value: 2,
               },
+              {
+                name: "下架审核中",
+                value: 3,
+              },
             ],
           },
         ];
@@ -930,7 +952,9 @@ export default {
                     return "-";
                   }
 
-                  return (item.approve_state === 1 && item.use_uid === "") ? "分配" : "已分配";
+                  return item.approve_state === 1 && item.use_uid === ""
+                    ? "分配"
+                    : "已分配";
                 },
                 callback: this.cloudAllot,
                 disabledRule(item) {
@@ -1002,15 +1026,25 @@ export default {
               },
               {
                 getLabel(item) {
-                  return item.state == 1 ? "下架" : "上架";
+                  if (item.state == 0 || item.state == 2) {
+                    return "上架";
+                  } else if (item.state == 1 || item.state == 3) {
+                    return "下架";
+                  } else {
+                    return "-";
+                  }
                 },
                 callback(item) {
-                  item.state == 1
-                    ? _self.soldOutItem(item)
-                    : _self.soldUpItem(item);
+                  if (item.state == 2) {
+                    return soldUpItem(item);
+                  } else if (item.state == 3) {
+                    return _self.soldOutItem(item);
+                  } else {
+                    return null;
+                  }
                 },
                 disabledRule(item) {
-                  return item.state === 0;
+                  return item.state == 0 || item.state == 1;
                 },
               },
               {
-- 
2.26.0