From dbf8b7b7c504246d60a560cc44024eae75b5f386 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 24 Sep 2021 16:27:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../message/SysMessageTemplateList.vue        | 15 +++++++------
 .../modules/SysMessageTemplateModal.vue       | 22 +++++--------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue
index a8cb952..bcf42f9 100644
--- a/src/views/modules/message/SysMessageTemplateList.vue
+++ b/src/views/modules/message/SysMessageTemplateList.vue
@@ -19,7 +19,8 @@
 
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="模板标题">
-                <a-input placeholder="请输入模板标题" v-model="queryParam.templateName"></a-input>
+<!--                <a-input placeholder="请输入模板标题" v-model="queryParam.templateName"></a-input>-->
+                <j-dict-select-tag placeholder="请选择模板标题" dictCode="notice_type" v-model="queryParam.templateName"></j-dict-select-tag>
               </a-form-item>
             </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -88,6 +89,7 @@ import SysMessageTemplateModal from './modules/SysMessageTemplateModal'
 import SysMessageTestModal from './modules/SysMessageTestModal'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import JEllipsis from '@/components/jero/JEllipsis'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import '@/assets/less/TableExpand.less'
 
 export default {
@@ -96,7 +98,8 @@ export default {
   components: {
     SysMessageTemplateModal,
     SysMessageTestModal,
-    JEllipsis
+    JEllipsis,
+    JDictSelectTag
   },
   data() {
     return {
@@ -123,7 +126,7 @@ export default {
         {
           title: '模板标题',
           align: 'center',
-          dataIndex: 'templateName',
+          dataIndex: 'templateName_dictText',
           scopedSlots: {customRender: 'text'},
           width: 200,
         },
@@ -137,10 +140,8 @@ export default {
         {
           title: '模板类型',
           align: 'center',
-          dataIndex: 'templateType',
-          // 只有一个 类型 就写死了 如果新增类型 需要改
-          customRender: function () { return '系统'},
-
+          dataIndex: 'templateType_dictText',
+          scopedSlots: {customRender: 'text'},
         },
         {
           title: '操作',
diff --git a/src/views/modules/message/modules/SysMessageTemplateModal.vue b/src/views/modules/message/modules/SysMessageTemplateModal.vue
index fc0e730..f0754db 100644
--- a/src/views/modules/message/modules/SysMessageTemplateModal.vue
+++ b/src/views/modules/message/modules/SysMessageTemplateModal.vue
@@ -142,19 +142,11 @@
         this.form.resetFields()
         this.getKey()
         this.model = Object.assign({}, record)
-        this.useEditor = (record.templateType==2 || record.templateType==4)
-        if(this.useEditor){
-          this.templateEditorContent=record.templateContent
-        }else{
-          this.templateEditorContent=''
-        }
+        // this.useEditor = (record.templateType==2 || record.templateType==4)
+        this.templateEditorContent=record.templateContent
         this.visible = true
         this.$nextTick(() => {
-          if(this.useEditor){
-            this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateName', 'templateTestJson', 'templateType'))
-          }else{
-            this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateContent', 'templateName', 'templateTestJson', 'templateType'))
-          }
+          this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateContent', 'templateName', 'templateTestJson', 'templateType'))
         })
       },
       close() {
@@ -177,13 +169,9 @@
               httpurl += this.url.edit
             }
             let formData = Object.assign(this.model, values)
-            //时间格式化
+            // 加密
+            formData.templateContent = encryption(this.templateEditorContent,this.key,this.iv)
 
-            if(this.useEditor){
-              // 加密
-              formData.templateContent = encryption(this.templateEditorContent,this.key,this.iv)
-              // formData.templateContent=this.templateEditorContent
-            }
             console.log(formData)
             httpAction(httpurl, formData, method).then((res) => {
               if (res.success) {