Commit 31fcb560 authored by 小费同学阿's avatar 小费同学阿 💬

68226 (优化)全局-所有的按钮点击触发后鼠标在移动到别的地方时,按钮被选中的样式应该恢复为初始状态

parent 3344307b
...@@ -64,26 +64,29 @@ ...@@ -64,26 +64,29 @@
<el-form-item> <el-form-item>
<!--选择全部--> <!--选择全部-->
<el-button <el-button
id="all-choice"
v-hasPermi="['finance:expenditure:export']" v-hasPermi="['finance:expenditure:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="checkAll" @click="checkAll('all-choice')"
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />选择全部 ><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />选择全部
</el-button> </el-button>
<!--反向选择--> <!--反向选择-->
<el-button <el-button
id="re-choice"
v-hasPermi="['finance:expenditure:export']" v-hasPermi="['finance:expenditure:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="reverseSelection" @click="reverseSelection('re-choice')"
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择 ><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择
</el-button> </el-button>
<!--批量导出--> <!--批量导出-->
<el-button <el-button
id="export-handle"
v-hasPermi="['finance:expenditure:export']" v-hasPermi="['finance:expenditure:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="handleExport" @click="handleExport('export-handle')"
><svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />批量导出 ><svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />批量导出
</el-button> </el-button>
</el-form-item> </el-form-item>
...@@ -129,7 +132,7 @@ ...@@ -129,7 +132,7 @@
</el-table-column> </el-table-column>
<el-table-column v-if="deptLevel === '1'" align="left" label="收入金额" prop="payAmount" show-overflow-tooltip> <el-table-column v-if="deptLevel === '1'" align="left" label="收入金额" prop="payAmount" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.payAmount ? moneyFormat(scope.row.payAmount)+ ' 元' : '-'}}</span> <span>{{ scope.row.payAmount ? moneyFormat(scope.row.payAmount)+ ' 元' : '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="left" label="支出金额" min-width="70" prop="payAmount" show-overflow-tooltip> <el-table-column align="left" label="支出金额" min-width="70" prop="payAmount" show-overflow-tooltip>
...@@ -429,10 +432,11 @@ export default { ...@@ -429,10 +432,11 @@ export default {
}, },
// 选择全部 // 选择全部
checkAll() { checkAll(allChoiceButtonId) {
this.ids = this.idsForever this.ids = this.idsForever
// 调用手动勾选 // 调用手动勾选
this.manualCheck() this.manualCheck()
document.getElementById(allChoiceButtonId).blur()
}, },
// 手动勾选 // 手动勾选
manualCheck() { manualCheck() {
...@@ -449,8 +453,9 @@ export default { ...@@ -449,8 +453,9 @@ export default {
}) })
}, },
// 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给) // 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给)
reverseSelection() { reverseSelection(reChoice) {
const temp = [] const temp = []
document.getElementById(reChoice).blur()
this.idsForever.forEach(item => { this.idsForever.forEach(item => {
if (!this.ids.includes(item)) { if (!this.ids.includes(item)) {
temp.push(item) temp.push(item)
...@@ -486,7 +491,8 @@ export default { ...@@ -486,7 +491,8 @@ export default {
}, },
/** 功能按钮--导出按钮操作 */ /** 功能按钮--导出按钮操作 */
handleExport() { handleExport(exportButtonId) {
document.getElementById(exportButtonId).blur()
console.log('queryParams', this.queryParams) console.log('queryParams', this.queryParams)
console.log('this.ids', this.ids) console.log('this.ids', this.ids)
if (this.ids.length === 0) { if (this.ids.length === 0) {
......
...@@ -72,26 +72,29 @@ ...@@ -72,26 +72,29 @@
<el-form-item> <el-form-item>
<!--选择全部--> <!--选择全部-->
<el-button <el-button
id="all-choice"
v-hasPermi="['finance:payment:export']" v-hasPermi="['finance:payment:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="checkAll" @click="checkAll('all-choice')"
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />选择全部 ><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />选择全部
</el-button> </el-button>
<!--反向选择--> <!--反向选择-->
<el-button <el-button
id="re-choice"
v-hasPermi="['finance:payment:export']" v-hasPermi="['finance:payment:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="reverseSelection" @click="reverseSelection('re-choice')"
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择 ><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择
</el-button> </el-button>
<!--批量导出--> <!--批量导出-->
<el-button <el-button
id="export-handle"
v-hasPermi="['finance:payment:export']" v-hasPermi="['finance:payment:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="handleExport" @click="handleExport('export-handle')"
><svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />批量导出 ><svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />批量导出
</el-button> </el-button>
</el-form-item> </el-form-item>
...@@ -513,10 +516,11 @@ export default { ...@@ -513,10 +516,11 @@ export default {
}, },
// 选择全部 // 选择全部
checkAll() { checkAll(allChoiceButtonId) {
this.ids = this.idsForever this.ids = this.idsForever
// 调用手动勾选 // 调用手动勾选
this.manualCheck() this.manualCheck()
document.getElementById(allChoiceButtonId).blur()
}, },
// 手动勾选 // 手动勾选
manualCheck() { manualCheck() {
...@@ -531,8 +535,9 @@ export default { ...@@ -531,8 +535,9 @@ export default {
}) })
}, },
// 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给) // 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给)
reverseSelection() { reverseSelection(reChoice) {
const temp = [] const temp = []
document.getElementById(reChoice).blur()
this.idsForever.forEach(item => { this.idsForever.forEach(item => {
if (!this.ids.includes(item)) { if (!this.ids.includes(item)) {
temp.push(item) temp.push(item)
...@@ -568,7 +573,8 @@ export default { ...@@ -568,7 +573,8 @@ export default {
}, },
/** 功能按钮--导出按钮操作 */ /** 功能按钮--导出按钮操作 */
handleExport() { handleExport(exportButtonId) {
document.getElementById(exportButtonId).blur()
console.log('queryParams', this.queryParams) console.log('queryParams', this.queryParams)
console.log('this.ids', this.ids) console.log('this.ids', this.ids)
if (this.ids.length === 0) { if (this.ids.length === 0) {
......
...@@ -64,26 +64,29 @@ ...@@ -64,26 +64,29 @@
<el-form-item> <el-form-item>
<!--选择全部--> <!--选择全部-->
<el-button <el-button
id="all-choice"
v-hasPermi="['finance:revenue:export']" v-hasPermi="['finance:revenue:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="checkAll" @click="checkAll('all-choice')"
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />选择全部 ><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />选择全部
</el-button> </el-button>
<!--反向选择--> <!--反向选择-->
<el-button <el-button
id="re-choice"
v-hasPermi="['finance:revenue:export']" v-hasPermi="['finance:revenue:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="reverseSelection" @click="reverseSelection('re-choice')"
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择 ><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择
</el-button> </el-button>
<!--批量导出--> <!--批量导出-->
<el-button <el-button
id="export-handle"
v-hasPermi="['finance:revenue:export']" v-hasPermi="['finance:revenue:export']"
class="fourWordswhiteBtn" class="fourWordswhiteBtn"
size="mini" size="mini"
@click="handleExport" @click="handleExport('export-handle')"
><svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />批量导出 ><svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />批量导出
</el-button> </el-button>
</el-form-item> </el-form-item>
...@@ -427,10 +430,11 @@ export default { ...@@ -427,10 +430,11 @@ export default {
}, },
// 选择全部 // 选择全部
checkAll() { checkAll(allChoiceButtonId) {
this.ids = this.idsForever this.ids = this.idsForever
// 调用手动勾选 // 调用手动勾选
this.manualCheck() this.manualCheck()
document.getElementById(allChoiceButtonId).blur()
}, },
// 手动勾选 // 手动勾选
manualCheck() { manualCheck() {
...@@ -447,8 +451,9 @@ export default { ...@@ -447,8 +451,9 @@ export default {
}) })
}, },
// 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给) // 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给)
reverseSelection() { reverseSelection(reChoice) {
const temp = [] const temp = []
document.getElementById(reChoice).blur()
this.idsForever.forEach(item => { this.idsForever.forEach(item => {
if (!this.ids.includes(item)) { if (!this.ids.includes(item)) {
temp.push(item) temp.push(item)
...@@ -484,7 +489,8 @@ export default { ...@@ -484,7 +489,8 @@ export default {
}, },
/** 功能按钮--导出按钮操作 */ /** 功能按钮--导出按钮操作 */
handleExport() { handleExport(exportButtonId) {
document.getElementById(exportButtonId).blur()
console.log('queryParams', this.queryParams) console.log('queryParams', this.queryParams)
console.log('this.ids', this.ids) console.log('this.ids', this.ids)
if (this.ids.length === 0) { if (this.ids.length === 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment