From 04f90e085432fbd3302ffd248c22050ff2fd2509 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 19 五月 2023 11:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/bignote/index.vue | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 7705a6e..113f9dd 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -63,13 +63,13 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ </el-form-item><el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
border-radius: 6px 6px 6px 6px;opacity:1; " >鎼滅储</el-button>
- <el-button size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ <el-button size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
border-radius: 6px 6px 6px 6px;opacity:1; " >閲嶇疆</el-button>
- </el-form-item>
+ </el-form-item>
+
</el-form>
<div style="width: 72px;
@@ -120,7 +120,7 @@
plain
icon="el-icon-download"
size="mini"
- @click="handleExport"
+ @click="handleExportTemplate"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
@@ -144,8 +144,8 @@
</el-row>
<!-- 搴忓彿銆佹椂闂淬�佷汉鐗┿�佸湴鐐广�佸ぇ浜嬫爣棰樸�佺數瀛愭枃浠躲�佸娉� -->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
- <el-table v-loading="loading" :data="familyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
- <el-table-column type="selection" width="55" align="center" />
+ <el-table v-loading="loading" :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
<el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center">
@@ -443,7 +443,10 @@
this.open = false;
this.reset();
},
-
+ getRowId(row)
+ {
+ return row.id
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -523,7 +526,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- console.log(this.ids)
+ // alert(this.ids)
this.single = selection.length!=1
this.multiple = !selection.length
},
@@ -606,17 +609,35 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
+
this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫変腑鏁版嵁椤癸紵').then(function() {
return delFamilyevent(Ids);
}).then(() => {
this.getList();
+ this.ids = []
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
this.download('/family/zfEvent/export', {
...this.queryParams
+ }, `zfEvent_${new Date().getTime()}.xlsx`)
+ }
+ else{
+ this.download('/family/zfEvent/export1/'+Ids, {
+ }, `zfEvent_${new Date().getTime()}.xlsx`)
+ }
+ },
+ /** 瀵煎叆妯℃澘涓嬭浇鎿嶄綔*/
+ handleExportTemplate()
+ {
+ this.download('/family/zfEvent/model', {
+
}, `zfEvent_${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎿嶄綔*/
@@ -635,6 +656,7 @@
}
}
+
}
};
</script>
--
Gitblit v1.9.1