From 12f2fd73462da331478fabc7eaa79fc35b1a59b3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 七月 2024 16:41:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index d85a2cc..942605d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -37,7 +37,7 @@
ElMessage.success(t('workOrder.deleteOk'))
router.push({path: '/main/processCard/SelectProcessCard', query: {random: Math.random()}})
} else {
- ElMessage.warning(t('processCard.deleteOk'))
+ ElMessage.warning(t('processCard.deleteNo'))
}
})
@@ -100,7 +100,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
@@ -230,7 +230,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectProcessCard',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -258,6 +258,7 @@
{title: t('basicData.operate'), width: 100, 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: 'processId',
width: 140,
@@ -290,7 +291,7 @@
toolbarConfig: {
buttons: [
- {code: 'update', name: '鎺掔増', status: 'primary'},
+ {code: 'update', name: t('processCard.composing'), status: 'primary'},
],
import: false,
// export: true,
--
Gitblit v1.8.0