From a0b97eb8e934ba28b9e51824d4cbbcc99cc70e17 Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期四, 18 七月 2024 23:08:00 +0800
Subject: [PATCH] fxi:解决发货bug
---
src/components/makepager/TableCommonView.vue | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 9cf911e..a45184f 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -7,6 +7,7 @@
:data="tableList.tableInfomation"
tooltip-effect="dark"
:height="'calc(100% - 0px)'"
+ :max-height="tableList.maxHeight"
style="width: 100%"
:lazy="tableList.lazy"
:show-summary="showSummary.show"
@@ -18,7 +19,7 @@
@row-click="tableRowClick"
:row-class-name="tableRowClassName"
>
- <el-table-column v-if="selectBox" type="selection" width="40"> </el-table-column>
+ <el-table-column v-if="selectBox" type="selection" width="40" :selectable="selectable"> </el-table-column>
<el-table-column v-if="tableList.selectIndex" type="index" label="搴忓彿" width="50"></el-table-column>
<el-table-column
v-for="(item, i) in tableList.tableColumn"
@@ -125,6 +126,21 @@
item.getCallMethod(scope.row[item.prop], scope.row)
}}</span>
</div>
+ <span
+ v-else-if="item.isClass"
+ :class="
+ item.isClass
+ ? item.getClassName(scope.row[item.prop], scope.row)
+ : ''
+ "
+ >{{
+ scope.row[item.prop]
+ ? scope.row[item.prop]
+ : scope.row[item.prop] === 0
+ ? scope.row[item.prop]
+ : "--"
+ }}</span
+ >
<span v-else>{{ scope.row[item.prop] ? scope.row[item.prop] : "--" }}</span>
</template>
</el-table-column>
@@ -135,8 +151,8 @@
</el-table>
<div class="overSpread1" v-show="iscolopen" @click="onMaskClick"></div>
- <div class="styleBtn">
- <i @click="checkCol()" class="label">...</i>
+ <div class="styleBtn" >
+ <i @click="checkCol()" v-if='colOpenShow' class="label">...</i>
<el-checkbox-group v-model="showcol" v-show="iscolopen" class="checkbox-group" @change="selectCheckBoxList">
<el-checkbox v-for="item in tableList.allcol" :label="item" :key="item">{{ item }} </el-checkbox>
</el-checkbox-group>
@@ -151,6 +167,11 @@
selectBox: {
type: Boolean,
default: false
+ },
+ // 鏄惁鍙互閰嶇疆鍒楄〃 琛ㄥご
+ colOpenShow: {
+ type: Boolean,
+ default: true,
},
tableList: {
type: Object,
@@ -184,11 +205,16 @@
return {}
}
},
- loading:{
+ loading: {
type: Boolean,
default: false
+ },
+ selectBoxList: {
+ type: Array,
+ default: () => []
}
},
+
data() {
return {
iscolopen: false,
@@ -390,6 +416,14 @@
}
}
this.$emit("tableRowClassName", row)
+ },
+ selectable(row) {
+ let list = this.selectBoxList.map((item) => item.number)
+ if (list.findIndex((v) => v == row.number) == -1) {
+ return true
+ } else {
+ return false
+ }
}
}
}
@@ -442,6 +476,9 @@
font-weight: bold;
}
}
+ .el-table__body-wrapper{
+ height:calc(100% - 50px)!important;
+ }
}
::v-deep .el-table .cell {
--
Gitblit v1.8.0