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
			}
			@@ -58,9 +57,10 @@
			})

			//第一次调用
			request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
			request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data.data)
			total.dataTotal = res.data.total.total*1
			total.pageTotal= res.data.total.pageTotal

			@@ -98,10 +98,9 @@
			}else{
			filterData.value[column.property] = value
			}
			request.post(`/Delivery/getseletShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
			request.post(`/Delivery/getSelectShippingOrder/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
			@@ -117,10 +116,9 @@


			const selectOrderList = ()=>{
			request.post(`/Delivery/getseletShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
			request.post(`/Delivery/getSelectShippingOrder/${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 +147,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: {},
			@@ -197,9 +195,9 @@
			],//表头按钮
			toolbarConfig: {
			buttons: [],
			import: false,
			export: true,
			print: true,
			/*import: false,
			export: true,
			print: true,*/
			zoom: true,
			custom: true
			},