Skip to content

薪
薪瑞通-前端
Commit c9a97699 authored by 谢子梦's avatar 谢子梦
Browse files
Options

合并-冲突

parents b17f44bb 38346e57
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/views/business/outPersonal/index.vue
View file @ c9a97699
...@@ -204,9 +204,9 @@ ...@@ -204,9 +204,9 @@
<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">
<div class="el-upload__tip" slot="tip"> <!-- <div class="el-upload__tip" slot="tip">-->
<!-- <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 --> <!-- <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 -->
</div> <!-- </div>-->
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="发薪名单模板" <a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="发薪名单模板"
href="/userImportTemplate.xlsx" target="_blank">下载模板</a> href="/userImportTemplate.xlsx" target="_blank">下载模板</a>
......
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