From e9f8d23f55f64903d834308f9f167aaf3195c20d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 七月 2025 09:10:26 +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 | 408 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 311 insertions(+), 97 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 29d8866..2472063 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
@@ -2,7 +2,7 @@
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
-import {ElDatePicker, ElMessage} from "element-plus"
+import {ElCheckbox, ElDatePicker, ElMessage} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {ArrowLeftBold, Search} from "@element-plus/icons-vue"
@@ -33,6 +33,22 @@
}
flag = !flag
}
+
+//鍊掑彊
+let flashback = ref(1)
+
+//瀹氫箟鎺掑簭瑙勫垯
+const optionVal = ref(0)
+const options = [
+ {
+ value: 0,
+ label: t('processCard.mainWidth'),
+ },
+ {
+ value: 1,
+ label: t('processCard.mainHeight'),
+ },
+]
//瀹氫箟鏃堕棿
const form = reactive({
@@ -71,8 +87,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)
@@ -100,6 +117,10 @@
})
produceList = produceList.value.concat(deepClone(res.data.data))
+ produceList.forEach(item => {
+ // 濡傛灉 shape 鍙兘鏄瓧绗︿覆灏辩敤 ==锛屽鏋滀竴瀹氭槸鏁板瓧灏辩敤 ===
+ item.shape = (item.shape == 2) ? t('order.alien') : t('order.universalShape');
+ });
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -144,6 +165,54 @@
},
filterConfig: { //绛涢�夐厤缃」
//remote: true
+ },
+ formConfig: {
+ data: {
+ shelfThickness: 800,
+ spacerThickness: 0,
+ inWeight: 4000,
+ inMaxQuantity: 20,
+ inLenMin:350,
+ inLenMax:3500,
+ inShortMax:2500,
+ inShortMin:350
+ },
+ 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: t('processCard.depthShelf'), itemRender: { name: 'VxeInput' },span:8,folding: true},
+ { field: 'inWeight', title:t('processCard.shelfCapacity'), itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'spacerThickness', title: t('processCard.IntervalThickness'), itemRender: { name: 'VxeInput' } ,span:8,folding: true},
+ { field: 'inLenMax', title: t('processCard.LongestLargestMax'), itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inLenMin', title: t('processCard.LongestShortestMax'), itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inMaxQuantity', title: t('processCard.quantityMax'), itemRender: { name: 'VxeInput' } ,span:8,folding: true},
+ { field: 'inShortMax', title: t('processCard.shortestLongest'), itemRender: { name: 'VxeInput' },span:8,folding: true },
+ { field: 'inShortMin', title: t('processCard.shortestSide'), itemRender: { name: 'VxeInput' },span:8,folding: true },
+ {
+ span: 24,
+ collapseNode: true,
+ align: 'center',
+ itemRender: {
+ name: 'VxeButtonGroup',
+ options: [
+ { type: 'submit', content: t('processCard.intelligentBranching'), status: 'primary' },
+ { type: 'reset', content: t('processCard.reset') }
+ ]
+ }
+ }
+ ]
},
customConfig: {
storage: true
@@ -214,9 +283,12 @@
],//琛ㄥご鎸夐挳
toolbarConfig: {
- // buttons: [{
- //
- // }],
+ slots:{
+ buttons: "toolbar_buttons"
+ },
+ buttons: [{
+
+ }],
// import: false,
// export: true,
// print: true,
@@ -244,13 +316,76 @@
})
return parseFloat(count.toFixed(2))
}
-
return ''
})
]
},
})
+const gridEventsRight = {
+ toolbarButtonClick({code}) {
+ const $grid = xGridLeft.value
+ if ($grid) {
+ switch (code) {
+ case 'sorting': {
+ request.post(`/processCard/selectSortingCard/${orderId}/${productionId}/${flashback.value}/${optionVal.value}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ pageTotal.value = res.data.total
+ maxProcseeId=res.data.maxFlowCard[0].process_id
+ orderOtherMoney.value = res.data.orderOtherMoney
+ orderOtherMoney.value.forEach(item => {
+ let column = {
+ field: `${item.column}`,
+ width: 100,
+ title: item.alias,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ sortable: true
+ }
+
+ gridOptions.columns.push(column)
+
+ })
+ produceList = res.data.data
+ produceList.forEach(item => {
+ // 濡傛灉 shape 鍙兘鏄瓧绗︿覆灏辩敤 ==锛屽鏋滀竴瀹氭槸鏁板瓧灏辩敤 ===
+ item.shape = (item.shape == 2) ? t('order.alien') : t('order.universalShape');
+ });
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+ return;
+
+ }
+
+ }
+ }
+ },
+ 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()
@@ -371,89 +506,89 @@
ElMessage.warning(t('processCard.schedulingOk'))
return
}
- //productionId
+
const $gridLeft = xGridLeft.value
const leftData = $gridLeft.getTableData().fullData
+
+ //钀芥灦椤哄簭
let index = 1
if (leftData.length !== 0) {
- index = leftData[0].landingSequence + 1
- //index = index.toString().padStart(2, '0')
+ index = Math.max(...leftData.map(d => d.landingSequence || 0)) + 1
}
- let processId= null
- // if (leftData.length !== 0){
- // processId = productionId + index.toString().padStart(3, '0')
- // }
- // else {
- if (maxProcseeId!== null || maxProcseeId!== undefined|| maxProcseeId!== ''){
- if (leftData.length !== 0){
- const str=leftData[0].processId
- const lastThree = str.slice(-3);
- const result = lastThree*1 + 1;
- processId= productionId + result.toString().padStart(3, '0')
- }
- else {
- // 鎴彇鍚庝笁浣�
- const lastThree = maxProcseeId.slice(-3);
- const result = lastThree*1 + 1;
- processId= productionId + result.toString().padStart(3, '0')
- }
- }
- else {
- processId = productionId + index.toString().padStart(3, '0')
- }
- //}
+ // 娴佺▼鍗″彿
+ let processId = null
+ if (maxProcseeId) {
+ const base = leftData.length !== 0 ? leftData[0].processId : maxProcseeId
+ const lastThree = base.slice(-3)
+ const result = parseInt(lastThree) + 1
+ processId = productionId + result.toString().padStart(3, '0')
+ } else {
+ processId = productionId + index.toString().padStart(3, '0')
+ }
-
- 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) => {
- //瀹氫箟key鍊间繚鎸�
- //鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error(t('processCard.schedulingQuantity'));
- item.quantity = checkedNum.value
- item.processId = processId
- item.landingSequence = index
- 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
- delete item._X_ROW_KEY
- if (item.baiscQuantity === 0) {
- $grid.remove(item)
- }
- $gridLeft.insertAt(item)
- //閲嶆柊璧嬪�糼ey
- item._X_ROW_KEY = key
- })
+ try {
+ if (/^[1-9]\d*$/.test(checkedNum.value)) {
+ //鏈夎緭鍏ユ暟閲�
+ checkedList.forEach((item) => {
+ if (item.baiscQuantity < checkedNum.value * 1) {
+ throw new Error(t('processCard.schedulingQuantity'))
+ }
+ item.quantity = checkedNum.value * 1
+ item.processId = processId
+ item.landingSequence = index // 鉁� 鍚屼竴鎵规锛岃惤鏋堕『搴忎竴鑷�
+ item.baiscQuantity -= checkedNum.value * 1
+ item.computeGrossArea = (
+ item.computeGrossArea - item.width * item.height * checkedNum.value / 1000000
+ ).toFixed(2)
- //娓呴櫎涓よ竟澶嶉�夋
+ const key = item._X_ROW_KEY
+ delete item._X_ROW_KEY
+
+ if (item.baiscQuantity === 0) {
+ $grid.remove(item)
+ }
+
+ const currentLeft = $gridLeft.getTableData().fullData
+ $gridLeft.clearSort()
+ $gridLeft.loadData([...currentLeft, item])
+ item._X_ROW_KEY = key
+ })
+ } else if (checkedNum.value === '') {
+ //娌℃湁杈撳叆鏁伴噺
+ checkedList.forEach((item) => {
+ item.processId = processId
+ item.landingSequence = index
+ item.quantity = item.baiscQuantity
+ delete item._X_ROW_KEY
+ })
+
+ $grid.remove(checkedList)
+ const currentLeft = $gridLeft.getTableData().fullData
+ $gridLeft.clearSort()
+ $gridLeft.loadData([...currentLeft, ...checkedList])
+ }
+
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
- } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
+ checkedNum.value = ''
- checkedList.forEach((item) => {
- item.processId = processId
- item.landingSequence = index
- item.quantity = item.baiscQuantity
- })
- //鍒犻櫎key
- checkedList.forEach((item) => {
- delete item._X_ROW_KEY
- })
- $gridLeft.insertAt(checkedList)
- $grid.remove(checkedList)
- //娓呴櫎涓よ竟澶嶉�夋
- $gridLeft.clearCheckboxRow()
- $grid.clearCheckboxRow()
+ // 鎻掑叆鍚庤瑙夋帓搴�
+ // $nextTick(() => {
+ // $gridLeft.sort('landingSequence', 'asc')
+ // })
+ } catch (e) {
+ ElMessage.warning(e.message )
}
}
+
+
//鎸夌紪鍙峰垱寤烘祦绋嬪崱
@@ -603,18 +738,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)
@@ -646,12 +769,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()
@@ -659,7 +804,13 @@
} catch (e) {
ElMessage.warning(e.message)
}
+ //姣忔鐐瑰嚮鎯呭喌杈撳叆妗�
+ if (checkedNum.value){
+ checkedNum.value =''
+ }
}
+
+
//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
const addLeft = () => {
try {
@@ -709,6 +860,7 @@
if (item.baiscQuantity === 0) {
$grid.remove(item)
}
+ $gridLeft.reloadData([...$gridLeft.getTableData().fullData])
//delete item._X_ROW_KEY
} else {
item.quantity = checkedNum.value
@@ -760,9 +912,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)
@@ -776,6 +927,9 @@
} catch (e) {
ElMessage.warning(e.message)
+ }
+ if (checkedNum.value){
+ checkedNum.value =''
}
}
@@ -803,6 +957,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){
@@ -848,18 +1011,25 @@
let quantit = ref('')
let weight = ref('')
-const handleCheckboxChange = ({row}) => {
- const $grid = xGrid.value
- //鑾峰彇鍙宠竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
- const checkedList = $grid.getCheckboxRecords()
+const handleCheckboxChange = ({ row }) => {
+ const $grid = xGrid.value;
+ // 鑾峰彇鍙宠竟琛ㄦ牸 checkbox 閫変腑鐨勬暟鎹�
+ const checkedList = $grid.getCheckboxRecords();
let quantitySum = 0;
let weightsum = 0;
+
checkedList.forEach(item => {
- quantitySum += item.baiscQuantity;
+ quantitySum += Number(item.baiscQuantity) || 0; // 纭繚杞崲涓烘暟瀛�
weightsum += weightSum(item);
});
- quantit.value = quantitySum;
+
+ quantit.value = Number(quantitySum) || 0; // 纭繚鏈�缁堝�兼槸鏁板瓧
weight.value = parseFloat(weightsum.toFixed(2));
+};
+
+//鍊掑簭璧嬪��
+function onFlashbackChange(checked) {
+ flashback.value = checked ? 0 : 1
}
</script>
@@ -918,10 +1088,10 @@
<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 v-model="checkedNum" clearable
+ <span>{{ $t('processCard.selectedQuantity') }}:<el-input id="checkedNum" v-model="checkedNum" clearable
type="number"></el-input></span><br>
<el-button style="width: 40px;" type="primary" @click="addRight"> 鈫�</el-button>
<br>
@@ -945,12 +1115,56 @@
<vxe-grid
id="rightTable"
ref="xGrid"
- checkbox-config="{ reserve: true, strict: true }"
+ :checkbox-config="{labelField: 'name', highlight: true, range: true,reserve: true, strict: true}"
class="mytable-scrollbar"
height="100%"
v-bind="gridOptions"
+ v-on="gridEventsRight"
@checkbox-change="handleCheckboxChange"
+ @checkbox-all="handleCheckboxChange"
+ @checkbox-range-end="handleCheckboxChange"
>
+
+ <!-- 鑷畾涔� toolbar_buttons 鎻掓Ы -->
+ <template #toolbar_buttons="{ $grid }">
+
+
+ <!-- 鎵嬪姩鍐欏嚭鎵�鏈夋寜閽� -->
+
+ <el-select
+ :default-first-option="true"
+ ref="getSelect" style="width: 80px"
+ v-model="optionVal"
+ class="m-2"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+
+ <el-button
+ type="primary"
+ style="margin-right:8px;width: 50px"
+ @click="$grid.dispatchEvent('toolbar-button-click', { code: 'sorting' })"
+ >
+ {{ t('processCard.sorting') }}
+ </el-button>
+
+ <el-checkbox
+ :model-value="flashback === 0"
+ @change="onFlashbackChange"
+ >
+ {{ t('processCard.flashback') }}
+ </el-checkbox>
+
+
+ </template>
+
+
+
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
--
Gitblit v1.8.0