Commit 948d11e9 authored by 王飞龙's avatar 王飞龙

bug修改

parent 39588ba5
......@@ -90,24 +90,24 @@
<el-button
v-hasPermi="['business:device:export']"
class="fourWordswhiteBtn"
@click="selectAll()"
@click="checkAll()"
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />
选择全部
</el-button>
<el-button
v-hasPermi="['business:device:export']"
class="fourWordswhiteBtn"
@click="reverseSelect(deviceList)"
@click="reverseSelection"
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择
</el-button>
<!-- <el-button-->
<!-- v-hasPermi="['business:device:import']"-->
<!-- class="fourWordswhiteBtn"-->
<!-- @click="handleImport"-->
<!-- >-->
<!-- <svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daoru" />-->
<!-- 批量导入-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['business:device:import']"-->
<!-- class="fourWordswhiteBtn"-->
<!-- @click="handleImport"-->
<!-- >-->
<!-- <svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daoru" />-->
<!-- 批量导入-->
<!-- </el-button>-->
<el-button
v-hasPermi="['business:device:export']"
class="fourWordswhiteBtn"
......@@ -130,9 +130,16 @@
</el-col>
</el-row>
<el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#F4F4F4'}" :row-key="getRowKeys" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="47" align="center" :reserve-selection="true" />
<el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index" >
<el-table
ref="table"
v-loading="loading"
:data="deviceList"
:header-cell-style="{ background:'#F4F4F4'}"
@select="selectChange"
@select-all="selectChange"
>
<el-table-column type="selection" width="47" align="center" />
<el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
......@@ -511,7 +518,7 @@ export default {
this.serviceShow = false
this.itemType = 3
}
this.getItemByType()
// this.getItemByType()
})
},
// 显示两位数字
......@@ -564,6 +571,8 @@ export default {
this.deviceList = response.rows
console.log('this.deviceList', this.deviceList)
this.idsForever = response.idList
console.log('idlist', this.idsForever)
this.total = response.total
this.loading = false
this.manualCheck()
......@@ -651,7 +660,7 @@ export default {
// 在下一个dom触发
this.$nextTick().then(() => {
// 当前页结合数据的id只要在临时集合里,就使得复选框勾选
this.drugList.forEach(item => {
this.deviceList.forEach(item => {
if (this.ids.includes(item.id)) {
this.$refs.table.toggleRowSelection(item, true)
} else {
......@@ -677,7 +686,7 @@ export default {
selectChange(selection, row) {
// 选中行是没有则将当前list里面的数据从ids里情况
if (selection.length === 0) {
const temp = this.drugList.map(item => {
const temp = this.deviceList.map(item => {
return item.id
})
this.ids = this.ids.filter(item => {
......
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