From fb20919d312b7f3bf81805eda670f42fa2d18e39 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 28 二月 2024 14:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web
---
src/components/makepager/TableCommonView.vue | 261 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 239 insertions(+), 22 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 5abfbd8..50ac390 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -1,19 +1,26 @@
+<!-- eslint-disable vue/no-use-v-if-with-v-for -->
<template>
- <div class="table-view">
+ <div class="table-view" v-loading="loading">
<el-table
ref="table"
border
:data="tableList.tableInfomation"
tooltip-effect="dark"
+ :height="'calc(100% - 0px)'"
+ :max-height="tableList.maxHeight"
style="width: 100%"
:lazy="tableList.lazy"
:show-summary="showSummary.show"
:summary-method="getSummaries"
:span-method="arraySpanMethod"
@selection-change="handleSelectionChange"
- :header-cell-style="{ background: '#ECF4FF', color: '#666' }"
+ :header-cell-style="{ background: '#f1f3f8', color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
+ size="mini"
+ @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"
:key="i"
@@ -23,6 +30,7 @@
:min-width="item.min"
show-overflow-tooltip
:sortable="item.sortable"
+ v-if="item.isShowColumn"
>
<template slot-scope="scope">
<span v-if="item.price">{{ "锟�" + number_format(scope.row[item.prop], 2, ".", ",") }}</span>
@@ -75,7 +83,7 @@
<div v-else-if="item.isProductName" class="product-view">
<ul v-if="scope.row.products && scope.row.products.length > 0">
<li v-for="(item, index) in scope.row.products" :key="index">
- <div :class="scope.row.products.length === 1 ? 'name-view no-bottom' : 'name-view'">
+ <div class="name-view">
{{ item.name }}
</div>
</li>
@@ -85,12 +93,38 @@
<div v-else-if="item.isProductAmount" class="product-view">
<ul v-if="scope.row.products && scope.row.products.length > 0">
<li v-for="(item, index) in scope.row.products" :key="index">
- <div :class="scope.row.products.length === 1 ? 'name-view no-bottom' : 'name-view'">
+ <div class="name-view">
{{ item.amount }}
</div>
</li>
</ul>
<div v-else class="no-product">{{ "--" }}</div>
+ </div>
+ <div v-else-if="item.isProductPrice" class="product-view">
+ <ul v-if="scope.row.products && scope.row.products.length > 0">
+ <li v-for="(item, index) in scope.row.products" :key="index">
+ <div class="name-view">
+ {{ item.price }}
+ </div>
+ </li>
+ </ul>
+ <div v-else class="no-product">{{ "--" }}</div>
+ </div>
+ <div v-else-if="item.isProductTotal" class="product-view">
+ <ul v-if="scope.row.products && scope.row.products.length > 0">
+ <li v-for="(item, index) in scope.row.products" :key="index">
+ <div class="name-view">
+ {{ item.total }}
+ </div>
+ </li>
+ </ul>
+ <div v-else class="no-product">{{ "--" }}</div>
+ </div>
+ <!-- 璋冪敤鏂规硶鏄剧ず鏂囧瓧 -->
+ <div v-else-if="item.isCallMethod">
+ <span :class="item.isClass ? item.getClassName(scope.row[item.prop], scope.row) : ''">{{
+ item.getCallMethod(scope.row[item.prop], scope.row)
+ }}</span>
</div>
<span v-else>{{ scope.row[item.prop] ? scope.row[item.prop] : "--" }}</span>
</template>
@@ -100,6 +134,14 @@
<el-empty description="鏆傛棤鏁版嵁"></el-empty>
</div>
</el-table>
+
+ <div class="overSpread1" v-show="iscolopen" @click="onMaskClick"></div>
+ <div class="styleBtn">
+ <i @click="checkCol()" 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>
+ </div>
</div>
</template>
@@ -109,14 +151,16 @@
props: {
selectBox: {
type: Boolean,
- default: true
+ default: false
},
tableList: {
type: Object,
default: () => {
return {
- selectBox: true,
+ selectIndex: true,
tableInfomation: [], // 鎺ュ彛杩斿洖鏁版嵁
+ showcol: [],
+ allcol: [],
tableColumn: [
// table琛ㄥ崟
{ label: "", prop: "", min: 200, tooltip: true }
@@ -133,13 +177,49 @@
mergeNumber: 1
}
}
+ },
+ // 閫変腑鐨勬牱寮�
+ selectClassRow: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ },
+ loading: {
+ type: Boolean,
+ default: false
+ },
+ selectBoxList: {
+ type: Array,
+ default: () => []
}
},
+
data() {
- return {}
+ return {
+ iscolopen: false,
+ showcol: []
+ }
},
computed: {},
+ watch: {
+ "tableList.showcol": {
+ handler(newVal) {
+ this.showcol = newVal
+ },
+ immediate: true
+ }
+ },
methods: {
+ onMaskClick() {
+ this.iscolopen = false
+ },
+ checkCol() {
+ this.iscolopen = !this.iscolopen
+ },
+ selectCheckBoxList(val) {
+ this.$emit("selTableCol", val)
+ },
handleReserve(row) {
return row._id ? row._id : row.id
},
@@ -156,10 +236,16 @@
.querySelector(".el-table__footer")
var cell = current.rows[0].cells
for (let i = 0; i < this.showSummary.mergeNumber; i++) {
- cell[i].style.display = "none"
+ cell[i] && cell[i].style && (cell[i].style.display = "none")
}
- cell[this.showSummary.mergeNumber].classList.remove("is-left")
- cell[this.showSummary.mergeNumber].colSpan = this.showSummary.mergeNumber.toString()
+ if (cell[this.showSummary.mergeNumber]) {
+ if (cell[this.showSummary.mergeNumber].classList) {
+ cell[this.showSummary.mergeNumber].classList.remove("is-left")
+ }
+ if (cell[this.showSummary.mergeNumber].colSpan) {
+ cell[this.showSummary.mergeNumber].colSpan = this.showSummary.mergeNumber.toString()
+ }
+ }
}
})
}
@@ -184,6 +270,37 @@
}
}, 0)
sums[index + 1]
+ if (column.property === "taxUnitPrice") {
+ let sumPrice = 0
+ this.tableList.tableInfomation.map((item) => {
+ item.products.map((val) => {
+ console.log(val.price)
+ sumPrice += parseFloat(val.price)
+ })
+ })
+ console.log((sums[index + 1] = sumPrice))
+ console.log(sumPrice)
+ }
+ if (column.property === "priceTax") {
+ let sumPrice = 0
+ this.tableList.tableInfomation.map((item) => {
+ item.products.map((val) => {
+ console.log(val.price)
+ sumPrice += parseFloat(val.total)
+ })
+ })
+ sums[index + 1] = sumPrice
+ }
+ if (column.property === "productAmount") {
+ let sumPrice = 0
+ this.tableList.tableInfomation.map((item) => {
+ item.products.map((val) => {
+ console.log(val.price)
+ sumPrice += parseFloat(val.amount)
+ })
+ })
+ sums[index + 1] = sumPrice
+ }
}
})
// console.log(sums)
@@ -266,6 +383,27 @@
// 鍏叡锛堥攢鍞満浼氥�佹姤浠峰崟銆侀攢鍞�诲崟銆侀攢鍞瓙鍗曘�傘�傘�傦級
selCommonClick(row) {
this.$emit("selCommonClick", row)
+ },
+ // 琛岀偣鍑�
+ tableRowClick(row, column, event) {
+ this.$emit("tableRowClick", row, column, event)
+ },
+ // 鍗曢�夎鐩稿叧
+ tableRowClassName({ row }) {
+ if (Object.keys(this.selectClassRow).length > 0) {
+ if (row.id == this.selectClassRow.id) {
+ return "onSelect"
+ }
+ }
+ 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
+ }
}
}
}
@@ -274,9 +412,8 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.table-view {
- // margin-top: 20px;
- margin-right: 10px;
- // margin-bottom: 40px;
+ position: relative;
+ height: 100%;
.blue {
width: 70px;
text-align: center;
@@ -293,26 +430,106 @@
margin-left: -10px;
margin-right: -11px;
li {
- height: 57px;
- line-height: 57px;
+ height: 22px;
+ line-height: 22px;
.name-view {
padding-left: 10px;
border-bottom: 1px solid #ebeef5;
}
.no-bottom {
- border-bottom: 0px;
+ border-bottom: 0;
}
}
+ li:last-child .name-view {
+ border-bottom: none;
+ }
.no-product {
- height: 57px;
- line-height: 57px;
+ height: 22px;
+ line-height: 22px;
}
}
}
::v-deep {
- .el-table__footer-wrapper tbody td.el-table__cell {
- background-color: #fff;
- text-align: right;
+ .el-table__footer-wrapper {
+ tbody td.el-table__cell {
+ background-color: #fff;
+ font-weight: bold;
+ }
+ }
+}
+
+::v-deep .el-table .cell {
+ font-size: 12px;
+ line-height: 17px;
+ font-family: PingFangSC;
+ color: rgba(0, 0, 0, 0.9);
+ .el-button--text {
+ width: auto;
+ height: auto;
+ font-family: PingFangSC-Medium, sans-serif;
+ }
+}
+::v-deep .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+}
+
+::v-deep {
+ .el-table .cell .el-button--text.el-button--small {
+ padding: 4px 0;
+ }
+}
+
+::v-deep .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+}
+
+.overSpread1 {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background: rgba(0, 0, 0, 0);
+ z-index: 10;
+}
+
+.styleBtn {
+ position: absolute;
+ width: 30px;
+ height: 36px;
+ // line-height: 26px;
+ // background: #06c062;
+ top: 0;
+ right: -6px;
+ z-index: 11;
+ .label {
+ position: absolute;
+ top: 6px;
+ font-size: 20px;
+ // line-height: 5px;
+ cursor: pointer;
+ color: #000;
+ transform: rotate(-90deg);
+ }
+ .checkbox-group {
+ width: 160px;
+ height: 300px;
+ overflow: auto;
+ display: flex;
+ flex-direction: column;
+ line-height: 25px;
+ background: #ffffff;
+ border-radius: 16px;
+ padding: 12px;
+ position: absolute;
+ right: 0;
+ top: 30px;
+ z-index: 99;
+ box-shadow: 0 0 2px 2px #f8f8f8;
}
}
</style>
--
Gitblit v1.8.0