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 | 748 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 576 insertions(+), 172 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 939fe77..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"
@@ -14,37 +14,15 @@
import useUserInfoStore from "@/stores/userInfo";
import {useI18n} from 'vue-i18n'
import footSum from "@/hook/footSum"
+import {changeFilterEvent,filterChanged} from "@/hook"
+import userInfo from "@/stores/userInfo"
//璇█鑾峰彇
const {t} = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
-const getTableRow = (row, type) => {
- switch (type) {
- case 'edit' : {
- router.push({path: '/main/processCard/PrintFlowCard', query: {id: row.id}})
- break
- }
- case 'setType': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'delete': {
- request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
- if (res.code == 200) {
- ElMessage.success(t('workOrder.deleteOk'))
- location.reload();
- } else {
- ElMessage.warning(res.msg)
- // router.push("/login")
- }
- })
- break
- }
- }
-}
-
+const user=userInfo()
let flag = $ref(true)
function intoCreateProduct() {
@@ -55,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({
@@ -93,17 +87,40 @@
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)
+let maxProcseeId=null
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, 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 = 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 {
@@ -111,11 +128,7 @@
}
})
-/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
-const changeFilterEvent = (event, option, $panel,) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
+
function padLeftZero(str) {
return ('00' + str).substr(str.length)
@@ -129,14 +142,7 @@
}
-//绛涢�夋柟娉�
-const filterChanged = ({option, row, column}) => {
- if (option.data) {
- return row[column.field].toString().toLowerCase().indexOf(option.data) > -1
- }
- return true
- //@filter-change="filterChanged"
-}
+
//鍙充晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
@@ -146,7 +152,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddProcessCardRight',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -158,10 +164,61 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- //remote: true
+ //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
+ },
+ sortConfig: {
+ multiple: true
},
editConfig: {
trigger: 'click',
@@ -169,13 +226,14 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'checkbox', fixed: "left", title: t('basicData.check')},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: '80px'},
{
field: 'orderNumber',
title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width: '100px'
},
{
field: 'shape',
@@ -183,7 +241,8 @@
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width: '70px'
},
{
field: 'width',
@@ -192,7 +251,7 @@
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged,
- width: '60px'
+ width: '78px'
},
{
field: 'height',
@@ -201,19 +260,35 @@
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged,
- width: '60px'
+ width: '78px'
},
- {field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '60px'},
- {field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '60px'},
+ {
+ 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: '60px'},
- {field: 'weight', title: t('processCard.weight')}
+ {field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
+ {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
+ {field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
+ {field: 'processing_note', title: t('order.processingNote'), width: '105px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
+ {field: 'bend_radius', title: t('order.bendRadius'), width: '120px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged,sortable: true,}
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
- // buttons: [{
- //
- // }],
+ slots:{
+ buttons: "toolbar_buttons"
+ },
+ buttons: [{
+
+ }],
// import: false,
// export: true,
// print: true,
@@ -222,22 +297,95 @@
},
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
+
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let count = 0
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["baiscQuantity",'computeGrossArea','weight','perimeter']
+
+ const List = ["baiscQuantity", 'computeGrossArea']
if (List.includes(column.field)) {
return footSum(data, column.field)
+ }
+ if (column.field === 'weight') {
+ data.forEach(row => {
+ count += weightSum(row)
+ })
+ 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()
@@ -247,7 +395,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddProcessCardLeft',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -259,7 +407,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- //remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -270,14 +418,14 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'checkbox', fixed: "left", title: t('basicData.check')},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'),width: 78},
{
field: 'processId',
title: t('processCard.processId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- width: 100,
- filterMethod: filterChanged
+ width: 135,
+ filterMethod: filterChanged,
},
{
field: 'orderNumber',
@@ -285,26 +433,38 @@
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'}
- , filterMethod: filterChanged
+ , filterMethod: filterChanged,
+ width: 98
},
{
field: 'landingSequence',
- title: '钀芥灦椤哄簭',
+ title: t('processCard.landingSequence'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width: 99
},
{
field: 'shape',
title: t('order.shape'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width:70
},
- {field: 'width', title: t('order.width'), showOverflow: "ellipsis"},
- {field: 'height', title: t('order.height')},
- {field: 'quantity', title: t('order.quantity')},
- {field: 'totalThickness', title: t('processCard.totalThickness')},
+ {
+ field: 'building_number',
+ title: t('order.buildingNumber'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '120px'
+ },
+ {field: 'width', title: t('order.width'), showOverflow: "ellipsis",width:70},
+ {field: 'height', title: t('order.height'),width:70},
+ {field: 'quantity', title: t('order.quantity'),width:70},
+ {field: 'totalThickness', title: t('processCard.totalThickness'),width:70},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -319,13 +479,13 @@
},
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'goodsQuantity','area','perimeter']
+ const List = ["quantity", 'goodsQuantity', 'area']
if (List.includes(column.field)) {
return footSum(data, column.field)
}
@@ -346,49 +506,143 @@
ElMessage.warning(t('processCard.schedulingOk'))
return
}
+
+ const $gridLeft = xGridLeft.value
+ const leftData = $gridLeft.getTableData().fullData
+
+ //钀芥灦椤哄簭
+ let index = 1
+ if (leftData.length !== 0) {
+ index = Math.max(...leftData.map(d => d.landingSequence || 0)) + 1
+ }
+
+ // 娴佺▼鍗″彿
+ 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+|)$/
+ if (!regex.test(checkedNum.value)) {
+ ElMessage.warning(t('processCard.schedulingNo'))
+ return
+ }
+
+ 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()
+ checkedNum.value = ''
+
+ // 鎻掑叆鍚庤瑙夋帓搴�
+ // $nextTick(() => {
+ // $gridLeft.sort('landingSequence', 'asc')
+ // })
+ } catch (e) {
+ ElMessage.warning(e.message )
+ }
+}
+
+
+
+
+//鎸夌紪鍙峰垱寤烘祦绋嬪崱
+const createProcessCardNo = () => {
+ const $grid = xGrid.value
+ const checkedList = $grid.getCheckboxRecords()
+
+ if (checkedList.length === 0) {
+ ElMessage.warning(t('processCard.schedulingOk'))
+ return
+ }
//productionId
const $gridLeft = xGridLeft.value
const leftData = $gridLeft.getTableData().fullData
- let index = 1
+ let index = 0
if (leftData.length !== 0) {
index = leftData[0].landingSequence + 1
//index = index.toString().padStart(2, '0')
}
- const processId = productionId + index.toString().padStart(3, '0')
+
+ let processId= null
+
+ 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')
+
+
+ }
+
+
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
- })
-
- //娓呴櫎涓よ竟澶嶉�夋
- $gridLeft.clearCheckboxRow()
- $grid.clearCheckboxRow()
- } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
checkedList.forEach((item) => {
+ index++
+ processId = productionId + index.toString().padStart(3, '0')
item.processId = processId
item.landingSequence = index
item.quantity = item.baiscQuantity
@@ -402,7 +656,7 @@
//娓呴櫎涓よ竟澶嶉�夋
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
- }
+
}
@@ -430,7 +684,10 @@
//瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
checkedList.forEach((item) => {
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.quantity < checkedNum.value) throw new Error(t('processCard.schedulingQuantity'));
+ // 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
//鍙宠竟琛ㄦ牸鏁版嵁
@@ -442,7 +699,7 @@
//鏁伴噺
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)
+ rightData[filterIndex].computeGrossArea = (rightData[filterIndex].width * rightData[filterIndex].height * rightData[filterIndex].baiscQuantity / 1000000).toFixed(2)
//濡傛灉宸﹁竟鏁伴噺涓�0鏃跺垹闄ゆ鏉℃暟鎹�
//鍒犻櫎key
let key = item._X_ROW_KEY
@@ -454,7 +711,7 @@
} else {
//鍙宠竟琛ㄦ牸娌℃湁姝ゆ潯鏁版嵁鍒欏線鍙宠竟琛ㄦ牸鎻掑叆鏁版嵁
item.baiscQuantity = checkedNum.value
- item.computeGrossArea=(item.width*item.height*checkedNum.value/1000000).toFixed(2)
+ item.computeGrossArea = (item.width * item.height * checkedNum.value / 1000000).toFixed(2)
if (item.quantity === 0) {
$gridLeft.remove(item)
}
@@ -477,40 +734,83 @@
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.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)
-
+ 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()
+
} catch (e) {
ElMessage.warning(e.message)
}
+ //姣忔鐐瑰嚮鎯呭喌杈撳叆妗�
+ if (checkedNum.value){
+ checkedNum.value =''
+ }
}
+
+
//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
const addLeft = () => {
try {
@@ -542,7 +842,7 @@
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
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)
+ item.computeGrossArea = (item.computeGrossArea - item.width * item.height * checkedNum.value / 1000000).toFixed(2)
//瀹氫箟key鍊间繚鎸�
let key = item._X_ROW_KEY
//宸﹁竟琛ㄦ牸鏁版嵁
@@ -555,17 +855,18 @@
//濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
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)
+ 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)
+ 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
@@ -584,22 +885,25 @@
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)
-
+ 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
}
+
}
}
@@ -608,9 +912,8 @@
checkedList.forEach((item) => {
item.processId = checkedListLeft[0].processId
item.landingSequence = checkedListLeft[0].landingSequence
- item.quantity = checkedListLeft[0].baiscQuantity
- item.computeGrossArea=(item.computeGrossArea-checkedListLeft[0].width*checkedListLeft[0].height*checkedListLeft[0].baiscQuantity/1000000).toFixed(2)
-
+ 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)
@@ -625,6 +928,9 @@
} catch (e) {
ElMessage.warning(e.message)
}
+ if (checkedNum.value){
+ checkedNum.value =''
+ }
}
@@ -635,6 +941,7 @@
if ($grid) {
switch (code) {
case 'saveFlowCard': {
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=true
const $table = xGridLeft.value
const $tableRight = xGrid.value
if ($table) {
@@ -643,20 +950,37 @@
let leftData = $tableRight.getTableData().fullData
if (selectRecords.length === 0) {
ElMessage.warning(t('processCard.pleaseSelectTheSavedDataFirst'))
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=false
return
}
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){
+ // ElMessage.warning('璇峰嬀閫夋墍鏈夋暟鎹繘琛屼繚瀛�')
+ // gridLeftOptions.toolbarConfig.buttons[0].disabled=false
+ // return;
+ // }
let flowCardData = ref({
flowCard: selectRecords,
userName: username,
- productionId: productionId
+ productionId: productionId,
+ userId:user.user.userId
})
- request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
+ 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}')
@@ -681,39 +1005,58 @@
},
}
+const weightSum = (row) => {
+ return parseFloat((row.baiscQuantity * row.thickness * row.width * row.height * 2.5 / 1000000).toFixed(2))
+}
+
+let quantit = ref('')
+let weight = ref('')
+const handleCheckboxChange = ({ row }) => {
+ const $grid = xGrid.value;
+ // 鑾峰彇鍙宠竟琛ㄦ牸 checkbox 閫変腑鐨勬暟鎹�
+ const checkedList = $grid.getCheckboxRecords();
+ let quantitySum = 0;
+ let weightsum = 0;
+
+ checkedList.forEach(item => {
+ quantitySum += Number(item.baiscQuantity) || 0; // 纭繚杞崲涓烘暟瀛�
+ weightsum += weightSum(item);
+ });
+
+ quantit.value = Number(quantitySum) || 0; // 纭繚鏈�缁堝�兼槸鏁板瓧
+ weight.value = parseFloat(weightsum.toFixed(2));
+};
+
+//鍊掑簭璧嬪��
+function onFlashbackChange(checked) {
+ flashback.value = checked ? 0 : 1
+}
</script>
<template>
- <div style="width: 100%;height: 100%">
+ <div style="width: 75%;height: 90%">
+ <div class="common-layout">
+ <el-button
+ id="searchButton1"
+ :icon="ArrowLeftBold"
+ round
+ style="float: left"
+ type="primary"
+ @click="intoCreateProduct">
+ {{ flag ? t('processCard.return') : t('processCard.return') }}
+ </el-button>
+ <!-- <el-button type="primary">淇濆瓨鍒嗘灦</el-button>-->
+ <!-- <el-button type="primary" :hidden="true">鍒嗘灦姹囨��</el-button>-->
- <div class="common-layout" style="width: 100%;height: 100%">
- <div class="header" style="height: 5%;width: 100%">
-
- <el-button
- id="searchButton1"
- :icon="ArrowLeftBold"
- round
- style="float: left"
- type="primary"
- @click="intoCreateProduct">
- {{ flag ? t('processCard.return') : t('processCard.return') }}
- </el-button>
- <!-- <el-button type="primary">淇濆瓨鍒嗘灦</el-button>-->
- <!-- <el-button type="primary" :hidden="true">鍒嗘灦姹囨��</el-button>-->
- <div style="width: 100px;">
-
- </div>
- </div>
<el-container style="height: 100%;width: 100%">
- <el-aside style="width: 44%;height: 100%">
+ <el-aside style="width: 52%;height: 100%">
<vxe-grid
ref="xGridLeft"
+ checkbox-config="{ reserve: true, strict: true }"
class="mytable-scrollbar"
- height="650px"
- max-height="100%"
+ height="100%"
v-bind="gridLeftOptions"
v-on="gridEvents"
- checkbox-config="{ reserve: true, strict: true }"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
@@ -733,45 +1076,95 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
-
-
</vxe-grid>
</el-aside>
- <div width="12%">
+ <div height="100%" style="margin: 5px" width="11%">
<el-main style="">
- <span>{{ $t('processCard.selectedQuantity') }}:<el-input v-model="checkedNum" clearable
+ <div>
+ <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>
- <el-button type="primary" @click="addRight"> 鈫�</el-button>
+ <el-button style="width: 40px;" type="primary" @click="addRight"> 鈫�</el-button>
<br>
<br>
- <el-button type="primary" @click="addLeft"> 鈫�</el-button>
+ <el-button style="width: 40px;" type="primary" @click="addLeft"> 鈫�</el-button>
<br>
<br>
<el-button type="primary" @click="createProcessCard">{{ $t('processCard.establishProcessCards') }}
+ </el-button>
+ <br><br><br><br><br>
+ <el-button type="primary" @click="createProcessCardNo">{{ $t('processCard.createBySequenceNumber') }}
</el-button>
</el-main>
</div>
<!-- 鍙充晶-->
- <div style="height: 100%;width: 100%">
+ <div style="height: 100%;width: 70%">
<el-aside style="width: 100%;height: 100%">
<vxe-grid
-
+ id="rightTable"
ref="xGrid"
+ :checkbox-config="{labelField: 'name', highlight: true, range: true,reserve: true, strict: true}"
class="mytable-scrollbar"
- height="650px"
- max-height="100%"
+ height="100%"
v-bind="gridOptions"
- checkbox-config="{ reserve: true, strict: true }"
+ 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 }">
@@ -785,12 +1178,16 @@
</li>
</ul>
</template>
+ <template #weight_sum="{ row }">
+ <span>{{ weightSum(row) }} </span>
+ </template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
@@ -804,8 +1201,14 @@
</template>
<style scoped>
+* {
+ margin: 0;
+ padding: 0;
+}
+
.common-layout {
- height: 100%;
+ width: 99%;
+ height: 96%;
}
.header {
@@ -824,4 +1227,5 @@
}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0