ERP_override.git

			@@ -56,6 +56,7 @@

			// 定义表头上传数据
			let titleUploadData = ref({
			deliveryId:'',
			deliveryState:'',
			stockState:'',
			paymentTerms:'',
			@@ -166,6 +167,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 +210,8 @@
			if(res.code==200){
			pageTotal.value=res.data.total
			titleUploadData.value=deepClone(res.data.delivery)

			titleUploadData.value.deliveryId=str
			console.log(titleUploadData.value)

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

			@@ -421,6 +424,13 @@
			if(res.code==200 && res.data==="true"){
			ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
			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"){
			@@ -446,6 +456,9 @@
			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/createDelivery',query:{
			deliveryID:titleUploadData.value.deliveryId,
			random:Math.random()}})*/
			} else {
			ElMessage.warning(t('basicData.msg.reviewFail'))
			}
			@@ -465,6 +478,9 @@
			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/createDelivery',query:{
			deliveryID:titleUploadData.value.deliveryId,
			random:Math.random()}})*/
			} else {
			ElMessage.warning(t('basicData.msg.reviewFail'))
			}