~admin/ERP_override.git

			@@ -15,7 +15,6 @@
			const getTableRow = (row,type) =>{
			switch (type) {
			case 'edit' :{
			console.log(row)
			router.push({path: '/main/delivery/createDelivery', query: { deliveryID: row.deliveryId }})
			break
			}
			@@ -101,7 +100,6 @@
			request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data)
			total.dataTotal = res.data.total.total*1
			total.pageTotal= res.data.total.pageTotal
			pageNum.value=1
			@@ -120,7 +118,6 @@
			request.post(`/Delivery/getseletShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data)
			produceList = deepClone(res.data.data)
			xGrid.value.loadData(produceList)
			gridOptions.loading=false
			@@ -149,7 +146,7 @@
			keepSource: true,//保持源数据
			align: 'center',//文字居中
			stripe:true,//斑马纹
			rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
			rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
			id: 'OrderList',
			showFooter: true,//显示脚
			printConfig: {},
			@@ -277,7 +274,7 @@
			<!--使用 pager 插槽-->
			<vxe-pager
			@page-change="handlePageChange"
			:layouts="[ 'PrevJump', 'PrevPage', 'Jump','PageCount', 'NextPage', 'NextJump', 'Total']"
			:layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
			v-model:current-page="pageNum"
			v-model:page-size="total.pageSize"
			v-model:pager-count="total.pageTotal"