From c70e37453d06f8eb6eddeddb3085548541cd34b5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:10 +0800
Subject: [PATCH] 修改人员
---
src/components/caorui/Department/components/Plan/index.vue | 62 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/src/components/caorui/Department/components/Plan/index.vue b/src/components/caorui/Department/components/Plan/index.vue
index 560a949..518316c 100644
--- a/src/components/caorui/Department/components/Plan/index.vue
+++ b/src/components/caorui/Department/components/Plan/index.vue
@@ -46,8 +46,8 @@
<el-date-picker v-model="yearDetailForm.date" class="date_box" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
size="small" type="date" value-format="yyyy-MM-dd">
</el-date-picker>
- <span>鐩戠潱椤圭洰</span>
- <el-input v-model="yearDetailForm.project" class="search" placeholder="璇疯緭鍏�" size="small"></el-input>
+ <!-- <span>鐩戠潱椤圭洰</span> -->
+ <!-- <el-input v-model="yearDetailForm.superviseDes" class="search" placeholder="璇疯緭鍏�" size="small"></el-input> -->
<el-button size="small" type="primary" @click="getYearDetailPlanList">鏌ヨ</el-button>
<el-button size="small" @click="clearDetail">娓呯┖</el-button>
</div>
@@ -92,7 +92,7 @@
return {
planId: undefined,
yearForm: {
- organizationPerson: undefined,
+ organizationPerson: undefined,
},
yearTableData: [], // 骞磋〃
yearPage: {
@@ -107,7 +107,7 @@
minWidth: '150px'
}, {
label: '缂栧埗浜�',
- prop: 'organizationPerson',
+ prop: 'organizationPersonName',
minWidth: '100'
}, {
label: '缂栧埗鏃ユ湡',
@@ -117,14 +117,17 @@
label: '鎵瑰噯浜�',
prop: 'approvalName',
minWidth: '100'
- }, {
+ },
+ {
label: '鎵瑰噯鏃ユ湡',
prop: 'approvalDate',
minWidth: '160'
- }, {
- label: '瀹℃牳浜�',
- prop: 'examine'
- }, {
+ },
+ // {
+ // label: '瀹℃牳浜�',
+ // prop: 'examine'
+ // },
+ {
dataType: 'tag',
label: '鎵瑰噯鐘舵��',
prop: 'approvalStatus',
@@ -190,8 +193,7 @@
}],
yearLoading: false,
yearDetailForm: {
- date: undefined,
- project: undefined
+ date: undefined
},
yearDetailTableData: [], // 骞存槑缁嗚〃
yearDeatilPage: {
@@ -307,7 +309,6 @@
// 娓呴櫎鏄庣粏
clearDetail() {
this.yearDetailForm.date = undefined
- this.yearDetailForm.project = undefined
this.getYearDetailPlanList()
},
@@ -323,8 +324,7 @@
planId: this.planId,
current: this.yearDeatilPage.curent,
size: this.yearDeatilPage.pageSize,
- date: this.yearDetailForm.date,
- project: this.yearDetailForm.project
+ date: this.yearDetailForm.date
}
})
if (code == 200) {
@@ -409,15 +409,35 @@
},
// 骞村害璁″垝琛�-涓嬭浇
downLoadPost(row) {
- this.$axios.get(exportSuperVisePlanApi + '?id=' + row.id,{responseType: "blob"}).then(res => {
+ this.$axios.post(exportSuperVisePlanApi ,{id:row.id},{responseType: "blob"}).then(res => {
this.outLoading = false
- this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res],{ type: 'application/msword' });
- const url = URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = url;
- link.download = row.fileName + '.docx';
- 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 = row.fileName + '.docx';
+ 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 = row.fileName + '.docx';
+ link.click();
+ this.$message.success('瀵煎嚭鎴愬姛')
+ }
+ }
})
},
async approvalYearPlanFun(approvalStatus, rowId) {
--
Gitblit v1.9.3