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 | 701 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 495 insertions(+), 206 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 35231b2..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
@@ -246,6 +246,35 @@
width: '70px'
},
{
+ field: 'longSide',
+ title: t('processCard.longSide'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '90px'
+ },
+ {
+ field: 'shortSide',
+ title: t('processCard.shortSide'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '90px'
+ },
+
+ {
+ field: 'building_number',
+ title: t('order.buildingNumber'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '120px'
+ },
+ {field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '80px'},
+ {
field: 'width',
title: t('order.width'),
sortable: true,
@@ -263,16 +292,6 @@
filterMethod: filterChanged,
width: '78px'
},
- {
- field: 'building_number',
- title: t('order.buildingNumber'),
- sortable: true,
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged,
- width: '120px'
- },
- {field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '80px'},
{field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
{field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
{field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
@@ -548,7 +567,7 @@
checkedNum.value = ''
} catch (e) {
- ElMessage.warning(e.message || '娴佺▼鍗″垱寤哄け璐�')
+ ElMessage.warning(e.message || t('processCard.msg.msg1'))
}
}
@@ -624,57 +643,62 @@
}
-
-//鍚戝彸杈硅〃鏍兼坊鍔犳暟鎹�
+//鍚戝彸2
const addRight = () => {
try {
- //宸﹁竟琛ㄦ牸瀹氫箟
+ // 宸﹁竟琛ㄦ牸瀹氫箟
const $gridLeft = xGridLeft.value
- //鍙宠竟琛ㄦ牸瀹氫箟
+ // 鍙宠竟琛ㄦ牸瀹氫箟
const $grid = xGrid.value
- //鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+ // 鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
const checkedList = $gridLeft.getCheckboxRecords()
- //鍒ゆ柇宸﹁竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
+
+ // 鍒ゆ柇宸﹁竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
if (checkedList.length === 0) {
ElMessage.warning(t('processCard.schedulingArea'))
return
}
- const regex = /^(\d+|)$/;
+
+ const regex = /^(\d+|)$/
if (!regex.test(checkedNum.value)) {
ElMessage.warning(t('processCard.schedulingNo'))
return
}
- //鍒ゆ柇姝ｆ暣鏁�
+
+ // 鍒ゆ柇姝ｆ暣鏁�
if (/^[1-9]\d*$/.test(checkedNum.value)) {
- //瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
+ // 瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
checkedList.forEach((item) => {
- //鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- // if (item.quantity < checkedNum.value*1) throw new Error(t('processCard.schedulingQuantity'));
+ // 鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�, 涓嶆弧瓒冲垯鎻愮ず
if (item.quantity < checkedNum.value * 1) {
ElMessage.warning(t('processCard.schedulingQuantity'))
}
- //宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
+
+ // 宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
item.quantity = item.quantity - checkedNum.value
- //鍙宠竟琛ㄦ牸鏁版嵁
- let rightData = $grid.getTableData().fullData
- //鍙宠竟琛ㄦ牸鏁版嵁涓煡鎵惧綋鍓嶆暟鎹笅鏍�
- let filterIndex = rightData.findIndex(item1 => item1.orderNumber === item.orderNumber)
- //濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
+
+ // 鍙宠竟琛ㄦ牸鏁版嵁
+ const rightData = $grid.getTableData().fullData
+ // 鍙宠竟琛ㄦ牸鏁版嵁涓煡鎵惧綋鍓嶆暟鎹笅鏍囷紙浠� orderNumber 鍖归厤锛�
+ const filterIndex = rightData.findIndex(d => d.orderNumber === item.orderNumber)
+
if (filterIndex >= 0) {
- //鏁伴噺
+ // 鏁伴噺鍙犲姞
rightData[filterIndex].baiscQuantity = rightData[filterIndex].baiscQuantity * 1 + checkedNum.value * 1
- //闈㈢Н
- rightData[filterIndex].computeGrossArea = (rightData[filterIndex].width * rightData[filterIndex].height * rightData[filterIndex].baiscQuantity / 1000000).toFixed(2)
- //濡傛灉宸﹁竟鏁伴噺涓�0鏃跺垹闄ゆ鏉℃暟鎹�
- //鍒犻櫎key
- let key = item._X_ROW_KEY
+ // 闈㈢Н閲嶇畻
+ rightData[filterIndex].computeGrossArea = (
+ rightData[filterIndex].width * rightData[filterIndex].height * rightData[filterIndex].baiscQuantity / 1000000
+ ).toFixed(2)
+
+ // 濡傛灉宸﹁竟鏁伴噺涓�0鏃跺垹闄ゆ鏉℃暟鎹�
+ const key = item._X_ROW_KEY
delete item._X_ROW_KEY
- if (item.baiscQuantity === 0) {
- $grid.remove(item)
+ if (item.baiscQuantity === 0 || item.quantity === 0) {
+ $gridLeft.remove(item)
}
item._X_ROW_KEY = key
} else {
- //鍙宠竟琛ㄦ牸娌℃湁姝ゆ潯鏁版嵁鍒欏線鍙宠竟琛ㄦ牸鎻掑叆鏁版嵁
+ // 鍙宠竟琛ㄦ牸娌℃湁姝ゆ潯鏁版嵁鍒欏線鍙宠竟琛ㄦ牸鎻掑叆鏁版嵁
item.baiscQuantity = checkedNum.value
item.computeGrossArea = (item.width * item.height * checkedNum.value / 1000000).toFixed(2)
if (item.quantity === 0) {
@@ -682,114 +706,258 @@
}
$grid.insert(item)
}
+
if (item.quantity === 0) {
$gridLeft.remove(item)
}
})
- } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
-
+ } else if (checkedNum.value === '') { // 鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧锛氬叏閲忕Щ鍔�
checkedList.forEach((item) => {
- //鍙充晶琛ㄦ牸
- let rightData = $grid.getTableData().fullData
- let filterIndex = rightData.findIndex(item1 => item1.orderNumber === item.orderNumber)
- //宸︿晶琛ㄦ牸
- let leftData = $gridLeft.getTableData().fullData
- let leftfilterIndex = leftData.findIndex(item1 => item1.orderNumber === item.orderNumber)
- //鏃犺緭鍏ュ苟涓斿鏋滃彸杈硅〃鏍兼暟鎹腑瀛樺湪褰撳墠鏁版嵁鍒欐暟閲忕浉鍔�
+ // 鍙充晶琛ㄦ牸
+ const rightData = $grid.getTableData().fullData
+ const filterIndex = rightData.findIndex(d => d.orderNumber === item.orderNumber)
+
if (filterIndex > -1) {
rightData[filterIndex].baiscQuantity = rightData[filterIndex].baiscQuantity * 1 + item.quantity * 1
- //闈㈢Н
- rightData[filterIndex].computeGrossArea = (rightData[filterIndex].width * rightData[filterIndex].height * rightData[filterIndex].baiscQuantity / 1000000).toFixed(2)
-
+ rightData[filterIndex].computeGrossArea = (
+ rightData[filterIndex].width * rightData[filterIndex].height * rightData[filterIndex].baiscQuantity / 1000000
+ ).toFixed(2)
} else {
-
item.baiscQuantity = item.quantity * 1
delete item._X_ROW_KEY
$grid.insert(item)
-
}
$gridLeft.remove(item)
})
-
}
- let leftDataList = $gridLeft.getTableData().fullData;
- let baseProcessId = productionId; // 鍥哄畾鐨勫墠缂�
+ // ===== 涓嬮潰杩欓儴鍒嗭細鎶娾�滃�掑簭鈥濇敼鎴愨�滈『搴忊�� =====
- // 缁熻鎵�鏈変笉閲嶅鐨� processId
- let uniqueProcessIds = new Set(leftDataList.map(item => item.processId));
- // 涓嶉噸澶嶇殑 processId 鐨勬�讳釜鏁�
- let totalUniqueCount = uniqueProcessIds.size;
- // 鐢ㄤ簬璁板綍宸茬粡鍒嗛厤鐨� processId
- let usedProcessIds = new Set();
+ // 鑾峰彇宸﹁〃鍓╀綑鏁版嵁
+ const leftDataList = $gridLeft.getTableData().fullData
+ const baseProcessId = productionId // 鍥哄畾鍓嶇紑
- leftDataList.forEach((item) => {
- let newProcessId;
- // 濡傛灉璇� processId 鏄涓�娆″嚭鐜帮紝浣跨敤閫掑噺鐨勭紪鍙风敓鎴愭柊鐨� processId
- if (!usedProcessIds.has(item.processId)) {
- newProcessId = `${baseProcessId}${(totalUniqueCount).toString().padStart(3, '0')}`;
- usedProcessIds.add(item.processId); // 鏍囪璇� processId 宸蹭娇鐢�
- totalUniqueCount--; // 閫掑噺
+ // 鍙朓D鏈熬鏁板瓧锛堟病鏈夋暟瀛楀垯杩斿洖鏋佸ぇ鍊硷紝闃叉鐩稿噺 NaN/閿欏簭锛�
+ const tailNum = (id) => {
+ const m = String(id ?? '').match(/(\d+)$/)
+ return m ? parseInt(m[1], 10) : Number.MAX_SAFE_INTEGER
+ }
- } else {
- // 濡傛灉璇� processId 宸茬粡浣跨敤杩囷紝缁х画浣跨敤宸插垎閰嶇殑缂栧彿
- newProcessId = `${baseProcessId}${(totalUniqueCount + 1).toString().padStart(3, '0')}`;
+ // 鍏堟寜鍘� processId 鍒嗙粍
+ const groupedByOld = leftDataList.reduce((acc, row) => {
+ const pid = row.processId
+ if (!acc[pid]) acc[pid] = []
+ acc[pid].push(row)
+ return acc
+ }, {})
- }
- // 鏇存柊 item.processId
- item.processId = newProcessId;
- });
- // 鑾峰彇鍓╀綑鏁版嵁,鐢ㄤ簬瀵硅惤鏋堕『搴忛噸鏂拌祴鍊�
- let remainingData = $gridLeft.getTableData().fullData;
- // 鎸� processId 鍒嗙粍
- let groupedData = remainingData.reduce((acc, curr) => {
- if (!acc[curr.processId]) {
- acc[curr.processId] = [];
- }
- acc[curr.processId].push(curr);
- return acc;
- }, {});
+ // 鎷垮埌鍘婚噸鍚庣殑鏃� processId 鍒楄〃锛屽苟鎸夆�滄湯灏炬暟瀛椻�濇搴忥紙灏忓埌澶э級鎺掑垪
+ const oldIds = Object.keys(groupedByOld).sort((a, b) => {
+ const da = tailNum(a)
+ const db = tailNum(b)
+ if (da !== db) return da - db
+ // 灏炬暟鐩稿悓鍐嶆寜瀛楀吀搴忓厹搴曪紝纭繚绋冲畾
+ return String(a).localeCompare(String(b))
+ })
- // 鎸� processId 鎺掑簭锛堝�掑簭锛�
- let sortedProcessIds = Object.keys(groupedData).sort((a, b) => b - a);
+ // 鏋勫缓浠庢棫 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)
+ })
- // 鏇存柊姣忎釜鍒嗙粍鐨� landingSequence
- sortedProcessIds.forEach((processId, index) => {
- let group = groupedData[processId];
- // 瀵规瘡涓� processId 鍒嗙粍鍐呯殑鏁版嵁锛屼笉鏀瑰彉椤哄簭锛岀洿鎺ヨ祴鐩稿悓鐨� landingSequence
- group.forEach((item) => {
- item.landingSequence = sortedProcessIds.length - index; // 鎸夊�掑簭璁剧疆 landingSequence
- });
- });
- //娓呴櫎涓よ竟澶嶉�夋
+ oldIds.forEach((oldId, idx) => {
+ const group = groupedByOld[oldId]
+ const newPid = pidMap.get(oldId)
+ const seq = idx + 1
+ group.forEach((row) => {
+ row.processId = newPid
+ row.landingSequence = seq
+ })
+ })
+
+ // 娓呴櫎涓よ竟澶嶉�夋 & 鍒锋柊鍒�
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
$grid.refreshColumn()
} catch (e) {
ElMessage.warning(e.message)
}
- //姣忔鐐瑰嚮鎯呭喌杈撳叆妗�
- if (checkedNum.value){
- checkedNum.value =''
+
+ // 姣忔鐐瑰嚮娓呯┖杈撳叆妗�
+ if (checkedNum.value) {
+ checkedNum.value = ''
}
}
+//鍚戝彸杈硅〃鏍兼坊鍔犳暟鎹�
+// const addRight = () => {
+// try {
+// //宸﹁竟琛ㄦ牸瀹氫箟
+// const $gridLeft = xGridLeft.value
+// //鍙宠竟琛ㄦ牸瀹氫箟
+// const $grid = xGrid.value
+// //鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+// const checkedList = $gridLeft.getCheckboxRecords()
+// //鍒ゆ柇宸﹁竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
+// if (checkedList.length === 0) {
+// ElMessage.warning(t('processCard.schedulingArea'))
+// return
+// }
+// const regex = /^(\d+|)$/;
+// if (!regex.test(checkedNum.value)) {
+// ElMessage.warning(t('processCard.schedulingNo'))
+// return
+// }
+// //鍒ゆ柇姝ｆ暣鏁�
+// if (/^[1-9]\d*$/.test(checkedNum.value)) {
+// //瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
+// checkedList.forEach((item) => {
+// //鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
+// // if (item.quantity < checkedNum.value*1) throw new Error(t('processCard.schedulingQuantity'));
+// if (item.quantity < checkedNum.value * 1) {
+// ElMessage.warning(t('processCard.schedulingQuantity'))
+// }
+// //宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
+// item.quantity = item.quantity - checkedNum.value
+// //鍙宠竟琛ㄦ牸鏁版嵁
+// let rightData = $grid.getTableData().fullData
+// //鍙宠竟琛ㄦ牸鏁版嵁涓煡鎵惧綋鍓嶆暟鎹笅鏍�
+// let filterIndex = rightData.findIndex(item1 => item1.orderNumber === item.orderNumber)
+// //濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
+// if (filterIndex >= 0) {
+// //鏁伴噺
+// rightData[filterIndex].baiscQuantity = rightData[filterIndex].baiscQuantity * 1 + checkedNum.value * 1
+// //闈㈢Н
+// rightData[filterIndex].computeGrossArea = (rightData[filterIndex].width * rightData[filterIndex].height * rightData[filterIndex].baiscQuantity / 1000000).toFixed(2)
+// //濡傛灉宸﹁竟鏁伴噺涓�0鏃跺垹闄ゆ鏉℃暟鎹�
+// //鍒犻櫎key
+// let key = item._X_ROW_KEY
+// delete item._X_ROW_KEY
+// if (item.baiscQuantity === 0) {
+// $grid.remove(item)
+// }
+// item._X_ROW_KEY = key
+// } else {
+// //鍙宠竟琛ㄦ牸娌℃湁姝ゆ潯鏁版嵁鍒欏線鍙宠竟琛ㄦ牸鎻掑叆鏁版嵁
+// item.baiscQuantity = checkedNum.value
+// item.computeGrossArea = (item.width * item.height * checkedNum.value / 1000000).toFixed(2)
+// if (item.quantity === 0) {
+// $gridLeft.remove(item)
+// }
+// $grid.insert(item)
+// }
+// if (item.quantity === 0) {
+// $gridLeft.remove(item)
+// }
+// })
+// } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
+//
+// checkedList.forEach((item) => {
+// //鍙充晶琛ㄦ牸
+// let rightData = $grid.getTableData().fullData
+// let filterIndex = rightData.findIndex(item1 => item1.orderNumber === item.orderNumber)
+// //宸︿晶琛ㄦ牸
+// let leftData = $gridLeft.getTableData().fullData
+// let leftfilterIndex = leftData.findIndex(item1 => item1.orderNumber === item.orderNumber)
+// //鏃犺緭鍏ュ苟涓斿鏋滃彸杈硅〃鏍兼暟鎹腑瀛樺湪褰撳墠鏁版嵁鍒欐暟閲忕浉鍔�
+// if (filterIndex > -1) {
+// rightData[filterIndex].baiscQuantity = rightData[filterIndex].baiscQuantity * 1 + item.quantity * 1
+// //闈㈢Н
+// rightData[filterIndex].computeGrossArea = (rightData[filterIndex].width * rightData[filterIndex].height * rightData[filterIndex].baiscQuantity / 1000000).toFixed(2)
+//
+// } else {
+//
+// item.baiscQuantity = item.quantity * 1
+// delete item._X_ROW_KEY
+// $grid.insert(item)
+//
+// }
+//
+// $gridLeft.remove(item)
+// })
+//
+// }
+//
+// let leftDataList = $gridLeft.getTableData().fullData;
+// let baseProcessId = productionId; // 鍥哄畾鐨勫墠缂�
+//
+// // 缁熻鎵�鏈変笉閲嶅鐨� processId
+// let uniqueProcessIds = new Set(leftDataList.map(item => item.processId));
+// // 涓嶉噸澶嶇殑 processId 鐨勬�讳釜鏁�
+// let totalUniqueCount = uniqueProcessIds.size;
+// // 鐢ㄤ簬璁板綍宸茬粡鍒嗛厤鐨� processId
+// let usedProcessIds = new Set();
+//
+// leftDataList.forEach((item) => {
+// let newProcessId;
+// // 濡傛灉璇� processId 鏄涓�娆″嚭鐜帮紝浣跨敤閫掑噺鐨勭紪鍙风敓鎴愭柊鐨� processId
+// if (!usedProcessIds.has(item.processId)) {
+// newProcessId = `${baseProcessId}${(totalUniqueCount).toString().padStart(3, '0')}`;
+// usedProcessIds.add(item.processId); // 鏍囪璇� processId 宸蹭娇鐢�
+// totalUniqueCount--; // 閫掑噺
+//
+// } else {
+// // 濡傛灉璇� processId 宸茬粡浣跨敤杩囷紝缁х画浣跨敤宸插垎閰嶇殑缂栧彿
+// newProcessId = `${baseProcessId}${(totalUniqueCount + 1).toString().padStart(3, '0')}`;
+//
+// }
+// // 鏇存柊 item.processId
+// item.processId = newProcessId;
+// });
+// // 鑾峰彇鍓╀綑鏁版嵁,鐢ㄤ簬瀵硅惤鏋堕『搴忛噸鏂拌祴鍊�
+// let remainingData = $gridLeft.getTableData().fullData;
+// // 鎸� processId 鍒嗙粍
+// let groupedData = remainingData.reduce((acc, curr) => {
+// if (!acc[curr.processId]) {
+// acc[curr.processId] = [];
+// }
+// acc[curr.processId].push(curr);
+// return acc;
+// }, {});
+//
+// // 鎸� processId 鎺掑簭锛堝�掑簭锛�
+// let sortedProcessIds = Object.keys(groupedData).sort((a, b) => b - a);
+//
+// // 鏇存柊姣忎釜鍒嗙粍鐨� landingSequence
+// sortedProcessIds.forEach((processId, index) => {
+// let group = groupedData[processId];
+//
+// // 瀵规瘡涓� processId 鍒嗙粍鍐呯殑鏁版嵁锛屼笉鏀瑰彉椤哄簭锛岀洿鎺ヨ祴鐩稿悓鐨� landingSequence
+// group.forEach((item) => {
+// item.landingSequence = sortedProcessIds.length - index; // 鎸夊�掑簭璁剧疆 landingSequence
+// });
+// });
+// //娓呴櫎涓よ竟澶嶉�夋
+// $gridLeft.clearCheckboxRow()
+// $grid.clearCheckboxRow()
+// $grid.refreshColumn()
+// } catch (e) {
+// ElMessage.warning(e.message)
+// }
+// //姣忔鐐瑰嚮鎯呭喌杈撳叆妗�
+// if (checkedNum.value){
+// checkedNum.value =''
+// }
+// }
-//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
+
+//鍚戝乏2
const addLeft = () => {
try {
- //宸﹁竟琛ㄦ牸瀹氫箟
const $gridLeft = xGridLeft.value
- //鍙宠竟琛ㄦ牸瀹氫箟
const $grid = xGrid.value
- //鑾峰彇鍙宠竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+
+ // 鍙宠〃閫変腑
const checkedList = $grid.getCheckboxRecords()
- //鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+ // 宸﹁〃閫変腑锛堣姹傚彧鑳介�� 1 鏉★紝鐢ㄤ簬纭畾鐩爣娴佺▼鍗★級
const checkedListLeft = $gridLeft.getCheckboxRecords()
- //鍒ゆ柇鍙宠竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
- if (checkedList.length * 1 === 0) {
+
+ // 鍩烘湰鏍￠獙
+ if (!checkedList.length) {
ElMessage.warning(t('processCard.schedulingOk'))
return
}
@@ -797,107 +965,234 @@
ElMessage.warning(t('processCard.schedulingTime'))
return
}
- const regex = /^(\d+|)$/;
+ const regex = /^(\d+|)$/
if (!regex.test(checkedNum.value)) {
ElMessage.warning(t('processCard.schedulingNo'))
return
}
- //鍒ゆ柇姝ｆ暣鏁�
- if (/^[1-9]\d*$/.test(checkedNum.value)) {
+
+ const isValidNum = /^[1-9]\d*$/.test(checkedNum.value)
+ const targetProcId = checkedListLeft[0].processId
+ const targetLandingSeq = checkedListLeft[0].landingSequence
+
+ // 宸ュ叿锛氭妸璁板綍濉炲埌宸﹁〃琛ㄥ熬锛堝瓨鍦ㄧ浉鍚� orderNumber+processId 灏卞彧鍚堝苟鏁伴噺锛�
+ const upsertToLeftTail = (srcRow, qtyToMove) => {
+ // 鐩爣琛屽簲鍏锋湁鐨勯敭鍊�
+ const keyOrder = srcRow.orderNumber
+ const keyProc = targetProcId
+
+ // 鍏堟壘鏄惁宸叉湁鍚� orderNumber + processId 鐨勮
+ const leftFull = $gridLeft.getTableData().fullData
+ const existIdx = leftFull.findIndex(r => r.orderNumber === keyOrder && r.processId === keyProc)
+
+ if (existIdx >= 0) {
+ // 鍚堝苟鏁伴噺
+ leftFull[existIdx].quantity = (leftFull[existIdx].quantity || 0) * 1 + qtyToMove * 1
+ // 杩欓噷涓嶉澶栨墸 left 琛岀殑 computeGrossArea锛岄伩鍏嶉噸澶嶆墸鍑忥紙鎵ｅ噺鍙湪鍙充晶鍑忓嚭鏃跺仛锛�
+ // 濡傞渶宸︿晶涔熸墸锛岃鎸変綘鐨勫彛寰勫湪姝ゅ琛ヤ笂
+ // 涓嶉渶瑕� reload锛岃繖閲岀洿鎺ユ敼 fullData锛屾渶鍚庣粺涓� refresh
+ } else {
+ // 鏂板缓涓�鏉℃斁鍒拌〃灏�
+ // 鍏嬮殕涓�涓共鍑�瀵硅薄锛岄伩鍏� _X_ROW_KEY 鍐茬獊
+ const { _X_ROW_KEY, ...plain } = srcRow
+ const newRow = {
+ ...plain,
+ processId: targetProcId,
+ landingSequence: targetLandingSeq,
+ quantity: qtyToMove,
+ // 濡傛灉浣犲笇鏈涙柊琛屼篃鍚屾鎵ｅ噺鑷韩闈㈢Н锛屽彲浠ユ墦寮�涓嬮潰杩欎竴琛岋紱
+ // 鍚﹀垯娉ㄩ噴淇濇寔鍙湪鍙充晶鎵ｅ噺涓�娆�
+ // computeGrossArea: (
+ // (plain.computeGrossArea || 0) - (plain.width * plain.height * qtyToMove) / 1000000
+ // ).toFixed(2)
+ }
+ $gridLeft.insertAt(newRow, -1) // 姘歌繙鎻掑埌琛ㄥ熬
+ }
+ }
+
+ if (isValidNum) {
+ // 绉诲姩銆屾寚瀹氭暟閲忋��
+ const moveQty = checkedNum.value * 1
+
checkedList.forEach((item) => {
- //鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧");
- item.baiscQuantity = item.baiscQuantity - checkedNum.value
- item.computeGrossArea = (item.computeGrossArea - item.width * item.height * checkedNum.value / 1000000).toFixed(2)
- //瀹氫箟key鍊间繚鎸�
- let key = item._X_ROW_KEY
- //宸﹁竟琛ㄦ牸鏁版嵁
- let leftData = $gridLeft.getTableData().fullData
- //宸﹁竟琛ㄦ牸鏁版嵁涓煡鎵惧綋鍓嶆暟鎹笅鏍�
- let filterIndex = leftData.findIndex(item1 => item1.orderNumber === item.orderNumber)
- //鍒ゆ柇鍙充晶鍕鹃�夊�间笌宸︿晶鏄惁鐩稿悓
- if (checkedListLeft[0].orderNumber === item.orderNumber) {
-
- //濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
- if (filterIndex >= 0) {
- leftData[filterIndex].quantity = leftData[filterIndex].quantity * 1 + checkedNum.value * 1
- leftData[filterIndex].computeGrossArea = (leftData[filterIndex].computeGrossArea - leftData[filterIndex].width * leftData[filterIndex].height * leftData[filterIndex].baiscQuantity / 1000000).toFixed(2)
-
- if (item.baiscQuantity === 0) {
- $grid.remove(item)
- }
- $gridLeft.reloadData([...$gridLeft.getTableData().fullData])
- //delete item._X_ROW_KEY
- } else {
- item.quantity = checkedNum.value
- item.processId = checkedListLeft[0].processId
- item.landingSequence = checkedListLeft[0].landingSequence
- item.computeGrossArea = (item.computeGrossArea - checkedListLeft[0].width * checkedListLeft[0].height * checkedNum.value / 1000000).toFixed(2)
- delete item._X_ROW_KEY
- $gridLeft.insert(item)
- item._X_ROW_KEY = key
- }
- } else {
-
- //濡傛灉鍕鹃�変袱涓�间笉鍚屽垯鎻掑叆鍚屾祦绋嬪崱
- item.quantity = checkedNum.value
- item.processId = checkedListLeft[0].processId
- item.landingSequence = checkedListLeft[0].landingSequence
- // /item.computeGrossArea=item.computeGrossArea
- if (item.baiscQuantity === 0) {
- $grid.remove(item)
-
- }
- for (let i = 0; i < leftData.length; i++) {
- if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId === item.processId) {
- leftData[i].quantity = leftData[i].quantity * 1 + checkedNum.value * 1
- leftData[i].computeGrossArea = (leftData[i].computeGrossArea - leftData[i].width * leftData[i].height * leftData[i].baiscQuantity / 1000000).toFixed(2)
- break
- } else if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId !== item.processId) {
- delete item._X_ROW_KEY
- $gridLeft.insert(item)
- item._X_ROW_KEY = key
- break
- } else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId !== item.processId) {
- delete item._X_ROW_KEY
- $gridLeft.insert(item)
- item._X_ROW_KEY = key
- break
- } else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId == item.processId) {
- delete item._X_ROW_KEY
- $gridLeft.insert(item)
- item._X_ROW_KEY = key
- break
- }
-
- }
+ if ((item.baiscQuantity * 1) < moveQty) {
+ throw new Error(t('processCard.msg.msg2'))
}
+ // 鍙宠〃鎵ｆ暟閲忋�佹墸闈㈢Н锛堝彧鎵ｄ竴娆★紝閬垮厤宸﹁〃鍐嶆墸閲嶅锛�
+ item.baiscQuantity = item.baiscQuantity * 1 - moveQty
+ item.computeGrossArea = (
+ (item.computeGrossArea * 1) - (item.width * item.height * moveQty) / 1000000
+ ).toFixed(2)
+
+ // 鍐欏叆宸﹁〃锛堣〃灏撅級锛屾垨鍚堝苟
+ upsertToLeftTail(item, moveQty)
+
+ // 鍙宠〃璇ヨ鍒嗗畬娓呴浂灏卞垹鎺�
+ if (item.baiscQuantity * 1 === 0) {
+ $grid.remove(item)
+ }
})
- } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
+ } else if (checkedNum.value === '') {
+ // 绉诲姩銆屽叏閮ㄥ緟鍒嗘暟閲忋��
checkedList.forEach((item) => {
- item.processId = checkedListLeft[0].processId
- item.landingSequence = checkedListLeft[0].landingSequence
- item.quantity = item.baiscQuantity
- item.computeGrossArea = (item.computeGrossArea - checkedListLeft[0].width * checkedListLeft[0].height * checkedListLeft[0].baiscQuantity / 1000000).toFixed(2)
- delete item._X_ROW_KEY
+ const moveQtyAll = item.baiscQuantity * 1
+ if (moveQtyAll <= 0) return
+
+ // 鍙宠〃鎵ｅ埌 0锛屾墸闈㈢Н
+ item.baiscQuantity = 0
+ item.computeGrossArea = (
+ (item.computeGrossArea * 1) - (item.width * item.height * moveQtyAll) / 1000000
+ ).toFixed(2)
+
+ // 鍐欏叆宸﹁〃锛堣〃灏撅級锛屾垨鍚堝苟
+ upsertToLeftTail(item, moveQtyAll)
+
+ // 绉婚櫎鍙宠〃璇ヨ
+ $grid.remove(item)
})
- $gridLeft.insertAt(checkedList)
- $grid.remove(checkedList)
}
- //娓呴櫎涓よ竟澶嶉�夋
- if ($gridLeft || $grid) {
- $gridLeft.clearCheckboxRow()
- $grid.clearCheckboxRow()
- }
+
+ // 娓呭嬀閫� & 鍒锋柊
+ if ($gridLeft) $gridLeft.clearCheckboxRow()
+ if ($grid) $grid.clearCheckboxRow()
$grid.refreshColumn()
+
} catch (e) {
ElMessage.warning(e.message)
}
- if (checkedNum.value){
- checkedNum.value =''
+
+ // 娓呯┖杈撳叆
+ if (checkedNum.value) {
+ checkedNum.value = ''
}
}
+
+
+
+
+
+//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
+// const addLeft = () => {
+// try {
+// //宸﹁竟琛ㄦ牸瀹氫箟
+// const $gridLeft = xGridLeft.value
+// //鍙宠竟琛ㄦ牸瀹氫箟
+// const $grid = xGrid.value
+// //鑾峰彇鍙宠竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+// const checkedList = $grid.getCheckboxRecords()
+// //鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+// const checkedListLeft = $gridLeft.getCheckboxRecords()
+// //鍒ゆ柇鍙宠竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
+// if (checkedList.length * 1 === 0) {
+// ElMessage.warning(t('processCard.schedulingOk'))
+// return
+// }
+// if (checkedListLeft.length !== 1) {
+// ElMessage.warning(t('processCard.schedulingTime'))
+// return
+// }
+// const regex = /^(\d+|)$/;
+// if (!regex.test(checkedNum.value)) {
+// ElMessage.warning(t('processCard.schedulingNo'))
+// return
+// }
+// //鍒ゆ柇姝ｆ暣鏁�
+// if (/^[1-9]\d*$/.test(checkedNum.value)) {
+// checkedList.forEach((item) => {
+// //鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
+// if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧");
+// item.baiscQuantity = item.baiscQuantity - checkedNum.value
+// item.computeGrossArea = (item.computeGrossArea - item.width * item.height * checkedNum.value / 1000000).toFixed(2)
+// //瀹氫箟key鍊间繚鎸�
+// let key = item._X_ROW_KEY
+// //宸﹁竟琛ㄦ牸鏁版嵁
+// let leftData = $gridLeft.getTableData().fullData
+// //宸﹁竟琛ㄦ牸鏁版嵁涓煡鎵惧綋鍓嶆暟鎹笅鏍�
+// let filterIndex = leftData.findIndex(item1 => item1.orderNumber === item.orderNumber)
+// //鍒ゆ柇鍙充晶鍕鹃�夊�间笌宸︿晶鏄惁鐩稿悓
+// if (checkedListLeft[0].orderNumber === item.orderNumber) {
+//
+// //濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
+// if (filterIndex >= 0) {
+// leftData[filterIndex].quantity = leftData[filterIndex].quantity * 1 + checkedNum.value * 1
+// leftData[filterIndex].computeGrossArea = (leftData[filterIndex].computeGrossArea - leftData[filterIndex].width * leftData[filterIndex].height * leftData[filterIndex].baiscQuantity / 1000000).toFixed(2)
+//
+// if (item.baiscQuantity === 0) {
+// $grid.remove(item)
+// }
+// $gridLeft.reloadData([...$gridLeft.getTableData().fullData])
+// //delete item._X_ROW_KEY
+// } else {
+// item.quantity = checkedNum.value
+// item.processId = checkedListLeft[0].processId
+// item.landingSequence = checkedListLeft[0].landingSequence
+// item.computeGrossArea = (item.computeGrossArea - checkedListLeft[0].width * checkedListLeft[0].height * checkedNum.value / 1000000).toFixed(2)
+// delete item._X_ROW_KEY
+// $gridLeft.insert(item)
+// item._X_ROW_KEY = key
+// }
+// } else {
+//
+// //濡傛灉鍕鹃�変袱涓�间笉鍚屽垯鎻掑叆鍚屾祦绋嬪崱
+// item.quantity = checkedNum.value
+// item.processId = checkedListLeft[0].processId
+// item.landingSequence = checkedListLeft[0].landingSequence
+// // /item.computeGrossArea=item.computeGrossArea
+// if (item.baiscQuantity === 0) {
+// $grid.remove(item)
+//
+// }
+// for (let i = 0; i < leftData.length; i++) {
+// if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId === item.processId) {
+// leftData[i].quantity = leftData[i].quantity * 1 + checkedNum.value * 1
+// leftData[i].computeGrossArea = (leftData[i].computeGrossArea - leftData[i].width * leftData[i].height * leftData[i].baiscQuantity / 1000000).toFixed(2)
+// break
+// } else if (leftData[i].orderNumber === item.orderNumber && leftData[i].processId !== item.processId) {
+// delete item._X_ROW_KEY
+// $gridLeft.insert(item)
+// item._X_ROW_KEY = key
+// break
+// } else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId !== item.processId) {
+// delete item._X_ROW_KEY
+// $gridLeft.insert(item)
+// item._X_ROW_KEY = key
+// break
+// } else if (leftData[i].orderNumber !== item.orderNumber && leftData[i].processId == item.processId) {
+// delete item._X_ROW_KEY
+// $gridLeft.insert(item)
+// item._X_ROW_KEY = key
+// break
+// }
+//
+// }
+// }
+//
+// })
+// } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
+// checkedList.forEach((item) => {
+// item.processId = checkedListLeft[0].processId
+// item.landingSequence = checkedListLeft[0].landingSequence
+// item.quantity = item.baiscQuantity
+// item.computeGrossArea = (item.computeGrossArea - checkedListLeft[0].width * checkedListLeft[0].height * checkedListLeft[0].baiscQuantity / 1000000).toFixed(2)
+// delete item._X_ROW_KEY
+// })
+// $gridLeft.insertAt(checkedList)
+// $grid.remove(checkedList)
+// }
+// //娓呴櫎涓よ竟澶嶉�夋
+// if ($gridLeft || $grid) {
+// $gridLeft.clearCheckboxRow()
+// $grid.clearCheckboxRow()
+// }
+// $grid.refreshColumn()
+// } catch (e) {
+// ElMessage.warning(e.message)
+// }
+// if (checkedNum.value){
+// checkedNum.value =''
+// }
+// }
//淇濆瓨娴佺▼鍗℃暟鎹�
@@ -907,19 +1202,15 @@
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'))
gridLeftOptions.toolbarConfig.buttons[0].disabled=false
@@ -927,20 +1218,17 @@
}
// 璁＄畻 $table 閲� quantity 瀛楁鐨勬�诲拰
- let totalQuantity = selectRecords.reduce((sum, record) => sum + (Number(record.quantity) || 0), 0);
+ let totalQuantity = data.reduce((sum, record) => sum + (Number(record.quantity) || 0), 0);
// 瀵规瘮鍏ㄥ眬鍙橀噺 orderQuantity
if (totalQuantity !== orderQuantity*1) {
- ElMessage.warning(`鎵�閫夋暟鎹殑鏁伴噺鎬诲拰 (${totalQuantity}) 涓庤鍗曟暟閲� (${orderQuantity}) 涓嶅尮閰嶏紝璇锋鏌ュ悗閲嶈瘯锛乣);
+ ElMessage.warning(`${t('processCard.msg.msg3')} (${totalQuantity}) ${t('processCard.msg.msg4')} (${orderQuantity}) ${t('processCard.msg.msg5')}`);
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: selectRecords,
+ flowCard: data,
userName: username,
productionId: productionId,
userId:user.user.userId
@@ -949,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