wotokol-edm 1.1.15 → 1.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wotokol-edm",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "",
   "main": "wotokol-edm.common.js",
   "scripts": {

package/wotokol-edm.common.js

@@ -118410,10 +118410,10 @@ var mailTemplatevue_type_template_id_2b36ea26_scoped_true_render = function rend
 };
 var mailTemplatevue_type_template_id_2b36ea26_scoped_true_staticRenderFns = [];
 
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=template&id=0aaac0a8&scoped=true
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=template&id=357bd4cd&scoped=true
 
 
-var TemplateListvue_type_template_id_0aaac0a8_scoped_true_render = function render() {
+var TemplateListvue_type_template_id_357bd4cd_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -118460,7 +118460,7 @@ var TemplateListvue_type_template_id_0aaac0a8_scoped_true_render = function rend
       "label": "应用场景",
       "value": "2"
     }
-  })], 1), _vm.searchForm.modelType == 1 && _vm.contentSelect == 2 ? _c('div', {
+  })], 1), _vm.searchForm.type == 1 && _vm.contentSelect == 2 ? _c('div', {
     staticClass: "temp_right"
   }, [_c('el-select', {
     attrs: {
@@ -118523,6 +118523,8 @@ var TemplateListvue_type_template_id_0aaac0a8_scoped_true_render = function rend
     on: {
       "change": function ($event) {
         _vm.mailTitleInput = '';
+        _vm.searchForm.content = '';
+        _vm.searchForm.mailSubject = '';
       }
     },
     slot: "prepend",
@@ -118594,12 +118596,15 @@ var TemplateListvue_type_template_id_0aaac0a8_scoped_true_render = function rend
       "placeholder": _vm.$i18n.t('common.please_select'),
       "clearable": ""
     },
+    on: {
+      "change": _vm.modelTypeChange
+    },
     model: {
-      value: _vm.searchForm.modelType,
+      value: _vm.searchForm.type,
       callback: function ($$v) {
-        _vm.$set(_vm.searchForm, "modelType", $$v);
+        _vm.$set(_vm.searchForm, "type", $$v);
       },
-      expression: "searchForm.modelType"
+      expression: "searchForm.type"
     }
   }, [_c('el-option', {
     key: 1,
@@ -118662,11 +118667,11 @@ var TemplateListvue_type_template_id_0aaac0a8_scoped_true_render = function rend
       "filterable": ""
     },
     model: {
-      value: _vm.searchForm.createdUser,
+      value: _vm.searchForm.userId,
       callback: function ($$v) {
-        _vm.$set(_vm.searchForm, "createdUser", $$v);
+        _vm.$set(_vm.searchForm, "userId", $$v);
       },
-      expression: "searchForm.createdUser"
+      expression: "searchForm.userId"
     }
   }, _vm._l(_vm.accountList, function (item) {
     return _c('el-option', {
@@ -118739,6 +118744,12 @@ var TemplateListvue_type_template_id_0aaac0a8_scoped_true_render = function rend
       }
     }, [_vm._v(_vm._s(item.label))]);
   }), 1)], 1)], 1)])])])], 1)], 1), _c('div', {
+    directives: [{
+      name: "loading",
+      rawName: "v-loading",
+      value: _vm.loading,
+      expression: "loading"
+    }],
     staticClass: "temp_box"
   }, [_vm.templateList.length ? _c('div', {
     staticClass: "temp_list"
@@ -118844,9 +118855,9 @@ var TemplateListvue_type_template_id_0aaac0a8_scoped_true_render = function rend
     }
   })], 1)]);
 };
-var TemplateListvue_type_template_id_0aaac0a8_scoped_true_staticRenderFns = [];
+var TemplateListvue_type_template_id_357bd4cd_scoped_true_staticRenderFns = [];
 
-;// ./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=template&id=0aaac0a8&scoped=true
+;// ./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=template&id=357bd4cd&scoped=true
 
 ;// ./src/components/EdmElement/TemplateCom/const.js
 
@@ -118956,15 +118967,22 @@ const templateSystemScene = [{
 
 function createSearchForm(tar) {
   let raw = {
-    // templatesTitle: '', //模板标题
-    // scene: '', //应用场景
-    // mailSubject: '', //邮件主题
-    // content: '', //正文
-    type: 2,
+    templatesTitle: "",
+    //模板标题
+    scene: "",
+    //应用场景
+    mailSubject: "",
+    //邮件主题
+    content: "",
+    //正文
+    type: null,
     //模版类型 1-系统模板；2-自定义模板
-    // modelLanguage: '', //语言
-    // isShared: '', //是否共享
-    // userId: '', //创建人
+    modelLanguage: "",
+    //语言
+    isShared: "",
+    //是否共享
+    userId: "",
+    //创建人
     searchSort: 1,
     //排序
     currentPage: 1,
@@ -118995,8 +119013,7 @@ function createSearchForm(tar) {
       language: TemplateCom_const_language,
       sortConfig: sortConfig,
       accountList: [],
-      currentPage: 5,
-      templateList: [1],
+      templateList: [],
       templateSystemScene: templateSystemScene,
       total: 0,
       loading: false
@@ -119031,20 +119048,19 @@ function createSearchForm(tar) {
     },
     // 获取列表
     getCardList() {
-      // if (this.contentSelect == '1') {
-      //   this.searchForm.templatesTitle = this.contentInput
-      // } else if (this.contentSelect == '2') {
-      //   //系统模版
-      //   if (this.searchForm.type == 2) {
-      //     this.searchForm.scene = this.contentInput
-      //   }
-      // }
-      // if (this.mailTitleSelect == '1') {
-      //   this.searchForm.mailSubject = this.mailTitleInput
-      // } else if (this.mailTitleSelect == '2') {
-      //   this.searchForm.content = this.mailTitleInput
-      // }
-      console.log(this.searchForm, "searchForm");
+      if (this.contentSelect == "1") {
+        this.searchForm.templatesTitle = this.contentInput;
+      } else if (this.contentSelect == "2") {
+        //系统模版
+        if (this.searchForm.type != 1) {
+          this.searchForm.scene = this.contentInput;
+        }
+      }
+      if (this.mailTitleSelect == "1") {
+        this.searchForm.mailSubject = this.mailTitleInput;
+      } else if (this.mailTitleSelect == "2") {
+        this.searchForm.content = this.mailTitleInput;
+      }
       this.loading = true;
       templatesList(this.searchForm).then(res => {
         if (res.code == "0") {
@@ -119076,6 +119092,8 @@ function createSearchForm(tar) {
       hubUserSonFather().then(res => {
         if (res.code == "0") {
           this.accountList = res.data;
+        } else {
+          this.$message.error(res.message);
         }
       });
     },
@@ -119098,10 +119116,10 @@ function createSearchForm(tar) {
 });
 ;// ./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=script&lang=js
  /* harmony default export */ var TemplateCom_TemplateListvue_type_script_lang_js = (TemplateListvue_type_script_lang_js); 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=style&index=0&id=0aaac0a8&prod&lang=scss&scoped=true
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=style&index=0&id=357bd4cd&prod&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=style&index=0&id=0aaac0a8&prod&lang=scss&scoped=true
+;// ./src/components/EdmElement/TemplateCom/TemplateList.vue?vue&type=style&index=0&id=357bd4cd&prod&lang=scss&scoped=true
 
 ;// ./src/components/EdmElement/TemplateCom/TemplateList.vue
 
@@ -119114,11 +119132,11 @@ function createSearchForm(tar) {
 
 var TemplateList_component = normalizeComponent(
   TemplateCom_TemplateListvue_type_script_lang_js,
-  TemplateListvue_type_template_id_0aaac0a8_scoped_true_render,
-  TemplateListvue_type_template_id_0aaac0a8_scoped_true_staticRenderFns,
+  TemplateListvue_type_template_id_357bd4cd_scoped_true_render,
+  TemplateListvue_type_template_id_357bd4cd_scoped_true_staticRenderFns,
   false,
   null,
-  "0aaac0a8",
+  "357bd4cd",
   null
   
 )