From 615d0a9e2011510b589ccc3b4bc58894a39e8295 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 05 七月 2024 10:17:03 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index b94d173..7d64f5f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -56,7 +56,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 10)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
@@ -126,7 +126,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectPrintFlowCard',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -161,6 +161,9 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
+ {field: 'customer_name', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged, width: 110},
+
{
field: 'project',
title: t('order.project'),
@@ -186,7 +189,7 @@
toolbarConfig: {
buttons: [
- {'code': 'titleStyle', 'name': '鏍囩鏍峰紡',status: 'primary'}
+ {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'}
],
zoom: true,
@@ -289,7 +292,7 @@
</vxe-grid>
<el-dialog
id="titleStyle"
- :title="'鏍囩鏍峰紡'"
+ :title="$t('processCard.labelStyle')"
style="width: 70%;height:70% "
:close-on-click-modal="false"
:close-on-press-escape="false"
--
Gitblit v1.8.0