From 7b336b5d570dece2d283d33221874e8dae1a2118 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 05 三月 2024 14:02:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- company/src/components/enterprise/importEmployees.vue | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/company/src/components/enterprise/importEmployees.vue b/company/src/components/enterprise/importEmployees.vue index c06e9a6..72e8cb1 100644 --- a/company/src/components/enterprise/importEmployees.vue +++ b/company/src/components/enterprise/importEmployees.vue @@ -31,6 +31,8 @@ return { list: [], price: 0, + type: null, + solutionId: null, addList: [], fileName: '' } @@ -40,13 +42,20 @@ this.title = title this.addList = [] this.fileName = '' + this.type = obj.type this.visible = true + this.solutionId = obj.solutionId this.list = obj.arr this.price = obj.price }, // 瀵煎嚭妯℃澘 exportTemplate () { - window.open(process.env.VUE_APP_MEMBER_URL) + // 鎶曚繚鐢宠 + if (this.type === 1) { + window.open(process.env.VUE_APP_MEMBER1_URL) + } else { + window.open(process.env.VUE_APP_MEMBER_URL) + } }, clickRef () { this.$refs.fileExcel.click() @@ -54,6 +63,7 @@ result (e) { const data = new FormData() data.append('file', e.target.files[0]) + data.append('solutionId', this.solutionId) importExcel(data) .then(res => { res.forEach(item => { -- Gitblit v1.9.3