ERP_override.git

			@@ -2,7 +2,7 @@

			import request from "@/utils/request"
			import deepClone from "@/utils/deepClone"
			import {ElDatePicker, ElMessage} from "element-plus"
			import {ElDatePicker, ElMessage, ElMessageBox} from "element-plus"
			import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
			import footSum from "@/hook/footSum"
			import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
			@@ -112,7 +112,7 @@
			align: 'center',//文字居中
			stripe:true,//斑马纹
			rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
			id: 'CustomerList',
			id: 'SelectDetailProcessCard',
			showFooter: true,//显示脚
			printConfig: {},
			importConfig: {},
			@@ -136,25 +136,25 @@
			},//表头参数
			columns:[
			{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
			{ type: 'seq',fixed:"left", title: '自序', width: 50 },
			{field: 'order_id', title: '销售单号',filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
			{field: 'process_id', width: 140, title: '流程卡号' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'order_number', title: '订单序号' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
			{field: 'technology_number', title: '小片顺序' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
			{field: 'quantity', title: '数量',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
			{field: 'child_width', title: '宽', },
			{field: 'child_height', title: '高', },
			{field: 'area', title: '面积' ,showOverflow:"ellipsis"},
			{field: 'product_name', title: '产品名称', },
			{field: 'glass_child', title: '单片名称', },
			{field: 'founder', title: '分架员', },
			{field: 'splitFrame_time', title: '分架时间', },
			{ type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
			{field: 'order_id', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
			{field: 'process_id', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'order_number', title: t('order.OrderNum') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
			{field: 'technology_number', title: t('processCard.technologyNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
			{field: 'quantity', title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
			{field: 'child_width', title: t('order.width'), },
			{field: 'child_height', title: t('order.height'), },
			{field: 'area', title: t('order.area') ,showOverflow:"ellipsis"},
			{field: 'product_name', title: t('order.product'), },
			{field: 'glass_child', title: t('reportingWorks.glassChild'), },
			{field: 'founder', title: t('processCard.founder'), },
			{field: 'splitFrame_time', title: t('processCard.splitFrameTime'), },
			],//表头按钮

			toolbarConfig: {
			// buttons: [{
			//
			// }],
			buttons: [
			{'code': 'add', 'name': "合并",status: 'primary'}
			],
			import: false,
			// export: true,
			// print: true,
			@@ -197,6 +197,50 @@
			})


			const gridEvents = {
			toolbarButtonClick ({ code }) {
			const $grid = xGrid.value
			if ($grid) {
			switch (code) {
			case 'add': {
			const selectRecords = $grid.getTableData().visibleData
			let flowData = ref({
			flowCard: selectRecords

			})
			ElMessageBox.confirm(
			"是否合并？",
			{
			confirmButtonText: t('basicData.confirmButtonText'),
			cancelButtonText: t('basicData.cancelButtonText'),
			distinguishCancelAndClose: true,
			type: 'warning',
			}
			).then(()=>{
			request.post("/processCard/mergeFlowCard", flowData.value).then((res) => {
			if(res.code==200 && res.data==="true"){
			ElMessage.success(t('basicData.msg.saveSuccess'))
			router.push({path: '/main/processCard/SelectProcessCard', query:{random:Math.random()}})
			}else{
			ElMessage.warning(t('basicData.msg.saveFail'))
			}
			}).catch((err)=>{
			ElMessage.error(t('basicData.msg.ServerConnectionError'))
			router.push("/login")
			})

			})
			break



			}
			}
			}
			}
			}



			</script>

			@@ -209,6 +253,7 @@
			class="mytable-scrollbar"
			ref="xGrid"
			v-bind="gridOptions"
			v-on="gridEvents"

			>
			<!-- @toolbar-button-click="toolbarButtonClickEvent"-->