From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
index eb54c7a..8311031 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
@@ -66,17 +66,17 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'basicName',
- title: '璁惧鍚嶇О',
+ title: t('machine.basicName'),
width: 500,
editRender: {name: 'input', attrs: {placeholder: ''}},
},
{
field: 'basicCategory',
- title: '鎵�鍦ㄥ伐搴�',
+ title: t('machine.basicCategory'),
width: 500,
editRender: {},
slots: {default: 'basicCategory_default', edit: 'basicCategory'}
@@ -87,7 +87,7 @@
buttons: [
{code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
{code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
- {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'save', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save'},
],
// import: false,
// export: true,
@@ -102,7 +102,7 @@
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return ''
}
if (footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -139,7 +139,7 @@
})
request.post("/maintenance/saveMachine", machineData.value).then((res) => {
if (res.code == 200) {
- ElMessage.success("淇濆瓨鎴愬姛")
+ ElMessage.success(t('basicData.msg.saveSuccess'))
//router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
router.push({
path: '/main/machine/AddMachine',
@@ -174,14 +174,13 @@
max-height="100%"
v-bind="gridOptions"
v-on="teamGridEvents"
- @filter-change="filterChanged"
>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
--
Gitblit v1.8.0