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/AddProcessCard.vue | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 9bb534c..781c618 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -738,13 +738,13 @@
const leftDataList = $gridLeft.getTableData().fullData
const baseProcessId = productionId // 鍥哄畾鍓嶇紑
- // 宸ュ叿锛氬彇ID鏈熬鏁板瓧锛堟病鏈夋暟瀛楀垯杩斿洖鏋佸ぇ鍊硷紝闃叉鐩稿噺 NaN/閿欏簭锛�
+ // 鍙朓D鏈熬鏁板瓧锛堟病鏈夋暟瀛楀垯杩斿洖鏋佸ぇ鍊硷紝闃叉鐩稿噺 NaN/閿欏簭锛�
const tailNum = (id) => {
const m = String(id ?? '').match(/(\d+)$/)
return m ? parseInt(m[1], 10) : Number.MAX_SAFE_INTEGER
}
- // 1) 鍏堟寜鍘� processId 鍒嗙粍
+ // 鍏堟寜鍘� processId 鍒嗙粍
const groupedByOld = leftDataList.reduce((acc, row) => {
const pid = row.processId
if (!acc[pid]) acc[pid] = []
@@ -752,7 +752,7 @@
return acc
}, {})
- // 2) 鎷垮埌鍘婚噸鍚庣殑鏃� processId 鍒楄〃锛屽苟鎸夆�滄湯灏炬暟瀛椻�濇搴忥紙灏忓埌澶э級鎺掑垪
+ // 鎷垮埌鍘婚噸鍚庣殑鏃� processId 鍒楄〃锛屽苟鎸夆�滄湯灏炬暟瀛椻�濇搴忥紙灏忓埌澶э級鎺掑垪
const oldIds = Object.keys(groupedByOld).sort((a, b) => {
const da = tailNum(a)
const db = tailNum(b)
@@ -761,14 +761,14 @@
return String(a).localeCompare(String(b))
})
- // 3) 鏋勫缓浠庢棫 processId -> 鏂� processId 鐨勬槧灏勶細001, 002, ... 姝ｅ簭閫掑
+ // 鏋勫缓浠庢棫 processId -> 鏂� processId 鐨勬槧灏勶細001, 002, ... 姝ｅ簭閫掑
const pidMap = new Map()
oldIds.forEach((oldId, idx) => {
const newPid = `${baseProcessId}${String(idx + 1).padStart(3, '0')}`
pidMap.set(oldId, newPid)
})
- // 4) 搴旂敤鏄犲皠锛屽苟璁剧疆 landingSequence锛氬悓缁勫悓搴忓彿锛屼笖浠� 1 寮�濮嬮�掑
+
oldIds.forEach((oldId, idx) => {
const group = groupedByOld[oldId]
const newPid = pidMap.get(oldId)
@@ -1006,7 +1006,7 @@
// (plain.computeGrossArea || 0) - (plain.width * plain.height * qtyToMove) / 1000000
// ).toFixed(2)
}
- $gridLeft.insertAt(newRow, -1) // 鉁� 姘歌繙鎻掑埌琛ㄥ熬
+ $gridLeft.insertAt(newRow, -1) // 姘歌繙鎻掑埌琛ㄥ熬
}
}
@@ -1202,18 +1202,14 @@
if ($grid) {
switch (code) {
case 'saveFlowCard': {
+
gridLeftOptions.toolbarConfig.buttons[0].disabled=true
const $table = xGridLeft.value
const $tableRight = xGrid.value
if ($table) {
const selectRecords = $table.getCheckboxRecords()
- // const selectRight = $tableRight.getCheckboxRecords()
let leftData = $tableRight.getTableData().fullData
- // if (selectRecords.length === 0) {
- // ElMessage.warning(t('processCard.pleaseSelectTheSavedDataFirst'))
- // gridLeftOptions.toolbarConfig.buttons[0].disabled=false
- // return
- // }
+
let data = $table.getTableData().fullData
if (leftData.length > 0) {
ElMessage.warning(t('processCard.pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt'))
@@ -1229,11 +1225,8 @@
gridLeftOptions.toolbarConfig.buttons[0].disabled = false;
return;
}
- // if (leftData.length!=selectRecords.length){
- // ElMessage.warning('璇峰嬀閫夋墍鏈夋暟鎹繘琛屼繚瀛�')
- // gridLeftOptions.toolbarConfig.buttons[0].disabled=false
- // return;
- // }
+ gridOptions.loading=true
+ gridLeftOptions.loading=true
let flowCardData = ref({
flowCard: data,
userName: username,
@@ -1244,14 +1237,15 @@
request.post(`/processCard/addFlowCard/${orderId}`, flowCardData.value).then((res) => {
if (res.code == 200) {
ElMessage.success(t('basicData.msg.saveSuccess'))
- //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
router.push({
path: '/main/processCard/AddProcessCard',
query: {orderId: orderId, productionId: productionId, random: Math.random()}
})
-
- //location.reload();
+ gridOptions.loading=false
+ gridLeftOptions.loading=false
} else {
+ gridOptions.loading=false
+ gridLeftOptions.loading=false
ElMessage.warning(res.msg)
}
})
--
Gitblit v1.8.0