ERP_override.git

			@@ -213,8 +213,13 @@
			titleUploadData.value=deepClone(res.data.delivery)
			titleUploadData.value.deliveryId=str

			//判断是否发货出库
			if(!company.deliveryOutbound){
			if(titleUploadData.value.stockState!==0){
			gridOptions.toolbarConfig.buttons[2].disabled = true
			}
			}
			//根据审核状态显示审核按钮或者是反审按钮

			if(titleUploadData.value.deliveryState!==0){
			gridOptions.toolbarConfig.buttons[1].disabled = true
			gridOptions.toolbarConfig.buttons[0].disabled = true
			@@ -222,9 +227,7 @@
			if(titleUploadData.value.deliveryState===0){
			gridOptions.toolbarConfig.buttons[2].disabled = true
			}
			if(titleUploadData.value.stockState!==0){
			gridOptions.toolbarConfig.buttons[2].disabled = true
			}

			pageNum=1
			produceList = deepClone(res.data.data)

			@@ -327,7 +330,7 @@
			{field: 'deliveryDetail.money',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'order.batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'shape',width:120, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'finishedGoodsInventory.actualSignalArea',width:120, title: t('productStock.singlePieceArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'area',width:120, title: t('productStock.singlePieceArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'grossArea',width:120, title: t('productStock.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'computeArea',width:120, title: t('order.computeArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			{field: 'computeGrossArea',width:120, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
			@@ -447,11 +450,12 @@
			deliveryId: route.query.deliveryID,
			type: 2,
			userName:userStore.user.userName,
			userId:userStore.user.userId
			userId:userStore.user.userId,
			deliveryOutbound:company.deliveryOutbound

			})
			request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
			if (res.code == 200 && res.data===true) {
			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:{
			@@ -471,11 +475,12 @@
			deliveryId: route.query.deliveryID,
			type: 0,
			userName:userStore.user.userName,
			userId:userStore.user.userId
			userId:userStore.user.userId,
			deliveryOutbound:company.deliveryOutbound

			})
			request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
			if (res.code == 200 && res.data===true) {
			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:{
			@@ -647,8 +652,8 @@
			</script>

			<template>
			<div class="main-div">
			<div class="order-primary" style="background-color: white">
			<div style="width: 100%;height: 100%">
			<div class="head" style="background-color: white">
			<el-row>
			<el-col :span="2"><el-text>{{$t('customer.customerNumber')}}:</el-text></el-col>
			<el-col :span="3"><el-input style="font-size: large;color: #181818" v-model="titleUploadData.customerId" :readonly="true" ></el-input></el-col>
			@@ -728,9 +733,9 @@
			<el-col :span="2"><el-input v-model="titleUploadData.freight" :readonly="true"/></el-col>
			</el-row>
			</div>
			<div class="order-detail">
			<div class="main-table">
			<vxe-grid
			max-height="97%"
			max-height="100%"
			class="mytable-scrollbar"
			ref="xGrid"
			v-bind="gridOptions"
			@@ -818,4 +823,14 @@
			height: 90%;
			width: 100%;
			}

			.head{
			width: 100%;
			height: 170px;
			}

			.main-table{
			width: 100%;
			height: calc(100% - 170px);
			}
			</style>