From 24cf0b6db81cf1cad07d26c9bfbf12564681e7a3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 四月 2024 11:33:58 +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 | 699 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 475 insertions(+), 224 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 c9978b9..de7e907 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
@@ -11,9 +11,14 @@
import Sortable from 'sortablejs'
import BasicTable from '@/components/basic/BasicTable.vue'
import {VXETable} from "vxe-table";
-
+import useUserInfoStore from "@/stores/userInfo";
+import { useI18n } from 'vue-i18n'
+//璇█鑾峰彇
+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' : {
@@ -27,11 +32,11 @@
case 'delete': {
request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
if (res.code == 200) {
- ElMessage.success("鍒犻櫎鎴愬姛")
+ ElMessage.success(t('workOrder.deleteOk'))
location.reload();
} else {
ElMessage.warning(res.msg)
- router.push("/login")
+ // router.push("/login")
}
})
break
@@ -39,6 +44,16 @@
}
}
+let flag = $ref(true)
+
+function intoCreateProduct() {
+ if (flag) {
+ router.push(`/main/processCard/SplittingDetails?orderId=${orderId}`)
+ } else {
+ router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
+ }
+ flag = !flag
+}
//瀹氫箟鏃堕棿
const form = reactive({
@@ -65,22 +80,7 @@
clientHeight.value = row.$event.target.clientHeight
}
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
-let filterData = ref({
- product: {
- thickness: '',
- totalThickness:''
- },
- orderDetail: {
- orderNumber: '',
- height: '',
- computeGrossArea: '',
- quantity: '',
- shape:'',
- width:'',
- weight:''
- }
-
-})
+let filterData = ref({})
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -94,12 +94,13 @@
let orderId = route.query.orderId
let productionId = route.query.productionId
+
+
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
if (res.code == 200) {
- //console.log(res.data)
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
@@ -114,36 +115,11 @@
// 鎵嬪姩瑙﹀彂绛涢��
$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) => {
@@ -151,27 +127,37 @@
return regex.test(value); // 杩斿洖true/false
}
+
+//绛涢�夋柟娉�
+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()
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -181,17 +167,46 @@
mode: 'row',
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: '閲嶉噺'}
+ columns: [
+ {type: 'checkbox', fixed: "left", title: t('basicData.check')},
+ {
+ field: 'orderNumber',
+ title: t('order.OrderNum'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'shape',
+ title: t('order.shape'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'width',
+ title: t('order.width'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '60px'
+ },
+ {
+ field: 'height',
+ title: t('order.height'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '60px'
+ },
+ {field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '60px'},
+ {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')}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -204,16 +219,14 @@
zoom: true,
custom: true
},
- data: [
-
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['鎬绘暟閲�','鎬婚潰绉�','鍒嗙鏁�']
- return[
+ 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)
@@ -225,28 +238,27 @@
})
-
//宸︿晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGridLeft = ref()
const gridLeftOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -256,38 +268,56 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type: 'checkbox', fixed: "left", title: '閫夋嫨'},
- {field: 'processId', title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },width:130 },
- {field: 'orderNumber', title: '璁㈠簭', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {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: '鎬诲帤搴�'},
+ columns: [
+ {type: 'checkbox', fixed: "left", title: t('basicData.check')},
+ {
+ field: 'processId',
+ title: t('processCard.processId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ width: 130,
+ filterMethod: filterChanged
+ },
+ {
+ field: 'orderNumber',
+ title: t('order.OrderNum'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'}
+ , filterMethod: filterChanged
+ },
+ {
+ field: 'landingSequence',
+ title: '钀芥灦椤哄簭',
+ 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')},
+ {field: 'totalThickness', title: t('processCard.totalThickness')},
],//琛ㄥご鎸夐挳
toolbarConfig: {
- // buttons: [{
- //
- // }],
- import: false,
- export: true,
- print: true,
+ buttons: [
+ {code: 'saveFlowCard', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save'},
+ ],
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
- data: [
-
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['鎬绘暟閲�','鎬婚潰绉�','鍒嗙鏁�']
- return[
+ 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)
@@ -298,36 +328,85 @@
}
})
+//瀹氫箟杈撳叆鏁伴噺
+let checkedNum = ref('')
//鍒涘缓娴佺▼鍗�
const createProcessCard = () => {
const $grid = xGrid.value
const checkedList = $grid.getCheckboxRecords()
- if(checkedList.length===0){
- ElMessage.warning("璇峰厛閫夋嫨鍙充晶鏁版嵁")
+
+ if (checkedList.length === 0) {
+ 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
+ if (leftData.length !== 0) {
+ 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)
+ const 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
+ })
+ //鍒犻櫎key
+ checkedList.forEach((item) => {
+ let key = item._X_ROW_KEY
+ delete item._X_ROW_KEY
+ if (item.baiscQuantity===0){
+ $grid.remove(checkedList)
+ }
+ $gridLeft.insertAt(checkedList)
+ 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 addRight = () => {
- try{
+const addRight = () => {
+ try {
//宸﹁竟琛ㄦ牸瀹氫箟
const $gridLeft = xGridLeft.value
//鍙宠竟琛ㄦ牸瀹氫箟
@@ -335,148 +414,263 @@
//鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
const checkedList = $gridLeft.getCheckboxRecords()
//鍒ゆ柇宸﹁竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
- if(checkedList.length===0){
- ElMessage.warning("璇峰厛閫夋嫨宸︿晶鏁版嵁")
+ if (checkedList.length === 0) {
+ ElMessage.warning(t('processCard.schedulingArea'))
return
}
- const regex = /^(\d+|)$/;
- if(!regex.test(checkedNum.value)){
- ElMessage.warning("璇疯緭鍏ユ鏁存暟")
+ const regex = /^(\d+|)$/;
+ if (!regex.test(checkedNum.value)) {
+ ElMessage.warning(t('processCard.schedulingNo'))
return
}
//鍒ゆ柇姝ｆ暣鏁�
- if(/^[1-9]\d*$/.test(checkedNum.value)){
+ if (/^[1-9]\d*$/.test(checkedNum.value)) {
//瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
- checkedList.forEach((item)=> {
+ checkedList.forEach((item) => {
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if(item.quantity <checkedNum.value) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡彲鐢ㄦ暟閲忕殑鏁板瓧");
+ if (item.quantity < checkedNum.value) throw new Error(t('processCard.schedulingQuantity'));
//宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
- item.quantity = item.quantity-checkedNum.value
+ item.quantity = item.quantity - checkedNum.value
//鍙宠竟琛ㄦ牸鏁版嵁
let rightData = $grid.getTableData().fullData
//鍙宠竟琛ㄦ牸鏁版嵁涓煡鎵惧綋鍓嶆暟鎹笅鏍�
let filterIndex = rightData.findIndex(item1 => item1.orderNumber === item.orderNumber)
//濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
- if (filterIndex>=0){
- rightData[filterIndex].baiscQuantity =rightData[filterIndex].baiscQuantity*1+ checkedNum.value*1
+ if (filterIndex >= 0) {
+ rightData[filterIndex].baiscQuantity = rightData[filterIndex].baiscQuantity * 1 + checkedNum.value * 1
//濡傛灉宸﹁竟鏁伴噺涓�0鏃跺垹闄ゆ鏉℃暟鎹�
- if(item.quantity=== 0){
+ if (item.quantity === 0) {
$gridLeft.remove(item)
}
- }else {
+ } else {
//鍙宠竟琛ㄦ牸娌℃湁姝ゆ潯鏁版嵁鍒欏線鍙宠竟琛ㄦ牸鎻掑叆鏁版嵁
item.baiscQuantity = checkedNum.value
+ if (item.quantity === 0) {
+ $gridLeft.remove(item)
+ }
$grid.insert(item)
}
})
- }else if(checkedNum.value===''){//鍒ゆ柇鏁伴噺杈撳叆妗嗘湁鏃犺緭鍏ユ暟瀛�
+ } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
- checkedList.forEach((item)=> {
+ checkedList.forEach((item) => {
let rightData = $grid.getTableData().fullData
let filterIndex = rightData.findIndex(item1 => item1.orderNumber === item.orderNumber)
//鏃犺緭鍏ュ苟涓斿鏋滃彸杈硅〃鏍兼暟鎹腑瀛樺湪褰撳墠鏁版嵁鍒欐暟閲忕浉鍔�
- if(filterIndex>-1){
- rightData[filterIndex].baiscQuantity =rightData[filterIndex].baiscQuantity*1+ item.quantity*1
- }else{
+ if (filterIndex > -1) {
+ rightData[filterIndex].baiscQuantity = rightData[filterIndex].baiscQuantity * 1 + item.quantity * 1
+ } else {
+ delete item._X_ROW_KEY
$grid.insert(item)
}
$gridLeft.remove(item)
})
- }
- }
- catch (e){
+
+ }
+ //娓呴櫎涓よ竟澶嶉�夋
+ $gridLeft.clearCheckboxRow()
+ $grid.clearCheckboxRow()
+ } catch (e) {
ElMessage.warning(e.message)
}
}
//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
-const addLeft = () => {
+const addLeft = () => {
+ try {
+ //宸﹁竟琛ㄦ牸瀹氫箟
+ const $gridLeft = xGridLeft.value
+ //鍙宠竟琛ㄦ牸瀹氫箟
+ const $grid = xGrid.value
+ //鑾峰彇鍙宠竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+ const checkedList = $grid.getCheckboxRecords()
+ //鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+ const checkedListLeft = $gridLeft.getCheckboxRecords()
+ //鍒ゆ柇鍙宠竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
+ if (checkedList.length * 1 === 0) {
+ ElMessage.warning(t('processCard.schedulingOk'))
+ return
+ }
+ if (checkedListLeft.length !== 1) {
+ ElMessage.warning(t('processCard.schedulingTime'))
+ return
+ }
+ const regex = /^(\d+|)$/;
+ if (!regex.test(checkedNum.value)) {
+ ElMessage.warning(t('processCard.schedulingNo'))
+ return
+ }
+ //鍒ゆ柇姝ｆ暣鏁�
+ if (/^[1-9]\d*$/.test(checkedNum.value)) {
+ checkedList.forEach((item) => {
+ //鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
+ if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧");
+ item.baiscQuantity = item.baiscQuantity - checkedNum.value
+ //瀹氫箟key鍊间繚鎸�
+ let key = item._X_ROW_KEY
+ //宸﹁竟琛ㄦ牸鏁版嵁
+ let leftData = $gridLeft.getTableData().fullData
+ //宸﹁竟琛ㄦ牸鏁版嵁涓煡鎵惧綋鍓嶆暟鎹笅鏍�
+ let filterIndex = leftData.findIndex(item1 => item1.orderNumber === item.orderNumber)
+ //鍒ゆ柇鍙充晶鍕鹃�夊�间笌宸︿晶鏄惁鐩稿悓
+ if (checkedListLeft[0].orderNumber === item.orderNumber) {
+ //濡傛灉鍙宠竟琛ㄦ牸鏁版嵁涓瓨鍦ㄥ綋鍓嶆暟鎹垯鏁伴噺鐩稿姞
+ if (filterIndex >= 0) {
+ leftData[filterIndex].quantity = leftData[filterIndex].quantity * 1 + checkedNum.value * 1
+
+ if (item.baiscQuantity === 0) {
+ $grid.remove(checkedList)
+ }
+ //delete item._X_ROW_KEY
+ } else {
+ item.quantity = checkedNum.value
+ item.processId = checkedListLeft[0].processId
+ item.landingSequence = checkedListLeft[0].landingSequence
+ 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
+ if (item.baiscQuantity === 0) {
+ $grid.remove(checkedList)
+
+ }
+ 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
+ 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 === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
+ checkedList.forEach((item) => {
+ item.processId = checkedListLeft[0].processId
+ item.landingSequence = checkedListLeft[0].landingSequence
+ item.quantity = checkedListLeft[0].baiscQuantity
+ 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 = {
+ toolbarButtonClick({code}) {
+ const $grid = xGridLeft.value
+ if ($grid) {
+ switch (code) {
+ case 'saveFlowCard': {
+ const $table = xGridLeft.value
+ const $tableRight = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ // const selectRight = $tableRight.getCheckboxRecords()
+ let leftData = $tableRight.getTableData().fullData
+ if (selectRecords.length === 0) {
+ ElMessage.warning("璇峰厛閫夋嫨淇濆瓨鐨勬暟鎹�")
+ return
+ }
+
+ if (leftData.length > 0) {
+ ElMessage.warning("璇峰厛灏嗗彸渚ф暟鎹叏閮ㄥ缓绔嬫祦绋嬪崱鍚庝繚瀛�")
+ return;
+ }
+ let flowCardData = ref({
+ flowCard: selectRecords,
+ userName: username,
+ productionId: productionId
+ })
+
+ request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success("淇濆瓨鎴愬姛")
+ //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)
+ }
+ })
+
+ }
+ return;
+
+ }
+
+ }
+ }
+ },
+
+}
</script>
<template>
- <div>
- <div class="header">
+ <div style="width: 100%;height: 100%">
- <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">鍒嗘灦姹囨��</el-button>
- <el-button type="primary">宸︿晶鍏ㄩ��</el-button>
- <el-button type="primary">鍙充晶鍏ㄩ��</el-button>
- </div>
- <div class="common-layout">
- <el-container height="100%">
- <el-aside width="44%" style="">
+ <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%">
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGridLeft"
- v-bind="gridLeftOptions"
- >
- <!-- @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)"/>
- </div>
- </div>
- </template>
-
-
- </vxe-grid>
-
- </el-aside>
-
- <el-main width="12%" style="">
- <span>鏈垎鏁伴噺:45</span><br>
- <span>鏈垎閲嶉噺:333</span><br>
- <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="44%" style="">
-
- <vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
+ max-height="100%"
+ height="650px"
+ v-bind="gridLeftOptions"
+ v-on="gridEvents"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
@@ -484,47 +678,104 @@
<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-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 width="12%">
+ <el-main style="">
+ <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-main>
+ </div>
+
+
+ <!-- 鍙充晶-->
+ <div style="height: 100%;width: 100%">
+
+ <el-aside style="width: 100%;height: 100%">
+ <vxe-grid
+
+ ref="xGrid"
+ class="mytable-scrollbar"
+ max-height="100%"
+ height="650px"
+ 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 #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{
+.common-layout {
height: 100%;
}
-.el-aside{
+.header {
+ width: 100%;
+ height: 35px;
+ margin-top: -20px;
+}
+
+.el-aside {
height: 100%;
}
-.el-main{
+.el-main {
height: 100%;
text-align: center;
}
-
</style>
\ No newline at end of file
--
Gitblit v1.8.0