From 8fd8bdf4d9b3fc0e4b66af2b48c848a74fb5d45f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 27 Apr 2024 17:31:53 +0800
Subject: [PATCH] 1

---
 src/views/email/create.vue | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/views/email/create.vue b/src/views/email/create.vue
index e137e1c..3023f27 100644
--- a/src/views/email/create.vue
+++ b/src/views/email/create.vue
@@ -2,7 +2,7 @@
   <div class="createPost-container">
     <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
       <sticky :z-index="10" class-name="sub-navbar draft">
-        <CommentDropdown v-show="dialogEmailTypeVisible" v-model="postForm.mailtype" />
+        <CommentDropdown v-show="mailTypeVisible" v-model="postForm.mailtype" />
         <el-button style="margin-left: 10px;" type="success" @click="dialogStatus==='create'?submitForm():updateFrom()">
           发布
         </el-button>
@@ -19,6 +19,16 @@
               <el-date-picker v-model.number="postForm.expiretime" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" required />
             </el-form-item>
           </el-col>
+          <el-col :span="10">
+            <el-form-item label-width="120px" label="用户注册时间>=:" class="postInfo-container-item" prop="sendtime">
+              <el-date-picker v-model.number="postForm.sendtime" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" required />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label-width="120px" label="用户注册时间<=:" class="postInfo-container-item" prop="expiretime">
+              <el-date-picker v-model.number="postForm.expiretime" type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" placeholder="Select date and time" required />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
@@ -47,20 +57,6 @@
               <el-input v-model="postForm.to" type="textarea" :rows="6" required />
               </el-input>
             </el-form-item>
-            <div class="postInfo-container">
-              <el-row>
-                <el-col :span="30">
-                  <el-form-item v-show="dialogUserTypeVisible" label="群发邮件用户类型(个人时忽略）:" class="postInfo-container-item">
-                    <el-radio-group v-model="postForm.usertype">
-                      <el-radio :label="0">全体用户</el-radio>
-                      <el-radio :label="1">only邮件发送时间之前注册的用户</el-radio>
-                      <el-radio :label="2">only邮件发送之后注册的用户</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-
-              </el-row>
-            </div>
           </el-col>
         </el-row>
 
@@ -99,9 +95,8 @@ export default {
         subject: [{ required: true, message: 'subject is required', trigger: 'blur' }],
         content: [{ required: true, message: 'content is required', trigger: 'blur' }]
       },
-      dialogUserTypeVisible: false,
       personalMailVisible: true,
-      dialogEmailTypeVisible: true,
+      mailTypeVisible: true,
       dialogStatus: 'create'
     }
   },
@@ -113,7 +108,6 @@ export default {
             this.personalMailVisible = true
             this.groupMailVisible = false
 
-            this.dialogUserTypeVisible = false
           }
           break
         case MAIL_TYPE_GROUP:
@@ -121,7 +115,6 @@ export default {
             this.personalMailVisible = false
             this.groupMailVisible = true
 
-            this.dialogUserTypeVisible = true
           }
           break
         case MAIL_TYPE_ALL:
@@ -129,7 +122,6 @@ export default {
             this.personalMailVisible = false
             this.groupMailVisible = false
 
-            this.dialogUserTypeVisible = true
           }
           break
       }
@@ -141,9 +133,8 @@ export default {
   created() {
     const mailid = this.$route.params.mailid
     if (mailid) {
-      this.dialogUserTypeVisible = false
       this.personalMailVisible = false
-      this.dialogEmailTypeVisible = false
+      this.mailTypeVisible = false
       this.dialogStatus = 'update'
       const editEmail = JSON.parse(sessionStorage.getItem('editEmail' + mailid))
       this.postForm = editEmail