Browse Source

Merge branch 'feature/style' of http://121.42.41.42:7070/r/esua-epdc-admin into feature/style

master
wanggongfeng 5 years ago
parent
commit
c7feae7775
  1. 1
      src/views/modules/message/mail-log.vue
  2. 1
      src/views/modules/message/mail-template.vue
  3. 1
      src/views/modules/message/sms.vue
  4. 1
      src/views/modules/message/smslog.vue
  5. 1
      src/views/modules/message/smstemplate.vue
  6. 7
      src/views/modules/sys/appmenutemplate.vue
  7. 7
      src/views/modules/sys/dict.vue
  8. 7
      src/views/modules/sys/params.vue
  9. 7
      src/views/modules/sys/role.vue
  10. 2
      src/views/modules/sys/user.vue

1
src/views/modules/message/mail-log.vue

@ -29,6 +29,7 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="templateId" :label="$t('mail.templateId')" sortable="custom" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="mailFrom" :label="$t('mail.mailFrom')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="mailTo" :label="$t('mail.mailTo')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>

1
src/views/modules/message/mail-template.vue

@ -26,6 +26,7 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="name" :label="$t('mail.name')" header-align="center" align="center"></el-table-column>
<el-table-column prop="subject" :label="$t('mail.subject')" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" :label="$t('mail.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>

1
src/views/modules/message/sms.vue

@ -32,6 +32,7 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="platform" :label="$t('sms.platform')" sortable="custom" header-align="center" width="120" align="center">
<template slot-scope="scope">
{{ scope.row.platform === 1 ? $t('sms.platform1') : scope.row.platform === 2 ? $t('sms.platform2') : '' }}

1
src/views/modules/message/smslog.vue

@ -36,6 +36,7 @@
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column v-if=false type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column type="index" label="序号" 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" width="120"></el-table-column>
<el-table-column prop="status" label="发送状态" header-align="center" align="center" :formatter="showStatus"></el-table-column>

1
src/views/modules/message/smstemplate.vue

@ -17,6 +17,7 @@
</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 type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="templateType" label="模板类型" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="templateTypeName" label="模板类型名称" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="enableFlag" label="启用标识" header-align="center" align="center" :formatter="showEnableFlag"></el-table-column>

7
src/views/modules/sys/appmenutemplate.vue

@ -46,6 +46,13 @@
header-align="center"
align="center"
width="50"
></el-table-column>
<el-table-column
type="index"
header-align="center"
align="center"
width="50"
label='序号'
></el-table-column>
<el-table-column
prop="templateName"

7
src/views/modules/sys/dict.vue

@ -40,6 +40,13 @@
@selection-change="dataListSelectionChangeHandle"
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column
type="index"
header-align="center"
align="center"
width="50"
label='序号'
></el-table-column>
<!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
<el-table-column prop="dictName"
:label="$t('dict.dictName')"

7
src/views/modules/sys/params.vue

@ -17,6 +17,13 @@
</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
type="index"
header-align="center"
align="center"
width="50"
label='序号'
></el-table-column>
<el-table-column prop="paramCode" :label="$t('params.paramCode')" header-align="center" align="center" min-width="400" show-overflow-tooltip></el-table-column>
<el-table-column prop="paramValue" :label="$t('params.paramValue')" header-align="center" align="center" width="100"></el-table-column>
<el-table-column prop="remark" :label="$t('params.remark')" header-align="center" align="center" width="100" show-overflow-tooltip></el-table-column>

7
src/views/modules/sys/role.vue

@ -41,6 +41,13 @@
header-align="center"
align="center"
width="50"></el-table-column>
<el-table-column
type="index"
header-align="center"
align="center"
width="50"
label='序号'
></el-table-column>
<el-table-column prop="name"
:label="$t('role.name')"
header-align="center"

2
src/views/modules/sys/user.vue

@ -11,6 +11,7 @@
<el-form-item label="邮箱">
<el-input v-model="dataForm.email" placeholder="邮箱" clearable @keyup.native="btKeyUpEmail"></el-input>
</el-form-item>
<br>
<el-form-item label="手机号">
<el-input v-model="dataForm.mobile" placeholder="手机号" clearable @keyup.native="btKeyUpMobile"></el-input>
</el-form-item>
@ -35,6 +36,7 @@
@sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="realName" :label="$t('user.realName')" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center" min-width="180" show-overflow-tooltip></el-table-column>

Loading…
Cancel
Save