From 8e9b5db2556694cb59522c7c6a3d52001045f4e5 Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Thu, 6 Aug 2020 15:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message-steps/select-template.vue         | 44 ++++++++++++++++++-
 .../directed-push/directed-push-add.vue       |  1 +
 .../message-alert/message-alert-add.vue       |  3 +-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/components/message-steps/select-template.vue b/src/components/message-steps/select-template.vue
index c4ecf23..e92d751 100644
--- a/src/components/message-steps/select-template.vue
+++ b/src/components/message-steps/select-template.vue
@@ -9,6 +9,18 @@
             placeholder="请输入消息模板名称/id"
           ></el-input>
         </div>
+        <div class="filter_item" v-if="tpl_types.length > 1">
+          <span class="filter_title">模板类型：</span>
+          <el-select v-model="type" placeholder="请选择">
+            <el-option
+              v-for="item in tpl_types"
+              :label="item.name"
+              :value="item.value"
+              :key="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
         <div class="filter_item">
           <span class="filter_title">最后更新时间：</span>
           <el-date-picker
@@ -127,6 +139,10 @@ export default {
       type: Boolean,
       defailt: false,
     },
+    tmpTypes: {
+      type: Array,
+      defailt: [],
+    },
   },
   data() {
     return {
@@ -138,6 +154,7 @@ export default {
       pageSize: 10,
       currentPage: 1,
       keyword: "",
+      type: "",
       updateTime: "",
       types: [
         {
@@ -161,6 +178,7 @@ export default {
           value: 4,
         },
       ],
+      tpl_types: [],
       detail: {
         name: "",
         tpl_type: "",
@@ -234,12 +252,36 @@ export default {
       },
     ];
 
+    if (this.tmpTypes.length > 0) {
+      let tpl_types = [];
+
+      this.types.forEach((item) => {
+        if (this.tmpTypes.indexOf(item.value) > -1) {
+          tpl_types.push(item);
+        }
+      });
+
+      if (this.tmpTypes.length > 1) {
+        tpl_types = [
+          {
+            name: "全部",
+            value: this.tmpTypes.join(","),
+          },
+          ...tpl_types,
+        ];
+      }
+
+      this.tpl_types = tpl_types;
+      this.type = tpl_types[0].value;
+    }
+
     this.getTemplateList();
   },
   methods: {
     getTemplateList() {
       let params = {
         page: this.currentPage,
+        tpl_type: this.type,
         size: this.pageSize,
         keyword: this.keyword,
         update_time_s: (this.updateTime && this.updateTime[0]) || "",
@@ -358,7 +400,7 @@ export default {
         ...this.selected,
         content: this.detail.content,
       });
-      
+
       this.$refs.dialog.hide();
     },
   },
diff --git a/src/pages/message-management/directed-push/directed-push-add.vue b/src/pages/message-management/directed-push/directed-push-add.vue
index eadba63..9f4ac78 100644
--- a/src/pages/message-management/directed-push/directed-push-add.vue
+++ b/src/pages/message-management/directed-push/directed-push-add.vue
@@ -51,6 +51,7 @@
         >
           <select-template
             class="apaas_step_content"
+            :tmp-types="[1]"
             @change="selectTemplate"
           ></select-template>
 
diff --git a/src/pages/message-management/message-alert/message-alert-add.vue b/src/pages/message-management/message-alert/message-alert-add.vue
index 9c4909d..7ffaad3 100644
--- a/src/pages/message-management/message-alert/message-alert-add.vue
+++ b/src/pages/message-management/message-alert/message-alert-add.vue
@@ -32,6 +32,7 @@
           <select-template
             class="apaas_step_content"
             :edit="true"
+            :tmp-types="[2, 3]"
             @change="selectTemplate"
           ></select-template>
 
@@ -98,7 +99,7 @@ export default {
       step: 0,
       done: false,
       templateId: "",
-      templateContent:"",
+      templateContent: "",
       targetUserIds: "",
     };
   },
-- 
2.26.0