From 2ad329b52d19e48bcdc9013aaf3fcee460456548 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 29 九月 2025 15:28:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index bf78e21..b421de7 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -78,7 +78,7 @@
const saveCraft = () => {
//rowIndex.value.process = craftObj.newCraft.join('->')
let orderProcess= craftObj.newCraft.join('->')
- request.post(`/processCard/updateProcess/${rowIndex.value.process_id}/${rowIndex.value.technology_number}/${rowIndex.value.order_id}/${orderProcess}`, craftObj).then((res) => {
+ request.post(`/processCard/updateProcess/${rowIndex.value.process_id}/${rowIndex.value.order_number}/${rowIndex.value.technology_number}/${rowIndex.value.order_id}/${orderProcess}`, craftObj).then((res) => {
if (res.code == 200 && res.data === true) {
ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({
@@ -87,7 +87,7 @@
})
} else {
- ElMessage.warning('淇濆瓨澶辫触锛屾鏌ユ槸鍚︽姤宸�')
+ ElMessage.warning(t('processCard.updateProcessMsg'))
}
})
@@ -129,14 +129,13 @@
completed.value=res.data.data
completedOk.value = row.quantity*1 - completed.value*1
//寮圭獥
- ElMessageBox.prompt( '鏈�澶у凡瀹屽伐鏁伴噺锛�'+completed.value, {
+ ElMessageBox.prompt( t('processCard.maxCompleted')+completed.value, {
confirmButtonText: t('basicData.save'),
cancelButtonText: t('basicData.cancelButtonText'),
inputPattern:/^(\d+|)$/,
inputErrorMessage: t('processCard.terminationMsg'),
inputValue:row.quantity
}).then(({ value }) => {
- console.log(completedOk.value, value)
if (completedOk.value < value ) {
ElMessage.warning(t('processCard.terminationMsg'))
return
@@ -244,6 +243,7 @@
{field: 'order_number', title: t('order.OrderNum') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 100},
{field: 'technology_number', title: t('processCard.technologyNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 100},
{field: 'quantity', title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
+ {field: 'termination_quantity', title: t('processCard.terminationQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
{field: 'child_width', title: t('order.width'),width: 80 },
{field: 'child_height', title: t('order.height'),width: 80 },
{field: 'area', title: t('order.area') ,showOverflow:"ellipsis",width: 70},
@@ -315,7 +315,7 @@
})
ElMessageBox.confirm(
- "鏄惁鍚堝苟锛�",
+ t('processCard.msg.msg6'),
{
confirmButtonText: t('basicData.confirmButtonText'),
cancelButtonText: t('basicData.cancelButtonText'),
@@ -381,7 +381,7 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<el-button @click="updateCraft(row)" link type="primary" size="small">{{$t('craft.updateCraft')}}</el-button>
- <el-button @click="updateTermination(row)" link type="primary" size="small">缁堟</el-button>
+ <el-button @click="updateTermination(row)" link type="primary" size="small">{{$t('processCard.termination')}}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
--
Gitblit v1.8.0