diff --git a/src/views/tenant/main/talents/index.vue b/src/views/tenant/main/talents/index.vue index 83d0de0..9e0abc9 100644 --- a/src/views/tenant/main/talents/index.vue +++ b/src/views/tenant/main/talents/index.vue @@ -190,33 +190,7 @@ export default { tempWorkType: [], worktypeDic: {}, arr: [],////// - excelOption: { - submitBtn: false, - emptyBtn: false, - column: [ - { - label: "文件上传", - prop: "excelFile", - type: "upload", - drag: true, - loadText: "文件上传中,请稍等", - span: 24, - propsHttp: { - res: "data", - }, - tip: "请上传 .xls,.xlsx 标准格式文件", - accept: excelAccept, - showFileList: false, - action: upload(), - }, - { - label: "模板下载", - prop: "excelTemplate", - formslot: true, - span: 24, - }, - ], - }, + excelBox: false, data: [], obj: {}, @@ -420,6 +394,36 @@ export default { ], }; }, + excelOption() { + const url = this.tenantId ? `${upload()}&id=${this.tenantId}` : upload() + return { + submitBtn: false, + emptyBtn: false, + column: [ + { + label: "文件上传", + prop: "excelFile", + type: "upload", + drag: true, + loadText: "文件上传中,请稍等", + span: 24, + propsHttp: { + res: "data", + }, + tip: "请上传 .xls,.xlsx 标准格式文件", + accept: excelAccept, + showFileList: false, + action: url, + }, + { + label: "模板下载", + prop: "excelTemplate", + formslot: true, + span: 24, + }, + ], + } + }, selectedWorkTypes: { get() { if (!this.obj.labelsBase) { @@ -801,6 +805,7 @@ export default { }, /*导入人才库*/ beforeAvatarUpload(file, done, loading) { + console.log(file) if (!isExcel(file)) { loading(); this.$message.error("上传人才库信息只能是 .xls,.xlsx 标准格式文件!"); @@ -839,7 +844,7 @@ export default { /*下载人才库模板 */ handleTemplate() { this.templateLoading = true; - getTemplate("trc") + getTemplate("rqkdr") .then((rep) => { this.templateLoading = false; window.open(rep.data.data); diff --git a/src/views/tenant/mission/Table/WaitingMission.vue b/src/views/tenant/mission/Table/WaitingMission.vue index 34b06b2..3acc966 100644 --- a/src/views/tenant/mission/Table/WaitingMission.vue +++ b/src/views/tenant/mission/Table/WaitingMission.vue @@ -419,7 +419,7 @@ export default { /*下载任务模板 */ handleTemplate() { this.templateLoading = true; - getTemplate("trc") + getTemplate("rwdr") .then((rep) => { this.templateLoading = false; window.open(rep.data.data); diff --git a/src/views/tenant/works/Table/WaitingMission.vue b/src/views/tenant/works/Table/WaitingMission.vue index e965b02..b80f68d 100644 --- a/src/views/tenant/works/Table/WaitingMission.vue +++ b/src/views/tenant/works/Table/WaitingMission.vue @@ -449,7 +449,7 @@ export default { /*下载任务模板 */ handleTemplate() { this.templateLoading = true; - getTemplate("trc") + getTemplate("gwdr") .then((rep) => { this.templateLoading = false; window.open(rep.data.data); diff --git a/vue.config.js b/vue.config.js index 2a71145..90ff354 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,9 +23,7 @@ module.exports = { port: 1888, proxy: { "/api": { - // target: 'http://192.168.3.120:8000', - target: 'http://10.165.0.173:8000', //内网 - // target: 'http://localhost:8000', + target: 'http://localhost:8000', ws: true, changeOrigin: true, pathRewrite: {