From 0f2eed699ae0e7b929702d7cf6d4d5e54c567242 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 27 Sep 2021 17:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=8E=A5=E6=94=B6=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/SysMessageTemplateModal.vue       | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/message/modules/SysMessageTemplateModal.vue b/src/views/modules/message/modules/SysMessageTemplateModal.vue
index d04788e..2c7aa48 100644
--- a/src/views/modules/message/modules/SysMessageTemplateModal.vue
+++ b/src/views/modules/message/modules/SysMessageTemplateModal.vue
@@ -10,7 +10,7 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-row :gutter="{ xs: 8, sm: 16, md: 24, lg: 32 }">
+        <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item
               :labelCol="labelCol"
@@ -37,14 +37,25 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24" >
-          <a-col :span="24" pull="2">
+        <a-row :gutter="24" >
+          <a-col :span="12" >
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="模板标题"
-              style="margin-left: -15px">
-              <j-dict-select-tag :triggerChange="true" dictCode="notice_type" v-decorator="['templateName', validatorRules.templateName ]" placeholder="请选择模板类型"></j-dict-select-tag>
+              style="margin-right: -35px"
+              >
+              <j-dict-select-tag  :triggerChange="true" dictCode="notice_type" v-decorator="['templateName', validatorRules.templateName ]" placeholder="请选择模板类型"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="12" >
+            <a-form-item
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              label="接收用户"
+             >
+              <j-dict-select-tag :triggerChange="true" dictCode="receive_message_user_type" v-decorator="['recipient', validatorRules.recipient ]" placeholder="请选择接收用户"></j-dict-select-tag>
             </a-form-item>
           </a-col>
         </a-row>
@@ -112,10 +123,10 @@
         form: this.$form.createForm(this),
         validatorRules: {
         // ,{validator: this.validateTemplateCode}
-        templateCode: {rules: [{required: true, message: '请输入模板CODE!' }]},
-        templateName: {rules: [{required: true, message: '请输入模板标题!'}]},
-        templateContent: {rules: []},
-        templateType: {rules: [{required: true, message: '请选择模板类型!'}]},
+        templateCode: {rules: [{required: true, message: '请输入模板CODE!' }],validateTrigger: 'blur'},
+        templateName: {rules: [{required: true, message: '请选择模板标题!'}],validateTrigger: 'change'},
+          recipient:{rules: [{required: true, message: '请选择接收用户!'}],validateTrigger: 'change'},
+        templateType: {rules: [{required: true, message: '请选择模板类型!'}],validateTrigger: 'change'}
         },
         url: {
           add: '/sys/message/sysMessageTemplate/add',
@@ -146,7 +157,7 @@
         this.templateEditorContent=record.templateContent
         this.visible = true
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateContent', 'templateName', 'templateTestJson', 'templateType'))
+          this.form.setFieldsValue(pick(this.model, 'templateCode', 'templateContent', 'templateName', 'templateTestJson', 'templateType','recipient'))
         })
       },
       close() {