From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 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 5e88767..47a6761 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
@@ -33,16 +33,7 @@
return count.toFixed(2)
}
-//瀹氫箟婊氬姩鏉￠珮搴�
-let scrollTop = ref(null)
-let scrollHeight = ref(null)
-let clientHeight = ref(null)
-const scrollEvnt = (row) => {
- // 鍐呭楂樺害
- scrollTop.value = row.$event.target.scrollTop
- scrollHeight.value = row.$event.target.scrollHeight
- clientHeight.value = row.$event.target.clientHeight
-}
+
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
let filterData = ref({
order: {
@@ -57,14 +48,17 @@
})
const columns = [
// {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: 'technology_number', width: 90,title: '灏忕墖椤哄簭',showOverflow:"ellipsis"},
- {field: 'quantity', width: 90,title: '鏁伴噺'},
- {field: 'broken_num',width: 90, title: '娆＄牬鏁伴噺'},
- {field: 'inventoryArea',width: 120, title: '鍏ュ簱闈㈢Н'},
+ {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: 110, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis"},
+ {field: 'technology_number', width: 90,title: t('processCard.technologyNumber'),showOverflow:"ellipsis"},
+ {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]
@@ -73,7 +67,7 @@
request.post(`/report/processCardProgress/${form.orderId}`,column).then((res) => {
if (res.code == 200) {
if(res.data.data.length===0){
- ElMessage.warning('鏈煡璇㈠埌姝よ鍗曟祦绋嬪崱鏁版嵁')
+ ElMessage.warning(t('report.noDataFoundForThisOrder'))
return
}
gridOptions.columns = JSON.parse(JSON.stringify(columns))
@@ -120,7 +114,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'ProcessCardProgress',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -211,7 +205,7 @@
</div>
<vxe-grid
- height="400px"
+ height="520px"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
--
Gitblit v1.8.0