From aece48b253b2e0b814bbdf5ee3d474e8cf697122 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
index 8642370..0fe60ae 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
@@ -45,6 +45,10 @@
       {
         "label": t('orderBasicData.saleMan'),
         "value": "saleMan"
+      },
+      {
+        "label": t('order.edgingType'),
+        "value": "edgingType"
       }
     ]
   },
@@ -322,7 +326,7 @@
       </el-col>
     </el-row>
     <el-row v-show="props.rowIndex">
-      <el-col :span="4">{{ $t('鎺掑簭') }}:</el-col>
+      <el-col :span="4">{{ $t('processCard.sorting') }}:</el-col>
       <el-col :span="12">
         <el-input type="number" v-model="basic.sort"/>
       </el-col>

--
Gitblit v1.8.0