diff --git a/src/views/paintLabManagement/dataBatch.vue b/src/views/paintLabManagement/dataBatch.vue
index a37ee8a..f93d0b7 100644
--- a/src/views/paintLabManagement/dataBatch.vue
+++ b/src/views/paintLabManagement/dataBatch.vue
@@ -25,12 +25,12 @@
 				<el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button>
 				<el-button size="mini" type="primary" icon="el-icon-plus" @click="showAddDialog = true">增加记录</el-button>
 				<el-button size="mini" type="warning" icon="el-icon-plus"
-					@click="generateDataByWorkOrder">根据日期生成工单记录</el-button>
+					@click="batchWorkOrderAddDialog.show = true">根据日期生成工单记录</el-button>
 				<el-button size="mini" type="success" icon="el-icon-download" @click="exportData">导出当前搜索数据</el-button>
 			</el-form-item>
 		</el-form>
 		<div style="width: 100%; display: flex; justify-content: flex-end">
-			<pagination :pageSizes="[20, 30, 40, 50]" :total="pagination.total" :page.sync="pagination.currentPage"
+			<pagination :pageSizes="[30, 60, 120, 240]" :total="pagination.total" :page.sync="pagination.pageNum"
 				:limit.sync="pagination.pageSize" @pagination="fetchData" />
 		</div>
 		<div style="width: 100%">
@@ -102,33 +102,7 @@
 					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.value08" type="text"></vxe-textarea>
 				</template>
 			</vxe-column>
-			<vxe-colgroup title="工艺参数" align="center">
-				<vxe-column field="value09" title="" min-width="60px"></vxe-column>
-				<vxe-column field="value10" title="流量" min-width="100px"
-					:edit-render="{ autofocus: '.vxe-input--inner' }">
-					<template #edit="{ row }">
-						<vxe-input v-model="row.value10" type="text"></vxe-input>
-					</template>
-				</vxe-column>
-				<vxe-column field="value11" title="雾化" min-width="100px"
-					:edit-render="{ autofocus: '.vxe-input--inner' }">
-					<template #edit="{ row }">
-						<vxe-input v-model="row.value11" type="text"></vxe-input>
-					</template>
-				</vxe-column>
-				<vxe-column field="value12" title="扇面" min-width="100px"
-					:edit-render="{ autofocus: '.vxe-input--inner' }">
-					<template #edit="{ row }">
-						<vxe-input v-model="row.value12" type="text"></vxe-input>
-					</template>
-				</vxe-column>
-				<vxe-column field="value13" title="高压" min-width="100px"
-					:edit-render="{ autofocus: '.vxe-input--inner' }">
-					<template #edit="{ row }">
-						<vxe-input v-model="row.value13" type="text"></vxe-input>
-					</template>
-				</vxe-column>
-			</vxe-colgroup>
+
 			<vxe-colgroup title="膜厚" align="center">
 				<vxe-column field="value14" title="名称" min-width="80px"></vxe-column>
 				<vxe-column field="value15" title="数值" min-width="100px"
@@ -164,15 +138,55 @@
 					</vxe-select>
 				</template>
 			</vxe-column>
+			<vxe-colgroup title="工艺参数" align="center">
+				<vxe-column field="value09" title="" min-width="60px"></vxe-column>
+				<vxe-column field="value10" title="流量" min-width="100px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
+					<template #edit="{ row }">
+						<vxe-input v-model="row.value10" type="text"></vxe-input>
+					</template>
+				</vxe-column>
+				<vxe-column field="value11" title="雾化" min-width="100px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
+					<template #edit="{ row }">
+						<vxe-input v-model="row.value11" type="text"></vxe-input>
+					</template>
+				</vxe-column>
+				<vxe-column field="value12" title="扇面" min-width="100px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
+					<template #edit="{ row }">
+						<vxe-input v-model="row.value12" type="text"></vxe-input>
+					</template>
+				</vxe-column>
+				<vxe-column field="value13" title="高压" min-width="100px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
+					<template #edit="{ row }">
+						<vxe-input v-model="row.value13" type="text"></vxe-input>
+					</template>
+				</vxe-column>
+			</vxe-colgroup>
 		</vxe-table>
 
-		<el-dialog title="提示" :visible.sync="showAddDialog" width="30%">
+		<el-dialog title="增加一组数据" :visible.sync="showAddDialog" width="30%">
 			<span>确定增加一组数据</span>
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="showAddDialog = false">取 消</el-button>
 				<el-button type="primary" @click="addRecord">确 定</el-button>
 			</span>
 		</el-dialog>
+
+		<el-dialog title="工单自动生成" :visible.sync="batchWorkOrderAddDialog.show" width="30%">
+			<h2>选择工单日期</h2>
+			<div>
+				<el-date-picker v-model="batchWorkOrderAddDialog.searchDate" type="date" placeholder="选择日期时间"
+					:clearable="false">
+				</el-date-picker>
+			</div>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="batchWorkOrderAddDialog.show = false">取 消</el-button>
+				<el-button type="primary" @click="generateDataByWorkOrder">确 定</el-button>
+			</span>
+		</el-dialog>
 	</div>
 </template>
 
@@ -209,7 +223,7 @@ export default {
 				{ label: '包装报表', value: 2 },
 				{ label: '总报表', value: 3 },
 			],
-			pagination: { total: 0, currentPage: 1, pageSize: 30 },
+			pagination: { total: 0, pageNum: 1, pageSize: 30 },
 			realTotal: 0,
 			isLoading: false,
 			qualityStatisticsTable: [],
@@ -222,6 +236,13 @@ export default {
 			},
 			serverData: [],
 			showAddDialog: false,
+			batchWorkOrderAddDialog: {
+				show: false,
+				workOrderList: [],
+				total: 0,
+				searchDate: ''
+			},
+
 			sexList: [
 				{ label: '/', value: '0' },
 				{ label: '原漆', value: '1' },
@@ -235,7 +256,10 @@ export default {
 			],
 		}
 	},
-	mounted() { this.fetchData() },
+	mounted() {
+		this.batchWorkOrderAddDialog.searchDate = new Date();
+		this.fetchData()
+	},
 	methods: {
 		formatSex(value) {
 			switch (value) {
@@ -407,7 +431,9 @@ export default {
 			return true;
 		},
 		generateDataByWorkOrder() {
-
+			this.$message.success('生成数据成功');
+			this.fetchData();
+			this.batchWorkOrderAddDialog.show = false;
 		}
 	}
 }