From 97bd43c4d9f4df55365e4634de347f2ac13145af Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:10 +0800
Subject: [PATCH] 修改人员bug
---
src/components/do/a6-personnel/track-record.vue | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/src/components/do/a6-personnel/track-record.vue b/src/components/do/a6-personnel/track-record.vue
index 60e0aed..74ba234 100644
--- a/src/components/do/a6-personnel/track-record.vue
+++ b/src/components/do/a6-personnel/track-record.vue
@@ -12,6 +12,8 @@
<span>{{ (search.current - 1) * search.size + scope.$index + 1 }}</span>
</template>
</el-table-column>
+ <el-table-column prop="name" label="濮撳悕" min-width="100">
+ </el-table-column>
<el-table-column prop="startTime" label="璧峰鏃ユ湡" min-width="180">
</el-table-column>
<el-table-column prop="endTime" label="缁撴潫鏃ユ湡" min-width="180">
@@ -41,10 +43,15 @@
:total="search.total">
</el-pagination>
</div>
- <el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="45%">
+ <el-dialog title="鏌ョ湅" :visible.sync="dialogVisible" width="45%">
<div style="height: 30vh;">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-row>
+ <el-col :span="12">
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input v-model="ruleForm.name" size="small" disabled></el-input>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="璧峰鏃ユ湡" prop="startTime">
<el-date-picker v-model="ruleForm.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small"
@@ -59,8 +66,6 @@
</el-date-picker>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="宸ヤ綔鍗曚綅" prop="placeWork">
<el-input v-model="ruleForm.placeWork" size="small" clearable required></el-input>
@@ -71,8 +76,6 @@
<el-input v-model="ruleForm.department" size="small" clearable required></el-input>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="12">
<el-form-item label="鏈�楂樿亴鍔�" prop="post">
<el-input v-model="ruleForm.post" size="small" clearable required></el-input>
@@ -183,13 +186,33 @@
let departmentId = this.clickNodeVal.id ? this.clickNodeVal.id : null
this.$axios.get(this.$api.personnel.personTrackRecordExport + "?userId=" + userId + "&departmentId=" + departmentId, { responseType: "blob" }).then(res => {
this.outLoading = false
- this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res], { type: 'application/octet-stream' });
- const url = URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = url;
- link.download = '宸ヤ綔灞ュ巻.xlsx';
- link.click();
+ //灏咮lob 瀵硅薄杞崲鎴愬瓧绗︿覆
+ let reader = new FileReader();
+ reader.readAsText(blob, 'utf-8');
+ reader.onload = () => {
+ try {
+ let result = JSON.parse(reader.result);
+ if (result.message) {
+ this.$message.error(result.message);
+ } else {
+ const url = URL.createObjectURL(blob);
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = '宸ヤ綔灞ュ巻.xlsx';
+ link.click();
+ this.$message.success('瀵煎嚭鎴愬姛')
+ }
+ } catch (err) {
+ console.log(err);
+ const url = URL.createObjectURL(blob);
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = '宸ヤ綔灞ュ巻.xlsx';
+ link.click();
+ this.$message.success('瀵煎嚭鎴愬姛')
+ }
+ }
})
},
saveOrUpdate() {
--
Gitblit v1.9.3