From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 3ef2eaa..a905c33 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -304,7 +304,10 @@
     {field: 'glass_address', title: t('processCard.glassAddress'), width: 90},
     {field: 'quantity', title: t('order.quantity'), width: 90},
     {field: 'total_area', title: t('order.area'), width: 90},
-    {field: 'product_name', title: t('order.product'), width: 120},
+    {field: 'product_name', title: t('order.product'), width: 120,
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
     {
       field: 'glass_child',
       title: t('reportingWorks.glassChild'),
@@ -335,7 +338,7 @@
       {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
       {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
       {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
-      {code: 'sortTable', name: "鎺掑簭姹囨��", status: 'primary'},
+      {code: 'sortTable', name: t('processCard.sortSummary'), status: 'primary'},
       // {code: 'printTest', name: "娴嬭瘯鎵撳嵃", status: 'primary'},
       // {code: 'printLike', name: "鍚岄厤缃墦鍗�", status: 'primary'},
     ],
@@ -414,7 +417,10 @@
               id += selectRecords[i].id + "|"
             }
           }
-          router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}})
+          router.push({
+            path: '/main/processCard/PrintLabel',
+            query: {printList: JSON.stringify(selectRecords),printType:1}
+          })
 
           break
         }
@@ -434,7 +440,7 @@
           }
           router.push({
             path: '/main/processCard/PrintCustomLabelSemi2',
-            query: {printList: JSON.stringify(selectRecords)}
+            query: {printList: JSON.stringify(selectRecords),printType:1}
           })
 
           break
@@ -506,7 +512,8 @@
                   type: type,
                   faceOrientation: faceOrientation,
                   lableType: lableTypes,
-                  printList: JSON.stringify(selectRecords)
+                  printList: JSON.stringify(selectRecords),
+                  printType:1
                 }
               })
             }
@@ -525,7 +532,8 @@
                   type: type,
                   faceOrientation: faceOrientation,
                   lableType: lableTypes,
-                  printList: JSON.stringify(selectRecords)
+                  printList: JSON.stringify(selectRecords),
+                  printType:1
                 }
               })
             }
@@ -536,7 +544,8 @@
                 type: type,
                 faceOrientation: faceOrientation,
                 lableType: lableTypes,
-                printList: JSON.stringify(selectRecords)
+                printList: JSON.stringify(selectRecords),
+                printType:1
               }
             })
 
@@ -718,6 +727,7 @@
           <div v-for="(option, index) in column.filters" :key="index">
             <input v-model="option.data"
                    type="text"
+                   @keyup.enter.native="$panel.confirmFilter()"
                    @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
@@ -811,7 +821,7 @@
     <el-dialog
         id="sizeCheck"
         v-model="dialogSortTable"
-        title="鎺掑簭姹囨��"
+        :title="$t('processCard.sortSummary')"
         destroy-on-close
         style="width: 80%;height:75% ">
       <select-sort-table id="child" :orderId="tableRow.orderId"/>

--
Gitblit v1.8.0