Browse Source

feat: [导出] 导出支持中英文

lkf
memorylkf 2 months ago
parent
commit
3c9c5b91cb
4 changed files with 23 additions and 20 deletions
  1. +0
    -7
      src/api/system/user.js
  2. +1
    -0
      src/utils/request.js
  3. +12
    -10
      src/views/system/role/index.vue
  4. +10
    -3
      src/views/system/user/index.vue

+ 0
- 7
src/api/system/user.js View File

@ -168,10 +168,3 @@ export function roleChangeList(query) {
params: query params: query
}) })
} }
export function roleChangeExport(data) {
return request({
url: '/system/business/roleChange/export',
method: 'post',
data
})
}

+ 1
- 0
src/utils/request.js View File

@ -24,6 +24,7 @@ const service = axios.create({
// request拦截器 // request拦截器
service.interceptors.request.use( service.interceptors.request.use(
(config) => { (config) => {
config.headers['lang'] = store.getters.language
// 是否需要设置 token // 是否需要设置 token
const isToken = (config.headers || {}).isToken === false const isToken = (config.headers || {}).isToken === false
// 是否需要防止数据重复提交 // 是否需要防止数据重复提交

+ 12
- 10
src/views/system/role/index.vue View File

@ -58,6 +58,16 @@
v-hasPermi="['system:role:add']" v-hasPermi="['system:role:add']"
>{{$t('form.add')}}</el-button> >{{$t('form.add')}}</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
@click="handleExport"
v-hasPermi="['system:role:export']"
>{{$t('form.export')}}</el-button>
</el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -80,16 +90,7 @@
v-hasPermi="['system:role:remove']" v-hasPermi="['system:role:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> --> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row> </el-row>
@ -694,6 +695,7 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.saveSimpleLog({name:'',nameEn:'',jcmc:'角色导出',jcmcEn:'Role Export'})
this.download('system/role/export', { this.download('system/role/export', {
...this.queryParams ...this.queryParams
}, `role_${new Date().getTime()}.xlsx`) }, `role_${new Date().getTime()}.xlsx`)

+ 10
- 3
src/views/system/user/index.vue View File

@ -264,12 +264,14 @@
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="$t('page.system.user.history')" :visible.sync="changeDialog.visible" width="70%" append-to-body> <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="$t('page.system.user.history')" :visible.sync="changeDialog.visible" width="70%" append-to-body>
<el-button type="warning" plain icon="el-icon-download" @click="handleExportHistory" v-hasPermi="['system:user:roleChange:export']" style="margin-bottom:10px">{{$t('form.export')}}</el-button>
<el-table v-loading="changeDialog.loading" :data="changeDialog.list"> <el-table v-loading="changeDialog.loading" :data="changeDialog.list">
<el-table-column :label="$t('form.signer')" prop="qmrMc" width="150" /> <el-table-column :label="$t('form.signer')" prop="qmrMc" width="150" />
<el-table-column :label="$t('form.qmyy')" :prop="$i18n.locale === 'zh_CN'?'jcmc':'jcmcEn'" width="150" />
<el-table-column :label="$t('form.qmyy')" :prop="$i18n.locale === 'zh_CN'?'jcmc':'jcmcEn'" width="180" />
<el-table-column :label="$t('form.signTime')" prop="createTime" width="150" /> <el-table-column :label="$t('form.signTime')" prop="createTime" width="150" />
<el-table-column :label="$t('page.system.user.bgqjs')" prop="bgq" /> <el-table-column :label="$t('page.system.user.bgqjs')" prop="bgq" />
<el-table-column :label="$t('page.system.user.bgqjs')" prop="bgh" />
<el-table-column :label="$t('page.system.user.bghjs')" prop="bgh" />
</el-table> </el-table>
<pagination <pagination
v-show="changeDialog.total>0" v-show="changeDialog.total>0"
@ -283,7 +285,7 @@
</template> </template>
<script> <script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect,roleChangeList,roleChangeExport } from "@/api/system/user"
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect,roleChangeList } from "@/api/system/user"
import { getToken } from "@/utils/auth" import { getToken } from "@/utils/auth"
import Treeselect from "@riophae/vue-treeselect" import Treeselect from "@riophae/vue-treeselect"
import "@riophae/vue-treeselect/dist/vue-treeselect.css" import "@riophae/vue-treeselect/dist/vue-treeselect.css"
@ -657,6 +659,7 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.saveSimpleLog({name:'',nameEn:'',jcmc:'用户导出',jcmcEn:'User Export'})
this.download('system/user/export', { this.download('system/user/export', {
...this.queryParams ...this.queryParams
}, `user_${new Date().getTime()}.xlsx`) }, `user_${new Date().getTime()}.xlsx`)
@ -716,6 +719,10 @@ export default {
}).finally(()=>{ }).finally(()=>{
this.changeDialog.loading = false; this.changeDialog.loading = false;
}) })
},
handleExportHistory(){
this.saveSimpleLog({name:'',nameEn:'',jcmc:'角色变更历史导出',jcmcEn:'Role History Export'})
this.download('/system/business/roleChange/export', this.changeDialog.searchForm, `roleHistory_${new Date().getTime()}.xlsx`)
} }
} }
} }

Loading…
Cancel
Save