From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 730b4b0..6b7ec73 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -46,37 +46,7 @@
processingNote: '',
}
})
-const columns = [
- // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {field: 'product_name', width: 150,
- title: t('order.product'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
- {field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
- {field: 'order_type', width: 120,title: t('order.orderType'),filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
- {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
- // {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
- // slots: {filter: 'num1_filter'},
- // filterMethod: filterChanged},
- // {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
- // slots: {filter: 'num1_filter'},
- // filterMethod: filterChanged},
- {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
- {field: 'quantity', width: 90,title: t('order.quantity')},
- {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
- {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
- {field: 'inventory',width: 120, title: t('report.inventoryNum')},
- {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
-]
+
//闇�瑕佸悎骞剁殑鍒�
let column = [1,3,8]
//鐐瑰嚮鏌ヨ
@@ -87,7 +57,7 @@
ElMessage.warning(t('report.noDataFoundForThisOrder'))
return
}
- gridOptions.columns = JSON.parse(JSON.stringify(columns))
+ //gridOptions.columns = JSON.parse(JSON.stringify(columns))
res.data.title.forEach(item =>{
let column = {slots: { default: 'quantitySum' }, width: 90,title: item.process}
gridOptions.columns.push(column)
@@ -143,7 +113,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -153,7 +123,37 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[],//琛ㄥご鎸夐挳
+ columns : [
+ // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+ {field: 'product_name', width: 150,
+ title: t('order.product'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'order_type', width: 120,title: t('order.orderType'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
+ // {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
+ {field: 'inventory',width: 120, title: t('report.inventoryNum')},
+ {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
+ ],
toolbarConfig: {
// buttons: [{
@@ -247,6 +247,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
--
Gitblit v1.8.0