From 46964bace341e98f238a0a3fd29f6adc643312c7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 24 十一月 2025 13:14:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue
index 3ceb0b8..2ed87c4 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue
@@ -40,6 +40,9 @@
],
toolbarConfig: {
+ slots:{
+ buttons: "title"
+ },
zoom: true,
custom: true
},
@@ -82,7 +85,9 @@
const list = ref([])
let props = defineProps({
- orderId:null
+ orderId:null,
+ row: {},
+ processId:null//鐢ㄤ簬鍚庣鏁版嵁杩斿洖锛岀粨鏋滅瓫閫�
})
const columns = [
{field: 'product_name', width: 150, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -144,7 +149,13 @@
item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
item.reportWorkQuantityShow=JSON.parse(item.reportWorkQuantityShow)
})
- await xGrid.value.loadData(res.data.data)
+ console.log(res.data.data)
+ if (props.processId!=null && props.processId!=""){
+ const processIdData = res.data.data.filter(item => item.process_id === props.processId)
+ await xGrid.value.loadData(processIdData)
+ }else {
+ await xGrid.value.loadData(res.data.data)
+ }
mergeCells.value = res.data.mergeCells
gridOptions.loading = false
@@ -205,6 +216,11 @@
copyTableCellValue(row,column)
}
}
+
+let showTitle = ref(false)
+const changeZoom = ()=> {
+ showTitle.value = !showTitle.value
+}
</script>
<template>
@@ -215,6 +231,7 @@
size="mini"
class="mytable-scrollbar"
ref="xGrid"
+ @zoom="changeZoom"
v-bind="gridOptions"
v-on="gridEvents"
>
@@ -237,6 +254,16 @@
<span>{{ show(row,column) }} </span>
</template>
+ <template #title>
+ <span style="font-weight: bold" v-show="showTitle">
+ {{ row.orderId }}
+ {{ row.project?'--':'' }}
+ {{row.project}}
+ {{ row.batch?'--':'' }}
+ {{row.batch}}
+ </span>
+ </template>
+
</vxe-grid>
</div>
--
Gitblit v1.8.0