Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/components/apass-list.vue

@@ -197,6 +197,10 @@ export default {
       this.currentPage = value;
       this.listAction();
     },
+    resetCurrentPage(value = 1) {
+      this.currentPage = value;
+      this.listAction();
+    },
     listAction() {
       if (this.timer) {
         clearTimeout(this.timer);

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]) || "",
@@ -287,6 +329,7 @@ export default {
       this.getTemplateList();
     },
     topFilterAction() {
+      this.currentPage = 1;
       this.getTemplateList();
     },
     topFilterClear() {
@@ -358,7 +401,7 @@ export default {
         ...this.selected,
         content: this.detail.content,
       });
-      
+
       this.$refs.dialog.hide();
     },
   },

src/pages/message-management/banner/banner-list.vue

@@ -268,8 +268,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -279,7 +282,7 @@ export default {
         down_time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     showDialog() {
       this.$refs.dialog.show();

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>
 

src/pages/message-management/directed-push/directed-push-list.vue

@@ -260,8 +260,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -270,7 +273,7 @@ export default {
         push_time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     addNew() {
       this.$router.push("/message/directed_push/add");

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: "",
     };
   },

src/pages/message-management/message-alert/message-alert-list.vue

@@ -33,8 +33,9 @@
               <span class="filter_title">状态：</span>
               <el-select v-model="topFilter.state" placeholder="请选择">
                 <el-option label="全部" value=""> </el-option>
-                <el-option label="推送成功" value="1"> </el-option>
-                <el-option label="推送失败" value="0"> </el-option>
+                <el-option label="推送成功" value="success"> </el-option>
+                <el-option label="推送失败" value="fail"> </el-option>
+                <el-option label="推送中" value="pushing"> </el-option>
               </el-select>
             </div>
             <div class="filter_item">
@@ -259,8 +260,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -269,7 +273,7 @@ export default {
         push_time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     addNew() {
       this.$router.push("/message/message_alert/add");

src/pages/message-management/message-template/message-template-list.vue

@@ -235,8 +235,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -245,7 +248,7 @@ export default {
         update_time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     showDialog() {
       this.$refs.dialog.show();

src/pages/message-management/recommended/recommended-list.vue

@@ -196,8 +196,11 @@ export default {
           });
         });
     },
+    resetCurrentPage() {
+      this.$refs.list.resetCurrentPage();
+    },
     topFilterAction() {
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     topFilterClear() {
       this.topFilter = {
@@ -206,7 +209,7 @@ export default {
         time: "",
       };
 
-      this.initList(this.tempFilter);
+      this.resetCurrentPage();
     },
     detailAction(item) {
       this.$router.push(

src/pages/workbench/fwzc_fwcs.vue

@@ -365,6 +365,7 @@
       :title="dialogInfo.title"
       :msg="dialogInfo.msg"
       :submit="dialogInfo.submit"
+      :cancelHide="true"
     ></apass-dialog>
   </div>
 </template>
@@ -997,6 +998,7 @@ export default {
         this.getOrganization();
       } else {
         self.is_map = 0;
+        self.getServiceType1();
       }
     },
     goBack() {
@@ -1076,9 +1078,8 @@ export default {
         }
       }
     });
-    self.getServiceType1();
-    self.getArea();
     self.judgeMap();
+    self.getArea();
   },
 };
 </script>