From 85aa4497849d485aa2e7ae01976ddc572f7022cc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 04 七月 2024 13:13:06 +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 |    8 ++++----
 1 files changed, 4 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..e66d9f8 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: {},
@@ -186,7 +186,7 @@
 
   toolbarConfig: {
     buttons: [
-      {'code': 'titleStyle', 'name': '鏍囩鏍峰紡',status: 'primary'}
+      {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'}
     ],
 
     zoom: true,
@@ -289,7 +289,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