ERP_override.git

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

			<template>
			<div style="width: 100%;height: 98%">
			<div style="width: 100%;height: 100%">
			<div class="head">
			<el-date-picker
			v-model="orderInfo.selectDeliveryDate"
			type="daterange"
			@@ -346,8 +347,10 @@

			/>
			<el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
			</div>
			<div class="main-table">
			<vxe-grid
			max-height="100%"
			height="100%"
			@filter-change="filterChanged"
			class="mytable-scrollbar"
			ref="xGrid"
			@@ -406,6 +409,9 @@
			</vxe-pager>
			</template>
			</vxe-grid>
			</div>



			<el-dialog
			:key="dialogKey"
			@@ -449,7 +455,15 @@
			margin: 8mm 16mm 8mm 16mm;
			}
			}
			.head{
			width: 100%;
			height: 35px;
			}

			.main-table{
			width: 100%;
			height: calc(100% - 35px);
			}

			@@ -305,7 +305,8 @@
			</script>

			<template>
			<div style="width: 100%;height: 98%">
			<div style="width: 100%;height: 100%">
			<div class="head">
			<el-date-picker
			v-model="orderInfo.selectOrderListDate"
			type="daterange"
			@@ -316,6 +317,8 @@

			/>
			<el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
			</div>
			<div class="main-table">
			<vxe-grid
			max-height="100%"
			class="mytable-scrollbar"
			@@ -366,11 +369,21 @@
			</vxe-pager>
			</template>
			</vxe-grid>
			</div>



			</div>
			</template>

			<style scoped>
			.head{
			width: 100%;
			height: 35px;
			}

			.main-table{
			width: 100%;
			height: calc(100% - 35px);
			}
			</style>

	north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史