lin
2024-03-11 12bf2d64efe9c62a33fc10b1acdca9ecfcd10fce
邮件信息优化
4 files modified
244 ■■■■■ changed files
src/views/grid/index.vue 73 ●●●● patch | view | raw | blame | history
src/views/resource/sms.vue 70 ●●●●● patch | view | raw | blame | history
src/views/system/email/emailSendingHistory.vue 73 ●●●● patch | view | raw | blame | history
src/views/system/email/emailTemplates.vue 28 ●●●● patch | view | raw | blame | history
src/views/grid/index.vue
@@ -1,10 +1,9 @@
<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">
      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>
@@ -19,8 +18,16 @@
</template>
<script>
import { getList, remove, update, add, getGrid } from "@/api/grid/grid"
import { mapGetters } from "vuex"
  import {
    getList,
    remove,
    update,
    add,
    getGrid
  } from "@/api/grid/grid"
  import {
    mapGetters
  } from "vuex"
// import website from '@/config/website'
export default {
    data () {
@@ -64,8 +71,7 @@
                viewBtn: true,
                selection: true,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        overHidden: true,
                        label: "所属社区",
                        addDisplay: false,
@@ -92,17 +98,16 @@
                        type: "tree",
                        dicUrl: "/api/blade-system/region/tree",
                        row:true,                        
              // cascader: ['principal'],
                        props: {
                            label: "name",
                            value: "id",
                        },
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请选择所属社区",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        overHidden: true,
@@ -110,13 +115,12 @@
                        prop: "gridName",
                        searchSpan: 4,
                        search: true,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入网格名称",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        overHidden: true,
@@ -124,13 +128,11 @@
                        prop: "gridCode",
                        searchSpan: 4,
                        search: true,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入网格编号",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
@@ -138,14 +140,19 @@
                        label: "负责人",
                        prop: "principal",
                        searchSpan: 4,
              type: 'tree',
              span: 8,
              dicUrl: `/api/blade-system/user/getUserListByParam?&roleId=1717429261910528001`,
                        search: true,
                        rules: [
                            {
              props: {
                label: 'name',
                value: 'id'
              },
              rules: [{
                                required: true,
                                message: "请输入负责人",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        width: 120,
@@ -153,8 +160,7 @@
                        prop: "principalPhone",
                        searchSpan: 4,
                        search: true,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入联系电话",
                                trigger: "blur",
@@ -174,13 +180,11 @@
                        hide: true,
                        span: 24,
                        display: false,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入区域",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        label: "排序",
@@ -188,13 +192,11 @@
                        type: "number",
                        hide: true,
                        value: 1,
                        rules: [
                            {
              rules: [{
                                required: true,
                                message: "请输入排序",
                                trigger: "blur",
                            },
                        ],
              }, ],
                    },
                    {
                        label: "网格简介",
@@ -216,8 +218,7 @@
            data: [],
        }
    },
    watch: {
    },
    watch: {},
    computed: {
        ...mapGetters(["permission", "userInfo"]),
        permissionList () {
src/views/resource/sms.vue
@@ -1,8 +1,8 @@
<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"
      :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"
@@ -33,8 +33,18 @@
</template>
<script>
import { getList, getDetail, add, update, remove, enable, send } from "@/api/resource/sms"
import { mapGetters } from "vuex"
  import {
    getList,
    getDetail,
    add,
    update,
    remove,
    enable,
    send
  } from "@/api/resource/sms"
  import {
    mapGetters
  } from "vuex"
import func from "@/util/func"
export default {
@@ -67,30 +77,30 @@
                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: "分类",
            //     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",
@@ -186,8 +196,7 @@
            },
            debugOption: {
                submitText: "发送",
                column: [
                    {
          column: [{
                        label: "资源编号",
                        prop: "code",
                        disabled: true,
@@ -414,4 +423,3 @@
    }
}
</script>
src/views/system/email/emailSendingHistory.vue
@@ -1,17 +1,20 @@
<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">
      :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 () {
@@ -39,16 +42,66 @@
                dialogClickModal: false,
                // menuWidth: 350,
                menu: false,
                column: [
          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,
            },
                    {
                        label: "标题",
                        prop: "title",
                        type: "input",
                        align: 'center'
              align: 'center',
              search: true,
              searchSpan: 4,
              searchLabelWidth: 56,
                    },
                    {
                        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'
                    },
@@ -209,7 +262,9 @@
        },
        onLoad (page, params = {}) {
            this.loading = true
            getMessageUserPage(page.currentPage, page.pageSize, Object.assign(params, {})).then(res => {
        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
src/views/system/email/emailTemplates.vue
@@ -1,10 +1,9 @@
<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">
      :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>
@@ -14,8 +13,16 @@
</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 () {
@@ -41,8 +48,7 @@
                selection: true,
                dialogClickModal: false,
                menuWidth: 350,
                column: [
                    {
          column: [{
                        label: "标题",
                        prop: "title",
                        type: "input",
@@ -54,6 +60,12 @@
                        type: "input",
                        align: 'center'
                    },
            {
              label: "创建时间",
              prop: "createTime",
              type: "input",
              align: 'center'
            },
                ]
            },
            data: [],