From 723edfdd07208ec27409d1cffb70b9a4eac69446 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:13:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index 94a319d..2b67b21 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -58,17 +58,17 @@
{field: 'process',width:120, title: t('craft.process'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'icon',width:120, title: t('order.icon'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'orderDetail.processingNote',width:120, title: t('order.processingNote'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'orderDetail.remarks',width:120, title: t('order.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderDetail.remarks',width:120, title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'orderDetail.edgingType',width:120, title: t('order.edgingType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged}
],//琛ㄥご鎸夐挳
mergeCells: [
- /*{ row: 0, col: 1, rowspan: 4, colspan: 1 },
- { row: 0, col: 2, rowspan: 4, colspan: 1 },
- { row: 0, col: 4, rowspan: 4, colspan: 1 },
- { row: 0, col: 5, rowspan: 4, colspan: 1 },
- { row: 0, col: 6, rowspan: 4, colspan: 1 },
- { row: 0, col: 7, rowspan: 4, colspan: 1 },
- { row: 0, col: 8, rowspan: 4, colspan: 1 },*/
+ // { row: 0, col: 1, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 2, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 4, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 5, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 6, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 7, rowspan: 4, colspan: 1 },
+ // { row: 0, col: 8, rowspan: 4, colspan: 1 },
],
toolbarConfig: {
buttons: [
--
Gitblit v1.8.0