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 | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 4c01593..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('鍒犻櫎澶辫触锛屾鏌ユ祦绋嬪崱鏄惁宸叉姤宸�')
+ ElMessage.warning(t('processCard.deleteNo'))
}
})
@@ -54,7 +54,7 @@
//瀹氫箟鍙橀噺
const form = reactive({
date1: '',
- getSelect:'涓嶅彲鎺掔増'
+ getSelect:t('processCard.composingNo')
})
@@ -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,
@@ -318,9 +319,9 @@
})
const sexOptions = ref([
- {label: '宸叉帓鐗�', value: '宸叉帓鐗�'},
- {label: '鍙帓鐗�', value: '鍙帓鐗�'},
- {label: '涓嶅彲鎺掔増', value: '涓嶅彲鎺掔増'}
+ {label: t('processCard.typesetter'), value: t('processCard.typesetter')},
+ {label: t('processCard.composingOk'), value: t('processCard.composingOk')},
+ {label: t('processCard.composingNo'), value: t('processCard.composingNo')}
])
//琛ㄦ牸鎸夐挳
@@ -334,7 +335,7 @@
if ($table) {
const selectRecords = $table.getCheckboxRecords()
if (selectRecords.length == 0) {
- ElMessage.warning("璇峰嬀閫夐渶瑕佺殑鏁版嵁")
+ ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
return;
}
@@ -345,14 +346,14 @@
//淇敼鎺掔増鐘舵��
request.post("/processCard/updateComposing", composingData.value).then((res) => {
if (res.code == 200 && res.data === true) {
- ElMessage.success("淇敼鎴愬姛")
+ ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({
path: '/main/processCard/SelectProcessCard',
query: {random: Math.random()}
})
} else {
- ElMessage.warning('淇敼澶辫触')
+ ElMessage.warning(t('basicData.msg.saveFail'))
}
})
@@ -368,7 +369,7 @@
}
const checkBoxConfig = {
checkMethod: ({row}) => {
- if (row['layoutStatus'] === '鍙帓鐗�' || row['layoutStatus'] === '宸叉帓鐗�') {
+ if (row['layoutStatus'] === t('processCard.composingOk') || row['layoutStatus'] === t('processCard.typesetter')) {
return row.disable
} else {
return !row.disable
@@ -463,9 +464,9 @@
<div v-for="(option, index) in column.filters" :key="index">
<select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" style="width: 100%">
- <option value="宸叉帓鐗�" label="宸叉帓鐗�"></option>
- <option value="鍙帓鐗�" label="鍙帓鐗�"></option>
- <option value="涓嶅彲鎺掔増" label="涓嶅彲鎺掔増"></option>
+ <option :value="$t('processCard.typesetter')" :label="$t('processCard.typesetter')"></option>
+ <option :value="$t('processCard.composingOk')" :label="$t('processCard.composingOk')"></option>
+ <option :value="$t('processCard.composingNo')" :label="$t('processCard.composingNo')"></option>
</select>
</div>
</div>
--
Gitblit v1.8.0