From 1abb22825fe46266bc2634a753164f0878c08e67 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 28 三月 2024 11:16:45 +0800
Subject: [PATCH] 销售明细单新建的表头配置功能问题修改+可编辑表格组件的样式调整+可配置表头之后小计功能的显示逻辑修改

---
 src/components/makepager/CommonFormTableView.vue |   45 +++++++++++++++++++++++++++++++++------------
 1 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index ca08f1f..12d33a5 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,17 @@
         </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"
+          show-overflow-tooltip
+          :sortable="item.sortable"
           v-if="item.isShowColumn"
-          align="center"
-        >
+        > 
           <!-- 琛ㄥご鏍峰紡 -->
           <template slot="header">
             <span v-if="item.isRequird" style="color: #f56c6c">*</span>
@@ -200,7 +203,7 @@
             <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>
@@ -327,7 +330,8 @@
       productIndex: 0,
       isRecalculate: true,
       iscolopen: false,
-      showcol: []
+      showcol: [],
+      mergeNumber:1
     }
   },
   created() {
@@ -346,16 +350,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 +414,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 +429,7 @@
       const sums = []
       columns.forEach((column, index) => {
         // // 鏇存敼琛屽悕绉�
-        if (index === this.showSummary.mergeNumber) {
+        if (index === this.mergeNumber) {
           sums[index] = "灏忚:"
           return
         }
@@ -669,6 +687,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 +697,7 @@
   .styleBtn {
     position: absolute;
     width: 30px;
-    height: 36px;
+    height: 48px;
     // line-height: 26px;
     // background: #06c062;
     top: 0;
@@ -684,7 +705,7 @@
     z-index: 11;
     .label {
       position: absolute;
-      top: 6px;
+      top: 11px;
       font-size: 20px;
       // line-height: 5px;
       cursor: pointer;
@@ -693,7 +714,7 @@
     }
     .checkbox-group {
       width: 160px;
-      height: 300px;
+      height: 180px;
       overflow: auto;
       display: flex;
       flex-direction: column;

--
Gitblit v1.8.0