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"
			@@ -208,18 +208,32 @@
			flowCard: selectRecords

			})
			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")
			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



			}
			}
			}