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"
			@@ -152,9 +152,9 @@
			],//表头按钮

			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"-->
			@@ -230,7 +275,9 @@
			<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 type="type" v-model="option.data"
			@keyup.enter.native="$panel.confirmFilter()"
			@input="changeFilterEvent($event, option, $panel)"/>
			</div>
			</div>
			</template>