ERP_override.git

			@@ -24,7 +24,9 @@
			import PrintCustomLabelProject from "@/components/pp/PrintCustomLabelProject.vue";
			import PrintProcessConsolidated from '@/components/pp/PrintConsolidatedReplenish.vue'
			import {createTemplate} from "@/hook/createTemplateTag";
			import useOrderInfoStore from "@/stores/sd/order/orderInfo";
			const company = companyInfo()
			const orderInfo = useOrderInfoStore()
			//语言获取
			const {t} = useI18n()
			let router = useRouter()
			@@ -211,11 +213,12 @@
			let startTime = form.date1[0]
			let endTime = form.date1[1]
			// 第一次加载查询
			request.post(`/Replenish/selectPrint/${startTime}/${endTime}`, filterData.value).then((res) => {
			request.post(`/Replenish/selectPrint/${orderInfo.replenishDate}`, filterData.value).then((res) => {

			if (res.code == 200) {
			produceList = produceList.value.concat(deepClone(res.data.data))
			titleSelectJson.value.dataType = res.data.type
			orderInfo.replenishDate = res.data.selectDate
			xGrid.value.reloadData(produceList)
			gridOptions.loading = false
			} else {
			@@ -230,11 +233,12 @@
			let endTime = form.date1[1]
			gridOptions.loading=true
			// 第一次加载查询
			request.post(`/Replenish/selectPrint/${startTime}/${endTime}`, filterData.value).then((res) => {
			request.post(`/Replenish/selectPrint/${orderInfo.replenishDate}`, filterData.value).then((res) => {

			if (res.code == 200) {

			xGrid.value.loadData(res.data.data)
			orderInfo.replenishDate = res.data.selectDate
			titleSelectJson.value.dataType = res.data.type
			gridOptions.loading = false
			} else {
			@@ -773,7 +777,8 @@
			<div style="width: 100%;height: 100%">
			<div class="head">
			<el-date-picker
			v-model="form.date1"
			v-model="orderInfo.replenishDate"
			:default-time="defaultTime"
			:end-placeholder="$t('basicData.endDate')"
			:start-placeholder="$t('basicData.startDate')"
			format="YYYY/MM/DD"