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'},

			],

			@@ -335,9 +335,8 @@
			</script>

			<template>
			<div class="main-div-customer">
			<div id="selectForm">
			<el-row :gutter="0">
			<div style="width: 100%;height: 100%">
			<div class="head">
			<el-date-picker
			v-model="orderInfo.workOrderDate"
			:start-placeholder="$t('basicData.startDate')"
			@@ -357,13 +356,15 @@
			: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>
			</el-row>
			<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>

			</div>

			<div class="main-table">
			<vxe-grid
			ref="xGrid"
			class="mytable-scrollbar"
			height="95%"
			height="100%"
			v-bind="gridOptions"
			v-on="gridEvents"
			>
			@@ -397,6 +398,7 @@


			</vxe-grid>
			</div>
			<el-dialog
			id="titleStyle"
			:title="$t('processCard.labelStyle')"
			@@ -420,12 +422,14 @@
			</template>

			<style scoped>
			.main-div-customer {
			width: 99%;
			height: 100%;
			.head{
			width: 100%;
			height: 35px;
			}
			#selectForm {
			width: 60%;

			.main-table{
			width: 100%;
			height: calc(100% - 35px);
			}
			:deep(#titleStyle .el-dialog__body){
			height: 90%;