diff --git a/src/resources/api/framework/mailserver/mailserver.js b/src/resources/api/framework/mailserver/mailserver.js
index 2fef378815ee358b1f476faab0907395c7b821a9..1494cc5f315fbaae793f10d5b1b3059c875da0a1 100644
--- a/src/resources/api/framework/mailserver/mailserver.js
+++ b/src/resources/api/framework/mailserver/mailserver.js
@@ -4,8 +4,8 @@ const mailserver = {
   // search(data) {
   //   return axios.post('/api/rest/mailserver/search', data);
   // },
-  get() {
-    return axios.post('/api/rest/mailserver/get', {});
+  get(data) {
+    return axios.post('/api/rest/mailserver/get', data);
   },
   save(data) {
     return axios.post('/api/rest/mailserver/save', data);
@@ -18,6 +18,18 @@ const mailserver = {
   // },
   test(data) {
     return axios.post('/api/rest/mailserver/test', data);
+  },
+  searchMailServerList(data) {
+    return axios.post('/api/rest/mailserver/list', data);
+  },
+  updateMailServerIsActive(data) {
+    return axios.post('/api/rest/mailserver/isactive/update', data);
+  },
+  updateMailServerIsDefault(data) {
+    return axios.post('/api/rest/mailserver/isdefault/update', data);
+  },
+  deleteMailServer(data) {
+    return axios.post('/api/rest/mailserver/delete', data);
   }
 };
 export default mailserver;
diff --git a/src/views/pages/framework/notifyconfig/mailserver-edit.vue b/src/views/pages/framework/notifyconfig/mailserver-edit.vue
index f48ed485eb2c75de855a37adedd036ea729e8a80..95c3246d5f6c3e452e094abe5c123d90032ce3ce 100644
--- a/src/views/pages/framework/notifyconfig/mailserver-edit.vue
+++ b/src/views/pages/framework/notifyconfig/mailserver-edit.vue
@@ -1,23 +1,30 @@
 <template>
   <div>
-    <div style="width:50%">
-      <TsForm ref="form" :itemList="formData"></TsForm>
-      <div class="mt-md" style="text-align: right">
+    <TsDialog v-bind="editDialogSetting" @on-close="close">
+      <template v-slot:header>
+        <div v-if="id">{{ $t('page.edit') }}</div>
+        <div v-if="!id">{{ $t('page.add') }}</div>
+      </template>
+      <div>
+        <TsForm ref="form" :itemList="formData"></TsForm>
+      </div>
+      <template v-slot:footer>
+        <Button @click="close()">{{ $t('page.cancel') }}</Button>
         <Button
           type="primary"
           ghost
           class="mr-md"
           @click="test()"
         >{{ $t('page.test') }}</Button>
-        <Button type="primary" @click="submit()">{{ $t('page.save') }}</Button>
-      </div>
-    </div>
+        <Button type="primary" @click="submit()">{{ $t('page.save') }} </Button>
+      </template>
+    </TsDialog>
     <TsDialog
       v-if="isShow"
       v-bind="setting"
       :isShow="isShow"
-      @on-close="close"
-      @on-cancel="close"
+      @on-close="closeTest"
+      @on-cancel="closeTest"
       @on-ok="testSend()"
     >
       <TsForm ref="testform" v-model="testVal" :itemList="testForm"></TsForm>
@@ -31,7 +38,11 @@ export default {
   components: {
     TsForm: () => import('@/resources/plugins/TsForm/TsForm.vue')
   },
-  props: [],
+  props: {
+    id: {
+      type: Number
+    }
+  },
   data() {
     return {
       canBack: false,
@@ -110,6 +121,12 @@ export default {
           defaultValue: ''
         }
       ],
+      editDialogSetting: {
+        type: 'modal',
+        maskClose: true,
+        isShow: true,
+        width: 'small'
+      },
       isShow: false,
       setting: {
         maskClose: true,
@@ -131,7 +148,9 @@ export default {
   beforeCreate() {},
 
   created() {
-    this.getData();
+    if (this.id) {
+      this.getData();
+    }
   },
 
   beforeMount() {},
@@ -155,15 +174,17 @@ export default {
       let form = this.$refs.form;
       if (form.valid()) {
         let data = form.getFormValue();
+        data.id = this.id;
         this.$api.framework.mailserver.save(data).then(res => {
           if (res.Status == 'OK') {
             this.$Message.success(this.$t('message.savesuccess'));
+            this.close(true);
           }
         });
       }
     },
     getData() {
-      this.$api.framework.mailserver.get().then(res => {
+      this.$api.framework.mailserver.get({id: this.id}).then(res => {
         if (res.Status == 'OK') {
           const obj = res.Return;
           if (obj) {
@@ -195,7 +216,10 @@ export default {
           });
       }
     },
-    close() {
+    close(needRefresh) {
+      this.$emit('close', needRefresh);
+    },
+    closeTest() {
       this.isShow = false;
       this.disabledTest = false;
       this.$set(this.testVal, 'emailAddress', '');
diff --git a/src/views/pages/framework/notifyconfig/mailserver-manage.vue b/src/views/pages/framework/notifyconfig/mailserver-manage.vue
new file mode 100644
index 0000000000000000000000000000000000000000..55b18e47c937e0d41b97e334563b8f9ce38ca1b1
--- /dev/null
+++ b/src/views/pages/framework/notifyconfig/mailserver-manage.vue
@@ -0,0 +1,192 @@
+<template>
+  <div>
+    <TsContain border="border">
+      <template slot="topLeft">
+        <div class="action-group">
+          <span class="action-item tsfont-plus" @click="addMailServer()">{{ $t('page.add') }}</span>
+        </div>
+      </template>
+      <template slot="topRight">
+
+      </template>
+      <div slot="content" ref="maintable">
+        <TsTable 
+          v-if="true"
+          :theadList="theadList"
+          v-bind="tabelData"
+        >
+          <template slot="isActive" slot-scope="{ row }">
+            <i-switch
+              :key="row.token"
+              v-model="row.isActive"
+              :true-value="1"
+              :false-value="0"
+              @on-change="handleIsActiveSwitchChange(row)"
+            ></i-switch>
+          </template>
+          <template slot="isDefault" slot-scope="{ row }">
+            <i-switch
+              :key="row.token"
+              v-model="row.isDefault"
+              :true-value="1"
+              :false-value="0"
+              @on-change="handleIsDefaultSwitchChange(row)"
+            ></i-switch>
+          </template>
+          <template slot="sslEnable" slot-scope="{ row }">
+            <span v-if="row.sslEnable" class="text-success">{{ $t('page.yes') }}</span>
+            <span v-else class="text-grey">{{ $t('page.no') }}</span>
+          </template>
+          <template slot="action" slot-scope="{ row }">
+            <div class="tstable-action">
+              <ul class="tstable-action-ul">
+                <li class="tsfont-edit" @click="editMailServer(row)">{{ $t('page.edit') }}</li>
+                <li v-if="row.isDefault == 0" class="tsfont-trash-o" @click="deleteMailServer(row)">{{ $t('page.delete') }}</li>
+              </ul>
+            </div>
+          </template>
+        </TsTable>
+      </div>
+    </TsContain>
+    <MailServerEdit 
+      v-if="isShowMailServerEdit"
+      :id="editId"
+      @close="closeMailServerEdit"
+    ></MailserverEdit>
+  </div>
+</template>
+<script>
+
+export default {
+  name: '',
+  components: {
+    MailServerEdit: () => import('./mailserver-edit.vue'),
+    TsContain: () => import('@/resources/components/TsContain/TsContain.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
+  },
+  props: {},
+  data() {
+    return {
+      theadList: [
+        {
+          title: this.$t('page.name'),
+          key: 'name'
+        },
+        {
+          title: this.$t('term.report.isactive'),
+          key: 'isActive'
+        },
+        {
+          title: this.$t('page.isdefault'),
+          key: 'isDefault'
+        },
+        {
+          title: this.$t('term.framework.smtphost'),
+          key: 'host'
+        },
+        {
+          title: this.$t('term.framework.smptport'),
+          key: 'port'
+        },
+        {
+          title: this.$t('term.framework.smptsslenable'),
+          key: 'sslEnable'
+        },
+        {
+          title: this.$t('page.emailaddress'),
+          key: 'fromAddress'
+        },
+        {
+          title: this.$t('page.username'),
+          key: 'userName'
+        },
+        {
+          title: this.$t('page.homeurl'),
+          key: 'homeUrl'
+        },
+        {
+          title: '',
+          key: 'action',
+          align: 'right'
+        }
+      ],
+      tabelData: null,
+      isShowMailServerEdit: false,
+      editId: null
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.searchMailServerList();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    searchMailServerList() {
+      this.$api.framework.mailserver.searchMailServerList({}).then(res => {
+        if (res.Status == 'OK') {
+          this.tabelData = res.Return;
+        }
+      });
+    },
+    editMailServer(row) {
+      this.isShowMailServerEdit = true;
+      this.editId = row.id;
+    },
+    closeMailServerEdit(needRefresh) {
+      this.isShowMailServerEdit = false;
+      this.editId = null;
+      if (needRefresh) {
+        this.searchMailServerList();
+      }
+    },
+    deleteMailServer(row) {
+      this.$api.framework.mailserver.deleteMailServer({id: row.id}).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.deletesuccess'));
+          this.searchMailServerList();
+        }
+      });
+    },
+    handleIsActiveSwitchChange(row) {
+      let param = {
+        id: row.id,
+        isActive: row.isActive
+      };
+      this.$api.framework.mailserver.updateMailServerIsActive(param).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          this.searchMailServerList();
+        }
+      });
+    },
+    handleIsDefaultSwitchChange(row) {
+      let param = {
+        id: row.id,
+        isDefault: row.isDefault
+      };
+      this.$api.framework.mailserver.updateMailServerIsDefault(param).then(res => {
+        if (res.Status == 'OK') {
+          this.$Message.success(this.$t('message.savesuccess'));
+          this.searchMailServerList();
+        }
+      });
+    },
+    addMailServer() {
+      this.id = null;
+      this.isShowMailServerEdit = true;
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/framework/notifyconfig/notifyconfig-manage.vue b/src/views/pages/framework/notifyconfig/notifyconfig-manage.vue
index b13e27450146285e41d45cde54912648610d4728..781f60fcf2d63d55199dc1b5f9d1875baae07fb4 100644
--- a/src/views/pages/framework/notifyconfig/notifyconfig-manage.vue
+++ b/src/views/pages/framework/notifyconfig/notifyconfig-manage.vue
@@ -10,7 +10,7 @@
       <template v-slot:content>
         <div>
           <div v-if="currentTab == 'mail'" class="padding">
-            <MailServerEdit></MailServerEdit>
+            <MailServerManage></MailServerManage>
           </div>
           <div v-if="currentTab == 'wechat'" class="padding">
             <WechatEdit></WechatEdit>
@@ -25,7 +25,7 @@ export default {
   name: '',
   components: {
     TsContain: () => import('@/resources/components/TsContain/TsContain.vue'),
-    MailServerEdit: () => import('./mailserver-edit.vue'),
+    MailServerManage: () => import('./mailserver-manage.vue'),
     WechatEdit: () => import('./wechat-edit.vue')
   },
   props: {},