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 | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 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 abb2a33..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(t('basicData.msg.saveFail'))
+ ElMessage.warning(t('processCard.updateProcessMsg'))
}
})
@@ -115,18 +115,67 @@
craftObj.technologyNumber.push(...numberList.technologyNumber);
rowIndex.value = row
}
+
+const updateTermination = (row) => {
+ let processId = row.process_id
+ let orderNumber = row.order_number
+ let process = row.process
+ const completed = ref()
+ const completedOk = ref()
+ //鑾峰彇绗竴閬撳伐搴忓畬宸ユ暟閲�
+ request.post(`/processCard/selectCompleted/${processId}/${orderNumber}/${process}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ completed.value=res.data.data
+ completedOk.value = row.quantity*1 - completed.value*1
+ //寮圭獥
+ 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 }) => {
+ if (completedOk.value < value ) {
+ ElMessage.warning(t('processCard.terminationMsg'))
+ return
+ }
+ request.post(`/processCard/updateTermination/${processId}/${orderNumber}/${value}`).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({
+ path: '/main/processCard/SelectDetailProcessCard',
+ query: {processId: processId,random: Math.random()}
+ })
+ }
+ })
+ })
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+
+
+
+}
+
//绗竴娆″姞杞�
const {currentRoute} = useRouter()
const route = currentRoute.value
let processId = route.query.processId
+let merge = null
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/flowCardDetail/${processId}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
+ merge = res.data.merge
+ if(merge != 0){
+ gridOptions.toolbarConfig.buttons[0].name=t('processCard.cancelMerger')
+ }
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -187,13 +236,14 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: t('basicData.operate'), width: 100, slots: { default: 'button_slot' },fixed:"left",},
+ {title: t('basicData.operate'), width: 120, slots: { default: 'button_slot' },fixed:"left",},
{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
{field: 'order_id', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 110 },
{field: 'process_id', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{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},
@@ -202,7 +252,7 @@
{field: 'glass_child', title: t('reportingWorks.glassChild'),width: 200 },
{field: 'founder', title: t('processCard.founder'),width: 110 },
{field: 'splitFrame_time', title: t('processCard.splitFrameTime'),width: 110 },
- {field: 'concatNumber', title: '鎬诲簭鍙�',width: 110},
+ {field: 'concatNumber', title: t('processCard.totalSequenceNumber'),width: 110},
],//琛ㄥご鎸夐挳
@@ -265,7 +315,7 @@
})
ElMessageBox.confirm(
- "鏄惁鍚堝苟锛�",
+ t('processCard.msg.msg6'),
{
confirmButtonText: t('basicData.confirmButtonText'),
cancelButtonText: t('basicData.cancelButtonText'),
@@ -273,7 +323,7 @@
type: 'warning',
}
).then(()=>{
- request.post("/processCard/mergeFlowCard", flowData.value).then((res) => {
+ request.post(`/processCard/mergeFlowCard/${merge}`, flowData.value).then((res) => {
if(res.code==200 && res.data==="true"){
ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({path: '/main/processCard/SelectProcessCard', query:{random:Math.random()}})
@@ -304,7 +354,7 @@
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
+ height="99%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
@@ -331,9 +381,19 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<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">{{$t('processCard.termination')}}</el-button>
</template>
-
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="text"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
</vxe-grid>
<el-dialog id="processChange"
--
Gitblit v1.8.0