From 4adce5c0784baf7de2ec62a12dacf207ea2a164e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 30 十二月 2025 08:14:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
index 974bdb2..9eae22a 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
@@ -174,7 +174,7 @@
},
{
code: 'flashback',
- name: '鍊掑彊',
+ name: t('processCard.flashback'),
prefixIcon: 'vxe-icon-indicator',
visible: true,
disabled: false
@@ -188,8 +188,9 @@
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'sort',
- width: 70,
+ width: 90,
editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true,
title: t('processCard.sorting'),
},
{
@@ -259,6 +260,14 @@
sortable: true,width: 100
},
{
+ field: 'bend_radius',
+ title: t('order.bendRadius'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ sortable: true,width: 120
+ },
+ {
field: 'area',
title: t('order.area'),
filters: [{data: ''}],
@@ -270,7 +279,7 @@
title: t('craft.process'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged,width: 120
+ filterMethod: filterChanged
},
],
@@ -496,6 +505,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
--
Gitblit v1.8.0