ERP_override.git

			@@ -14,6 +14,7 @@
			import footSum from "@/hook/footSum";
			import {changeFilterEvent,filterChanged} from "@/hook"
			import companyInfo from "@/stores/sd/companyInfo";
			import {multiply} from "@/utils/decimal";

			//语言获取
			const { t } = useI18n()
			@@ -56,6 +57,7 @@

			// 定义表头上传数据
			let titleUploadData = ref({
			deliveryId:'',
			deliveryState:'',
			stockState:'',
			paymentTerms:'',
			@@ -166,6 +168,7 @@
			titleUploadData.value=deepClone(res.data.title)
			titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
			titleUploadData.value.payMethod = titleSelectJson.value.payMethod[0].basicName
			titleUploadData.value.deliveryId=""
			const today = new Date
			today.setTime(today.getTime() )
			titleUploadData.value.deliveryDate=today.getFullYear() +
			@@ -208,7 +211,7 @@
			if(res.code==200){
			pageTotal.value=res.data.total
			titleUploadData.value=deepClone(res.data.delivery)

			titleUploadData.value.deliveryId=str

			//根据审核状态显示审核按钮或者是反审按钮

			@@ -295,6 +298,7 @@
			customConfig: {
			storage: true
			},
			checkboxConfig:{checkAll:true},
			mouseConfig:{selected: true},//鼠标选中
			keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
			editConfig: {
			@@ -420,7 +424,14 @@
			request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
			if(res.code==200 && res.data==="true"){
			ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
			router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
			//router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
			if(titleUploadData.value.deliveryId.trim()===""){
			router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
			}else{
			router.push({path:'/main/delivery/createDelivery',query:{
			deliveryID:titleUploadData.value.deliveryId,
			random:Math.random()}})
			}
			}else if(res.data==="false1"){
			ElMessage.warning(t('delivery.pleaseMsg1'))
			}else if(res.data==="false2"){
			@@ -445,7 +456,10 @@
			request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
			if (res.code == 200 && res.data===true) {
			ElMessage.success(t('basicData.msg.ReviewSuccess'))
			router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
			//router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
			router.push({path:'/main/delivery/createDelivery',query:{
			deliveryID:titleUploadData.value.deliveryId,
			random:Math.random()}})
			} else {
			ElMessage.warning(t('basicData.msg.reviewFail'))
			}
			@@ -464,7 +478,10 @@
			request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
			if (res.code == 200 && res.data===true) {
			ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
			router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
			//router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
			router.push({path:'/main/delivery/createDelivery',query:{
			deliveryID:titleUploadData.value.deliveryId,
			random:Math.random()}})
			} else {
			ElMessage.warning(t('basicData.msg.reviewFail'))
			}
			@@ -495,6 +512,10 @@
			}
			dataList.forEach((item,index) =>{
			if(index>=result.start && index<=result.end){
			//取消选中
			if(parseInt(firstVal)<=0){
			xGrid.value.setCheckboxRow(item, false);
			}
			if(result.cell.indexOf('.')>-1){
			const columnArr = result.cell.split('.')
			item[columnArr[0]][columnArr[1]] = firstVal
			@@ -547,7 +568,7 @@
			return new Error(t('delivery.theShipmentQuantityCannotBeGreaterThanTheInventoryQuantity'))
			}else if (e.row.deliveryDetail.quantity ==="") {
			return new Error(t('delivery.theShipmentQuantityCannotBeEmptyOr0'))
			}
			}
			const regex = /^[1-9]\d*$/g
			if ( !regex.test(e.row.deliveryDetail.quantity) ) {
			return new Error(t('productStock.pleaseEnterAPositiveInteger'))
			@@ -568,6 +589,16 @@
			],

			})

			const editClosedEvent = ({ row, column }) => {

			if (['deliveryDetail.quantity'].includes(column.property)) {
			if(parseInt(row.deliveryDetail.quantity)===0){
			xGrid.value.setCheckboxRow(row, false);
			}
			}

			}


			</script>
			@@ -662,6 +693,7 @@
			v-bind="gridOptions"
			v-on="gridEvents"
			:edit-rules="validRules"
			@edit-closed="editClosedEvent"

			>
			<template #num1_filter="{ column, $panel }">