From 0782140a00e554ec7a1c724ecc1eb36726d994f8 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 22 五月 2023 11:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/cause/Entry.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/views/cause/Entry.vue b/src/views/cause/Entry.vue
index a576229..7f0713c 100644
--- a/src/views/cause/Entry.vue
+++ b/src/views/cause/Entry.vue
@@ -194,7 +194,7 @@
<template slot="header">
<el-form :inline="true" :model="queryInfoReport" class="demo-form-inline">
<el-form-item label="鎶ユ浜�:">
- <el-input placeholder="璇疯緭鍏ュ鍚嶆垨韬唤璇�" v-model="queryInfoReport.people" :style="{ width: '180px' }">
+ <el-input placeholder="璇疯緭鍏ュ鍚�" v-model="queryInfoReport.people" :style="{ width: '180px' }">
</el-input>
</el-form-item>
<el-form-item label="鎵嬫満鍙风爜:">
@@ -206,20 +206,21 @@
<el-option v-for="item in optionsGroup" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
- </el-form-item>
+<!-- </el-form-item>-->
- <el-form-item label="鎶ユ鏉愭枡:">
- <el-select v-model="queryInfoReport.HavaMaterial" :style="{ width: '100px' }">
- <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="鎶ユ鏉愭枡:">-->
+<!-- <el-select v-model="queryInfoReport.HavaMaterial" :style="{ width: '100px' }">-->
+<!-- <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
- <el-form-item>
+<!-- <el-form-item>-->
<el-button type="primary" @click="searchByCondition">鏌ヨ</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addVisibelReport">娣诲姞</el-button>
+ <el-button type="primary" @click="exportExcel">瀵煎嚭</el-button>
</el-form-item>
<el-form-item>
<el-upload name="multipartFile" class="upload-demo" action="/api/cause/reporterUpload"
@@ -228,7 +229,7 @@
<!-- <el-button type="primary">瀵煎叆</el-button>-->
</el-upload>
</el-form-item>
- <el-form-item>0
+ <el-form-item>
<!-- <el-button type="primary" @click="exportExcel">鎶ユ鏉愭枡瀵煎嚭</el-button>-->
</el-form-item>
@@ -277,8 +278,10 @@
<!-- <el-button type="text" size="medium"-->
<!-- @click="leaveReport(scope.row.id, scope.row.causeId, scope.row.groupId)" style="color:#ff0000"-->
<!-- :disabled="scope.row.isInGroup == 0">閫�缇� </el-button>-->
+<!-- <el-button type="text" size="medium" @click="removeReport(scope.row.id, scope.row.causeId)"-->
+<!-- style="color:#ff0000" :disabled="scope.row.isInGroup == 1">鍒犻櫎 </el-button>-->
<el-button type="text" size="medium" @click="removeReport(scope.row.id, scope.row.causeId)"
- style="color:#ff0000" :disabled="scope.row.isInGroup == 1">鍒犻櫎 </el-button>
+ style="color:#ff0000" >鍒犻櫎 </el-button>
</template>
</el-table-column>
</el-table>
@@ -1087,6 +1090,9 @@
},
methods:
{
+ expExcel(){
+
+ },
addAduitAnJian(){
let date=(new Date()).valueOf();//鑾峰彇鏃堕棿鎴�
let txt = '1234567890';//鐢熸垚鐨勯殢鏈烘満鍣ㄧ爜
@@ -1208,7 +1214,7 @@
//妗堜欢浜哄憳
//瀵煎嚭鏂囦欢
exportExcel() {
- this.$http.post('/api/report/exportReporter?id=' + this.exportReportId, {}, { responseType: 'blob' })
+ this.$http.post('/api//cause/exp?causeId=' + this.exportReportId, {}, { responseType: 'blob' })
.then(res => {
const fileName = decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1])
const blob = new Blob([res.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
--
Gitblit v1.8.0