From 47e51078a55706950c21b54ca49e64b7444cdb60 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 24 四月 2024 16:02:15 +0800
Subject: [PATCH] 销售明细单的样式调整+发货的页面增加仓库
---
src/components/makepager/CommonFormTableView.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index ca08f1f..bca864a 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -9,6 +9,7 @@
:summary-method="getSummaries"
:span-method="arraySpanMethod"
style="width: 100%"
+ :header-cell-style="{ background: '#f1f3f8', color: '#000009', 'font-size': '14px', 'font-family': 'PingFangSC' }"
@selection-change="handleSelectionChange"
:row-key="(row) => row.productId"
>
@@ -16,15 +17,18 @@
</el-table-column>
<el-table-column v-if="tableList.isReturn" type="index" label="#" width="50" align="center"></el-table-column>
<el-table-column
+ align="center"
v-for="(item, i) in tableList.tableColumn"
:key="i"
:prop="item.prop"
:label="item.label"
:width="item.width"
:min-width="item.min"
- v-if="item.isShowColumn"
- align="center"
- >
+ show-overflow-tooltip
+ :sortable="item.sortable"
+ v-if="(item.isShowColumn&&colOpenShow)||item.isShowColumn==undefined"
+ >
+ <!-- 鎵�鏈夌殑琛ㄦ牸淇敼涓哄彲閰嶇疆琛ㄥご鐨勪箣鍚� v-if淇敼涓簐-if="item.isShowColumn" -->
<!-- 琛ㄥご鏍峰紡 -->
<template slot="header">
<span v-if="item.isRequird" style="color: #f56c6c">*</span>
@@ -200,15 +204,16 @@
<span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="40" v-if="!detailEnter" align="center">
+ <el-table-column label="鎿嶄綔" width="70" v-if="!detailEnter" align="center" fixed='right'>
<template slot-scope="scope">
+
<el-button type="text" size="small" :disabled="!isOperate" @click="deleteClick(scope)">鍒犻櫎</el-button>
</template>
</el-table-column>
<slot name="tableButton" />
</el-table>
- <div class="styleBtn">
- <i @click="checkCol()" class="label">...</i>
+ <div class="styleBtn" v-if="colOpenShow">
+ <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>
@@ -256,6 +261,11 @@
detailEnter: {
type: Boolean,
default: false
+ },
+ // 鏄惁鍙互閰嶇疆鍒楄〃 琛ㄥご
+ colOpenShow: {
+ type: Boolean,
+ default: false,
},
selectBox: {
type: Boolean,
@@ -327,7 +337,8 @@
productIndex: 0,
isRecalculate: true,
iscolopen: false,
- showcol: []
+ showcol: [],
+ mergeNumber:1
}
},
created() {
@@ -339,6 +350,7 @@
watch:{
"productTableList": {
handler() {
+ this.showcol = this.productTableList.showcol
this.getTableInfo()
},
immediate: true
@@ -346,16 +358,30 @@
"productTableList.showcol": {
handler(newVal) {
this.showcol = newVal
+ this.getMergeNumber()
},
immediate: true
- }
+ },
},
computed: {},
methods: {
+ getMergeNumber(){
+ let pattern=new RegExp("[0-9]+");
+ if(pattern.test(this.showSummary.mergeNumber)){
+ this.mergeNumber=this.showSummary.mergeNumber
+ }else{
+ for(let i in this.showcol){
+ if(this.showcol[i]==this.showSummary.mergeNumber){
+ this.mergeNumber=Number(i)+1;
+ }
+ }
+ }
+ },
checkCol() {
this.iscolopen = !this.iscolopen
},
selectCheckBoxList(val) {
+ this.getMergeNumber()
this.$emit("selTableCol", val)
},
getTableInfo(){
@@ -396,11 +422,11 @@
if (this.$refs.table) {
var current = this.$refs.table.querySelector(".el-table__footer-wrapper").querySelector(".el-table__footer")
var cell = current.rows[0].cells
- for (let i = 0; i < this.showSummary.mergeNumber; i++) {
+ for (let i = 0; i < this.mergeNumber; i++) {
cell[i].style.display = "none"
}
- cell[this.showSummary.mergeNumber].classList.remove("is-left")
- cell[this.showSummary.mergeNumber].colSpan = this.showSummary.mergeNumber.toString()
+ cell[this.mergeNumber].classList.remove("is-left")
+ cell[this.mergeNumber].colSpan = this.mergeNumber.toString()
}
})
}
@@ -411,7 +437,7 @@
const sums = []
columns.forEach((column, index) => {
// // 鏇存敼琛屽悕绉�
- if (index === this.showSummary.mergeNumber) {
+ if (index === this.mergeNumber) {
sums[index] = "灏忚:"
return
}
@@ -669,6 +695,9 @@
.el-table th.el-table__cell > .cell {
padding: 0 5px;
}
+ .el-table__fixed-footer-wrapper tbody td.el-table__cell{
+ background:#fff;
+ }
.el-input__inner {
// text-align: left;
text-align: center !important;
@@ -676,7 +705,7 @@
.styleBtn {
position: absolute;
width: 30px;
- height: 36px;
+ height: 48px;
// line-height: 26px;
// background: #06c062;
top: 0;
@@ -684,7 +713,7 @@
z-index: 11;
.label {
position: absolute;
- top: 6px;
+ top: 11px;
font-size: 20px;
// line-height: 5px;
cursor: pointer;
@@ -693,7 +722,7 @@
}
.checkbox-group {
width: 160px;
- height: 300px;
+ height: 180px;
overflow: auto;
display: flex;
flex-direction: column;
--
Gitblit v1.8.0