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/workOrder/SelectWorkOrder.vue | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index b195e99..1e99bb7 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -12,6 +12,7 @@
import {VXETable} from "vxe-table";
import { useI18n } from 'vue-i18n'
import useUserInfoStore from '@/stores/userInfo'
+import footSum from "@/hook/footSum"
//璇█鑾峰彇
const { t } = useI18n()
const userStore = useUserInfoStore()
@@ -37,7 +38,7 @@
router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
} else {
- ElMessage.warning('鍒犻櫎澶辫触锛屾鏌ユ槸鍚﹀凡鍒嗘灦')
+ ElMessage.warning(t('workOrder.deleteNo'))
}
})
@@ -111,7 +112,7 @@
//鑾峰彇3澶╁墠鍒板綋鍓嶆椂闂�
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
@@ -215,7 +216,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'selectWorkOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -243,6 +244,7 @@
{title: t('basicData.operate'), width: 110, slots: {default: 'button_slot'}, fixed: "left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+ {field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
{
field: 'productionId',
title: t('workOrder.productionId'),
@@ -252,11 +254,12 @@
, width: 130
},
{field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
- {field: 'order.project', title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
- {field: 'order.orderType', title: '璁㈠崟绫诲瀷', showOverflow: "ellipsis", width: 110},
- {field: 'orderDetail.grossArea', title: '闈㈢Н', width: 70},
- {field: 'orderDetail.quantity', title: '鏁伴噺',},
- {field: 'order.creator', title: '鍒涘缓浜�',},
+ {field: 'order.project', title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
+ {field: 'order.orderType', title: t('order.orderType'), showOverflow: "ellipsis", width: 110},
+ {field: 'orderDetail.grossArea', title: t('order.grossArea'), width: 70},
+ {field: 'orderDetail.quantity', title: t('order.quantity'),},
+ {field: 'order.creator', title: t('order.creator'),},
+ {field: 'founder', title: t('product.creator'),},
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
toolbarConfig: {
@@ -270,15 +273,15 @@
custom: true
},
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['', '', '']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["orderDetail.grossArea",'orderDetail.quantity']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
--
Gitblit v1.8.0