From 9866aa9501cd64269857bcc6c75a77a2fcd4c9d4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 98a66e5..d9c0f21 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -93,6 +93,7 @@
         filters: [{data: ''}],
         slots: {filter: 'num1_filter'},
         filterMethod: filterChanged,
+        sortable: true
       }
 
       gridOptions.columns.push(column)
@@ -899,7 +900,7 @@
             <el-button type="primary" @click="createProcessCard">{{ $t('processCard.establishProcessCards') }}
             </el-button>
             <br><br><br><br><br>
-            <el-button type="primary" @click="createProcessCardNo">鎸夊簭鍙峰垱寤�
+            <el-button type="primary" @click="createProcessCardNo">{{ $t('processCard.createBySequenceNumber') }}
             </el-button>
           </el-main>
         </div>

--
Gitblit v1.8.0