From 7f54cffaf13d9fc48f415a89c63950f526b3e06d Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 21 十一月 2025 11:35:03 +0800
Subject: [PATCH] 修改前端展示信息来源，优化数据来源由原来的数据库改为前端表格数据
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue | 218 +++++++++++++++++++----------------------------------
1 files changed, 79 insertions(+), 139 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
index 0f62169..4e4b7d7 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
@@ -116,7 +116,7 @@
sortable: true
},
{
- field: 'product_name',
+ field: 'productName',
width: 150,
title: t('order.product'),
filters: [{data: ''}],
@@ -140,7 +140,7 @@
sortable: true
},
{
- field: 'building_number',
+ field: 'buildingNumber',
width: 150,
title: '妤煎眰鍙�',
filters: [{data: ''}],
@@ -189,7 +189,7 @@
sortable: true
},
{
- field: 'icon',
+ field: 'markIcon',
width: 150,
title: '鍗版爣绫诲瀷',
filters: [{data: ''}],
@@ -446,31 +446,10 @@
};
const handleCommand = async (command) => {
- // 褰撻�夋嫨妯℃嫙璁＄畻锛坈ommand === 3锛夋椂锛屽厛妫�鏌� tempering_state 鐘舵��
if (command === 3) {
- try {
- const res = await request.post(`/glassOptimize/getProjectState/${projectNo.value}`);
- if (Number(res.code) === 200) {
- const projectData = res.data.data;
+ // 鎵ц妯℃嫙璁＄畻
+ await emit('changeDialog', command);
- // 妫�鏌� tempering_state 鐘舵��
- if (projectData.tempering_state === 1) {
- // 濡傛灉宸插畬鎴愭ā鎷熻绠楋紝鎻愮ず鐢ㄦ埛骞堕樆姝㈡墦寮�
- ElMessage.warning('宸插畬鎴愭ā鎷熻绠楋紝涓嶅厑璁搁噸澶嶈绠�');
- return;
- } else if (projectData.tempering_state === 0) {
- // 濡傛灉鏈繘琛屾ā鎷熻绠楋紝鍏佽鎵撳紑
- await emit('changeDialog', command);
- }
- } else {
- ElMessage.warning(res.msg);
- return;
- }
- } catch (error) {
- ElMessage.error('妫�鏌ュ伐绋嬬姸鎬佸け璐ワ紝璇风◢鍚庨噸璇�');
- console.error('妫�鏌ュ伐绋嬬姸鎬佸け璐�:', error);
- return;
- }
} else {
// 鍏朵粬鍛戒护鐩存帴鎵ц
await emit('changeDialog', command);
@@ -506,103 +485,47 @@
}
emit('getSmallPieceData', 1);
optimizeData.value.glassDetails = [];
- // 浠庡悗绔帴鍙ｈ幏鍙� glassDetail 鏁版嵁锛岃�屼笉鏄粠琛ㄦ牸涓鍙�
- fetchGlassDetailData();
+ // 浠庤〃鏍间腑鑾峰彇 glassDetail 鏁版嵁锛岃�屼笉鏄粠鍚庣鎺ュ彛璇诲彇
+ const tableData = xGrid.value.getTableData().fullData;
+ const glassDetailData = tableData.map(item => {
+ let rackNoValue = 0;
+ if (item.rackNo !== undefined && item.rackNo !== null && item.rackNo !== '') {
+ rackNoValue = item.rackNo;
+ }
+ return {
+ width: item.width,
+ height: item.height,
+ processId: item.processId,
+ layer: item.layer,
+ totalLayer: item.totalLayer,
+ orderSort: item.order_number,
+ markIcon: item.markIcon,
+ quantity: item.quantity,
+ patchState: item.patchState,
+ upGrind: item.longGrind1,
+ downGrind: item.longGrind2,
+ leftGrind: item.shortGrind1,
+ rightGrind: item.shortGrind2,
+ heatLayoutId: item.heatLayoutId,
+ process: item.process,
+ orderNo: item.orderNo,
+ customerName: item.customerName,
+ processingNote: item.processingNote,
+ projectName: item.projectName,
+ productName: item.productName,
+ buildingNumber: item.buildingNumber,
+ rackNo: rackNoValue
+ };
+ });
- // xGrid.value.getTableData().fullData.forEach(items=>{
- // let rackNoValue = 0;
- // if (items.rackNo !== undefined && items.rackNo !== null && items.rackNo !== '') {
- // rackNoValue = items.rackNo;
- // }
- // const detail={
- // width :null,
- // height :null,
- // processId :null,
- // layer :null,
- // totalLayer :null,
- // orderSort :null,
- // markIcon :null,
- // quantity:null,
- // patchState :null,
- // upGrind :null,
- // downGrind :null,
- // leftGrind:null,
- // rightGrind :null,
- // rackNo: rackNoValue
- // }
- // detail.width=items.width
- // detail.height=items.height
- // detail.processId=items.process_ids
- // detail.layer=items.layer
- // detail.totalLayer=items.total_layer
- // detail.orderSort=items.order_number
- // detail.markIcon=items.icon
- // detail.patchState=items.patch_state
- // detail.quantity=items.quantity
- // detail.upGrind=items.longGrind1
- // detail.downGrind=items.longGrind2
- // detail.leftGrind=items.shortGrind1
- // detail.rightGrind=items.shortGrind2
- // detail.rackNo=items.rackNo
- //
- // optimizeData.value.glassDetails .push(detail)
- // })
+ // 鏇存柊 optimizeData 涓殑 glassDetails
+ optimizeData.value.glassDetails = glassDetailData;
+
+ // 鎵撳紑浼樺寲瀵硅瘽妗�
+ dialogVisible.value[4] = true;
}else{
dialogVisible.value[index] = true;
- }
-};
-
-const fetchGlassDetailData = async () => {
- try {
- const res = await request.post(`/glassOptimize/optimizeInfo/${projectNo.value}/${username}`);
- console.log(res);
- if (res.code === "200" && res.data && res.data.data) {
- // 澶勭悊浠庡悗绔幏鍙栫殑鏁版嵁
- const glassDetailData = res.data.data.map(item => {
- let rackNoValue = 0;
- if (item.rackNo !== undefined && item.rackNo !== null && item.rackNo !== '') {
- rackNoValue = item.rackNo;
- }
- return {
- width: item.width,
- height: item.height,
- processId: item.processId,
- layer: item.layer,
- totalLayer: item.totalLayer,
- orderSort: item.order_number,
- markIcon: item.markIcon,
- quantity: item.quantity,
- patchState: item.patchState,
- upGrind: item.upGrind,
- downGrind: item.downGrind,
- leftGrind: item.leftGrind,
- rightGrind:item.rightGrind,
- heatLayoutId:item.heatLayoutId,
- process:item.process,
- orderNo:item.orderNo,
- customerName:item.customerName,
- processingNote:item.processingNote,
- projectName:item.projectName,
- productName:item.productName,
- buildingNumber:item.buildingNumber,
- rackNo: rackNoValue
- };
- });
-
- // 鏇存柊 optimizeData 涓殑 glassDetails
- optimizeData.value.glassDetails = glassDetailData;
-
- // 鎵撳紑浼樺寲瀵硅瘽妗�
- dialogVisible.value[4] = true;
-
- console.log('鑾峰彇鍒扮殑 glassDetail 鏁版嵁:', glassDetailData);
- } else {
- ElMessage.error('鑾峰彇鐜荤拑璇︽儏鏁版嵁澶辫触');
- }
- } catch (error) {
- console.error('鑾峰彇 glassDetail 鏁版嵁鍑洪敊:', error);
- ElMessage.error('鑾峰彇鐜荤拑璇︽儏鏁版嵁鏃跺彂鐢熼敊璇�');
}
};
@@ -704,34 +627,51 @@
localStorage.setItem('projectNo', projectNo.value);
});
-const saveOptimizeData = () => {
- if(orderInfo.optimizeData!==null){
- if(quantitys.value===orderInfo.optimizeData.optimalResults.glassTotalQuantity){
- console.log("淇濆瓨鏁版嵁1",orderInfo.optimizeData)
- request.post(`/glassOptimize/saveOptimizeData/${projectNo.value}`,orderInfo.optimizeData).then((res) => {
- if ((Number(res.code) === 200)) {
- ElMessage.success("淇濆瓨鎴愬姛");
- } else {
- ElMessage.warning(res.msg);
- }
+const saveOptimizeData = async () => {
+ try {
+ // 鍏堜粠鍚庣鏌ヨ宸ョ▼鐘舵��
+ const stateRes = await request.post(`/glassOptimize/getProjectState/${projectNo.value}`);
+ if (Number(stateRes.code) === 200) {
+ const projectData = stateRes.data.data;
- }).catch((error) => {
- console.error("鑾峰彇鏁版嵁鍑洪敊:", error);
- });
- }else{
- ElMessage.warning("鍘熺墖涓嶈冻锛屽皬鐗囨湭鍏ㄩ儴浼樺寲");
+ // 妫�鏌� optimize_state 鐘舵��
+ if (projectData.optimize_state === 1) {
+ // 濡傛灉宸插畬鎴愪紭鍖栵紝鎻愮ず鐢ㄦ埛骞堕樆姝㈢户缁墽琛�
+ ElMessage.warning('宸插畬鎴愪紭鍖栦繚瀛橈紝涓嶅厑璁搁噸澶嶆彁浜�');
+ return;
+ }
+ } else {
+ ElMessage.warning(stateRes.msg);
+ return;
}
-
- }else {
- ElMessage.warning("鏁版嵁鏈紭鍖�");
+ if(orderInfo.optimizeData!==null){
+ if(quantitys.value===orderInfo.optimizeData.optimalResults.glassTotalQuantity){
+ console.log("淇濆瓨鏁版嵁1",orderInfo.optimizeData)
+ request.post(`/glassOptimize/saveOptimizeData/${projectNo.value}`,orderInfo.optimizeData).then((res) => {
+ if ((Number(res.code) === 200)) {
+ ElMessage.success("淇濆瓨鎴愬姛");
+ } else {
+ ElMessage.warning(res.msg);
+ }
+ }).catch((error) => {
+ console.error("鑾峰彇鏁版嵁鍑洪敊:", error);
+ });
+ }else{
+ ElMessage.warning("鍘熺墖涓嶈冻锛屽皬鐗囨湭鍏ㄩ儴浼樺寲");
+ }
+ }else {
+ ElMessage.warning("鏁版嵁鏈紭鍖�");
+ }
+ } catch (error) {
+ ElMessage.error('妫�鏌ュ伐绋嬬姸鎬佸け璐ワ紝璇风◢鍚庨噸璇�');
+ console.error('妫�鏌ュ伐绋嬬姸鎬佸け璐�:', error);
}
-
}
const fetchData = () => {
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions,cellArea.value)
- request.post(`/glassOptimize/projectInfo/${projectNo.value}/${username}`).then((res) => {
+ request.post(`/glassOptimize/optimizeInfo/${projectNo.value}/${username}`).then((res) => {
if ((Number(res.code) === 200)) {
let data = res.data.data;
const grindingTrimming = res.data.grindingTrimming;
--
Gitblit v1.8.0