Merge remote-tracking branch 'origin/master'

jiangping

2024-03-05 b6d2a806e6572ffc4c226c91f0a60b31a7b1fbc0

 company/src/components/enterprise/importEmployees.vue

@@ -10,7 +10,7 @@
            <el-form-item label="上传名单" required>
                <div style="width: 100%;display: flex;align-items: center;">
                    <el-button type="primary" @click="clickRef">点击上传</el-button>
                    <el-button type="text">名单模板.EXCEL</el-button>
                    <el-button type="text" @click="exportTemplate">名单模板.EXCEL</el-button>
                </div>
                <div style="font-size: 14px; color: black;" v-if="fileName">{{fileName}}</div>
            </el-form-item>
@@ -44,6 +44,10 @@
                this.list = obj.arr
                this.price = obj.price
            },
            // 导出模板
            exportTemplate () {
                window.open(process.env.VUE_APP_MEMBER_URL)
            },
            clickRef () {
                this.$refs.fileExcel.click()
            },
@@ -70,7 +74,7 @@
            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) {
                        if (this.addList[i].idCard === this.list[a].idcardNo) {
                            this.$message.warning(`[${this.addList[i].name}]员工重复`)
                            return
                        }