From d8085c81987d5819d7f270bcf0bd68d879f28d2b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 13 三月 2024 10:30:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 68 ++++++++++++++++++----------------
1 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
index caee1e8..5196dc5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -7,6 +7,10 @@
import deepClone from "@/utils/deepClone";
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
+import { useI18n } from 'vue-i18n'
+
+//璇█鑾峰彇
+const { t } = useI18n()
let router = useRouter()
@@ -77,7 +81,7 @@
body: {
options: [
[
- { code: 'copyChecked', name: '閫変腑鐩稿悓', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
]
]
}
@@ -99,34 +103,34 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {field: 'select',type:'checkbox',title: '閫夋嫨', width: 80,fixed:"left"},
- {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
- {field: 'reworkTeam', width: 120, title: '杩斿伐鐝粍', slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}, editRender: {}},
- {field: 'orderId', width: 120, title: '閿�鍞崟鍙�', sortable: true, showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
- {field: 'processId', width: 120, title: '娴佺▼鍗″彿', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
- {field: 'project', width: 120, title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'batch', width: 80, title: '鎵规', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
- {field: 'orderSort', width: 80, title: '搴忓彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'productName', width: 120, title: '鍗曠墖鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'technologyNumber', width: 80, title: '鏍囪', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
- {field: 'glassAddress', width: 90, title: '鐗囨爣璁�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'breakageQuantity', width: 120, title: '娆＄牬鏁伴噺', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkNum',width:120, title: '杩斿伐鏁伴噺',editRender: { name: 'input', attrs: { placeholder: '' } },filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'width', width: 80, title: '瀹�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'height', width: 80, title: '楂�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'shape', width: 80, title: '褰㈢姸', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkProcesses', width: 100, title: '杩斿伐宸ュ簭', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkType', width: 100, title: '杩斿伐绫诲瀷', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkReason', width: 120, title: '杩斿伐鍘熷洜', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'responsibleEquipment', width: 120, title: '璐ｄ换璁惧', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'responsibleTeam', width: 120, title: '璐ｄ换鐝粍', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'area', width: 120, title: '杩斿伐闈㈢Н', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'qualityInspector', width: 100, title: '璐ㄦ鍛�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
+ {field: 'select',type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {field: 'reworkTeam', width: 120, title: t('rework.reworkTeam'), slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}, editRender: {}},
+ {field: 'orderId', width: 120, title: t('order.orderId'), sortable: true, showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'processId', width: 120, title: t('processCard.processId'), sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'batch', width: 80, title: t('order.batch'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
+ {field: 'orderSort', width: 80, title: t('order.OrderNum'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'productName', width: 120, title: t('order.product'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'technologyNumber', width: 80, title: t('replenish.mark'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
+ {field: 'glassAddress', width: 90, title: t('replenish.sliceMarking'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'breakageQuantity', width: 120, title: t('reportingWorks.quantityBroken'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkNum',width:120, title: t('productStock.reworkQuantity'),editRender: { name: 'input', attrs: { placeholder: '' } },filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'width', width: 80, title: t('order.width'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'height', width: 80, title: t('order.height'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'shape', width: 80, title: t('order.shape'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkProcesses', width: 100, title: t('rework.reworkProcess'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkType', width: 100, title: t('rework.reworkType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkReason', width: 120, title: t('rework.reasonForRework'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'responsibleTeam', width: 120, title: t('reportingWorks.responsibleTeam'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'area', width: 120, title: t('rework.reworkArea'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'qualityInspector', width: 100, title: t('reportingWorks.qualityInspector'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {'code': 'add', 'name': '淇濆瓨',status: 'primary',icon: 'vxe-icon-save'}
+ {'code': 'add', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save'}
],
import: false,
export: true,
@@ -140,7 +144,7 @@
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -166,7 +170,7 @@
return
}
} else {
- ElMessage.warning("鏈�変腑鏁版嵁")
+ ElMessage.warning(t('productStock.unselectedData'))
return
}
@@ -177,7 +181,7 @@
})
request.post("/rework/saveRework", flowData.value).then((res) => {
if(res.code==200){
- ElMessage.success("杩斿伐鍗曟彁浜ゆ垚鍔�")
+ ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({path:'/main/rework/AddRework',query:{random:Math.random()}})
}else{
ElMessage.warning(res.msg)
@@ -254,19 +258,19 @@
/*鏁版嵁鏍￠獙*/
const validRules = ref({
reworkTeam: [
- { required: true, message: '璇烽�夋嫨杩斿伐鐝粍' }
+ { required: true, message: t('rework.PleaseSelectAReworkTeam') }
],
reworkNum: [{
validator (e) {
if (e.row.reworkNum > e.row.breakageQuantity) {
- return new Error('杩斿伐鏁伴噺涓嶈兘澶т簬娆＄牬鏁伴噺')
+ return new Error(t('rework.TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity'))
}else if (e.row.reworkNum ==="") {
- return new Error('杩斿伐鏁伴噺涓嶈兘涓虹┖鎴栬�呮槸0')
+ return new Error(t('rework.reworkQuantityCannotBeEmptyOr0'))
}
const regex = /^[1-9]\d*$/g
if ( !regex.test(e.row.reworkNum) ) {
- return new Error('璇疯緭鍏ユ鏁存暟')
+ return new Error(t('productStock.pleaseEnterAPositiveInteger'))
}
}
--
Gitblit v1.8.0