From 3bfff48245e0eb8affcbf2a16fb2c75eb1cff8bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 14 四月 2025 11:10:40 +0800
Subject: [PATCH] 模拟计算发送数据处理

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index 6752364..19b74ae 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -54,7 +54,8 @@
   list: null,
   printMergeVal: null,
   like: null,
-  project:null
+  project:null,
+  merge: null
 })
 const getTableRow = (row, type) => {
   switch (type) {
@@ -81,6 +82,7 @@
     }
     case 'edit3' :{
       printRow.value.project=row.project_no
+      printRow.value.merge = company.flowCardMerge
       if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
         dialogTableVisibleStraight.value = true
       }else{
@@ -217,6 +219,20 @@
     {
       field: 'project_no',
       title: t('ingredientsStock.projectNo'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged
+    },
+    {
+      field: 'glass_thickness',
+      title: t('order.totalThickness'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged
+    },
+    {
+      field: 'glass_type',
+      title: t('ingredients.films'),
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
@@ -459,6 +475,7 @@
           :printList="printRow.list"
           :printMerge="printRow.printMergeVal"
           :printProject="printRow.project"
+          :merges="printRow.merge"
           style="width: 100%;height: 100%"/>
     </el-dialog>
 
@@ -477,6 +494,7 @@
           :printList="printRow.list"
           :printMerge="printRow.printMergeVal"
           :printProject="printRow.project"
+          :merges="printRow.merge"
           style="width: 100%;height: 100%"/>
     </el-dialog>
   </div>

--
Gitblit v1.8.0