From 2f919191f1c7739eb0ef54392cd265284b55af9e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 29 一月 2024 19:58:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- company/src/components/enterprise/importEmployees.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/company/src/components/enterprise/importEmployees.vue b/company/src/components/enterprise/importEmployees.vue index ccba938..dc04b87 100644 --- a/company/src/components/enterprise/importEmployees.vue +++ b/company/src/components/enterprise/importEmployees.vue @@ -1,43 +1,86 @@ <template> <GlobalWindow :title="title" - width="100%" + width="30%" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm" > <el-form class="demo-form-inline"> <el-form-item label="涓婁紶鍚嶅崟" required> - <el-button type="primary" @click="clickRef">鐐瑰嚮涓婁紶</el-button> - <el-button type="text">鍚嶅崟妯℃澘.EXCEL</el-button> + <div style="width: 100%;display: flex;align-items: center;"> + <el-button type="primary" @click="clickRef">鐐瑰嚮涓婁紶</el-button> + <el-button type="text">鍚嶅崟妯℃澘.EXCEL</el-button> + </div> + <div style="font-size: 14px; color: black;" v-if="fileName">{{fileName}}</div> </el-form-item> </el-form> - <input type="file" accept=".excel" ref="fileExcel" @change="result" /> + <input type="file" style="position: fixed; left: 0; top: -50px;" accept=".xlsx" ref="fileExcel" @change="result" /> </GlobalWindow> </template> <script> import BaseOpera from '@/components/base/BaseOpera' import GlobalWindow from '@/components/common/GlobalWindow' + import { importExcel } from '@/api/business/member' export default { name: 'importEmployees', extends: BaseOpera, components: { GlobalWindow }, data () { return { - list: [] + list: [], + price: 0, + addList: [], + fileName: '' } }, methods: { - open (title, arr) { + open (title, obj) { this.title = title + this.addList = [] + this.fileName = '' this.visible = true + this.list = obj.arr + this.price = obj.price }, clickRef () { this.$refs.fileExcel.click() }, result (e) { - console.log(e) + const data = new FormData() + data.append('file', e.target.files[0]) + importExcel(data) + .then(res => { + res.forEach(item => { + item.memberName = item.name + item.fee = '' + }) + this.addList = res + this.fileName = e.target.files[0].name + }) + .catch(err => { + this.$message.error(err) + this.fileName = '' + }) + .finally(() => { + this.$refs.fileExcel.value = null + }) + }, + confirm () { + for (let i = 0; i < this.addList.length; i++) { + for (let a = 0; a < this.list.length; a++) { + if (this.addList[i].name === this.list[a].memberName || this.addList[i].idCard === this.list[a].idcardNo) { + this.$message.warning(`[${this.addList[i].name}]鍛樺伐閲嶅`) + return + } + } + } + this.addList.forEach(item => { + item.fee = this.price || '' + }) + this.$emit('result', this.addList) + this.visible = false } } } -- Gitblit v1.9.3