From 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 11 八月 2025 10:07:48 +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/OrderProcess.vue | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 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 84cc787..1009b2c 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
@@ -71,7 +71,7 @@
row: {}
})
const columns = [
- {field: 'order_number',fixed:"left", width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis"},
+ {field: 'order_number',fixed:"left", width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
// {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{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' }},
@@ -80,12 +80,12 @@
{field: 'technology_number', width: 90,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'child_width', width: 90,title: t('order.width'),showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'child_height', width: 90,title: t('order.height'),showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'quantity',slots: { default: 'show'}, width: 90,title: t('order.quantity')},
{field: 'glassQuantity', width: 90,title: t('order.glassQuantity')},
- {field: 'gross_area', width: 90,title: t('order.area')},
- {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: 'grossArea',slots: { default: 'show'}, width: 90,title: t('order.area')},
+ {field: 'shippedQuantity',slots: { default: 'show'},width: 120, title: t('delivery.deliveryQuantity')},
+ {field: 'inventory',slots: { default: 'show'},width: 120, title: t('productStock.inventoryQuantity')},
+ {field: 'inventoryArea',slots: { default: 'show'},width: 120, title: t('report.inventoryArea')},
{field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
let column = [0,1,3,8,10,11,12,13]
@@ -122,7 +122,7 @@
xGrid.value.updateFooter()
const lastProcess = title.value[title.value.length-1].process
const filter = data.value.filter(item => {
- const lastFinish = parseInt(item['reportWorkQuantity'][lastProcess])
+ const lastFinish = parseInt(item['reportWorkQuantityShow'][lastProcess])
const allFinish = item.glassQuantity*1
return allFinish>lastFinish
})
@@ -186,19 +186,24 @@
}
}
const footSum =(list, field) => {
- if(xGrid.value.isFilter() || orderType.value!==1){
- return
- }
+
let count = 0
list.forEach(item => {
if(field.indexOf('.')>-1){
let array = field.split('.')
- count += Number(item[array[0]][array[1]]) || 0
+ //鍒ゆ柇鏄惁涓虹瓫閫夌姸鎬佸拰闈炶鍗曞悎骞剁姸鎬�
+ if(xGrid.value.isFilter() || orderType.value!==1){
+
+ count += Number(item[array[0]+'Show'][array[1]]) || 0
+ }else{
+ count += Number(item[array[0]][array[1]]) || 0
+ }
+
}else {
count += Number(item[field]) || 0
}
})
- return count.toFixed(2)
+ return count.toFixed(2).replace(/\.?0+$/, '');
}
const quantitySum = ( row,column )=>{
@@ -212,8 +217,12 @@
+'('
+reportWorkQuantityCount
+')' )
- //return
}
+//鍒囨崲妯″紡鍗曠墖鏄剧ず
+const show = (row,column ) =>{
+ return row[column.field+'Show']
+}
+
let showTitle = ref(false)
const changeZoom = ()=> {
showTitle.value = !showTitle.value
@@ -247,6 +256,10 @@
<span>{{ quantitySum(row,column) }} </span>
</template>
+ <template #show="{ row,column }">
+ <span>{{ show(row,column) }} </span>
+ </template>
+
<template #title>
<span style="font-weight: bold" v-show="showTitle">
{{ row.orderId }}
--
Gitblit v1.8.0