From c5151996182a7342bed2d62fcbd99349b9b2e3a1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 03 七月 2024 14:58:28 +0800
Subject: [PATCH] 提交
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 206 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 142 insertions(+), 64 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 de7e907..6431867 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
@@ -5,16 +5,17 @@
import {ElDatePicker, ElMessage} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
-import {Search} from "@element-plus/icons-vue"
+import {ArrowLeftBold, Search} from "@element-plus/icons-vue"
import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
import useUserInfoStore from "@/stores/userInfo";
-import { useI18n } from 'vue-i18n'
+import {useI18n} from 'vue-i18n'
+import footSum from "@/hook/footSum"
//璇█鑾峰彇
-const { t } = useI18n()
+const {t} = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
const userStore = useUserInfoStore()
@@ -36,7 +37,7 @@
location.reload();
} else {
ElMessage.warning(res.msg)
- // router.push("/login")
+ // router.push("/login")
}
})
break
@@ -144,8 +145,8 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'CustomerListRight',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -157,7 +158,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- //remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -206,7 +207,7 @@
{field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '60px'},
{field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
{field: 'thickness', title: t('processCard.glassThickness'), width: '60px'},
- {field: 'weight', title: t('processCard.weight')}
+ {field: 'weight', title: t('processCard.weight'),slots:{default:'weight_sum'}}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -221,20 +222,38 @@
},
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['', '', '', '', '']
- return [
+
+ weighAllAmount(data) {
+ let count = 0
+ data.forEach(row => {
+ count += row.weight
+ })
+ return count
+ },
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let count = 0
+
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+
+ 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 ''
})
]
- }
+ },
})
@@ -245,7 +264,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true, height: 30, useKey: false},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -258,7 +277,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- //remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -275,7 +294,7 @@
title: t('processCard.processId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- width: 130,
+ width: 100,
filterMethod: filterChanged
},
{
@@ -288,12 +307,18 @@
},
{
field: 'landingSequence',
- title: '钀芥灦椤哄簭',
+ title: t('processCard.landingSequence'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
- {field: 'shape', title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
+ {
+ field: 'shape',
+ title: t('order.shape'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
{field: 'width', title: t('order.width'), showOverflow: "ellipsis"},
{field: 'height', title: t('order.height')},
{field: 'quantity', title: t('order.quantity')},
@@ -312,15 +337,15 @@
},
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["quantity",'goodsQuantity','area']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -357,30 +382,29 @@
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.quantity = checkedNum.value
item.processId = processId
item.landingSequence = index
- item.baiscQuantity=item.baiscQuantity - checkedNum.value
- })
- //鍒犻櫎key
- checkedList.forEach((item) => {
+ 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(checkedList)
+ if (item.baiscQuantity === 0) {
+ $grid.remove(item)
}
- $gridLeft.insertAt(checkedList)
+ $gridLeft.insertAt(item)
+ //閲嶆柊璧嬪�糼ey
item._X_ROW_KEY = key
})
-//娓呴櫎涓よ竟澶嶉�夋
+ //娓呴櫎涓よ竟澶嶉�夋
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
- }
- else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
+ } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
checkedList.forEach((item) => {
item.processId = processId
@@ -397,11 +421,7 @@
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
}
-
-
-
}
-
//鍚戝彸杈硅〃鏍兼坊鍔犳暟鎹�
@@ -428,8 +448,11 @@
//瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
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
//鍙宠竟琛ㄦ牸鏁版嵁
let rightData = $grid.getTableData().fullData
@@ -437,31 +460,64 @@
let filterIndex = rightData.findIndex(item1 => item1.orderNumber === item.orderNumber)
//濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
if (filterIndex >= 0) {
+ //鏁伴噺
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)
//濡傛灉宸﹁竟鏁伴噺涓�0鏃跺垹闄ゆ鏉℃暟鎹�
- if (item.quantity === 0) {
- $gridLeft.remove(item)
+ //鍒犻櫎key
+ let key = item._X_ROW_KEY
+ delete item._X_ROW_KEY
+ if (item.baiscQuantity === 0) {
+ $grid.remove(item)
}
+ item._X_ROW_KEY = key
} else {
//鍙宠竟琛ㄦ牸娌℃湁姝ゆ潯鏁版嵁鍒欏線鍙宠竟琛ㄦ牸鎻掑叆鏁版嵁
item.baiscQuantity = checkedNum.value
+ item.computeGrossArea=(item.width*item.height*checkedNum.value/1000000).toFixed(2)
if (item.quantity === 0) {
$gridLeft.remove(item)
}
$grid.insert(item)
}
+ if (item.quantity === 0) {
+ $gridLeft.remove(item)
+ }
})
} else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
checkedList.forEach((item) => {
+ //鍙充晶琛ㄦ牸
let rightData = $grid.getTableData().fullData
let filterIndex = rightData.findIndex(item1 => item1.orderNumber === item.orderNumber)
+ //宸︿晶琛ㄦ牸
+ let leftData = $gridLeft.getTableData().fullData
+ let leftfilterIndex = leftData.findIndex(item1 => item1.orderNumber === item.orderNumber)
//鏃犺緭鍏ュ苟涓斿鏋滃彸杈硅〃鏍兼暟鎹腑瀛樺湪褰撳墠鏁版嵁鍒欐暟閲忕浉鍔�
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)
+
} else {
- delete item._X_ROW_KEY
- $grid.insert(item)
+
+
+ // 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)
+
+
}
$gridLeft.remove(item)
@@ -507,6 +563,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)
//瀹氫箟key鍊间繚鎸�
let key = item._X_ROW_KEY
//宸﹁竟琛ㄦ牸鏁版嵁
@@ -519,15 +576,17 @@
//濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
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)
if (item.baiscQuantity === 0) {
- $grid.remove(checkedList)
+ $grid.remove(item)
}
//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)
delete item._X_ROW_KEY
$gridLeft.insert(item)
item._X_ROW_KEY = key
@@ -538,28 +597,33 @@
item.quantity = checkedNum.value
item.processId = checkedListLeft[0].processId
item.landingSequence = checkedListLeft[0].landingSequence
+ // /item.computeGrossArea=item.computeGrossArea
if (item.baiscQuantity === 0) {
- $grid.remove(checkedList)
+ $grid.remove(item)
}
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)
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
}
- 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
- }
}
}
@@ -569,6 +633,8 @@
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)
+
delete item._X_ROW_KEY
})
$gridLeft.insertAt(checkedList)
@@ -597,15 +663,15 @@
const $tableRight = xGrid.value
if ($table) {
const selectRecords = $table.getCheckboxRecords()
- // const selectRight = $tableRight.getCheckboxRecords()
+ // const selectRight = $tableRight.getCheckboxRecords()
let leftData = $tableRight.getTableData().fullData
if (selectRecords.length === 0) {
- ElMessage.warning("璇峰厛閫夋嫨淇濆瓨鐨勬暟鎹�")
+ ElMessage.warning(t('processCard.pleaseSelectTheSavedDataFirst'))
return
}
if (leftData.length > 0) {
- ElMessage.warning("璇峰厛灏嗗彸渚ф暟鎹叏閮ㄥ缓绔嬫祦绋嬪崱鍚庝繚瀛�")
+ ElMessage.warning(t('processCard.pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt'))
return;
}
let flowCardData = ref({
@@ -616,7 +682,7 @@
request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
if (res.code == 200) {
- ElMessage.success("淇濆瓨鎴愬姛")
+ ElMessage.success(t('basicData.msg.saveSuccess'))
//router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
router.push({
path: '/main/processCard/AddProcessCard',
@@ -639,6 +705,10 @@
},
}
+const weightSum = (row) =>{
+ return parseFloat((row.baiscQuantity*row.thickness*row.width*row.height*2.5/1000000).toFixed(2))
+}
+
</script>
<template>
@@ -667,10 +737,11 @@
<vxe-grid
ref="xGridLeft"
class="mytable-scrollbar"
- max-height="100%"
height="650px"
+ max-height="100%"
v-bind="gridLeftOptions"
v-on="gridEvents"
+ checkbox-config="{ reserve: true, strict: true }"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
@@ -696,20 +767,23 @@
</template>
+
</vxe-grid>
</el-aside>
<div width="12%">
<el-main style="">
- <span>{{$t('processCard.selectedQuantity')}}:<el-input v-model="checkedNum" clearable type="number"></el-input></span><br>
+ <span>{{ $t('processCard.selectedQuantity') }}:<el-input v-model="checkedNum" clearable
+ type="number"></el-input></span><br>
<el-button type="primary" @click="addRight"> 鈫�</el-button>
<br>
<br>
<el-button type="primary" @click="addLeft"> 鈫�</el-button>
<br>
<br>
- <el-button type="primary" @click="createProcessCard">{{$t('processCard.establishProcessCards')}}</el-button>
+ <el-button type="primary" @click="createProcessCard">{{ $t('processCard.establishProcessCards') }}
+ </el-button>
</el-main>
</div>
@@ -722,9 +796,10 @@
ref="xGrid"
class="mytable-scrollbar"
- max-height="100%"
height="650px"
+ max-height="100%"
v-bind="gridOptions"
+ checkbox-config="{ reserve: true, strict: true }"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
@@ -739,6 +814,9 @@
</li>
</ul>
</template>
+ <template #weight_sum="{ row }">
+ <span>{{ weightSum(row) }} </span>
+ </template>
<template #num1_filter="{ column, $panel }">
<div>
--
Gitblit v1.8.0