Commit a92df261 authored by 谢子梦's avatar 谢子梦

优化

parent 647a0851
...@@ -126,7 +126,7 @@ export const loadView = (view) => { ...@@ -126,7 +126,7 @@ export const loadView = (view) => {
return (resolve) => require([`@/views/${view}`], resolve) return (resolve) => require([`@/views/${view}`], resolve)
} else { } else {
// 使用 import 实现生产环境的路由懒加载 // 使用 import 实现生产环境的路由懒加载
return () => import(`@/views/${view}`) return () => require(`@/views/${view}`)
} }
} }
......
...@@ -38,12 +38,8 @@ ...@@ -38,12 +38,8 @@
v-hasPermi="['business:outPersonal:export']">导出</el-button> v-hasPermi="['business:outPersonal:export']">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="info" icon="el-icon-upload2" @click="upload.open = true"
type="info" v-hasPermi="['business:outPersonal:add']">导入</el-button>
icon="el-icon-upload2"
@click="upload.open = true"
v-hasPermi="['business:outPersonal:add']"
>导入</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -55,14 +51,14 @@ ...@@ -55,14 +51,14 @@
<el-table-column label="身份证号" align="center" prop="userCode" fixed /> <el-table-column label="身份证号" align="center" prop="userCode" fixed />
<el-table-column label="收款账号" align="center" prop="payeeAccNo"> <el-table-column label="收款账号" align="center" prop="payeeAccNo">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.payeeAccNo }} {{ scope.row.payeeAccNo }}
<dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType"/> <dict-tag :options="dict.type.payee_acc_type" :value="scope.row.payeeAccType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="性别" align="center" prop="gender" /> <el-table-column label="性别" align="center" prop="gender" />
<el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110"> <el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType"/> <dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="岗位名称" align="center" prop="postName" /> <el-table-column label="岗位名称" align="center" prop="postName" />
...@@ -202,18 +198,9 @@ ...@@ -202,18 +198,9 @@
</el-dialog> </el-dialog>
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
<el-dialog title="导入人员信息" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog title="导入人员信息" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
ref="upload" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:limit="1" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
...@@ -221,7 +208,9 @@ ...@@ -221,7 +208,9 @@
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
</div> </div>
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link> <a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="userImportTemplate"
href="/userImportTemplate.xlsx" target="_blank">下载模板</a>
<!-- <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link> -->
</div> </div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment