ERP_override.git

			@@ -89,7 +89,7 @@
			.toISOString()
			.replace('T', ' ')
			.slice(0, 10) //默认开始时间7天前
			const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
			const end = new Date(new Date().getTime())
			.toISOString()
			.replace('T', ' ')
			.slice(0, 10)//默认结束时间当前时间
			@@ -230,8 +230,8 @@
			buttons: [
			{code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
			{'code': 'titleStyle', 'name': t('processCard.labelStyle'),status: 'primary'},
			{code: 'detailsPrint', name: '明细打印', status: 'primary'},
			{code: 'detailsProcessPrint', name: '明细分架打印', status: 'primary'},
			{code: 'detailsPrint', name: t('processCard.detailPrinting'), status: 'primary'},
			{code: 'detailsProcessPrint', name: t('processCard.detailsPrintedSeparately'), status: 'primary'},

			],

			@@ -357,7 +357,7 @@
			:icon="Search"
			type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
			</el-button>
			<vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value" content="合并" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
			<vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value" :content="$t('processCard.merge')" :checked-value="1" :unchecked-value="3" ></vxe-checkbox>
			</el-row>
			</div>
			<vxe-grid
			@@ -388,7 +388,9 @@
			<template #num1_filter="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">
			<input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
			<input v-model="option.data" type="text"
			@keyup.enter.native="$panel.confirmFilter()"
			@input="changeFilterEvent($event, option, $panel)"/>
			</div>
			</div>
			</template>