From 4b77127271956054f1d2d9fe90ce322d65e15513 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 7 Jan 2020 14:51:22 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E7=9F=AD=E4=BF=A1=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/message/smslog-add-or-update.vue  | 166 ++++++++++++++++++
 src/views/modules/message/smslog.vue          |  78 ++++++++
 .../message/smstemplate-add-or-update.vue     | 153 ++++++++++++++++
 src/views/modules/message/smstemplate.vue     |  71 ++++++++
 4 files changed, 468 insertions(+)
 create mode 100644 src/views/modules/message/smslog-add-or-update.vue
 create mode 100644 src/views/modules/message/smslog.vue
 create mode 100644 src/views/modules/message/smstemplate-add-or-update.vue
 create mode 100644 src/views/modules/message/smstemplate.vue

diff --git a/src/views/modules/message/smslog-add-or-update.vue b/src/views/modules/message/smslog-add-or-update.vue
new file mode 100644
index 00000000..0d63aa27
--- /dev/null
+++ b/src/views/modules/message/smslog-add-or-update.vue
@@ -0,0 +1,166 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="短信模板表ID" prop="smsTemplateId">
+          <el-input v-model="dataForm.smsTemplateId" placeholder="短信模板表ID"></el-input>
+      </el-form-item>
+          <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+      </el-form-item>
+          <el-form-item label="参数1" prop="params1">
+          <el-input v-model="dataForm.params1" placeholder="参数1"></el-input>
+      </el-form-item>
+          <el-form-item label="参数2" prop="params2">
+          <el-input v-model="dataForm.params2" placeholder="参数2"></el-input>
+      </el-form-item>
+          <el-form-item label="参数3" prop="params3">
+          <el-input v-model="dataForm.params3" placeholder="参数3"></el-input>
+      </el-form-item>
+          <el-form-item label="参数4" prop="params4">
+          <el-input v-model="dataForm.params4" placeholder="参数4"></el-input>
+      </el-form-item>
+          <el-form-item label="发送状态 0：失败  1：成功" prop="status">
+          <el-input v-model="dataForm.status" placeholder="发送状态 0：失败  1：成功"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        smsTemplateId: '',
+        mobile: '',
+        params1: '',
+        params2: '',
+        params3: '',
+        params4: '',
+        status: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        delFlag: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        smsTemplateId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        params1: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        params2: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        params3: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        params4: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        status: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/message/smslog/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/message/smslog/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/message/smslog.vue b/src/views/modules/message/smslog.vue
new file mode 100644
index 00000000..0445ed9a
--- /dev/null
+++ b/src/views/modules/message/smslog.vue
@@ -0,0 +1,78 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-message__smslog}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('message:smslog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('message:smslog:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="smsTemplateId" label="短信模板表ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="params1" label="参数1" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="params2" label="参数2" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="params3" label="参数3" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="params4" label="参数4" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="status" label="发送状态 0：失败  1：成功" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标记" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('message:smslog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('message:smslog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './smslog-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/message/smslog/page',
+        getDataListIsPage: true,
+        deleteURL: '/message/smslog',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/message/smstemplate-add-or-update.vue b/src/views/modules/message/smstemplate-add-or-update.vue
new file mode 100644
index 00000000..b7959133
--- /dev/null
+++ b/src/views/modules/message/smstemplate-add-or-update.vue
@@ -0,0 +1,153 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? '短信配置' : '短信配置'" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item v-if=false label="真实参数名称" prop="paramName">
+          <el-input v-model="dataForm.paramName" placeholder="参数名称">{{ this.dataForm.paramName }}</el-input>
+      </el-form-item>
+      <el-form-item label="参数名称" prop="paramCode">
+        <el-select v-model="dataForm.paramCode" placeholder="参数名称" @change="selectModel($event)">
+          <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
+      </el-form-item>
+          <el-form-item label="参数值" prop="paramValue">
+          <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      </el-form-item>
+          <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        paramCode: '',
+        paramName: '',
+        paramValue: '',
+        remark: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        delFlag: ''
+      },
+      paramNameArr: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        paramCode: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        paramName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        paramValue: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getParamListInfo('sms_template_type')
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 参数名称取值变化事件
+    selectModel (id) {
+      this.paramNameArr.find((item) => {
+        if (item.dictValue === id) {
+          this.dataForm.paramName = item.dictName
+        }
+      })
+    },
+    // 获取参数名称code下拉信息
+    getParamListInfo (dictType) {
+      this.$http.get(`/sys/dict/listSimple/` + dictType).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        if (dictType === 'sms_template_type') {
+          this.paramNameArr = res.data
+        }
+      }).catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/message/smstemplate/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/message/smstemplate/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/message/smstemplate.vue b/src/views/modules/message/smstemplate.vue
new file mode 100644
index 00000000..0d00bd46
--- /dev/null
+++ b/src/views/modules/message/smstemplate.vue
@@ -0,0 +1,71 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-message__smstemplate}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('短信配置') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="paramCode" label="参数编码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="paramName" label="参数名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="paramValue" label="参数值" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './smstemplate-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/message/smstemplate/page',
+        getDataListIsPage: true,
+        deleteURL: '/message/smstemplate',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From ac9d0e38e752da3bfd68b67cbab597c14eefc5c3 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 7 Jan 2020 15:48:20 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/zh-CN.js                             |  4 ++
 .../message/smstemplate-add-or-update.vue     | 38 ++++++++++---------
 src/views/modules/message/smstemplate.vue     |  9 +++--
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 08f74ccf..e64b1d66 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -212,6 +212,10 @@ t.sms.qcloudSignName = '短信签名'
 t.sms.qcloudTemplateId = '短信模板'
 t.sms.qcloudTemplateIdTips = '短信模板ID'
 
+t.smstemplate = {}
+t.smstemplate.add = '新增模板'
+t.smstemplate.update = '修改模板'
+
 t.oss = {}
 t.oss.config = '云存储配置'
 t.oss.upload = '上传文件'
diff --git a/src/views/modules/message/smstemplate-add-or-update.vue b/src/views/modules/message/smstemplate-add-or-update.vue
index b7959133..d0f22b93 100644
--- a/src/views/modules/message/smstemplate-add-or-update.vue
+++ b/src/views/modules/message/smstemplate-add-or-update.vue
@@ -1,20 +1,20 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? '短信配置' : '短信配置'" :close-on-click-modal="false" :close-on-press-escape="false">
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('smstemplate.add') : $t('smstemplate.update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item v-if=false label="真实参数名称" prop="paramName">
-          <el-input v-model="dataForm.paramName" placeholder="参数名称">{{ this.dataForm.paramName }}</el-input>
-      </el-form-item>
-      <el-form-item label="参数名称" prop="paramCode">
-        <el-select v-model="dataForm.paramCode" placeholder="参数名称" @change="selectModel($event)">
+      <el-form-item label="模板类型" prop="templateType">
+        <el-select v-model="dataForm.templateType" placeholder="模板类型" @change="selectModel($event)">
           <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
           </el-option>
         </el-select>
       </el-form-item>
-          <el-form-item label="参数值" prop="paramValue">
-          <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+          <el-form-item label="短信签名" prop="signName">
+          <el-input v-model="dataForm.signName" placeholder="短信签名"></el-input>
+      </el-form-item>
+      <el-form-item label="短信模板" prop="template">
+          <el-input v-model="dataForm.template" placeholder="短信模板"></el-input>
       </el-form-item>
           <el-form-item label="备注" prop="remark">
-          <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+          <el-input v-model="dataForm.remark" placeholder="备注" type="textarea" :rows="2"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -32,9 +32,10 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        paramCode: '',
-        paramName: '',
-        paramValue: '',
+        templateType: '',
+        templateTypeName: '',
+        signName: '',
+        template: '',
         remark: '',
         revision: '',
         createdBy: '',
@@ -49,13 +50,16 @@ export default {
   computed: {
     dataRule () {
       return {
-        paramCode: [
+        templateType: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        paramName: [
+        templateTypeName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        paramValue: [
+        signName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        template: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         remark: [
@@ -99,7 +103,7 @@ export default {
     selectModel (id) {
       this.paramNameArr.find((item) => {
         if (item.dictValue === id) {
-          this.dataForm.paramName = item.dictName
+          this.dataForm.templateTypeName = item.dictName
         }
       })
     },
@@ -112,7 +116,7 @@ export default {
         if (dictType === 'sms_template_type') {
           this.paramNameArr = res.data
         }
-      }).catch(() => { })
+      }).catch(() => {})
     },
     // 获取信息
     getInfo () {
diff --git a/src/views/modules/message/smstemplate.vue b/src/views/modules/message/smstemplate.vue
index 0d00bd46..ba0e56f1 100644
--- a/src/views/modules/message/smstemplate.vue
+++ b/src/views/modules/message/smstemplate.vue
@@ -9,7 +9,7 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('短信配置') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('smstemplate.add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -18,9 +18,10 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="paramCode" label="参数编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="paramName" label="参数名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="paramValue" label="参数值" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="templateType" label="模板类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="templateTypeName" label="模板类型名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="signName" label="短信签名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="template" label="短信模板" header-align="center" align="center"></el-table-column>
         <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>

From 88f33892a6659b408a95f0ac08569dc351f07183 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 7 Jan 2020 16:16:06 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/message/smslog-add-or-update.vue   | 18 ------------------
 src/views/modules/message/smslog.vue           | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/message/smslog-add-or-update.vue b/src/views/modules/message/smslog-add-or-update.vue
index 0d63aa27..26fd5e21 100644
--- a/src/views/modules/message/smslog-add-or-update.vue
+++ b/src/views/modules/message/smslog-add-or-update.vue
@@ -21,24 +21,6 @@
       </el-form-item>
           <el-form-item label="发送状态 0：失败  1：成功" prop="status">
           <el-input v-model="dataForm.status" placeholder="发送状态 0：失败  1：成功"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标记" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/message/smslog.vue b/src/views/modules/message/smslog.vue
index 0445ed9a..3b723799 100644
--- a/src/views/modules/message/smslog.vue
+++ b/src/views/modules/message/smslog.vue
@@ -9,7 +9,8 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('message:smslog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <!-- <el-button v-if="$hasPermission('message:smslog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('message:smslog:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -24,13 +25,9 @@
         <el-table-column prop="params2" label="参数2" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params3" label="参数3" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params4" label="参数4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" label="发送状态 0：失败  1：成功" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="status" label="发送状态" header-align="center" align="center" :formatter="showStatus"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('message:smslog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -73,6 +70,15 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    showStatus (row, column) {
+      if (row.status === '0') {
+        return '失败'
+      } else {
+        return '成功'
+      }
+    }
   }
 }
 </script>

From d3521bd7417cc79e1e897ecaedae50a30b194314 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 7 Jan 2020 16:56:15 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=AE=A1=E7=90=86PC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/zh-CN.js                             |   1 +
 src/views/modules/message/smslog-detail.vue   | 148 +++++++++++++++
 src/views/modules/message/smslog.vue          |  17 +-
 .../message/smstemplate-add-or-update.vue     |  16 +-
 .../modules/message/smstemplate-detail.vue    | 171 ++++++++++++++++++
 src/views/modules/message/smstemplate.vue     |  27 ++-
 6 files changed, 375 insertions(+), 5 deletions(-)
 create mode 100644 src/views/modules/message/smslog-detail.vue
 create mode 100644 src/views/modules/message/smstemplate-detail.vue

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index e64b1d66..f07d4006 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -215,6 +215,7 @@ t.sms.qcloudTemplateIdTips = '短信模板ID'
 t.smstemplate = {}
 t.smstemplate.add = '新增模板'
 t.smstemplate.update = '修改模板'
+t.smstemplate.see = '查看模板'
 
 t.oss = {}
 t.oss.config = '云存储配置'
diff --git a/src/views/modules/message/smslog-detail.vue b/src/views/modules/message/smslog-detail.vue
new file mode 100644
index 00000000..26fd5e21
--- /dev/null
+++ b/src/views/modules/message/smslog-detail.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="短信模板表ID" prop="smsTemplateId">
+          <el-input v-model="dataForm.smsTemplateId" placeholder="短信模板表ID"></el-input>
+      </el-form-item>
+          <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+      </el-form-item>
+          <el-form-item label="参数1" prop="params1">
+          <el-input v-model="dataForm.params1" placeholder="参数1"></el-input>
+      </el-form-item>
+          <el-form-item label="参数2" prop="params2">
+          <el-input v-model="dataForm.params2" placeholder="参数2"></el-input>
+      </el-form-item>
+          <el-form-item label="参数3" prop="params3">
+          <el-input v-model="dataForm.params3" placeholder="参数3"></el-input>
+      </el-form-item>
+          <el-form-item label="参数4" prop="params4">
+          <el-input v-model="dataForm.params4" placeholder="参数4"></el-input>
+      </el-form-item>
+          <el-form-item label="发送状态 0：失败  1：成功" prop="status">
+          <el-input v-model="dataForm.status" placeholder="发送状态 0：失败  1：成功"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        smsTemplateId: '',
+        mobile: '',
+        params1: '',
+        params2: '',
+        params3: '',
+        params4: '',
+        status: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        delFlag: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        smsTemplateId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        params1: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        params2: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        params3: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        params4: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        status: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/message/smslog/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/message/smslog/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/message/smslog.vue b/src/views/modules/message/smslog.vue
index 3b723799..450a66e1 100644
--- a/src/views/modules/message/smslog.vue
+++ b/src/views/modules/message/smslog.vue
@@ -30,6 +30,7 @@
         <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
+            <el-button type="text" size="small" @click="smslogDetailHandle(scope.row.id)">查看</el-button>
             <el-button v-if="$hasPermission('message:smslog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('message:smslog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -46,6 +47,8 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <!--查看-->
+      <actphrase-detail v-if="smslogDetailVisible" ref="smslogDetail" @refreshDataList="getDataList"></actphrase-detail>
     </div>
   </el-card>
 </template>
@@ -53,6 +56,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './smslog-add-or-update'
+import smslogDetail from './smslog-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -65,11 +69,13 @@ export default {
       },
       dataForm: {
         id: ''
-      }
+      },
+      smslogDetailVisible: false
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    smslogDetail
   },
   methods: {
     showStatus (row, column) {
@@ -78,6 +84,13 @@ export default {
       } else {
         return '成功'
       }
+    },
+    smslogDetailHandle (smslogId) {
+      this.smslogDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.smslogDetail.dataForm.id = smslogId
+        this.$refs.smslogDetail.init()
+      })
     }
   }
 }
diff --git a/src/views/modules/message/smstemplate-add-or-update.vue b/src/views/modules/message/smstemplate-add-or-update.vue
index d0f22b93..faefbbda 100644
--- a/src/views/modules/message/smstemplate-add-or-update.vue
+++ b/src/views/modules/message/smstemplate-add-or-update.vue
@@ -6,6 +6,12 @@
           <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
           </el-option>
         </el-select>
+      </el-form-item>
+      <el-form-item label="启用标识" prop="enableFlag">
+        <el-select v-model="dataForm.enableFlag" placeholder="启用标识">
+          <el-option v-for="item in enableFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
       </el-form-item>
           <el-form-item label="短信签名" prop="signName">
           <el-input v-model="dataForm.signName" placeholder="短信签名"></el-input>
@@ -37,6 +43,7 @@ export default {
         signName: '',
         template: '',
         remark: '',
+        enableFlag: '',
         revision: '',
         createdBy: '',
         createdTime: '',
@@ -44,7 +51,11 @@ export default {
         updatedTime: '',
         delFlag: ''
       },
-      paramNameArr: []
+      paramNameArr: [],
+      enableFlagArr: [
+        { dictValue: '1', dictName: '是' },
+        { dictValue: '0', dictName: '否' }
+      ]
     }
   },
   computed: {
@@ -65,6 +76,9 @@ export default {
         remark: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        enableFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         revision: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/message/smstemplate-detail.vue b/src/views/modules/message/smstemplate-detail.vue
new file mode 100644
index 00000000..b0216450
--- /dev/null
+++ b/src/views/modules/message/smstemplate-detail.vue
@@ -0,0 +1,171 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('smstemplate.add') : $t('smstemplate.see')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="true">
+      <el-form-item label="模板类型" prop="templateType">
+        <el-select v-model="dataForm.templateType" placeholder="模板类型" @change="selectModel($event)">
+          <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="启用标识" prop="enableFlag">
+        <el-select v-model="dataForm.enableFlag" placeholder="启用标识">
+          <el-option v-for="item in enableFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
+      </el-form-item>
+          <el-form-item label="短信签名" prop="signName">
+          <el-input v-model="dataForm.signName" placeholder="短信签名"></el-input>
+      </el-form-item>
+      <el-form-item label="短信模板" prop="template">
+          <el-input v-model="dataForm.template" placeholder="短信模板"></el-input>
+      </el-form-item>
+          <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注" type="textarea" :rows="2"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button v-if=false @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button v-if=false type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        templateType: '',
+        templateTypeName: '',
+        signName: '',
+        template: '',
+        remark: '',
+        enableFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        delFlag: ''
+      },
+      paramNameArr: [],
+      enableFlagArr: [
+        { dictValue: '1', dictName: '是' },
+        { dictValue: '0', dictName: '否' }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        templateType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        templateTypeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        template: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        enableFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getParamListInfo('sms_template_type')
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 参数名称取值变化事件
+    selectModel (id) {
+      this.paramNameArr.find((item) => {
+        if (item.dictValue === id) {
+          this.dataForm.templateTypeName = item.dictName
+        }
+      })
+    },
+    // 获取参数名称code下拉信息
+    getParamListInfo (dictType) {
+      this.$http.get(`/sys/dict/listSimple/` + dictType).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        if (dictType === 'sms_template_type') {
+          this.paramNameArr = res.data
+        }
+      }).catch(() => {})
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/message/smstemplate/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/message/smstemplate/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/message/smstemplate.vue b/src/views/modules/message/smstemplate.vue
index ba0e56f1..0a900116 100644
--- a/src/views/modules/message/smstemplate.vue
+++ b/src/views/modules/message/smstemplate.vue
@@ -20,6 +20,7 @@
         <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
         <el-table-column prop="templateType" label="模板类型" header-align="center" align="center"></el-table-column>
         <el-table-column prop="templateTypeName" label="模板类型名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="enableFlag" label="启用标识" header-align="center" align="center" :formatter="showEnableFlag"></el-table-column>
         <el-table-column prop="signName" label="短信签名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="template" label="短信模板" header-align="center" align="center"></el-table-column>
         <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
@@ -27,6 +28,7 @@
         <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
+            <el-button type="text" size="small" @click="smstemplateDetailHandle(scope.row.id)">查看</el-button>
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -43,6 +45,8 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <!--查看-->
+      <smstemplate-detail v-if="smstemplateDetailVisible" ref="smstemplateDetail" @refreshDataList="getDataList"></smstemplate-detail>
     </div>
   </el-card>
 </template>
@@ -50,6 +54,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './smstemplate-add-or-update'
+import smstemplateDetail from './smstemplate-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -62,11 +67,29 @@ export default {
       },
       dataForm: {
         id: ''
-      }
+      },
+      smstemplateDetailVisible: false
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    smstemplateDetail
+  },
+  methods: {
+    smstemplateDetailHandle (smstemplateId) {
+      this.smstemplateDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.smstemplateDetail.dataForm.id = smstemplateId
+        this.$refs.smstemplateDetail.init()
+      })
+    },
+    showEnableFlag (row, column) {
+      if (row.enableFlag === '0') {
+        return '否'
+      } else {
+        return '是'
+      }
+    }
   }
 }
 </script>

From b3b3aa91b65229eba21ee034cc77ccaa90aabe9d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 7 Jan 2020 17:45:33 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/message/smslog-add-or-update.vue  | 24 +++++++++++++--
 src/views/modules/message/smslog-detail.vue   | 29 ++++++++++++++-----
 src/views/modules/message/smslog.vue          | 13 +++++++--
 src/views/modules/message/smstemplate.vue     |  1 -
 4 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/message/smslog-add-or-update.vue b/src/views/modules/message/smslog-add-or-update.vue
index 26fd5e21..2318da3c 100644
--- a/src/views/modules/message/smslog-add-or-update.vue
+++ b/src/views/modules/message/smslog-add-or-update.vue
@@ -19,8 +19,17 @@
           <el-form-item label="参数4" prop="params4">
           <el-input v-model="dataForm.params4" placeholder="参数4"></el-input>
       </el-form-item>
-          <el-form-item label="发送状态 0：失败  1：成功" prop="status">
-          <el-input v-model="dataForm.status" placeholder="发送状态 0：失败  1：成功"></el-input>
+      <el-form-item label="发送状态" prop="status">
+          <el-select v-model="dataForm.status" placeholder="发送状态">
+            <el-option v-for="item in statusArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            </el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="平台类型" prop="platform">
+          <el-select v-model="dataForm.platform" placeholder="平台类型">
+            <el-option v-for="item in platformArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            </el-option>
+          </el-select>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -45,13 +54,22 @@ export default {
         params3: '',
         params4: '',
         status: '',
+        platform: '',
         revision: '',
         createdBy: '',
         createdTime: '',
         updatedBy: '',
         updatedTime: '',
         delFlag: ''
-      }
+      },
+      statusArr: [
+        { dictValue: 1, dictName: '成功' },
+        { dictValue: 0, dictName: '失败' }
+      ],
+      platformArr: [
+        { dictValue: 1, dictName: '阿里云' },
+        { dictValue: 2, dictName: '腾讯云' }
+      ]
     }
   },
   computed: {
diff --git a/src/views/modules/message/smslog-detail.vue b/src/views/modules/message/smslog-detail.vue
index 26fd5e21..994230f3 100644
--- a/src/views/modules/message/smslog-detail.vue
+++ b/src/views/modules/message/smslog-detail.vue
@@ -1,9 +1,6 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="短信模板表ID" prop="smsTemplateId">
-          <el-input v-model="dataForm.smsTemplateId" placeholder="短信模板表ID"></el-input>
-      </el-form-item>
           <el-form-item label="手机号" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
       </el-form-item>
@@ -19,8 +16,17 @@
           <el-form-item label="参数4" prop="params4">
           <el-input v-model="dataForm.params4" placeholder="参数4"></el-input>
       </el-form-item>
-          <el-form-item label="发送状态 0：失败  1：成功" prop="status">
-          <el-input v-model="dataForm.status" placeholder="发送状态 0：失败  1：成功"></el-input>
+      <el-form-item label="发送状态" prop="status">
+          <el-select v-model="dataForm.status" placeholder="发送状态">
+            <el-option v-for="item in statusArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            </el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="平台类型" prop="platform">
+          <el-select v-model="dataForm.platform" placeholder="平台类型">
+            <el-option v-for="item in platformArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            </el-option>
+          </el-select>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -45,13 +51,22 @@ export default {
         params3: '',
         params4: '',
         status: '',
+        platform: '',
         revision: '',
         createdBy: '',
         createdTime: '',
         updatedBy: '',
         updatedTime: '',
         delFlag: ''
-      }
+      },
+      statusArr: [
+        { dictValue: 1, dictName: '成功' },
+        { dictValue: 0, dictName: '失败' }
+      ],
+      platformArr: [
+        { dictValue: 1, dictName: '阿里云' },
+        { dictValue: 2, dictName: '腾讯云' }
+      ]
     }
   },
   computed: {
diff --git a/src/views/modules/message/smslog.vue b/src/views/modules/message/smslog.vue
index 450a66e1..04b691f0 100644
--- a/src/views/modules/message/smslog.vue
+++ b/src/views/modules/message/smslog.vue
@@ -18,7 +18,6 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
         <el-table-column prop="smsTemplateId" label="短信模板表ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params1" label="参数1" header-align="center" align="center"></el-table-column>
@@ -26,6 +25,7 @@
         <el-table-column prop="params3" label="参数3" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params4" label="参数4" header-align="center" align="center"></el-table-column>
         <el-table-column prop="status" label="发送状态" header-align="center" align="center" :formatter="showStatus"></el-table-column>
+        <el-table-column prop="platform" label="平台类型" header-align="center" align="center" :formatter="showPlatform"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
@@ -48,7 +48,7 @@
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <!--查看-->
-      <actphrase-detail v-if="smslogDetailVisible" ref="smslogDetail" @refreshDataList="getDataList"></actphrase-detail>
+      <smslog-detail v-if="smslogDetailVisible" ref="smslogDetail" @refreshDataList="getDataList"></smslog-detail>
     </div>
   </el-card>
 </template>
@@ -79,12 +79,19 @@ export default {
   },
   methods: {
     showStatus (row, column) {
-      if (row.status === '0') {
+      if (row.status === 0) {
         return '失败'
       } else {
         return '成功'
       }
     },
+    showPlatform (row, column) {
+      if (row.status === 1) {
+        return '阿里云'
+      } else {
+        return '腾讯云'
+      }
+    },
     smslogDetailHandle (smslogId) {
       this.smslogDetailVisible = true
       this.$nextTick(() => {
diff --git a/src/views/modules/message/smstemplate.vue b/src/views/modules/message/smstemplate.vue
index 0a900116..786ec857 100644
--- a/src/views/modules/message/smstemplate.vue
+++ b/src/views/modules/message/smstemplate.vue
@@ -17,7 +17,6 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
         <el-table-column prop="templateType" label="模板类型" header-align="center" align="center"></el-table-column>
         <el-table-column prop="templateTypeName" label="模板类型名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="enableFlag" label="启用标识" header-align="center" align="center" :formatter="showEnableFlag"></el-table-column>

From 341880d3ddfe653792a844290b5fb9d98ae246b2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 7 Jan 2020 18:17:40 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/message/smslog-add-or-update.vue  |  3 ++
 src/views/modules/message/smslog-detail.vue   |  3 ++
 src/views/modules/message/smslog.vue          | 31 +++++++++++++++----
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/message/smslog-add-or-update.vue b/src/views/modules/message/smslog-add-or-update.vue
index 2318da3c..64a814fe 100644
--- a/src/views/modules/message/smslog-add-or-update.vue
+++ b/src/views/modules/message/smslog-add-or-update.vue
@@ -96,6 +96,9 @@ export default {
         status: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        platform: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         revision: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/message/smslog-detail.vue b/src/views/modules/message/smslog-detail.vue
index 994230f3..3e270308 100644
--- a/src/views/modules/message/smslog-detail.vue
+++ b/src/views/modules/message/smslog-detail.vue
@@ -93,6 +93,9 @@ export default {
         status: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        platform: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         revision: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/message/smslog.vue b/src/views/modules/message/smslog.vue
index 04b691f0..81ff4b52 100644
--- a/src/views/modules/message/smslog.vue
+++ b/src/views/modules/message/smslog.vue
@@ -2,23 +2,34 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-message__smslog}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="手机号" clearable></el-input>
+      </el-form-item>
+          <el-form-item label="发送状态" prop="status">
+            <el-select v-model="dataForm.status" placeholder="发送状态" clearable>
+              <el-option v-for="item in statusArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+              </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="平台类型" prop="platform">
+            <el-select v-model="dataForm.platform" placeholder="平台类型" clearable>
+              <el-option v-for="item in platformArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+              </el-option>
+            </el-select>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <!-- <el-button v-if="$hasPermission('message:smslog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if=false type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('message:smslog:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if=false type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="smsTemplateId" label="短信模板表ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params1" label="参数1" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params2" label="参数2" header-align="center" align="center"></el-table-column>
@@ -70,6 +81,14 @@ export default {
       dataForm: {
         id: ''
       },
+      statusArr: [
+        { dictValue: 1, dictName: '成功' },
+        { dictValue: 0, dictName: '失败' }
+      ],
+      platformArr: [
+        { dictValue: 1, dictName: '阿里云' },
+        { dictValue: 2, dictName: '腾讯云' }
+      ],
       smslogDetailVisible: false
     }
   },
@@ -86,7 +105,7 @@ export default {
       }
     },
     showPlatform (row, column) {
-      if (row.status === 1) {
+      if (row.platform === 1) {
         return '阿里云'
       } else {
         return '腾讯云'

From 70cde4b5e07cbc1352c32a37bc83f08820f4f4a9 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 8 Jan 2020 09:02:35 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E5=8F=AA=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/message/smslog-detail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/message/smslog-detail.vue b/src/views/modules/message/smslog-detail.vue
index 3e270308..17c5e48f 100644
--- a/src/views/modules/message/smslog-detail.vue
+++ b/src/views/modules/message/smslog-detail.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="true">
           <el-form-item label="手机号" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
       </el-form-item>
@@ -29,7 +29,7 @@
           </el-select>
       </el-form-item>
       </el-form>
-    <template slot="footer">
+    <template slot="footer" v-if=false>
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>

From 62a38aad15bee3c73a959cbedf79734202860dc0 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 8 Jan 2020 09:59:32 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/message/smslog.vue | 36 ++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/message/smslog.vue b/src/views/modules/message/smslog.vue
index 81ff4b52..eb9a6498 100644
--- a/src/views/modules/message/smslog.vue
+++ b/src/views/modules/message/smslog.vue
@@ -11,12 +11,18 @@
               </el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="平台类型" prop="platform">
+        <el-form-item v-if=false label="平台类型" prop="platform">
             <el-select v-model="dataForm.platform" placeholder="平台类型" clearable>
               <el-option v-for="item in platformArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
               </el-option>
             </el-select>
         </el-form-item>
+        <el-form-item label="模板类型" prop="templateType">
+        <el-select v-model="dataForm.templateType" placeholder="模板类型" clearable>
+          <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
+      </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -29,17 +35,18 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column v-if=false type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="platform" label="平台类型" header-align="center" align="center" :formatter="showPlatform"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="status" label="发送状态" header-align="center" align="center" :formatter="showStatus"></el-table-column>
+        <el-table-column prop="templateTypeName" label="模板类型" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params1" label="参数1" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params2" label="参数2" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params3" label="参数3" header-align="center" align="center"></el-table-column>
         <el-table-column prop="params4" label="参数4" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" label="发送状态" header-align="center" align="center" :formatter="showStatus"></el-table-column>
-        <el-table-column prop="platform" label="平台类型" header-align="center" align="center" :formatter="showPlatform"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column prop="createdTime" label="发送时间" header-align="center" align="center"></el-table-column>
+        <el-table-column v-if=false prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column v-if=false :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="smslogDetailHandle(scope.row.id)">查看</el-button>
             <el-button v-if="$hasPermission('message:smslog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -89,6 +96,7 @@ export default {
         { dictValue: 1, dictName: '阿里云' },
         { dictValue: 2, dictName: '腾讯云' }
       ],
+      paramNameArr: [],
       smslogDetailVisible: false
     }
   },
@@ -96,6 +104,9 @@ export default {
     AddOrUpdate,
     smslogDetail
   },
+  created () {
+    this.getParamListInfo('sms_template_type')
+  },
   methods: {
     showStatus (row, column) {
       if (row.status === 0) {
@@ -111,6 +122,17 @@ export default {
         return '腾讯云'
       }
     },
+    // 获取参数名称code下拉信息
+    getParamListInfo (dictType) {
+      this.$http.get(`/sys/dict/listSimple/` + dictType).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        if (dictType === 'sms_template_type') {
+          this.paramNameArr = res.data
+        }
+      }).catch(() => {})
+    },
     smslogDetailHandle (smslogId) {
       this.smslogDetailVisible = true
       this.$nextTick(() => {

From 6a7fe243d514694916ce6123f27fc9d695adbd97 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 13 Jan 2020 13:57:03 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/message/smstemplate.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/message/smstemplate.vue b/src/views/modules/message/smstemplate.vue
index 786ec857..1c7df711 100644
--- a/src/views/modules/message/smstemplate.vue
+++ b/src/views/modules/message/smstemplate.vue
@@ -2,9 +2,12 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-message__smstemplate}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
+        </el-form-item> -->
+        <el-form-item label="模板类型名称" prop="templateTypeName">
+          <el-input v-model="dataForm.templateTypeName" placeholder="模板类型名称" clearable></el-input>
+      </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -27,7 +30,7 @@
         <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="smstemplateDetailHandle(scope.row.id)">查看</el-button>
+            <!-- <el-button type="text" size="small" @click="smstemplateDetailHandle(scope.row.id)">查看</el-button> -->
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>