From bd03748adb5b9fda8ac4b52c8de93062eaa8ee72 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 22 五月 2024 10:26:09 +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 | 883 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 746 insertions(+), 137 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 94408ab..7434174 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
@@ -1,172 +1,781 @@
<script setup>
-import {ArrowLeftBold} from "@element-plus/icons-vue";
-import {useRouter} from "vue-router";
-const router = useRouter()
-let flag = $ref(true)
-function intoCreateProduct(){
- if(flag){
- router.push('/main/processCard/SplittingDetails')
- }else {
- router.push('/main/processCard/SplittingDetails')
+
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import {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"
+import GlassType from "@/components/sd/product/GlassType.vue"
+import {useRouter} from 'vue-router'
+import Sortable from 'sortablejs'
+import BasicTable from '@/components/sd/product/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' : {
+ 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
+ }
}
- flag=!flag
}
-const tableData = [
- {
- processCard: 'NG231201A01',
- orderSequence: '1',
- landingSequence: '1',
- floorNumber: '14-BSGB05',
- shape: '鏅舰',
- longSide: '5000',
- shortSide: '4400',
- total: '24',
- totalThickness: '26',
+
+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({
+ date1: '',
+})
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
+
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+ // 鍐呭楂樺害
+ scrollTop.value = row.$event.target.scrollTop
+ scrollHeight.value = row.$event.target.scrollHeight
+ clientHeight.value = row.$event.target.clientHeight
+}
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({})
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = $ref(1)
+let pageState = null
+
+const {currentRoute} = useRouter()
+const route = currentRoute.value
+
+let orderId = route.query.orderId
+let productionId = route.query.productionId
+
+
+//绗竴娆″姞杞芥暟鎹�
+
+request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+})
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+const changeFilterEvent = (event, option, $panel,) => {
+ // 鎵嬪姩瑙﹀彂绛涢��
+ $panel.changeOption(event, !!option.data, option)
+}
+
+function padLeftZero(str) {
+ return ('00' + str).substr(str.length)
+}
+
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ 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",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'CustomerList',
+ showFooter: true,//鏄剧ず鑴�
+ printConfig: {},
+ importConfig: {},
+ exportConfig: {},
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
+ columnConfig: {
+ resizable: true,
+ useKey: true
},
- {
- processCard: 'NG231201A01',
- orderSequence: '2',
- landingSequence: '2',
- floorNumber: '15-BSGB05',
- shape: '鏅舰',
- longSide: '5000',
- shortSide: '4400',
- total: '24',
- totalThickness: '26',
+ filterConfig: { //绛涢�夐厤缃」
+ //remote: true
},
- {
- processCard: 'NG231201A02',
- orderSequence: '3',
- landingSequence: '3',
- floorNumber: '16-BSGB05',
- shape: '鏅舰',
- longSide: '5000',
- shortSide: '4400',
- total: '24',
- totalThickness: '26',
+ customConfig: {
+ storage: true
},
-]
-const tableData2 = [
- {
- orderSequence: '4',
- floorNumber: '17-BSGB08',
- shape: '鏅舰',
- longSide: '4600',
- shortSide: '3880',
- undividedQuantity: '15',
- undividedArea: '99.84',
- totalThickness:'28',
- glassThickness:'24',
- undividedWeight:'111'
+ editConfig: {
+ trigger: 'click',
+ mode: 'row',
+ showStatus: true
+ },//琛ㄥご鍙傛暟
+ 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: {
+ // buttons: [{
+ //
+ // }],
+ // import: false,
+ // export: true,
+ // print: true,
+ zoom: true,
+ custom: true
},
- {
- orderSequence: '5',
- floorNumber: '18-BSGB08',
- shape: '鏅舰',
- longSide: '4600',
- shortSide: '3880',
- undividedQuantity: '15',
- undividedArea: '99.84',
- totalThickness:'28',
- glassThickness:'24',
- undividedWeight:'111'
+ data: [],//table body瀹為檯鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['', '', '', '', '']
+ return [
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return t('basicData.total')
+ }
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
+
+})
+
+//宸︿晶瀛愮粍浠舵帴鏀跺弬鏁�
+const xGridLeft = ref()
+const gridLeftOptions = reactive({
+ border: "full",//琛ㄦ牸鍔犺竟妗�
+ keepSource: true,//淇濇寔婧愭暟鎹�
+ align: 'center',//鏂囧瓧灞呬腑
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'CustomerList',
+ showFooter: true,//鏄剧ず鑴�
+ printConfig: {},
+ importConfig: {},
+ exportConfig: {},
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
+ columnConfig: {
+ resizable: true,
+ useKey: true
},
- {
- orderSequence: '6',
- floorNumber: '19-BSGB08',
- shape: '鏅舰',
- longSide: '4600',
- shortSide: '3880',
- undividedQuantity: '15',
- undividedArea: '99.84',
- totalThickness:'28',
- glassThickness:'24',
- undividedWeight:'111'
+ filterConfig: { //绛涢�夐厤缃」
+ //remote: true
},
-]
+ customConfig: {
+ storage: true
+ },
+ editConfig: {
+ trigger: 'click',
+ mode: 'row',
+ showStatus: true
+ },//琛ㄥご鍙傛暟
+ 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: [
+ {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瀹為檯鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['']
+ return [
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return t('basicData.total')
+ }
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
+
+})
+//瀹氫箟杈撳叆鏁伴噺
+let checkedNum = ref('')
+//鍒涘缓娴佺▼鍗�
+const createProcessCard = () => {
+ 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
+ if (leftData.length !== 0) {
+ index = leftData[0].landingSequence + 1
+ //index = index.toString().padStart(2, '0')
+ }
+ 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()
+ }
+
+
+
+}
+
+
+
+//鍚戝彸杈硅〃鏍兼坊鍔犳暟鎹�
+const addRight = () => {
+ try {
+ //宸﹁竟琛ㄦ牸瀹氫箟
+ const $gridLeft = xGridLeft.value
+ //鍙宠竟琛ㄦ牸瀹氫箟
+ const $grid = xGrid.value
+ //鑾峰彇宸﹁竟琛ㄦ牸checkbox閫変腑鐨勬暟鎹�
+ const checkedList = $gridLeft.getCheckboxRecords()
+ //鍒ゆ柇宸﹁竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
+ if (checkedList.length === 0) {
+ ElMessage.warning(t('processCard.schedulingArea'))
+ 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.quantity < checkedNum.value) throw new Error(t('processCard.schedulingQuantity'));
+ //宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
+ 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
+ //濡傛灉宸﹁竟鏁伴噺涓�0鏃跺垹闄ゆ鏉℃暟鎹�
+ if (item.quantity === 0) {
+ $gridLeft.remove(item)
+ }
+ } else {
+ //鍙宠竟琛ㄦ牸娌℃湁姝ゆ潯鏁版嵁鍒欏線鍙宠竟琛ㄦ牸鎻掑叆鏁版嵁
+ item.baiscQuantity = checkedNum.value
+ if (item.quantity === 0) {
+ $gridLeft.remove(item)
+ }
+ $grid.insert(item)
+ }
+ })
+ } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
+
+ 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 {
+ delete item._X_ROW_KEY
+ $grid.insert(item)
+ }
+
+ $gridLeft.remove(item)
+ })
+
+
+ }
+ //娓呴櫎涓よ竟澶嶉�夋
+ $gridLeft.clearCheckboxRow()
+ $grid.clearCheckboxRow()
+ } catch (e) {
+ ElMessage.warning(e.message)
+ }
+}
+//鍚戝乏杈硅〃鏍兼坊鍔犳暟鎹�
+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="">
- <el-table :data="tableData" border style="width: 100%" height="100%">
- <el-table-column sortable prop="processCard" label="娴佺▼鍗″彿" width="120" />
- <el-table-column prop="orderSequence" label="璁㈠簭" width="60" />
- <el-table-column prop="landingSequence" label="钀芥灦椤哄簭" width="85" />
- <el-table-column prop="floorNumber" label="妤煎眰缂栧彿" :show-overflow-tooltip='true' width="120" />
- <el-table-column prop="shape" label="褰㈢姸" width="65" />
- <el-table-column prop="longSide" label="闀胯竟" width="65" />
- <el-table-column prop="shortSide" label="鐭竟" width="65" />
- <el-table-column prop="total" label="鎬绘暟閲�" width="75" />
- <el-table-column prop="totalThickness" label="鎬诲帤搴�" width="75" />
- </el-table><!-- <h1>{{msg}}</h1> -->
+ <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
+ ref="xGridLeft"
+ class="mytable-scrollbar"
+ max-height="100%"
+ height="650px"
+ v-bind="gridLeftOptions"
+ v-on="gridEvents"
+ >
+ <!-- @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>
- <el-main width="12%" style="">
- <span>鏈垎鏁伴噺:45</span><br>
- <span>鏈垎閲嶉噺:333</span><br>
- <span>閫変腑鏁伴噺:</span><br>
- <el-button type="primary"> 鈫� </el-button>
- <br>
- <br>
- <el-button type="primary"> 鈫� </el-button>
- <br>
- <br>
- <el-button type="primary">寤虹珛娴佺▼鍗�</el-button>
- </el-main>
+ <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>
- <el-aside width="44%" style="">
- <el-table :data="tableData2" border style="width: 100%" height="100%">
- <el-table-column prop="orderSequence" label="璁㈠簭" width="60" />
- <el-table-column prop="floorNumber" label="妤煎眰缂栧彿" :show-overflow-tooltip='true' width="100" />
- <el-table-column prop="shape" label="褰㈢姸" width="65" />
- <el-table-column prop="longSide" label="闀胯竟" width="60" />
- <el-table-column prop="shortSide" label="鐭竟" width="60" />
- <el-table-column prop="undividedQuantity" label="寰呭垎鏁伴噺" width="85" />
- <el-table-column prop="undividedArea" label="寰呭垎闈㈢Н" width="85" />
- <el-table-column prop="totalThickness" label="鎬诲帤搴�" width="75" />
- <el-table-column prop="glassThickness" label="鐜荤拑鍘氬害" width="85" />
- <el-table-column prop="undividedWeight" label="寰呭垎閲嶉噺" width="85" />
- </el-table><!-- <h1>{{msg}}</h1> -->
- </el-aside>
+ <!-- 鍙充晶-->
+ <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