From 2ad00b6623beac3b504105beba9cb56143f7db13 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 22 一月 2024 08:29:45 +0800
Subject: [PATCH] 实体类相关文件提交

---
 north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
index 20344a6..b9d9d7b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
@@ -62,7 +62,6 @@
   },//琛ㄥご鍙傛暟
   columns:[
     {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-    { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
     {field: '1', width: 100, title: '搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
     {field: '2',width: 120, title: '妤煎眰缂栧彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
     {field: '3', width: 100,title: '褰㈢姸', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -217,7 +216,7 @@
   ],//table body瀹為檯鏁版嵁
   //鑴氶儴姹傚拰
   footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
-    let footList=['7','11','12','13','14','15','16','17','18']
+    let footList=['11','12','13','14','15','16','17','18']
     return[
       columns.map((column, columnIndex) => {
         if (columnIndex === 0) {
@@ -262,6 +261,9 @@
 })
 
 const mergeCells = ref([
+  { row: 0, col: 1, rowspan: 3, colspan: 0},
+  { row: 3, col: 1, rowspan: 3, colspan: 0},
+
   { row: 0, col: 2, rowspan: 3, colspan: 0},
   { row: 3, col: 2, rowspan: 3, colspan: 0},
 
@@ -271,11 +273,8 @@
   { row: 0, col: 4, rowspan: 3, colspan: 0},
   { row: 3, col: 4, rowspan: 3, colspan: 0},
 
-  { row: 0, col: 5, rowspan: 3, colspan: 0},
-  { row: 3, col: 5, rowspan: 3, colspan: 0},
 
-  { row: 0, col: 8, rowspan: 3, colspan: 0},
-  { row: 3, col: 8, rowspan: 3, colspan: 0},
+
 ])
 
 </script>

--
Gitblit v1.8.0