From b97e00dae4fa017c8273e41fb0f24cf7c7c69a33 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 25 十一月 2024 13:28:35 +0800
Subject: [PATCH] 工程打印标签调整

---
 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 e5b63f1..5edee96 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
@@ -89,7 +89,7 @@
       .toISOString()
       .replace('T', ' ')
       .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
-  const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+  const end = new Date(new Date().getTime())
       .toISOString()
       .replace('T', ' ')
       .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -230,8 +230,8 @@
     buttons: [
       {code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
       {'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
-      {code: 'detailsPrint', name: '鏄庣粏鎵撳嵃', status: 'primary'},
-      {code: 'detailsProcessPrint', name: '鏄庣粏鍒嗘灦鎵撳嵃', status: 'primary'},
+      {code: 'detailsPrint', name: t('processCard.detailPrinting'), status: 'primary'},
+      {code: 'detailsProcessPrint', name: t('processCard.detailsPrintedSeparately'), status: 'primary'},
 
     ],
 
@@ -357,7 +357,7 @@
             :icon="Search"
             type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
         </el-button>
-        <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value"  content="鍚堝苟" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
+        <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value"  :content="$t('processCard.merge')" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
       </el-row>
     </div>
     <vxe-grid

--
Gitblit v1.8.0