From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 799 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 550 insertions(+), 249 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 83deb13..6ac6a3c 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,51 +5,33 @@
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 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("鍒犻櫎鎴愬姛")
- location.reload();
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
- break
- }
- }
-}
-
+const user=userInfo()
let flag = $ref(true)
-function intoCreateProduct(){
- if(flag){
+
+function intoCreateProduct() {
+ if (flag) {
router.push(`/main/processCard/SplittingDetails?orderId=${orderId}`)
- }else {
+ } else {
router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
}
- flag=!flag
+ flag = !flag
}
//瀹氫箟鏃堕棿
@@ -77,22 +59,7 @@
clientHeight.value = row.$event.target.clientHeight
}
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
-let filterData = ref({
- product: {
- thickness: '',
- totalThickness: ''
- },
- orderDetail: {
- orderNumber: '',
- height: '',
- computeGrossArea: '',
- binningQuantity: '',
- shape: '',
- width: '',
- weight: ''
- }
-
-})
+let filterData = ref({})
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -106,13 +73,31 @@
let orderId = route.query.orderId
let productionId = route.query.productionId
+
+const orderOtherMoney = ref(null)
+
+let maxProcseeId=null
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
if (res.code == 200) {
- console.log(res.data)
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,
+ }
+
+ gridOptions.columns.push(column)
+
+ })
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
gridOptions.loading = false
@@ -121,50 +106,21 @@
}
})
-/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
-const changeFilterEvent = (event, option, $panel,) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
+
function padLeftZero(str) {
return ('00' + str).substr(str.length)
}
-function filterChanged(column) {
- gridOptions.loading = true
- //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
- let value = column.datas[0] != undefined ? column.datas[0] : ''
- value = value.trim()
- //鍒ゆ柇鏄惁瀛樺湪澶栭敭
- if (column.property.indexOf('.') > -1) {
- const columnArr = column.property.split('.')
- filterData.value[columnArr[0]] = {
- [columnArr[1]]: value
- }
- } else {
- filterData.value[column.property] = value
- }
-
-
- request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
- if (res.code == 200) {
-
- pageTotal.value = res.data.total
- produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
const hasDecimal = (value) => {
const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
return regex.test(value); // 杩斿洖true/false
}
+
+
+
//鍙充晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
@@ -173,8 +129,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: 'AddProcessCardRight',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -186,10 +142,13 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
+ },
+ sortConfig: {
+ multiple: true
},
editConfig: {
trigger: 'click',
@@ -197,16 +156,51 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'checkbox', fixed: "left", title: '閫夋嫨'},
- {field: 'orderNumber', title: '璁㈠簭', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'shape', title: '褰㈢姸', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'width', title: '瀹�', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'height', title: '楂�', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'baiscQuantity', title: '寰呭垎鏁伴噺', showOverflow: "ellipsis"},
- {field: 'computeGrossArea', title: '寰呭垎闈㈢Н'},
- {field: 'totalThickness', title: '鎬诲帤搴�'},
- {field: 'thickness', title: '鐜荤拑鍘氬害'},
- {field: 'weight', title: '閲嶉噺'}
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: '80px'},
+ {
+ field: 'orderNumber',
+ title: t('order.OrderNum'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '100px'
+ },
+ {
+ field: 'shape',
+ title: t('order.shape'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '70px'
+ },
+ {
+ field: 'width',
+ title: t('order.width'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '78px'
+ },
+ {
+ field: 'height',
+ title: t('order.height'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '78px'
+ },
+ {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: '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: '85px',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: {
@@ -221,23 +215,32 @@
},
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
+
footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['baiscQuantity', 'computeGrossArea', 'totalThickness','thickness', 'weight']
+ let count = 0
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ 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 ''
})
]
- }
+ },
})
-
//宸︿晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGridLeft = ref()
@@ -246,8 +249,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: 'AddProcessCardLeft',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -259,7 +262,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -270,44 +273,67 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'checkbox', fixed: "left", title: '閫夋嫨'},
- {field: 'processId', title: '娴佺▼鍗″彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 130},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'),width: 78},
+ {
+ field: 'processId',
+ title: t('processCard.processId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ width: 135,
+ filterMethod: filterChanged,
+ },
{
field: 'orderNumber',
- title: '璁㈠簭',
+ title: t('order.OrderNum'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'}
+ , filterMethod: filterChanged,
+ width: 98
},
- {field: 'landingSequence', title: '钀芥灦椤哄簭', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'shape', title: '褰㈢姸', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'width', title: '瀹�', showOverflow: "ellipsis"},
- {field: 'height', title: '楂�'},
- {field: 'quantity', title: '鎬绘暟閲�'},
- {field: 'totalThickness', title: '鎬诲帤搴�'},
+ {
+ field: 'landingSequence',
+ title: t('processCard.landingSequence'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: 99
+ },
+ {
+ field: 'shape',
+ title: t('order.shape'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width:70
+ },
+ {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: {
buttons: [
- {code: 'saveFlowCard', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'saveFlowCard', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save'},
],
- import: false,
- export: true,
- print: true,
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['鎬绘暟閲�', '鎬婚潰绉�', '鍒嗙鏁�']
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ 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 ''
})
@@ -315,12 +341,15 @@
}
})
+//瀹氫箟杈撳叆鏁伴噺
+let checkedNum = ref('')
//鍒涘缓娴佺▼鍗�
const createProcessCard = () => {
const $grid = xGrid.value
const checkedList = $grid.getCheckboxRecords()
+
if (checkedList.length === 0) {
- ElMessage.warning("璇峰厛閫夋嫨鍙充晶鏁版嵁")
+ ElMessage.warning(t('processCard.schedulingOk'))
return
}
//productionId
@@ -331,16 +360,151 @@
index = leftData[0].landingSequence + 1
//index = index.toString().padStart(2, '0')
}
- const processId = productionId + index.toString().padStart(2, '0')
- checkedList.forEach((item) => {
- item.processId = processId
- item.landingSequence = index
- })
- $gridLeft.insertAt(checkedList)
- $grid.remove(checkedList)
+ 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')
+ }
+ //}
+
+
+ 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) => {
+ 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()
+ }
}
-let checkedNum = ref('')
+
+//鎸夌紪鍙峰垱寤烘祦绋嬪崱
+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 = 0
+ if (leftData.length !== 0) {
+ index = leftData[0].landingSequence + 1
+ //index = index.toString().padStart(2, '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
+ }
+
+ checkedList.forEach((item) => {
+ index++
+ processId = productionId + index.toString().padStart(3, '0')
+ 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()
+
+}
+
//鍚戝彸杈硅〃鏍兼坊鍔犳暟鎹�
const addRight = () => {
@@ -353,12 +517,12 @@
const checkedList = $gridLeft.getCheckboxRecords()
//鍒ゆ柇宸﹁竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
if (checkedList.length === 0) {
- ElMessage.warning("璇峰厛閫夋嫨宸︿晶鏁版嵁")
+ ElMessage.warning(t('processCard.schedulingArea'))
return
}
const regex = /^(\d+|)$/;
if (!regex.test(checkedNum.value)) {
- ElMessage.warning("璇疯緭鍏ユ鏁存暟")
+ ElMessage.warning(t('processCard.schedulingNo'))
return
}
//鍒ゆ柇姝ｆ暣鏁�
@@ -366,7 +530,10 @@
//瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
checkedList.forEach((item) => {
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.quantity < checkedNum.value) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡彲鐢ㄦ暟閲忕殑鏁板瓧");
+ // 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
//鍙宠竟琛ㄦ牸鏁版嵁
@@ -375,33 +542,74 @@
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 === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘湁鏃犺緭鍏ユ暟瀛�
+ } 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 {
+
+
+ // 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)
})
- }
+
+ }
+ //娓呴櫎涓よ竟澶嶉�夋
+ $gridLeft.clearCheckboxRow()
+ $grid.clearCheckboxRow()
} catch (e) {
ElMessage.warning(e.message)
}
@@ -418,56 +626,113 @@
//鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
const checkedListLeft = $gridLeft.getCheckboxRecords()
//鍒ゆ柇鍙宠竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
- if (checkedList.length === 0) {
- ElMessage.warning("璇峰厛閫夋嫨鍙充晶鏁版嵁")
+ if (checkedList.length * 1 === 0) {
+ ElMessage.warning(t('processCard.schedulingOk'))
return
}
if (checkedListLeft.length !== 1) {
- ElMessage.warning("璇峰厛閫夋嫨宸︿晶涓�鏉℃暟鎹�")
+ ElMessage.warning(t('processCard.schedulingTime'))
return
}
const regex = /^(\d+|)$/;
if (!regex.test(checkedNum.value)) {
- ElMessage.warning("璇疯緭鍏ユ鏁存暟")
+ ElMessage.warning(t('processCard.schedulingNo'))
return
}
//鍒ゆ柇姝ｆ暣鏁�
if (/^[1-9]\d*$/.test(checkedNum.value)) {
checkedList.forEach((item) => {
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.baiscQuantity < checkedNum.value) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡彲鐢ㄦ暟閲忕殑鏁板瓧");
+ 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
//宸﹁竟琛ㄦ牸鏁版嵁
let leftData = $gridLeft.getTableData().fullData
//宸﹁竟琛ㄦ牸鏁版嵁涓煡鎵惧綋鍓嶆暟鎹笅鏍�
let filterIndex = leftData.findIndex(item1 => item1.orderNumber === item.orderNumber)
- //濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
- if (filterIndex >= 0) {
- leftData[filterIndex].quantity = leftData[filterIndex].quantity * 1 + checkedNum.value * 1
+ //鍒ゆ柇鍙充晶鍕鹃�夊�间笌宸︿晶鏄惁鐩稿悓
+ if (checkedListLeft[0].orderNumber === item.orderNumber) {
- if (item.baiscQuantity === 0) {
- $grid.remove(checkedList)
+ //濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
+ 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(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
}
} else {
+
+ //濡傛灉鍕鹃�変袱涓�间笉鍚屽垯鎻掑叆鍚屾祦绋嬪崱
item.quantity = checkedNum.value
item.processId = checkedListLeft[0].processId
item.landingSequence = checkedListLeft[0].landingSequence
- $gridLeft.insert(item)
+ // /item.computeGrossArea=item.computeGrossArea
+ if (item.baiscQuantity === 0) {
+ $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 (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘湁鏃犺緭鍏ユ暟瀛�
+ } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
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)
+
+ delete item._X_ROW_KEY
})
$gridLeft.insertAt(checkedList)
$grid.remove(checkedList)
}
+ //娓呴櫎涓よ竟澶嶉�夋
+ if ($gridLeft || $grid) {
+ $gridLeft.clearCheckboxRow()
+ $grid.clearCheckboxRow()
+ }
+
} catch (e) {
ElMessage.warning(e.message)
}
}
+
//淇濆瓨娴佺▼鍗℃暟鎹�
const gridEvents = {
@@ -476,34 +741,41 @@
if ($grid) {
switch (code) {
case 'saveFlowCard': {
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=true
const $table = xGridLeft.value
const $tableRight = xGrid.value
if ($table) {
const selectRecords = $table.getCheckboxRecords()
- const selectRight = $tableRight.getCheckboxRecords()
- if (selectRecords.length === 0){
- ElMessage.warning("璇峰厛閫夋嫨淇濆瓨鐨勬暟鎹�")
+ // const selectRight = $tableRight.getCheckboxRecords()
+ let leftData = $tableRight.getTableData().fullData
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('processCard.pleaseSelectTheSavedDataFirst'))
return
}
- if (selectRight.length > 0){
- ElMessage.warning("璇峰厛灏嗗彸渚ф暟鎹叏閮ㄥ缓绔嬫祦绋嬪崱鍚庝繚瀛�")
+
+ if (leftData.length > 0) {
+ ElMessage.warning(t('processCard.pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt'))
return;
}
- //console.log(selectRecords[0].quantity)
let flowCardData = ref({
flowCard: selectRecords,
- userName:username,
- productionId:productionId
+ userName: username,
+ productionId: productionId,
+ userId:user.user.userId
})
- console.log(flowCardData.value)
request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
if (res.code == 200) {
- ElMessage.success("淇濆瓨鎴愬姛")
- location.reload();
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
+ router.push({
+ path: '/main/processCard/AddProcessCard',
+ query: {orderId: orderId, productionId: productionId, random: Math.random()}
+ })
+
+ //location.reload();
} else {
ElMessage.warning(res.msg)
- router.push("/login")
}
})
@@ -517,36 +789,49 @@
},
}
+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 += item.baiscQuantity;
+ weightsum += weightSum(item);
+ });
+ quantit.value = quantitySum;
+ weight.value = parseFloat(weightsum.toFixed(2));
+}
</script>
<template>
- <div>
+ <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="height: 100%">
- <div class="header">
-
- <el-button
- style="float: left"
- @click="intoCreateProduct"
- id="searchButton1"
- type="primary"
- :icon="ArrowLeftBold"
- round>
- {{ flag ? '杩斿洖' : '杩斿洖' }}
- </el-button>
- <!-- <el-button type="primary">淇濆瓨鍒嗘灦</el-button>-->
-<!-- <el-button type="primary" :hidden="true">鍒嗘灦姹囨��</el-button>-->
- <div style="width: 100px;">
-
- </div>
- </div>
- <el-container height="600px">
- <el-aside width="44%" >
+ <el-container style="height: 100%;width: 100%">
+ <el-aside style="width: 52%;height: 100%">
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGridLeft"
+ checkbox-config="{ reserve: true, strict: true }"
+ class="mytable-scrollbar"
+ height="100%"
v-bind="gridLeftOptions"
v-on="gridEvents"
>
@@ -563,86 +848,101 @@
</li>
</ul>
</template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">鎵撳嵃</el-button>
- <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">鎺掔増</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
- </template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
- </div>
- </div>
- </template>
-
-
- </vxe-grid>
-
- </el-aside>
-
- <el-main width="12%" style="">
- <span>閫変腑鏁伴噺:<el-input type="number" v-model="checkedNum"></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 @click="createProcessCard" type="primary">寤虹珛娴佺▼鍗�</el-button>
- </el-main>
-
- <el-aside width="45%" height="500px" style="">
- <vxe-grid
-
- max-height="97%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span v-if="hasDecimal(item.field)">{{
- row[item.field.split('.')[0]][item.field.split('.')[1]]
- }}</span>
- <span v-else>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
-
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">鎵撳嵃</el-button>
- <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">鎺掔増</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
- </template>
-
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data"
+ type="text"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
</vxe-grid>
+
</el-aside>
+
+ <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>
+ </div>
+ <span>{{ $t('processCard.selectedQuantity') }}:<el-input v-model="checkedNum" clearable
+ type="number"></el-input></span><br>
+ <el-button style="width: 40px;" type="primary" @click="addRight"> 鈫�</el-button>
+ <br>
+ <br>
+ <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">鎸夊簭鍙峰垱寤�
+ </el-button>
+ </el-main>
+ </div>
+
+
+ <!-- 鍙充晶-->
+ <div style="height: 100%;width: 70%">
+
+ <el-aside style="width: 100%;height: 100%">
+ <vxe-grid
+ id="rightTable"
+ ref="xGrid"
+ checkbox-config="{ reserve: true, strict: true }"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ @checkbox-change="handleCheckboxChange"
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{
+ row[item.field.split('.')[0]][item.field.split('.')[1]]
+ }}</span>
+ <span v-else>{{ row[item.field] }}</span>
+ </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"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
+ </vxe-grid>
+ </el-aside>
+ </div>
</el-container>
</div>
</div>
</template>
<style scoped>
-.common-layout {
- height: 100%;
+* {
+ margin: 0;
+ padding: 0;
}
-.header{
+.common-layout {
+ width: 99%;
+ height: 96%;
+}
+
+.header {
width: 100%;
height: 35px;
margin-top: -20px;
@@ -658,4 +958,5 @@
}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0