From 12bf2d64efe9c62a33fc10b1acdca9ecfcd10fce Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 11 Mar 2024 11:20:41 +0800
Subject: [PATCH] 邮件信息优化

---
 src/views/system/email/emailTemplates.vue      |  424 +++++-----
 src/views/system/email/emailSendingHistory.vue |  463 ++++++----
 src/views/grid/index.vue                       |  735 ++++++++--------
 src/views/resource/sms.vue                     |  798 +++++++++---------
 4 files changed, 1,248 insertions(+), 1,172 deletions(-)

diff --git a/src/views/grid/index.vue b/src/views/grid/index.vue
index 107fbec..4d16b8f 100644
--- a/src/views/grid/index.vue
+++ b/src/views/grid/index.vue
@@ -1,391 +1,392 @@
 <template>
-    <basic-container>
-        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
-            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
-            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot="menuLeft">
-                <el-button size="small" icon="el-icon-delete" plain v-if="permission.grid_delete" @click="handleDelete">删 除
-                </el-button>
-            </template>
-            <template slot-scope="{row, size}" slot="principalPhone">
-                <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
-                    v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
-                </el-button>
-            </template>
-        </avue-crud>
-    </basic-container>
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button size="small" icon="el-icon-delete" plain v-if="permission.grid_delete" @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot-scope="{row, size}" slot="principalPhone">
+        <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
+          v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
 </template>
 
 <script>
-import { getList, remove, update, add, getGrid } from "@/api/grid/grid"
-import { mapGetters } from "vuex"
-// import website from '@/config/website'
-export default {
-    data () {
-        //手机号格式校验
-        let validatorPhone = function (rule, value, callback) {
-            if (value) {
-                if (!/^1[3456789]\d{9}$/.test(value)) {
-                    callback(new Error('手机号格式有误!'))
-                } else {
-                    callback()
-                }
-            }
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getGrid
+  } from "@/api/grid/grid"
+  import {
+    mapGetters
+  } from "vuex"
+  // import website from '@/config/website'
+  export default {
+    data() {
+      //手机号格式校验
+      let validatorPhone = function(rule, value, callback) {
+        if (value) {
+          if (!/^1[3456789]\d{9}$/.test(value)) {
+            callback(new Error('手机号格式有误!'))
+          } else {
             callback()
+          }
         }
+        callback()
+      }
 
-        return {
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
-            },
-            datetime: "",
-            selectionList: [],
-            option: {
-                labelWidth: 96,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 210,
-
-                height: "auto",
-                calcHeight: 54,
-                dialogWidth: 950,
-                tip: false,
-                border: true,
-                //stripe:true,
-                index: true,
-                viewBtn: true,
-                selection: true,
-                dialogClickModal: false,
-                column: [
-                    {
-                        overHidden: true,
-                        label: "所属社区",
-                        addDisplay: false,
-                        editDisplay: false,
-                        viewDisplay: false,
-                        prop: "communityName",
-                        search: true,
-                        searchSpan: 4,
-                        searchLabelWidth: 76,
-                        row:true, 
-                        rules: [{
-                            required: true,
-                            message: "请选择所属社区",
-                            trigger: "blur",
-                        }],
-                    },
-
-                    {
-                        hide: true,
-                        parent: false,
-                        label: "所属社区",
-                        prop: "communityCode",
-                        search: false,
-                        type: "tree",
-                        dicUrl: "/api/blade-system/region/tree",
-                        row:true,                        
-                        props: {
-                            label: "name",
-                            value: "id",
-                        },
-                        rules: [
-                            {
-                                required: true,
-                                message: "请选择所属社区",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
-                    {
-                        overHidden: true,
-                        label: "网格名称",
-                        prop: "gridName",
-                        searchSpan: 4,
-                        search: true,
-                        rules: [
-                            {
-                                required: true,
-                                message: "请输入网格名称",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
-                    {
-                        overHidden: true,
-                        label: "网格编号",
-                        prop: "gridCode",
-                        searchSpan: 4,
-                        search: true,
-                        rules: [
-                            {
-                                required: true,
-                                message: "请输入网格编号",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
-
-                    {
-                        width: 110,
-                        label: "负责人",
-                        prop: "principal",
-                        searchSpan: 4,
-                        search: true,
-                        rules: [
-                            {
-                                required: true,
-                                message: "请输入负责人",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
-                    {
-                        width: 120,
-                        label: "联系电话",
-                        prop: "principalPhone",
-                        searchSpan: 4,
-                        search: true,
-                        rules: [
-                            {
-                                required: true,
-                                message: "请输入联系电话",
-                                trigger: "blur",
-                            },
-
-                            {
-                                validator: validatorPhone,
-                                trigger: 'blur'
-                            }
-                        ],
-                        slot: true
-                    },
-                    {
-                        label: "区域",
-                        prop: "geom",
-                        type: "textarea",
-                        hide: true,
-                        span: 24,
-                        display: false,
-                        rules: [
-                            {
-                                required: true,
-                                message: "请输入区域",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
-                    {
-                        label: "排序",
-                        prop: "sort",
-                        type: "number",
-                        hide: true,
-                        value: 1,
-                        rules: [
-                            {
-                                required: true,
-                                message: "请输入排序",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
-                    {
-                        label: "网格简介",
-                        prop: "remark",
-                        component: "AvueUeditor",
-                        options: {
-                            action: "/api/blade-resource/oss/endpoint/put-file",
-                            props: {
-                                res: "data",
-                                url: "link",
-                            },
-                        },
-                        hide: true,
-                        minRows: 6,
-                        span: 24,
-                    },
-                ],
-            },
-            data: [],
-        }
-    },
-    watch: {
-    },
-    computed: {
-        ...mapGetters(["permission", "userInfo"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.grid_add, true),
-                viewBtn: this.vaildData(this.permission.grid_view, true),
-                delBtn: this.vaildData(this.permission.grid_delete, true),
-                editBtn: this.vaildData(this.permission.grid_edit, true),
-            }
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
         },
-        ids () {
-            let ids = []
-            this.selectionList.forEach((ele) => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
-        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          labelWidth: 96,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 210,
 
-        textDispose () {
-            return (row, flag, type) => {
-                if (row[flag] || row[type] == null) {
-                    return row[type]
-                } else {
-                    if (type == 'principalIdCard') {
-                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
-                    } else {
-                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
-                    }
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          border: true,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [{
+              overHidden: true,
+              label: "所属社区",
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              prop: "communityName",
+              search: true,
+              searchSpan: 4,
+              searchLabelWidth: 76,
+              row: true,
+              rules: [{
+                required: true,
+                message: "请选择所属社区",
+                trigger: "blur",
+              }],
+            },
+
+            {
+              hide: true,
+              parent: false,
+              label: "所属社区",
+              prop: "communityCode",
+              search: false,
+              type: "tree",
+              dicUrl: "/api/blade-system/region/tree",
+              row: true,
+              // cascader: ['principal'],
+              props: {
+                label: "name",
+                value: "id",
+              },
+              rules: [{
+                required: true,
+                message: "请选择所属社区",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              overHidden: true,
+              label: "网格名称",
+              prop: "gridName",
+              searchSpan: 4,
+              search: true,
+
+              rules: [{
+                required: true,
+                message: "请输入网格名称",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              overHidden: true,
+              label: "网格编号",
+              prop: "gridCode",
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入网格编号",
+                trigger: "blur",
+              }, ],
+            },
+
+            {
+              width: 110,
+              label: "负责人",
+              prop: "principal",
+              searchSpan: 4,
+              type: 'tree',
+              span: 8,
+              dicUrl: `/api/blade-system/user/getUserListByParam?&roleId=1717429261910528001`,
+              search: true,
+              props: {
+                label: 'name',
+                value: 'id'
+              },
+              rules: [{
+                required: true,
+                message: "请输入负责人",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              width: 120,
+              label: "联系电话",
+              prop: "principalPhone",
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                  required: true,
+                  message: "请输入联系电话",
+                  trigger: "blur",
+                },
+
+                {
+                  validator: validatorPhone,
+                  trigger: 'blur'
                 }
-            }
+              ],
+              slot: true
+            },
+            {
+              label: "区域",
+              prop: "geom",
+              type: "textarea",
+              hide: true,
+              span: 24,
+              display: false,
+              rules: [{
+                required: true,
+                message: "请输入区域",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "排序",
+              prop: "sort",
+              type: "number",
+              hide: true,
+              value: 1,
+              rules: [{
+                required: true,
+                message: "请输入排序",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "网格简介",
+              prop: "remark",
+              component: "AvueUeditor",
+              options: {
+                action: "/api/blade-resource/oss/endpoint/put-file",
+                props: {
+                  res: "data",
+                  url: "link",
+                },
+              },
+              hide: true,
+              minRows: 6,
+              span: 24,
+            },
+          ],
+        },
+        data: [],
+      }
+    },
+    watch: {},
+    computed: {
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.grid_add, true),
+          viewBtn: this.vaildData(this.permission.grid_view, true),
+          delBtn: this.vaildData(this.permission.grid_delete, true),
+          editBtn: this.vaildData(this.permission.grid_edit, true),
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      },
+
+      textDispose() {
+        return (row, flag, type) => {
+          if (row[flag] || row[type] == null) {
+            return row[type]
+          } else {
+            if (type == 'principalIdCard') {
+              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+            } else {
+              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+            }
+          }
+        }
+      }
     },
     methods: {
-        showStringDispose (row, type) {
-            row[type] = !row[type]
-        },
+      showStringDispose(row, type) {
+        row[type] = !row[type]
+      },
 
-        rowSave (row, done, loading) {
-            add(row).then(
-                () => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    done()
-                },
-                (error) => {
-                    window.console.log(error)
-                    loading()
-                }
-            )
-        },
-        rowUpdate (row, index, done, loading) {
-            update(row).then(
-                () => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    done()
-                },
-                (error) => {
-                    window.console.log(error)
-                    loading()
-                }
-            )
-        },
-        rowDel (row) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    return remove(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                })
-        },
-        searchReset () {
-            this.query = {}
+      rowSave(row, done, loading) {
+        add(row).then(
+          () => {
             this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        handleDelete () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+            this.$message({
+              type: "success",
+              message: "操作成功!",
             })
-                .then(() => {
-                    return remove(this.ids)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!",
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        beforeOpen (done, type) {
-            if (["edit", "view"].includes(type)) {
-                getGrid(this.form.id).then((res) => {
-                    this.form = res.data.data
-                })
-            }
-            // con
             done()
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            this.loading = true
-
-            getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
-                const data = {
-                    ...res.data.data,
-                    records: res.data.data.records.map(item => {
-                        return {
-                            ...item,
-                            'principalPhoneflag': false
-                        }
-                    })
-                }
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(
+          () => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
             })
+            done()
+          },
+          (error) => {
+            window.console.log(error)
+            loading()
+          }
+        )
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(row.id)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+          })
+      },
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
         }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            return remove(this.ids)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getGrid(this.form.id).then((res) => {
+            this.form = res.data.data
+          })
+        }
+        // con
+        done()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        this.loading = true
+
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
+          const data = {
+            ...res.data.data,
+            records: res.data.data.records.map(item => {
+              return {
+                ...item,
+                'principalPhoneflag': false
+              }
+            })
+          }
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     }
-}
+  }
 </script>
 
 <style>
-.avue-upload__icon {
+  .avue-upload__icon {
     line-height: 6;
-}
-</style>
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/resource/sms.vue b/src/views/resource/sms.vue
index 14ef752..54037f1 100644
--- a/src/views/resource/sms.vue
+++ b/src/views/resource/sms.vue
@@ -1,417 +1,425 @@
 <template>
-    <basic-container>
-        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-            :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave"
-            @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot="menuLeft">
-                <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.sms_delete"
-                    @click="handleDelete">删 除
-                </el-button>
-            </template>
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
+      :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.sms_delete"
+          @click="handleDelete">删 除
+        </el-button>
+      </template>
 
-            <template slot-scope="{ row, size, index }" slot="menu">
-                <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
-                    @click="handleDebug(row)">调试
-                </el-button>
-                <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.sms_enable"
-                    @click.stop="handleEnable(row)">启用
-                </el-button>
-            </template>
+      <template slot-scope="{ row, size, index }" slot="menu">
+        <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
+          @click="handleDebug(row)">调试
+        </el-button>
+        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.sms_enable"
+          @click.stop="handleEnable(row)">启用
+        </el-button>
+      </template>
 
-            <template slot-scope="{row, size}" slot="status">
-                <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
-            </template>
-            <template slot-scope="{row, size}" slot="category">
-                <el-tag :size="size">{{ row.categoryName }}</el-tag>
-            </template>
-        </avue-crud>
-        <el-dialog title="手机短信发送调试" append-to-body :visible.sync="box" width="550px">
-            <avue-form :option="debugOption" v-model="debugForm" @submit="handleSend" />
-        </el-dialog>
-    </basic-container>
+      <template slot-scope="{row, size}" slot="status">
+        <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
+      </template>
+      <template slot-scope="{row, size}" slot="category">
+        <el-tag :size="size">{{ row.categoryName }}</el-tag>
+      </template>
+    </avue-crud>
+    <el-dialog title="手机短信发送调试" append-to-body :visible.sync="box" width="550px">
+      <avue-form :option="debugOption" v-model="debugForm" @submit="handleSend" />
+    </el-dialog>
+  </basic-container>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove, enable, send } from "@/api/resource/sms"
-import { mapGetters } from "vuex"
-import func from "@/util/func"
+  import {
+    getList,
+    getDetail,
+    add,
+    update,
+    remove,
+    enable,
+    send
+  } from "@/api/resource/sms"
+  import {
+    mapGetters
+  } from "vuex"
+  import func from "@/util/func"
 
-export default {
-    data () {
-        return {
-            form: {},
-            query: {},
-            loading: true,
-            box: false,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
-            },
-            selectionList: [],
-            option: {
-                labelWidth: 96,
-                searchLabelWidth: 96,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 350,
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        box: false,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          labelWidth: 96,
+          searchLabelWidth: 96,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 350,
 
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                border: true,
-                index: true,
-                viewBtn: true,
-                selection: true,
-                dialogWidth: 880,
-                dialogClickModal: false,
-                column: [
-                    {
-                        label: "分类",
-                        type: "radio",
-                        value: 1,
-                        span: 24,
-                        width: 100,
-                        searchLabelWidth: 46,
-                        row: true,
-                        dicUrl: "/api/blade-system/dict/dictionary?code=sms",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey"
-                        },
-                        dataType: "number",
-                        slot: true,
-                        prop: "category",
-                        searchSpan: 4,
-                        search: true,
-                        rules: [{
-                            required: true,
-                            message: "请选择分类",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "资源编号",
-                        prop: "smsCode",
-                        span: 24,
-                        width: 200,
-                        searchSpan: 4,
-                        search: true,
-                        rules: [{
-                            required: true,
-                            message: "请输入资源编号",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "模版ID",
-                        prop: "templateId",
-                        span: 24,
-                        width: 200,
-                        searchSpan: 4,
-                        searchLabelWidth: 80,
-                        search: true,
-                        rules: [{
-                            required: true,
-                            message: "请输入模版ID",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "accessKey",
-                        prop: "accessKey",
-                        span: 24,
-                        overHidden: true,
-                        rules: [{
-                            required: true,
-                            message: "请输入accessKey",
-                            trigger: "blur"
-                        }],
-                    },
-                    {
-                        label: "secretKey",
-                        prop: "secretKey",
-                        span: 24,
-                        overHidden: true,
-                        display: true,
-                        hide: true,
-                        rules: [{
-                            required: true,
-                            message: "请输入secretKey",
-                            trigger: "blur"
-                        }],
-                    },
-                    {
-                        label: "regionId",
-                        prop: "regionId",
-                        span: 24,
-                        value: "cn-hangzhou",
-                        hide: true,
-                        display: false
-                    },
-                    {
-                        label: "短信签名",
-                        prop: "signName",
-                        span: 24,
-                        width: 200,
-                        rules: [{
-                            required: true,
-                            message: "请输入短信签名",
-                            trigger: "blur"
-                        }],
-                    },
-                    {
-                        width: 100,
-                        label: "是否启用",
-                        prop: "status",
-                        span: 24,
-                        align: "center",
-                        slot: true,
-                        addDisplay: false,
-                        editDisplay: false,
-                        viewDisplay: false,
-                    },
-                    {
-                        label: "备注",
-                        prop: "remark",
-                        span: 24,
-                        hide: true
-                    },
-                ]
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogWidth: 880,
+          dialogClickModal: false,
+          column: [
+            // {
+            //     label: "分类",
+            //     type: "radio",
+            //     value: 1,
+            //     span: 24,
+            //     width: 100,
+            //     searchLabelWidth: 46,
+            //     row: true,
+            //     dicUrl: "/api/blade-system/dict/dictionary?code=sms",
+            //     props: {
+            //         label: "dictValue",
+            //         value: "dictKey"
+            //     },
+            //     dataType: "number",
+            //     slot: true,
+            //     prop: "category",
+            //     searchSpan: 4,
+            //     search: true,
+            //     rules: [{
+            //         required: true,
+            //         message: "请选择分类",
+            //         trigger: "blur"
+            //     }]
+            // },
+            {
+              label: "资源编号",
+              prop: "smsCode",
+              span: 24,
+              width: 200,
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入资源编号",
+                trigger: "blur"
+              }]
             },
-            data: [],
-            debugForm: {
-                code: '',
+            {
+              label: "模版ID",
+              prop: "templateId",
+              span: 24,
+              width: 200,
+              searchSpan: 4,
+              searchLabelWidth: 80,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入模版ID",
+                trigger: "blur"
+              }]
             },
-            debugOption: {
-                submitText: "发送",
-                column: [
-                    {
-                        label: "资源编号",
-                        prop: "code",
-                        disabled: true,
-                        span: 24,
-                    },
-                    {
-                        label: "发送手机",
-                        prop: "phones",
-                        span: 24,
-                    },
-                    {
-                        label: "发送参数",
-                        prop: "params",
-                        span: 24,
-                        placeholder: "例: {'code':2333,'title':'通知标题'}",
-                    },
-                ]
-            }
+            {
+              label: "accessKey",
+              prop: "accessKey",
+              span: 24,
+              overHidden: true,
+              rules: [{
+                required: true,
+                message: "请输入accessKey",
+                trigger: "blur"
+              }],
+            },
+            {
+              label: "secretKey",
+              prop: "secretKey",
+              span: 24,
+              overHidden: true,
+              display: true,
+              hide: true,
+              rules: [{
+                required: true,
+                message: "请输入secretKey",
+                trigger: "blur"
+              }],
+            },
+            {
+              label: "regionId",
+              prop: "regionId",
+              span: 24,
+              value: "cn-hangzhou",
+              hide: true,
+              display: false
+            },
+            {
+              label: "短信签名",
+              prop: "signName",
+              span: 24,
+              width: 200,
+              rules: [{
+                required: true,
+                message: "请输入短信签名",
+                trigger: "blur"
+              }],
+            },
+            {
+              width: 100,
+              label: "是否启用",
+              prop: "status",
+              span: 24,
+              align: "center",
+              slot: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+            },
+            {
+              label: "备注",
+              prop: "remark",
+              span: 24,
+              hide: true
+            },
+          ]
+        },
+        data: [],
+        debugForm: {
+          code: '',
+        },
+        debugOption: {
+          submitText: "发送",
+          column: [{
+              label: "资源编号",
+              prop: "code",
+              disabled: true,
+              span: 24,
+            },
+            {
+              label: "发送手机",
+              prop: "phones",
+              span: 24,
+            },
+            {
+              label: "发送参数",
+              prop: "params",
+              span: 24,
+              placeholder: "例: {'code':2333,'title':'通知标题'}",
+            },
+          ]
         }
+      }
     },
     watch: {
-        'form.category' () {
-            const category = func.toInt(this.form.category)
-            this.$refs.crud.option.column.filter(item => {
-                if (item.prop === "templateId") {
-                    if (category === 1) {
-                        item.label = "模版内容"
-                    } else {
-                        item.label = "模版ID"
-                    }
-                }
-                if (item.prop === "accessKey") {
-                    if (category === 1) {
-                        item.label = "apiKey"
-                    } else if (category === 4) {
-                        item.label = "appId"
-                    } else {
-                        item.label = "accessKey"
-                    }
-                }
-                if (item.prop === "secretKey") {
-                    item.display = category !== 1
-                    if (category === 4) {
-                        item.label = "appKey"
-                    } else {
-                        item.label = "secretKey"
-                    }
-                }
-                if (item.prop === "regionId") {
-                    if (category === 3) {
-                        item.display = true
-                        item.value = "cn-hangzhou"
-                    } else {
-                        item.display = false
-                    }
-                }
-            })
-        }
+      'form.category'() {
+        const category = func.toInt(this.form.category)
+        this.$refs.crud.option.column.filter(item => {
+          if (item.prop === "templateId") {
+            if (category === 1) {
+              item.label = "模版内容"
+            } else {
+              item.label = "模版ID"
+            }
+          }
+          if (item.prop === "accessKey") {
+            if (category === 1) {
+              item.label = "apiKey"
+            } else if (category === 4) {
+              item.label = "appId"
+            } else {
+              item.label = "accessKey"
+            }
+          }
+          if (item.prop === "secretKey") {
+            item.display = category !== 1
+            if (category === 4) {
+              item.label = "appKey"
+            } else {
+              item.label = "secretKey"
+            }
+          }
+          if (item.prop === "regionId") {
+            if (category === 3) {
+              item.display = true
+              item.value = "cn-hangzhou"
+            } else {
+              item.display = false
+            }
+          }
+        })
+      }
     },
     computed: {
-        ...mapGetters(["userInfo", "permission"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.sms_add, false),
-                viewBtn: this.vaildData(this.permission.sms_view, false),
-                delBtn: this.vaildData(this.permission.sms_delete, false),
-                editBtn: this.vaildData(this.permission.sms_edit, false)
-            }
-        },
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
+      ...mapGetters(["userInfo", "permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.sms_add, false),
+          viewBtn: this.vaildData(this.permission.sms_view, false),
+          delBtn: this.vaildData(this.permission.sms_delete, false),
+          editBtn: this.vaildData(this.permission.sms_edit, false)
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      }
     },
     methods: {
-        rowSave (row, done, loading) {
-            add(row).then(() => {
-                this.onLoad(this.page)
-                this.$message({
-                    type: "success",
-                    message: "操作成功!"
-                })
-                done()
-            }, error => {
-                window.console.log(error)
-                loading()
-            })
-        },
-        rowUpdate (row, index, done, loading) {
-            update(row).then(() => {
-                this.onLoad(this.page)
-                this.$message({
-                    type: "success",
-                    message: "操作成功!"
-                })
-                done()
-            }, error => {
-                window.console.log(error)
-                loading()
-            })
-        },
-        rowDel (row) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return remove(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                })
-        },
-        handleEnable (row) {
-            this.$confirm("是否确定启用这条配置?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return enable(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        handleDebug (row) {
-            this.box = true
-            this.debugForm.code = row.smsCode
-        },
-        handleSend (form, done, loading) {
-            send(form.code, form.phones, form.params).then((res) => {
-                this.$message({
-                    type: "success",
-                    message: "发送成功!"
-                })
-                done()
-                window.console.log(res)
-                this.box = false
-            }, error => {
-                window.console.log(error)
-                loading()
-            })
-        },
-        handleDelete () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return remove(this.ids)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        beforeOpen (done, type) {
-            if (["edit", "view"].includes(type)) {
-                getDetail(this.form.id).then(res => {
-                    this.form = res.data.data
-                })
-            }
-            done()
-        },
-        searchReset () {
-            this.query = {}
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page)
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          })
+          done()
+        }, error => {
+          window.console.log(error)
+          loading()
+        })
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page)
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          })
+          done()
+        }, error => {
+          window.console.log(error)
+          loading()
+        })
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(row.id)
+          })
+          .then(() => {
             this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            this.loading = true
-            getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
+            this.$message({
+              type: "success",
+              message: "操作成功!"
             })
+          })
+      },
+      handleEnable(row) {
+        this.$confirm("是否确定启用这条配置?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return enable(row.id)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      handleDebug(row) {
+        this.box = true
+        this.debugForm.code = row.smsCode
+      },
+      handleSend(form, done, loading) {
+        send(form.code, form.phones, form.params).then((res) => {
+          this.$message({
+            type: "success",
+            message: "发送成功!"
+          })
+          done()
+          window.console.log(res)
+          this.box = false
+        }, error => {
+          window.console.log(error)
+          loading()
+        })
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
         }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(this.ids)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data
+          })
+        }
+        done()
+      },
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        this.loading = true
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     }
-}
-</script>
-
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/system/email/emailSendingHistory.vue b/src/views/system/email/emailSendingHistory.vue
index e269cf7..11da3e8 100644
--- a/src/views/system/email/emailSendingHistory.vue
+++ b/src/views/system/email/emailSendingHistory.vue
@@ -1,224 +1,279 @@
 <template>
-    <basic-container>
-        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-            :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave"
-            @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
-        </avue-crud>
-    </basic-container>
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
+      :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+    </avue-crud>
+  </basic-container>
 </template>
 
 <script>
-import { getMessageUserPage } from "@/api/system/email"
-import { mapGetters } from "vuex"
+  import {
+    getMessageUserPage
+  } from "@/api/system/email"
+  import {
+    mapGetters
+  } from "vuex"
 
-export default {
-    data () {
-        return {
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          addBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          // menuWidth: 350,
+          menu: false,
+          column: [{
+              label: "发送人",
+              prop: "sendUserName",
+              type: "input",
+              align: 'center',
+              search: true,
+              searchSpan: 3,
+              searchLabelWidth: 66,
+            }, {
+              label: "接收人",
+              prop: "receiveUserName",
+              type: "input",
+              align: 'center',
+              search: true,
+              searchSpan: 3,
+              searchLabelWidth: 66,
             },
-            selectionList: [],
-            option: {
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                searchShow: true,
-                searchMenuSpan: 6,
-                border: true,
-                index: true,
-                viewBtn: false,
-                addBtn: false,
-                selection: true,
-                dialogClickModal: false,
-                // menuWidth: 350,
-                menu: false,
-                column: [
-                    {
-                        label: "标题",
-                        prop: "title",
-                        type: "input",
-                        align: 'center'
-                    },
-                    {
-                        label: "正文内容",
-                        prop: "content",
-                        type: "input",
-                        align: 'center'
-                    },
-                ]
+            {
+              label: "标题",
+              prop: "title",
+              type: "input",
+              align: 'center',
+              search: true,
+              searchSpan: 4,
+              searchLabelWidth: 56,
             },
-            data: [],
-        }
+            {
+              label: "正文内容",
+              prop: "content",
+              type: "input",
+              align: 'center',
+              search: true,
+              searchSpan: 4,
+              searchLabelWidth: 76,
+            },
+            {
+              label: "发送状态",
+              prop: "sendStatus",
+              type: "switch",
+              align: 'center',
+              search: true,
+              searchSpan: 3,
+              searchLabelWidth: 76,
+              // 1:待发送,2.:发送成功 3:发送失败
+              dicData: [{
+                  label: "待发送",
+                  value: 1
+                },
+                {
+                  label: "发送成功",
+                  value: 2
+                }, {
+                  label: "发送失败",
+                  value: 3
+                },
+              ],
+            },
+            {
+              label: "发送时间",
+              prop: "createTime",
+              type: "input",
+              align: 'center'
+            },
+          ]
+        },
+        data: [],
+      }
     },
     computed: {
-        ...mapGetters(["permission", "userInfo"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.email_add, false),
-                viewBtn: this.vaildData(this.permission.email_view, false),
-                delBtn: this.vaildData(this.permission.email_delete, false),
-                editBtn: this.vaildData(this.permission.email_edit, false)
-            }
-        },
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.email_add, false),
+          viewBtn: this.vaildData(this.permission.email_view, false),
+          delBtn: this.vaildData(this.permission.email_delete, false),
+          editBtn: this.vaildData(this.permission.email_edit, false)
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      }
     },
     methods: {
-        handleSubmit (form, done) {
-            console.log(form, "+++++++++")
+      handleSubmit(form, done) {
+        console.log(form, "+++++++++")
 
-            form.emails = form.emails.split(",")
+        form.emails = form.emails.split(",")
 
-            sendEmail(form).then(res => {
-                this.$message({
-                    type: "success",
-                    message: "发送成功!"
-                })
-            })
-            done()
-        },
-        rowSave (row, done, loading) {
-            add(row).then(() => {
-                this.onLoad(this.page)
-                this.$message({
-                    type: "success",
-                    message: "操作成功!"
-                })
-                done()
-            }, error => {
-                loading()
-                window.console.log(error)
-            })
-        },
-        rowUpdate (row, index, done, loading) {
-            update(row).then(() => {
-                this.onLoad(this.page)
-                this.$message({
-                    type: "success",
-                    message: "操作成功!"
-                })
-                done()
-            }, error => {
-                loading()
-                console.log(error)
-            })
-        },
-        rowDel (row) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return remove(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                })
-        },
-
-        handleEnable (row) {
-            this.$confirm("是否确定启用这条配置?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return enable(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        handleDelete () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return remove(this.ids)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        beforeOpen (done, type) {
-            if (["edit", "view"].includes(type)) {
-                getDetail(this.form.id).then(res => {
-                    this.form = res.data.data
-                })
-            }
-            done()
-        },
-        searchReset () {
-            this.query = {}
+        sendEmail(form).then(res => {
+          this.$message({
+            type: "success",
+            message: "发送成功!"
+          })
+        })
+        done()
+      },
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page)
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          })
+          done()
+        }, error => {
+          loading()
+          window.console.log(error)
+        })
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page)
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          })
+          done()
+        }, error => {
+          loading()
+          console.log(error)
+        })
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(row.id)
+          })
+          .then(() => {
             this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            this.loading = true
-            getMessageUserPage(page.currentPage, page.pageSize, Object.assign(params, {})).then(res => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
+            this.$message({
+              type: "success",
+              message: "操作成功!"
             })
+          })
+      },
+
+      handleEnable(row) {
+        this.$confirm("是否确定启用这条配置?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return enable(row.id)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
         }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return remove(this.ids)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data
+          })
+        }
+        done()
+      },
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        this.loading = true
+        getMessageUserPage(page.currentPage, page.pageSize, Object.assign(params, {
+          type: 2
+        })).then(res => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     }
-}
+  }
 </script>
 
-<style></style>
+<style></style>
\ No newline at end of file
diff --git a/src/views/system/email/emailTemplates.vue b/src/views/system/email/emailTemplates.vue
index 1bd5770..77c0a11 100644
--- a/src/views/system/email/emailTemplates.vue
+++ b/src/views/system/email/emailTemplates.vue
@@ -1,226 +1,238 @@
 <template>
-    <basic-container>
-        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-            :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave"
-            @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot-scope="{ row, size, index }" slot="menu">
-                <el-button :size="size" type="text" icon="el-icon-circle-check" @click.stop="handleEnable(row)">复制
-                </el-button>
-            </template>
-        </avue-crud>
-    </basic-container>
+  <basic-container>
+    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
+      :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
+      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template slot-scope="{ row, size, index }" slot="menu">
+        <el-button :size="size" type="text" icon="el-icon-circle-check" @click.stop="handleEnable(row)">复制
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
 </template>
 
 <script>
-import { getEmailTemplateList, saveEmailTemplateList, updateEmailTemplateList, detailEmailTemplateList, removeEmailTemplateList } from "@/api/system/email"
-import { mapGetters } from "vuex"
+  import {
+    getEmailTemplateList,
+    saveEmailTemplateList,
+    updateEmailTemplateList,
+    detailEmailTemplateList,
+    removeEmailTemplateList
+  } from "@/api/system/email"
+  import {
+    mapGetters
+  } from "vuex"
 
-export default {
-    data () {
-        return {
-            form: {},
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height: 'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: false,
+          selection: true,
+          dialogClickModal: false,
+          menuWidth: 350,
+          column: [{
+              label: "标题",
+              prop: "title",
+              type: "input",
+              align: 'center'
             },
-            selectionList: [],
-            option: {
-                height: 'auto',
-                calcHeight: 30,
-                tip: false,
-                searchShow: true,
-                searchMenuSpan: 6,
-                border: true,
-                index: true,
-                viewBtn: false,
-                selection: true,
-                dialogClickModal: false,
-                menuWidth: 350,
-                column: [
-                    {
-                        label: "标题",
-                        prop: "title",
-                        type: "input",
-                        align: 'center'
-                    },
-                    {
-                        label: "正文内容",
-                        prop: "content",
-                        type: "input",
-                        align: 'center'
-                    },
-                ]
+            {
+              label: "正文内容",
+              prop: "content",
+              type: "input",
+              align: 'center'
             },
-            data: [],
-        }
+            {
+              label: "创建时间",
+              prop: "createTime",
+              type: "input",
+              align: 'center'
+            },
+          ]
+        },
+        data: [],
+      }
     },
     computed: {
-        ...mapGetters(["permission", "userInfo"]),
-        permissionList () {
-            return {
-                addBtn: this.vaildData(this.permission.email_add, false),
-                viewBtn: this.vaildData(this.permission.email_view, false),
-                delBtn: this.vaildData(this.permission.email_delete, false),
-                editBtn: this.vaildData(this.permission.email_edit, false)
-            }
-        },
-        ids () {
-            let ids = []
-            this.selectionList.forEach(ele => {
-                ids.push(ele.id)
-            })
-            return ids.join(",")
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.email_add, false),
+          viewBtn: this.vaildData(this.permission.email_view, false),
+          delBtn: this.vaildData(this.permission.email_delete, false),
+          editBtn: this.vaildData(this.permission.email_edit, false)
         }
+      },
+      ids() {
+        let ids = []
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id)
+        })
+        return ids.join(",")
+      }
     },
     methods: {
-        handleSubmit (form, done) {
-            console.log(form, "+++++++++")
+      handleSubmit(form, done) {
+        console.log(form, "+++++++++")
 
-            form.emails = form.emails.split(",")
+        form.emails = form.emails.split(",")
 
-            sendEmail(form).then(res => {
-                this.$message({
-                    type: "success",
-                    message: "发送成功!"
-                })
-            })
-            done()
-        },
-        rowSave (row, done, loading) {
-            saveEmailTemplateList(row).then(() => {
-                this.onLoad(this.page)
-                this.$message({
-                    type: "success",
-                    message: "操作成功!"
-                })
-                done()
-            }, error => {
-                loading()
-                window.console.log(error)
-            })
-        },
-        rowUpdate (row, index, done, loading) {
-            updateEmailTemplateList(row).then(() => {
-                this.onLoad(this.page)
-                this.$message({
-                    type: "success",
-                    message: "操作成功!"
-                })
-                done()
-            }, error => {
-                loading()
-                console.log(error)
-            })
-        },
-        rowDel (row) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return removeEmailTemplateList(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                })
-        },
-
-        handleEnable (row) {
-            this.$confirm("是否确定启用这条配置?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return enable(row.id)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        handleDelete () {
-            if (this.selectionList.length === 0) {
-                this.$message.warning("请选择至少一条数据")
-                return
-            }
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            })
-                .then(() => {
-                    return removeEmailTemplateList(this.ids)
-                })
-                .then(() => {
-                    this.onLoad(this.page)
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    })
-                    this.$refs.crud.toggleSelection()
-                })
-        },
-        beforeOpen (done, type) {
-            if (["edit", "view"].includes(type)) {
-                detailEmailTemplateList(this.form.id).then(res => {
-                    this.form = res.data.data
-                })
-            }
-            done()
-        },
-        searchReset () {
-            this.query = {}
+        sendEmail(form).then(res => {
+          this.$message({
+            type: "success",
+            message: "发送成功!"
+          })
+        })
+        done()
+      },
+      rowSave(row, done, loading) {
+        saveEmailTemplateList(row).then(() => {
+          this.onLoad(this.page)
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          })
+          done()
+        }, error => {
+          loading()
+          window.console.log(error)
+        })
+      },
+      rowUpdate(row, index, done, loading) {
+        updateEmailTemplateList(row).then(() => {
+          this.onLoad(this.page)
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          })
+          done()
+        }, error => {
+          loading()
+          console.log(error)
+        })
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return removeEmailTemplateList(row.id)
+          })
+          .then(() => {
             this.onLoad(this.page)
-        },
-        searchChange (params, done) {
-            this.query = params
-            this.page.currentPage = 1
-            this.onLoad(this.page, params)
-            done()
-        },
-        selectionChange (list) {
-            this.selectionList = list
-        },
-        selectionClear () {
-            this.selectionList = []
-            this.$refs.crud.toggleSelection()
-        },
-        currentChange (currentPage) {
-            this.page.currentPage = currentPage
-        },
-        sizeChange (pageSize) {
-            this.page.pageSize = pageSize
-        },
-        refreshChange () {
-            this.onLoad(this.page, this.query)
-        },
-        onLoad (page, params = {}) {
-            this.loading = true
-            getEmailTemplateList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-                const data = res.data.data
-                this.page.total = data.total
-                this.data = data.records
-                this.loading = false
-                this.selectionClear()
+            this.$message({
+              type: "success",
+              message: "操作成功!"
             })
+          })
+      },
+
+      handleEnable(row) {
+        this.$confirm("是否确定启用这条配置?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return enable(row.id)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据")
+          return
         }
+        this.$confirm("确定将选择数据删除?", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            return removeEmailTemplateList(this.ids)
+          })
+          .then(() => {
+            this.onLoad(this.page)
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            })
+            this.$refs.crud.toggleSelection()
+          })
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          detailEmailTemplateList(this.form.id).then(res => {
+            this.form = res.data.data
+          })
+        }
+        done()
+      },
+      searchReset() {
+        this.query = {}
+        this.onLoad(this.page)
+      },
+      searchChange(params, done) {
+        this.query = params
+        this.page.currentPage = 1
+        this.onLoad(this.page, params)
+        done()
+      },
+      selectionChange(list) {
+        this.selectionList = list
+      },
+      selectionClear() {
+        this.selectionList = []
+        this.$refs.crud.toggleSelection()
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query)
+      },
+      onLoad(page, params = {}) {
+        this.loading = true
+        getEmailTemplateList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data
+          this.page.total = data.total
+          this.data = data.records
+          this.loading = false
+          this.selectionClear()
+        })
+      }
     }
-}
+  }
 </script>
 
-<style></style>
+<style></style>
\ No newline at end of file

--
Gitblit v1.9.3