~admin/ERP_override.git

			@@ -16,7 +16,7 @@
			//定义表头数据
			const titleUploadData = ref({
			//流程卡号
			processId: 'NG24030501A01/2',
			processId: 'NG24030701B01/1',
			//销售单号
			orderId: '',
			//生产单号
			@@ -229,11 +229,10 @@
			const regex = /^[0-9]\d*$/
			const brokenNum =
			(row.breakageQuantity === undefined \|\| row.breakageQuantity===null) ? 0 : row.breakageQuantity

			if (row.completedQuantity && !regex.test(row.completedQuantity)) {
			return new Error('请输入整数，并且大于-1')
			}else if(row.completedQuantity+brokenNum>row.quantity){
			return new Error((`${row.completedQuantity}+$(brokenNum)>${row.quantity}`))
			return new Error('请输入整数，并且大于等于0')
			}else if((row.completedQuantity1+brokenNum1)>row.quantity*1){
			return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
			}

			}
			@@ -524,12 +523,12 @@
			titleUploadData.value.creator = user.user.userName
			titleUploadData.value.creatorId = user.user.userId
			const requestDetailData = xGrid.value.getTableData().fullData.filter((row) => {
			const a = (row.completedQuantity !== undefined && row.completedQuantity !== null && row.completedQuantity !== '')
			const b = (row.breakageQuantity !== undefined && row.breakageQuantity !== null && row.breakageQuantity !== '')
			const a = (row.completedQuantity !== undefined && row.completedQuantity !== null && row.completedQuantity !== '' && row.completedQuantity*1!==0)
			const b = (row.breakageQuantity !== undefined && row.breakageQuantity !== null && row.breakageQuantity !== '' && row.breakageQuantity*1!==0)
			return (a \|\| b)
			})
			if(requestDetailData.length === 0){
			ElMessage.warning('请填写至少一条损耗数和完工数')
			ElMessage.warning('请填写至少一条损耗数和完工数大于0')
			return false
			}

			@@ -537,11 +536,12 @@
			title:titleUploadData.value,
			detail:xGrid.value.getTableData().fullData
			}
			console.log(xGrid.value.getTableData().fullData)
			request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
			if (res.code == 200){
			ElMessage.success("报工成功")
			router.push({path:'/main/reportingWorks/AddReportingWork',query:{random:Math.random()}})
			}else{
			ElMessage.error(res.msg)
			}
			}).catch(err =>{
			ElMessage.error(err.message)