From 1c13bd7a2cd2c8ba69a185da69344c8b59f4e561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 09:29:15 +0800
Subject: [PATCH] 选中求和功能以及还原双击回车才能点击单元格
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 45480ad..1f502b8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -98,10 +98,10 @@
value: '1',
label: t('processCard.finishedProductLabel'),
},
- // {
- // value: '2',
- // label: t('processCard.halfProductLabel'),
- // },
+/* {
+ value: '2',
+ label: t('processCard.halfProductLabel'),
+ },*/
{
value: `${company.printLabel.labelValue}`,
label: `${company.printLabel.labelType}`,
@@ -225,7 +225,7 @@
{field: 'quantity', title: t('order.quantity'),},
{field: 'total_area', title: t('order.area'),},
{field: 'product_name', title: t('order.product'),},
- {field: 'glass_child', title: t('reportingWorks.glassChild'),},
+ {field: 'glass_child', title: t('reportingWorks.glassChild'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
{field: 'founder', title: t('processCard.founder'),},
{field: 'splitFrame_time', title: t('processCard.splitFrameTime'),},
],//琛ㄥご鎸夐挳
@@ -284,7 +284,9 @@
id += selectRecords[i].id + "|"
}
}
- router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMerge.value}})
+
+ let printMergeVal=printMerge.value
+ router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
break
}
@@ -379,7 +381,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'demo_2',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -396,6 +398,15 @@
},
customConfig: {
storage: true
+ },
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{
+ isArrow: true,
+ isDel: true,
+ isEnter: true,
+ isTab: true,
+ isEdit: true,
+ isChecked: true
},
editConfig: {
trigger: 'click',
@@ -451,14 +462,16 @@
title: t('order.width'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ sortable: true,
},
{
field: 'child_height',
title: t('order.height'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ sortable: true,
},
{
field: 'area',
@@ -635,7 +648,7 @@
ref="xGridDetail"
class="mytable-scrollbar"
max-height="100%"
- height="600px"
+ height="550px"
size="small"
v-bind="detailGridOptions"
v-on="gridEvents">
--
Gitblit v1.8.0