From 3c87c3ff67c2193ab5bfaa31f0fb1ad5a68cd5af Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 15 三月 2024 09:09:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index dab7819..878aa7a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -253,11 +253,11 @@
},
{field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
{field: 'orderDetail.productName', title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
- {field: 'orderDetail.computeArea', title: t('order.area'), showOverflow: "ellipsis", width: 110},
+ {field: 'orderDetail.computeArea', title: t('order.computeArea'), showOverflow: "ellipsis", width: 110},
{field: 'orderDetail.quantity', title: t('order.quantity'), width: 70},
{field: 'orderDetail.computeGrossArea', title: t('order.trueGrossArea'),},
{field: 'orderDetail.perimeter', title: t('workOrder.perimeter'), showOverflow: "ellipsis"},
- {field: 'orderDetail.bendRadius', title: t('order.trueGrossArea'),},
+ {field: 'orderDetail.bendRadius', title: t('order.bendRadius'),},
{field: 'orderDetail.processingNote', title: t('order.processingNote'),}
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
--
Gitblit v1.8.0