From 7a0527e207c59cdcce0b1f7a41bd7457a236ab23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 10:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index c9436c7..bef4ae0 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -15,13 +15,15 @@
showOverflow:true,
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
virtualScroll: true, // 寮�鍚櫄鎷熸粴鍔ㄥ姛鑳�
- id: 'OrderList',
+ id: 'Order_Process',
printConfig: {},
importConfig: {},
exportConfig: {},
scrollY:{ enabled: true,gt:13 },//寮�鍚櫄鎷熸粴鍔�
//scrollX:{ enabled: true,gt:15 },//寮�鍚櫄鎷熸粴鍔�
-
+ filterConfig: { //绛涢�夐厤缃」
+ // remote: true
+ },
columnConfig: {
resizable: true,
useKey: true
@@ -35,7 +37,17 @@
columns:[
],
- mergeCells:[]
+ mergeCells:[],
+ toolbarConfig: {
+ zoom: true,
+ custom: true
+ },
+ cellClassName ({ row, column,columnIndex}) {
+ if (columnIndex>10 && row.quantity*1 === row.reportWorkQuantity[column.title]*1){
+ return 'row-green'
+ }
+ return null
+ },
})
@@ -44,19 +56,19 @@
orderId:null
})
const columns = [
- {field: 'order_number',fixed:"left", width: 90,title: '璁㈠崟搴忓彿',showOverflow:"ellipsis"},
+ {field: 'order_number',fixed:"left", width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis"},
// {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {field: 'product_name', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'glass_child',width: 130, title: '鍗曠墖鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'order_type', width: 120,title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'process_id',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'product_name', width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order_type', width: 120,title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'process_id',width: 110, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'technology_number', width: 90,title: '灏忕墖椤哄簭',showOverflow:"ellipsis"},
- {field: 'quantity', width: 90,title: '鏁伴噺'},
- {field: 'shippedQuantity',width: 120, title: '鍙戣揣鏁伴噺'},
- {field: 'inventory',width: 120, title: '搴撳瓨鏁伴噺'},
- {field: 'inventoryArea',width: 120, title: '搴撳瓨闈㈢Н'},
- {field: 'broken_num',width: 90, title: '娆＄牬鏁伴噺'},
+ {field: 'technology_number', width: 90,title: t('processCard.technologyNumber'),showOverflow:"ellipsis"},
+ {field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'shippedQuantity',width: 120, title: t('delivery.deliveryQuantity')},
+ {field: 'inventory',width: 120, title: t('productStock.inventoryQuantity')},
+ {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
+ {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
let column = [0,1,3,6,7,8,9]
@@ -74,6 +86,9 @@
if (res.code == 200) {
gridOptions.columns = JSON.parse(JSON.stringify(columns))
+ gridOptions.columns.forEach(item =>{
+ item.filterMethod = filterChanged
+ })
res.data.title.forEach(item =>{
let column = {slots: { default: 'quantitySum' }, width: 90,title: item.process}
gridOptions.columns.push(column)
@@ -82,7 +97,7 @@
item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
})
- gridOptions.mergeCells= res.data.mergeCells
+ //gridOptions.mergeCells= res.data.mergeCells
xGrid.value.loadData(res.data.data)
} else {
ElMessage.warning(res.msg)
@@ -117,7 +132,11 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input
+ type="type"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -131,5 +150,8 @@
</template>
<style scoped>
+::v-deep(.vxe-grid .vxe-body--column.row-green) {
+ background-color: #D5EAFF;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0