From 1e1c416c6aa6596feb333b75d882ffeede73d3c9 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
index 16a748b..e0a7005 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue
@@ -45,10 +45,10 @@
{field: 'model', title: t('warehouseBasicData.type'),},
{field: 'leftTrim', title: '宸︿慨杈�',},
{field: 'downTrim', title: '涓嬩慨杈�',},
- {field: 'rigthTrim', title: '鍙充慨杈�',},
+ {field: 'rightTrim', title: '鍙充慨杈�',},
{field: 'upTrim', title: '涓婁慨杈�',},
{field: 'available_quantity', title: '搴撳瓨鏁伴噺',},
- {field: '', title: '鍔犲伐鏁伴噺',},
+ {field: 'processingQuantity', title: '鍔犲伐鏁伴噺',},
{field: 'name', title: '鍚嶇О',},
{field: 'producer', title: '渚涘簲鍟�',}
],//琛ㄥご鍙傛暟
@@ -131,12 +131,13 @@
const thickness = ref(route.params.thickNess);
const model = ref(route.params.model);
+let projectNo = ref(null);
-
-const selectMaterialStore = () =>{
- request.post(`/glassOptimize/materialStore/${thickness.value}/${model.value}`).then((res) => {
+const selectMaterialStore = async () =>{
+ request.post(`/glassOptimize/materialStore/${thickness.value}/${model.value}/${projectNo}`).then((res) => {
if (Number(res.code) === 200) {
const rawData = res.data.data;
+ const edgeTrimming = res.data.edgeTrimming;
if (Array.isArray(rawData) && rawData.length > 0) {
const formattedData = rawData.map(item => {
const formattedItem = {};
@@ -150,13 +151,28 @@
}
return formattedItem;
});
- const data = formattedData;
- data.forEach(item => {
- item.leftTrim = 0;
- item.downTrim = 0;
- item.rigthTrim = 0;
- item.upTrim = 0;
- });
+ if(edgeTrimming!=null){
+ const edgeTrimmingData = edgeTrimming.map(item => {
+ const edgeTrimmingItem = {};
+ for (const key in item) {
+ if (typeof item[key] === 'string') {
+ //鍘婚櫎瀛楃涓插睘鎬у�煎紑澶村拰缁撳熬鐨勫弻寮曞彿
+ edgeTrimmingItem[key] = item[key].replace(/^\"|\"$/g, '');
+ } else {
+ edgeTrimmingItem[key] = item[key];
+ }
+ }
+ return edgeTrimmingItem;
+ });
+ console.log(edgeTrimmingData)
+ formattedData.forEach(item => {
+ item.leftTrim = edgeTrimmingData[0].leftTrim;
+ item.downTrim = edgeTrimmingData[0].downTrim;
+ item.rightTrim = edgeTrimmingData[0].rightTrim;
+ item.upTrim = edgeTrimmingData[0].upTrim;
+ });
+ }
+
xGrid.value.loadData(formattedData);
gridOptions.data = formattedData;
} else {
@@ -169,7 +185,11 @@
};
onMounted(() => {
- selectMaterialStore();
+ if(route.params.projectNo!=null){
+ projectNo=route.params.projectNo
+ selectMaterialStore();
+ }
+
});
watch(() => props.receivedData, (newData) => {
@@ -222,7 +242,7 @@
// 浠� receivedData 涓幏鍙栧搴旂殑鍊兼潵鏇存柊琛ㄦ牸鏁版嵁椤�
leftTrim: Number(receivedData.quicksetLeft),
downTrim: Number(receivedData.quicksetBottom),
- rigthTrim: Number(receivedData.quicksetRight),
+ rightTrim: Number(receivedData.quicksetRight),
upTrim: Number(receivedData.quicksetTop),
};
updatedData.push(updatedItem);
--
Gitblit v1.8.0