ERP_override.git

			@@ -13,9 +13,11 @@
			import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
			import PrintSheet1 from "@/components/sd/delivery/PrintSheet1.vue";
			import PrintSheet2 from "@/components/sd/delivery/PrintSheet2.vue";
			import useOrderInfoStore from "@/stores/sd/order/orderInfo";

			//语言获取
			const { t } = useI18n()
			const orderInfo = useOrderInfoStore()
			const router = useRouter()
			const userStore = useUserInfoStore()
			const username = userStore.user.userName
			@@ -89,13 +91,13 @@
			})

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

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

			selectDate.value = res.data.selectDate
			orderInfo.selectDeliveryDate = res.data.selectDate
			pageNum.value=1
			produceList = deepClone(res.data.data)
			xGrid.value.loadData(produceList)
			@@ -129,7 +131,7 @@
			}else{
			filterData.value[column.property] = value
			}
			request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
			request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {

			if(res.code==200){
			total.dataTotal = res.data.total.total*1
			@@ -147,7 +149,7 @@


			const selectOrderList = ()=>{
			request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
			request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {

			if(res.code==200){
			if (res.data.total!=null){
			@@ -333,7 +335,7 @@
			<template>
			<div style="width: 100%;height: 100%">
			<el-date-picker
			v-model="selectDate"
			v-model="orderInfo.selectDeliveryDate"
			type="daterange"
			:start-placeholder="$t('basicData.startDate')"
			:end-placeholder="$t('basicData.endDate')"