From b8982b86a15d186c4cf6144fface700d9769fa95 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 三月 2025 09:13:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 133 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 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 5e32056..f845e9a 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
@@ -71,8 +71,9 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
-let orderId = route.query.orderId
-let productionId = route.query.productionId
+const orderId = route.query.orderId
+const productionId = route.query.productionId
+const orderQuantity = route.query.quantity
const orderOtherMoney = ref(null)
@@ -144,6 +145,54 @@
},
filterConfig: { //绛涢�夐厤缃」
//remote: true
+ },
+ formConfig: {
+ data: {
+ shelfThickness: 800,
+ spacerThickness: 0,
+ inWeight: 4000,
+ inMaxQuantity: 20,
+ inLenMin:400,
+ inLenMax:3500,
+ inShortMax:2500,
+ inShortMin:400
+ },
+ rules:{
+ shelfThickness: [
+ { required: true, message: t('basicData.msg.greater0'),type:'number',pattern:/^[1-9]\d*$/ }
+ ],
+ spacerThickness: [
+ { required: true, message: t('delivery.pleaseEnterANumericalValueGreaterThanOrEqualTo0'),type:'number',pattern:/^[0-9]\d*$/ }
+ ],
+ inWeight: [
+ { required: true, message: t('basicData.msg.greater0'),type:'number',pattern:/^[1-9]\d*$/ }
+ ],
+ inMaxQuantity: [
+ { required: true, message: t('basicData.msg.greater0'),type:'number',pattern:/^[1-9]\d*$/ }
+ ]
+ },
+ items:[
+ { field: 'shelfThickness', title: '鏋跺瓙绾垫繁(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true},
+ { field: 'inWeight', title: '鏋跺瓙鎵块噸锛圞G锛�', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'spacerThickness', title: '闂撮殧鍘氬害(mm)', itemRender: { name: 'VxeInput' } ,span:8,folding: true},
+ { field: 'inLenMax', title: '闀胯竟鏈�澶�(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inLenMin', title: '闀胯竟鏈�鐭�(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inMaxQuantity', title: '鏈�澶ф暟閲�', itemRender: { name: 'VxeInput' } ,span:8,folding: true},
+ { field: 'inShortMax', title: '鐭竟鏈�澶�(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inShortMin', title: '鐭竟鏈�鐭�(mm)', itemRender: { name: 'VxeInput' },span:8,folding: true },
+ {
+ span: 24,
+ collapseNode: true,
+ align: 'center',
+ itemRender: {
+ name: 'VxeButtonGroup',
+ options: [
+ { type: 'submit', content: '鏅鸿兘鍒嗘灦', status: 'primary' },
+ { type: 'reset', content: '閲嶇疆' }
+ ]
+ }
+ }
+ ]
},
customConfig: {
storage: true
@@ -244,13 +293,33 @@
})
return parseFloat(count.toFixed(2))
}
-
return ''
})
]
},
})
+const gridEventsRight = {
+ formSubmit () {
+ let form = gridOptions.formConfig.data
+ form.orderId =orderId
+ form.productionId = productionId
+ request.post(`/processCard/processCardAutoRack`,form).then(res => {
+ xGridLeft.value.reloadData(res.data.orderDetailList)
+ xGrid.value.reloadData(res.data.orderDetailsNotScope)
+ })
+ },
+ formReset () {
+ router.push({
+ path: '/main/processCard/AddProcessCard',
+ query: {orderId: orderId,
+ productionId: productionId,
+ quantity: orderQuantity,
+ random:Math.random()
+ }
+ })
+ }
+}
//宸︿晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGridLeft = ref()
@@ -606,18 +675,6 @@
} else {
-
- // item.baiscQuantity = item.baiscQuantity * 1 + leftData[leftfilterIndex].quantity * 1
- // item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
- //item.computeGrossArea=(item.width*item.height*item.baiscQuantity/1000000).toFixed(2)
- // for (let i = 0; i <checkedList.length ; i++) {
- //
- // if (checkedList[i].orderNumber === item.orderNumber){
- // console.log(item.baiscQuantity +"---"+ checkedList[i].quantity )
- // item.baiscQuantity = item.baiscQuantity * 1 + checkedList[i].quantity * 1
- // }
- // }
-
delete item._X_ROW_KEY
$grid.insert(item)
@@ -649,12 +706,34 @@
} 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()
@@ -662,10 +741,13 @@
} catch (e) {
ElMessage.warning(e.message)
}
+ //姣忔鐐瑰嚮鎯呭喌杈撳叆妗�
if (checkedNum.value){
checkedNum.value =''
}
}
+
+
//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
const addLeft = () => {
try {
@@ -715,6 +797,7 @@
if (item.baiscQuantity === 0) {
$grid.remove(item)
}
+ $gridLeft.reloadData([...$gridLeft.getTableData().fullData])
//delete item._X_ROW_KEY
} else {
item.quantity = checkedNum.value
@@ -766,9 +849,8 @@
checkedList.forEach((item) => {
item.processId = checkedListLeft[0].processId
item.landingSequence = checkedListLeft[0].landingSequence
- item.quantity = checkedListLeft[0].baiscQuantity
+ 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)
@@ -812,6 +894,15 @@
if (leftData.length > 0) {
ElMessage.warning(t('processCard.pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt'))
gridLeftOptions.toolbarConfig.buttons[0].disabled=false
+ return;
+ }
+
+ // 璁＄畻 $table 閲� quantity 瀛楁鐨勬�诲拰
+ let totalQuantity = selectRecords.reduce((sum, record) => sum + (Number(record.quantity) || 0), 0);
+ // 瀵规瘮鍏ㄥ眬鍙橀噺 orderQuantity
+ if (totalQuantity !== orderQuantity*1) {
+ ElMessage.warning(`鎵�閫夋暟鎹殑鏁伴噺鎬诲拰 (${totalQuantity}) 涓庤鍗曟暟閲� (${orderQuantity}) 涓嶅尮閰嶏紝璇锋鏌ュ悗閲嶈瘯锛乣);
+ gridLeftOptions.toolbarConfig.buttons[0].disabled = false;
return;
}
// if (leftData.length!=selectRecords.length){
@@ -927,8 +1018,8 @@
<div height="100%" style="margin: 5px" width="11%">
<el-main style="">
<div>
- <span><el-input v-model="quantit" style="width: 80px;"/></span>
- <span><el-input v-model="weight" style="width: 80px;"/></span>
+ <span><el-input :readonly="true" v-model="quantit" style="width: 80px;"/></span>
+ <span><el-input :readonly="true" v-model="weight" style="width: 80px;"/></span>
</div>
<span>{{ $t('processCard.selectedQuantity') }}:<el-input id="checkedNum" v-model="checkedNum" clearable
type="number"></el-input></span><br>
@@ -958,7 +1049,9 @@
class="mytable-scrollbar"
height="100%"
v-bind="gridOptions"
+ v-on="gridEventsRight"
@checkbox-change="handleCheckboxChange"
+ @checkbox-all="handleCheckboxChange"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
--
Gitblit v1.8.0