diff --git a/src/api/paintLabManagement/dataRawMaterial.js b/src/api/paintLabManagement/dataRawMaterial.js
index aeb7f59..89aefb6 100644
--- a/src/api/paintLabManagement/dataRawMaterial.js
+++ b/src/api/paintLabManagement/dataRawMaterial.js
@@ -3,112 +3,120 @@ import request from '@/utils/request'
 //============================================================
 // 获取原材料
 export function GetRawMateriallist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/getrawmateriallist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/getrawmateriallist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 增加原材料
 export function AddRawMateriallist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/addrawmateriallist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/addrawmateriallist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 删除原材料
 export function DelRawMateriallist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/delrawmateriallist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/delrawmateriallist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 更新原材料
 export function UpdateRawMateriallist(data) {
-    return request({
-      url: 'mes/ql/PaintLab/updaterawmateriallist',
-      method: 'post',
-      data: data,
-    })
-  }
- 
-  
+  return request({
+    url: 'mes/ql/PaintLab/updaterawmateriallist',
+    method: 'post',
+    data: data,
+  })
+}
 
 //============================================================
 // 获取调试数据
 export function GetTestlist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/gettestlist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/gettestlist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 增加测试数据
 export function AddTestlist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/addtestlist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/addtestlist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 删除测试数据
 export function DelTestlist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/deltestlist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/deltestlist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 更新测试数据
 export function UpdateTestlist(data) {
-    return request({
-      url: 'mes/ql/PaintLab/updatetestlist',
-      method: 'post',
-      data: data,
-    })
-  }
+  return request({
+    url: 'mes/ql/PaintLab/updatetestlist',
+    method: 'post',
+    data: data,
+  })
+}
 
 //============================================================
 // 获取批处理数据
 export function GetBatchlist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/getbatchlist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/getbatchlist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 增加批处理数据
 export function AddBatchlist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/addbatchlist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/addbatchlist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 删除批处理数据
 export function DelBatchlist(query) {
-	return request({
-		url: 'mes/ql/PaintLab/delbatchlist',
-		method: 'get',
-		params: query,
-	})
+  return request({
+    url: 'mes/ql/PaintLab/delbatchlist',
+    method: 'get',
+    params: query,
+  })
 }
 
 // 更新批处理数据
 export function UpdateBatchlist(data) {
-    return request({
-      url: 'mes/ql/PaintLab/updatebatchlist',
-      method: 'post',
-      data: data,
-    })
-  }
\ No newline at end of file
+  return request({
+    url: 'mes/ql/PaintLab/updatebatchlist',
+    method: 'post',
+    data: data,
+  })
+}
+// ================================================================================
+
+// 根据传入数据查询物料清单下拉
+export function QueryMaterialOptions(query) {
+  return request({
+    url: 'mes/ql/PaintLab/QueryMaterialOptions',
+    method: 'get',
+    params: query,
+  })
+}
diff --git a/src/views/paintLabManagement/dataBatch.vue b/src/views/paintLabManagement/dataBatch.vue
index c7f30b8..a37ee8a 100644
--- a/src/views/paintLabManagement/dataBatch.vue
+++ b/src/views/paintLabManagement/dataBatch.vue
@@ -1,96 +1,49 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索部分 -->
-		<div>
-			<el-form :model="search" inline size="mini" label-width="80px">
-				<el-form-item label="开始日期">
-					<el-date-picker
-						:style="{ width: inputWidth }"
-						v-model="search.starttime"
-						type="datetime"
-						placeholder="选择日期时间"
-						align="right"
-						:picker-options="pickerOptions"
-					>
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="结束日期">
-					<el-date-picker
-						:style="{ width: inputWidth }"
-						v-model="search.endtime"
-						type="datetime"
-						placeholder="选择日期时间"
-						align="right"
-						:picker-options="pickerOptions"
-					>
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="颜色代号">
-					<el-input v-model.trim="search.workorderid" placeholder="颜色代号" :style="{ width: inputWidth }"></el-input>
-				</el-form-item>
-				<el-form-item label="产品描述">
-					<el-input v-model.trim="search.description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
-				</el-form-item>
-				<!-- <el-form-item label="零件号">
-					<el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
-				</el-form-item> -->
-
-				<!-- <el-form-item label="班组">
-					<el-select v-model="search.team" placeholder="输入班组" :style="{ width: inputWidth }">
-						<el-option label="A班" value="A"> </el-option>
-						<el-option label="B班" value="B"> </el-option>
-						<el-option label="" value=""> </el-option>
-					</el-select>
-				</el-form-item> -->
-				<!-- <el-form-item label="报表类型">
-					<el-select v-model="search.reportType" placeholder="请选择" :style="{ width: inputWidth }">
-						<el-option v-for="item in reportType_options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-					</el-select>
-				</el-form-item> -->
-				<BR></BR>
-				<el-form-item label=" ">
-					<el-button size="mini" type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
-					<el-button size="mini" type="primary" @click="dialogVisible = true">增加记录</el-button>
-					<!-- <el-button size="mini" type="primary" @click="getList">删除记录</el-button> -->
-					<!-- <el-button size="mini" type="warning" @click="exportAllDataEvent(false)">日生产报表导出</el-button> exportAllDataEvent(true)@click="exportDataEvent"-->
-					<el-button size="mini" type="success">导入数据</el-button>
-					<el-button size="mini" type="success" @click="openExportEvent">导出数据</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
+		<el-form :model="searchForm" inline size="mini" label-width="80px">
+			<el-form-item label="开始日期">
+				<el-date-picker :style="{ width: inputWidth }" v-model="searchForm.starttime" type="datetime"
+					placeholder="选择日期时间" align="right" :picker-options="datePickerOptions">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="结束日期">
+				<el-date-picker :style="{ width: inputWidth }" v-model="searchForm.endtime" type="datetime"
+					placeholder="选择日期时间" align="right" :picker-options="datePickerOptions">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="颜色代号">
+				<el-input v-model.trim="searchForm.workorderid" placeholder="颜色代号"
+					:style="{ width: inputWidth }"></el-input>
+			</el-form-item>
+			<el-form-item label="产品描述">
+				<el-input v-model.trim="searchForm.description" placeholder="输入产品描述"
+					:style="{ width: inputWidth }"></el-input>
+			</el-form-item>
+			<br />
+			<el-form-item label=" ">
+				<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>
+				<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.pageNum"
-				:limit.sync="pagination.pageSize"
-				@pagination="getList"
-			/>
+			<pagination :pageSizes="[20, 30, 40, 50]" :total="pagination.total" :page.sync="pagination.currentPage"
+				:limit.sync="pagination.pageSize" @pagination="fetchData" />
 		</div>
 		<div style="width: 100%">
-			<div style="font-size: 20px;text-align: center; margin 0 auto">
-				{{ reportType_options[search.reportType].label }} 共 {{ realTotal }} 条
+			<div style="font-size: 20px; text-align: center;">
+				批量数据 共 {{ realTotal }} 条
 			</div>
 		</div>
 		<!-- 表格部分 -->
-		<vxe-table
-			@menu-click="contextMenuClickEvent"
-			:menu-config="tableMenu"
-			border
-			:header-cell-style="headerCellStyle"
-			ref="xTable"
-			:column-config="{ resizable: true }"
-			:row-config="{ isHover: false, isCurrent: false, height: 30 }"
-			:loading="loading"
-			:data="QualityStatisticsTable"
-			:merge-cells="mergeCells"
-			:cell-style="cellStyle"
-			size="mini"
-			align="center"
-			max-height="800px"
-			:export-config="{}"
-			:edit-config="{ trigger: 'click', mode: 'cell' }"
-		>
+		<vxe-table @menu-click="handleContextMenuClick" :menu-config="tableMenuConfig" border
+			:header-cell-style="getHeaderCellStyle" ref="dataTable" :column-config="{ resizable: true }"
+			:row-config="{ isHover: false, isCurrent: false, height: 30 }" :loading="isLoading"
+			:data="qualityStatisticsTable" :merge-cells="mergedCells" :cell-style="getCellStyle" size="mini"
+			align="center" max-height="800px" :export-config="{}" :edit-config="{ trigger: 'click', mode: 'cell' }">
 			<vxe-column field="dt" title="日期" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
 					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.dt" type="text"></vxe-textarea>
@@ -101,13 +54,13 @@
 					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.code" type="text"></vxe-textarea>
 				</template>
 			</vxe-column>
-			<vxe-column field="description" title="产品描述" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+			<vxe-column field="description" title="产品描述" width="140px"
+				:edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
 					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.description" type="text"></vxe-textarea>
 				</template>
 			</vxe-column>
 			<vxe-column field="value01" title="角度" width="140px"></vxe-column>
-
 			<vxe-column field="value02" title="△L" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
 					<vxe-input v-model="row.value02" type="text"></vxe-input>
@@ -137,52 +90,54 @@
 				<template #default="{ row }">
 					<span>{{ formatSex(row.value07) }}</span>
 				</template>
-
 				<template #edit="{ row }">
 					<vxe-select v-model="row.value07" transfer>
-						<vxe-option v-for="item in sexList" :key="item.value" :value="item.value" :label="item.label"></vxe-option>
+						<vxe-option v-for="item in sexList" :key="item.value" :value="item.value"
+							:label="item.label"></vxe-option>
 					</vxe-select>
 				</template>
 			</vxe-column>
 			<vxe-column field="value08" title="调整配方" width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
-					<vxe-textarea :autosize="{ minRows: 4 }"  v-model="row.value08" type="text"></vxe-textarea>
+					<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' }">
+				<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' }">
+				<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' }">
+				<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' }">
+				<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" :edit-render="{ autofocus: '.vxe-input--inner' }">
+				<vxe-column field="value15" title="数值" min-width="100px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
 					<template #edit="{ row }">
 						<vxe-input v-model="row.value15" type="text"></vxe-input>
 					</template>
 				</vxe-column>
 			</vxe-colgroup>
-
 			<vxe-column field="value16" title="橘皮" min-width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
 					<vxe-input v-model="row.value16" type="text"></vxe-input>
@@ -202,20 +157,20 @@
 				<template #default="{ row }">
 					<span>{{ formatName(row.value19) }}</span>
 				</template>
-
 				<template #edit="{ row }">
 					<vxe-select v-model="row.value19" transfer>
-						<vxe-option v-for="item in nameList" :key="item.value" :value="item.value" :label="item.label"></vxe-option>
+						<vxe-option v-for="item in nameList" :key="item.value" :value="item.value"
+							:label="item.label"></vxe-option>
 					</vxe-select>
 				</template>
 			</vxe-column>
 		</vxe-table>
 
-		<el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
+		<el-dialog title="提示" :visible.sync="showAddDialog" width="30%">
 			<span>确定增加一组数据</span>
 			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addData">确 定</el-button>
+				<el-button @click="showAddDialog = false">取 消</el-button>
+				<el-button type="primary" @click="addRecord">确 定</el-button>
 			</span>
 		</el-dialog>
 	</div>
@@ -223,100 +178,50 @@
 
 <script>
 import {
-	GetQualityStatisticsTable_first,
-	GetQualityStatisticsTable_again,
-	deleteStatisticsTable,
+	GetBatchlist,
+	AddBatchlist,
+	DelBatchlist,
+	UpdateBatchlist,
 	downloadStatisticsTableExcel,
-} from '@/api/qualityManagement/qualityStatistics_V2'
-import { GetBatchlist, AddBatchlist, DelBatchlist, UpdateBatchlist } from '@/api/paintLabManagement/dataRawMaterial'
+} from '@/api/paintLabManagement/dataRawMaterial'
 
 export default {
-	name: 'dataCapture',
+	name: 'DataCapture',
 	data() {
 		return {
 			inputWidth: '180px',
-			pickerOptions: {
+			datePickerOptions: {
 				shortcuts: [
-					{
-						text: '今天',
-						onClick(picker) {
-							picker.$emit('pick', new Date())
-						},
-					},
-					{
-						text: '昨天',
-						onClick(picker) {
-							const date = new Date()
-							date.setTime(date.getTime() - 3600 * 1000 * 24)
-							picker.$emit('pick', date)
-						},
-					},
-					{
-						text: '一周前',
-						onClick(picker) {
-							const date = new Date()
-							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
-							picker.$emit('pick', date)
-						},
-					},
-				],
+					{ text: '今天', onClick(picker) { picker.$emit('pick', new Date()) } },
+					{ text: '昨天', onClick(picker) { const date = new Date(); date.setTime(date.getTime() - 3600 * 1000 * 24); picker.$emit('pick', date) } },
+					{ text: '一周前', onClick(picker) { const date = new Date(); date.setTime(date.getTime() - 3600 * 1000 * 24 * 7); picker.$emit('pick', date) } }
+				]
 			},
-			search: {
+			searchForm: {
 				starttime: new Date(new Date(new Date().toLocaleDateString()).getTime()),
 				endtime: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
-				team: null,
 				workorderid: null,
-				partnumber: null,
-				reportType: 0,
-				description: '',
+				description: ''
 			},
-			reportType_options: [
+			reportTypeOptions: [
 				{ label: '批量生产记录', value: 0 },
 				{ label: '抛光报表', value: 1 },
 				{ label: '包装报表', value: 2 },
 				{ label: '总报表', value: 3 },
 			],
-			pagination: {
-				total: 0,
-				pageNum: 1,
-				pageSize: 30,
-			},
+			pagination: { total: 0, currentPage: 1, pageSize: 30 },
 			realTotal: 0,
-			loading: false,
-			QualityStatisticsTable: [],
-			mergeCells: [
-				// { row: 0, col: 0, rowspan: 3, colspan: 0 },
-			],
-			hiddenCells: [],
-			// 列表对照表
-			tableCellDict: [],
-			// 右键菜单
-			tableMenu: {
-				header: {
-					options: [
-						[
-							{ code: 'hideColumn', name: '隐藏列', disabled: false },
-							{ code: 'showAllColumn', name: '取消所有隐藏列', disabled: false },
-						],
-					],
-				},
-				body: {
-					options: [
-						[
-							// { code: 'copy', name: '复制', prefixIcon: 'vxe-icon-copy', disabled: false },
-							// { code: 'reload', name: '刷新', disabled: false },
-							// { code: 'insertAt', name: '插入', disabled: false },
-							{ code: 'remove', name: '删除', disabled: false },
-							// { code: 'save', name: '保存', prefixIcon: 'vxe-icon-save', disabled: false },
-							{ code: 'update', name: '修改', disabled: false },
-						],
-					],
-				},
-				visibleMethod: this.visibleMethod,
+			isLoading: false,
+			qualityStatisticsTable: [],
+			mergedCells: [],
+			hiddenColumns: [],
+			tableMenuConfig: {
+				header: { options: [[{ code: 'hideColumn', name: '隐藏列' }, { code: 'showAllColumns', name: '取消所有隐藏列' }]] },
+				body: { options: [[{ code: 'removeRow', name: '删除' }, { code: 'updateRow', name: '修改' }]] },
+				visibleMethod: this.isMenuItemVisible
 			},
-			// 后台数据结构
 			serverData: [],
-			dialogVisible: false,
+			showAddDialog: false,
 			sexList: [
 				{ label: '/', value: '0' },
 				{ label: '原漆', value: '1' },
@@ -330,331 +235,181 @@ export default {
 			],
 		}
 	},
-	mounted() {
-		this.getList()
-	},
-	created() {},
+	mounted() { this.fetchData() },
 	methods: {
-		//todo  设置表合并行
-		mergeTable(num) {
-			this.mergeCells = []
-			for (let i = 0; i < this.QualityStatisticsTable.length; i = i + num) {
-				let count = 13 - this.hiddenCells.length
-
-				// 颜色/代号   批次号
-				this.mergeCells.push({ row: i, col: 0, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 1, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 2, rowspan: num, colspan: 0 })
-				// mDE
-				this.mergeCells.push({ row: i, col: 8, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 9, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 10, rowspan: num, colspan: 0 })
-
-				// 粘度  固含量  电阻值
-				// this.mergeCells.push({ row: i, col: 9, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 18, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 19, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 20, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 21, rowspan: num, colspan: 0 })
-			}
-		},
 		formatSex(value) {
 			switch (value) {
-				case '0':
-					return '/'
-					break
-				case '1':
-					return '原漆'
-					break
-				case '2':
-					return '加浆'
-					break
-				case '3':
-					return '库存油漆'
-					break
+				case '0': return '/';
+				case '1': return '原漆';
+				case '2': return '加浆';
+				case '3': return '库存油漆';
 			}
-			return ''
+			return '';
 		},
+
 		formatName(value) {
 			switch (value) {
-				case '0':
-					return '刘会芳'
-					break
-				case '1':
-					return '沈桂华'
-					break
-				case '2':
-					return '其他'
-					break
+				case '0': return '刘会芳';
+				case '1': return '沈桂华';
+				case '2': return '其他';
 			}
-			return ''
+			return '';
 		},
-		addData() {
-			this.dialogVisible = false
-			AddBatchlist({ num: 1 }).then((res) => {
-				if (res.code == 200) {
-					this.getList()
+
+		addRecord() {
+			this.showAddDialog = false;
+			AddBatchlist({ num: 1 }).then(res => {
+				if (res.code === 200) this.fetchData();
+			});
+		},
+
+		fetchData() {
+			this.isLoading = true;
+			setTimeout(() => this.isLoading = false, 30000);
+			const query = { ...this.searchForm, ...this.pagination };
+			['team', 'partnumber', 'reportType', 'description'].forEach(key => delete query[key]);
+			GetBatchlist(query).then(res => {
+				if (res.code === 200) {
+					this.qualityStatisticsTable = res.data.item1;
+					this.pagination.total = res.data.item2;
+					this.realTotal = Math.ceil(this.pagination.total / 6);
+					this.mergeTableRows(6);
+					this.isLoading = false;
 				}
-			})
+			});
 		},
 
-		//todo 获取统计数据
-		getList() {
-			this.loading = true
-			setTimeout(() => {
-				this.loading = false
-			}, 30000)
-
-			let query = { ...this.search, ...this.pagination }
-
-			delete query['team']
-			//query['workorderid']
-			delete query['partnumber']
-			delete query['reportType']
-			delete query['description']
-			delete query['total']
-
-			GetBatchlist(query).then((res) => {
-				if (res.code == 200) {
-					this.QualityStatisticsTable = res.data.item1
-					this.pagination.total = res.data.item2
-					this.realTotal = this.pagination.total / 6
-					this.mergeTable(6)
-					this.loading = false
-					// console.log(res.data)
-					// console.log(this.pagination.total)
-				}
-			})
+		getHeaderCellStyle() {
+			return { backgroundColor: '#2D3D51', color: '#ffffff', border: '1px solid #161823', fontSize: '18px' };
 		},
 
-		//todo 设置表头颜色
-		headerCellStyle() {
-			return {
-				backgroundColor: '#2D3D51',
-				color: '#ffffff',
-				border: '1px solid #161823',
-				fontSize: '18px',
-			}
+		getCellStyle() {
+			return { border: '1px solid #161823', fontSize: '16px', fontWeight: '700' };
 		},
 
-		cellStyle() {
-			return {
-				border: '1px solid #161823',
-				fontSize: '16px',
-				fontWeight: '700',
-			}
+		exportData() {
+			this.$refs.dataTable.openExport()
+			// const data = { ...this.searchForm, ...this.pagination, type: this.searchForm.reportType + 1, isShowDetail: isDetailed };
+			// const fileName = `${this.reportTypeOptions[this.searchForm.reportType].label}${isDetailed ? '-缺陷详情' : '-日生产报表'}.xlsx`;
+			// downloadStatisticsTableExcel(data).then(res => {
+			// 	const blobURL = URL.createObjectURL(res.data);
+			// 	const link = document.createElement('a');
+			// 	link.href = blobURL;
+			// 	link.download = fileName;
+			// 	link.style.display = 'none';
+			// 	document.body.appendChild(link);
+			// 	link.click();
+			// 	document.body.removeChild(link);
+			// 	URL.revokeObjectURL(blobURL);
+			// });
 		},
 
-		//todo 导出excel
-		exportDataEvent() {
-			this.$refs.xTable.openExport()
-		},
-		// 导出全部数据
-		exportAllDataEvent(isShowDetail = false) {
-			let data = { ...this.search, ...this.pagination }
-			data.type = this.search.reportType + 1
-			data.isShowDetail = isShowDetail
-			let fileName = this.reportType_options[this.search.reportType].label + (isShowDetail ? '-缺陷详情' : '-日生产报表') + '.xlsx'
-			downloadStatisticsTableExcel(data).then((res) => {
-				console.log(res)
-				let blobURL = URL.createObjectURL(res.data)
-				//创建标签
-				let link = document.createElement('a')
-				//设置href
-				link.href = blobURL
-				//设置a标签的行为是download,不然就跳转了,同时设置名字是"test.ppt"
-				link.download = fileName
-				//隐藏a标签，他只是下载，没必要出现
-				link.style.display = 'none'
-				//模拟点击
-				link.click()
-				//最后，把这个URL进行销毁,免得他占内存
-				URL.revokeObjectURL()
-			})
-			// this.download('/mes/qc/statistics/downloadStatisticsTableExcel');
-		},
-		// 合格率去除小数
-		offsetRate(num) {
-			if (num === null) {
-				return ''
-			}
-			return parseInt(num)
-		},
-		// 数据去除0
-		offsetValue(num) {
-			if (num === 0 || num === '0') {
-				return ''
-			}
-			return num
-		},
-		// 右键菜单
-		contextMenuClickEvent({ menu, row, column }) {
-			const $table = this.$refs.xTable
+		handleContextMenuClick({ menu, row }) {
 			switch (menu.code) {
-				case 'hideColumn':
-					this.hideColumn(column)
-					break
-				case 'showAllColumn':
-					this.resetColumn()
-					break
-				case 'remove':
-					this.removeData(row)
-					break
-				// $table.remove(row)
-				case 'update':
-					this.updateData(row)
-					break
+				case 'hideColumn': this.hideColumn(row); break;
+				case 'showAllColumns': this.resetColumns(); break;
+				case 'removeRow': this.removeRow(row); break;
+				case 'updateRow': this.updateRow(row); break;
 			}
 		},
-		// 隐藏列
+
 		hideColumn(column) {
-			const $table = this.$refs.xTable
-			$table.hideColumn(column)
-			this.hiddenCells.push(column.title)
-			this.resetMergeTable()
+			this.$refs.dataTable.hideColumn(column);
+			this.hiddenColumns.push(column.title);
+			this.resetMergedCells();
 		},
-		// 取消所有隐藏列
-		resetColumn() {
-			const $table = this.$refs.xTable
-			this.hiddenCells = []
-			$table.resetColumn()
-			this.resetMergeTable()
+
+		resetColumns() {
+			this.$refs.dataTable.resetColumn();
+			this.hiddenColumns = [];
+			this.resetMergedCells();
 		},
-		resetMergeTable() {
-			if (this.search.reportType === 3) {
-				this.mergeTable(2)
-			} else {
-				this.mergeTable(3)
-			}
-		},
-		// 删除数据
-		removeData(row) {
-			this.$confirm('此操作将永久删除该条记录, 是否继续?', '提示', {
+
+		resetMergedCells() { this.mergeTableRows(this.searchForm.reportType === 3 ? 2 : 3); },
+
+		removeRow(row) {
+			this.$confirm('此操作将永久删除该组记录, 是否继续?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
-				type: 'warning',
+				type: 'warning'
 			}).then(() => {
-				const deleteData = {
-					idGroup: row.idGroup,
-				}
-				//console.log(deleteData);
-				DelBatchlist(deleteData).then((res) => {
+				DelBatchlist({ idGroup: row.idGroup }).then(res => {
 					if (res.code === 200) {
-						this.$message({
-							type: 'success',
-							message: '删除成功!',
-						})
-						this.getList()
+						this.$message.success('删除成功!');
+						this.fetchData();
 					} else {
-						this.$message({
-							type: 'error',
-							message: '删除失败!请检查!',
-						})
+						this.$message.error('删除失败!请检查!');
 					}
-				})
-			})
+				});
+			});
 		},
-		//修改数据
-		updateData(row) {
-			// 查找行号
-			var index = 0
-			for (const number of this.QualityStatisticsTable) {
-				if (row.id === number.id) {
-					break // 成功中断循环
-				} else index = index + 1
-			}
-			//onsole.log(index);
 
-			// 计算每组数据的，第一行
-			const baseValue = parseInt(index / 6) * 6
-			const updateData1 = {
-				id: 1,
-				plIdGroup: '',
-				description:'',
-				plDt: '',
-				plCode: '',
-				plValue01: '',
-				plValue02: '',
-				plValue03: '',
-				plValue04: '',
-				plValue05: '',
-				plValue06: '',
-				plValue07: '',
-				plValue08: '',
-				plValue09: '',
-				plValue10: '',
-				plValue11: '',
-				plValue12: '',
-				plValue13: '',
-				plValue14: '',
-				plValue15: '',
-				plValue16: '',
-				plValue17: '',
-				plValue18: '',
-				plValue19: '',
-				plCreatedBy: '',
-				plCreatedTime: '',
-				plUpdatedBy: '',
-				plUpdatedTime: '',
-			}
+		updateRow(row) {
+			const baseIndex = Math.floor(this.qualityStatisticsTable.indexOf(row) / 6) * 6;
+			const updatedData = Array.from({ length: 6 }, (_, i) => ({
+				id: this.qualityStatisticsTable[baseIndex + i].id,
+				plIdGroup: this.qualityStatisticsTable[baseIndex + i].idGroup,
+				description: this.qualityStatisticsTable[baseIndex].description,
+				plDt: this.qualityStatisticsTable[baseIndex].dt,
+				plCode: this.qualityStatisticsTable[baseIndex].code,
+				plValue01: this.qualityStatisticsTable[baseIndex + i].value01,
+				plValue02: this.qualityStatisticsTable[baseIndex + i].value02,
+				plValue03: this.qualityStatisticsTable[baseIndex + i].value03,
+				plValue04: this.qualityStatisticsTable[baseIndex + i].value04,
+				plValue05: this.qualityStatisticsTable[baseIndex + i].value05,
+				plValue06: this.qualityStatisticsTable[baseIndex].value06,
+				plValue07: this.qualityStatisticsTable[baseIndex].value07,
+				plValue08: this.qualityStatisticsTable[baseIndex].value08,
+				plValue09: this.qualityStatisticsTable[baseIndex + i].value09,
+				plValue10: this.qualityStatisticsTable[baseIndex + i].value10,
+				plValue11: this.qualityStatisticsTable[baseIndex + i].value11,
+				plValue12: this.qualityStatisticsTable[baseIndex + i].value12,
+				plValue13: this.qualityStatisticsTable[baseIndex + i].value13,
+				plValue14: this.qualityStatisticsTable[baseIndex + i].value14,
+				plValue15: this.qualityStatisticsTable[baseIndex + i].value15,
+				plValue16: this.qualityStatisticsTable[baseIndex].value16,
+				plValue17: this.qualityStatisticsTable[baseIndex].value17,
+				plValue18: this.qualityStatisticsTable[baseIndex].value18,
+				plValue19: this.qualityStatisticsTable[baseIndex].value19,
+				plCreatedBy: this.qualityStatisticsTable[baseIndex + i].createdBy,
+				plCreatedTime: this.qualityStatisticsTable[baseIndex + i].createdTime,
+				plUpdatedBy: this.qualityStatisticsTable[baseIndex + i].updatedBy,
+				plUpdatedTime: this.qualityStatisticsTable[baseIndex + i].updatedTime
+			}));
 
-			// 获取表格数据
-			this.serverData = []
-			this.serverData.push(updateData1)
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			//console.log(this.QualityStatisticsTable[baseValue])
-			for (var i = 0; i < 6; i++) {
-				this.serverData[i].id = this.QualityStatisticsTable[baseValue + i].id
-				this.serverData[i].plIdGroup = this.QualityStatisticsTable[baseValue + i].idGroup
-				this.serverData[i].description = this.QualityStatisticsTable[baseValue].description // 有合并
-				this.serverData[i].plDt = this.QualityStatisticsTable[baseValue].dt // 有合并
-				this.serverData[i].plCode = this.QualityStatisticsTable[baseValue].code // 有合并
-				this.serverData[i].plValue01 = this.QualityStatisticsTable[baseValue + i].value01
-				this.serverData[i].plValue02 = this.QualityStatisticsTable[baseValue + i].value02
-				this.serverData[i].plValue03 = this.QualityStatisticsTable[baseValue + i].value03
-				this.serverData[i].plValue04 = this.QualityStatisticsTable[baseValue + i].value04
-				this.serverData[i].plValue05 = this.QualityStatisticsTable[baseValue + i].value05
-				this.serverData[i].plValue06 = this.QualityStatisticsTable[baseValue].value06 // 有合并
-				this.serverData[i].plValue07 = this.QualityStatisticsTable[baseValue].value07 // 有合并
-				this.serverData[i].plValue08 = this.QualityStatisticsTable[baseValue].value08 // 有合并
-				this.serverData[i].plValue09 = this.QualityStatisticsTable[baseValue + i].value09
-				this.serverData[i].plValue10 = this.QualityStatisticsTable[baseValue + i].value10
-				this.serverData[i].plValue11 = this.QualityStatisticsTable[baseValue + i].value11
-				this.serverData[i].plValue12 = this.QualityStatisticsTable[baseValue + i].value12
-				this.serverData[i].plValue13 = this.QualityStatisticsTable[baseValue + i].value13
-				this.serverData[i].plValue14 = this.QualityStatisticsTable[baseValue + i].value14
-				this.serverData[i].plValue15 = this.QualityStatisticsTable[baseValue + i].value15
-				this.serverData[i].plValue16 = this.QualityStatisticsTable[baseValue].value16 // 有合并
-				this.serverData[i].plValue17 = this.QualityStatisticsTable[baseValue].value17 // 有合并
-				this.serverData[i].plValue18 = this.QualityStatisticsTable[baseValue].value18 // 有合并
-				this.serverData[i].plValue19 = this.QualityStatisticsTable[baseValue].value19 // 有合并
-				this.serverData[i].plCreatedBy = this.QualityStatisticsTable[baseValue + i].createdBy
-				this.serverData[i].plCreatedTime = this.QualityStatisticsTable[baseValue + i].createdTime
-				this.serverData[i].plUpdatedBy = this.QualityStatisticsTable[baseValue + i].updatedBy
-				this.serverData[i].plUpdatedTime = this.QualityStatisticsTable[baseValue + i].updatedTime
-			}
-
-			// 数据传输到后台
-			UpdateBatchlist(this.serverData).then((res) => {
-				if (res.code == 200) {
-					//console.log(res.data)
-					this.$message({
-						showClose: true,
-						message: '更新成功-' + res.data,
-						type: 'success',
-					})
+			UpdateBatchlist(updatedData).then(res => {
+				if (res.code === 200) {
+					this.$message.success(`更新成功-${res.data}`);
 				}
-			})
+			});
 		},
-		// 导出
-		openExportEvent() {
-			this.$refs.xTable.openExport()
+
+		mergeTableRows(rowsPerGroup) {
+			this.mergedCells = [];
+			for (let i = 0; i < this.qualityStatisticsTable.length; i += rowsPerGroup) {
+				this.mergedCells.push(
+					{ row: i, col: 0, rowspan: rowsPerGroup },
+					{ row: i, col: 1, rowspan: rowsPerGroup },
+					{ row: i, col: 2, rowspan: rowsPerGroup },
+					{ row: i, col: 8, rowspan: rowsPerGroup },
+					{ row: i, col: 9, rowspan: rowsPerGroup },
+					{ row: i, col: 10, rowspan: rowsPerGroup },
+					{ row: i, col: 18, rowspan: rowsPerGroup },
+					{ row: i, col: 19, rowspan: rowsPerGroup },
+					{ row: i, col: 20, rowspan: rowsPerGroup },
+					{ row: i, col: 21, rowspan: rowsPerGroup }
+				);
+			}
 		},
-	},
+
+		isMenuItemVisible(menu) {
+			// Implement visibility logic if needed
+			return true;
+		},
+		generateDataByWorkOrder() {
+
+		}
+	}
 }
 </script>
 
diff --git a/src/views/paintLabManagement/dataRawMaterial.vue b/src/views/paintLabManagement/dataRawMaterial.vue
index 92e2e5a..f8e63c4 100644
--- a/src/views/paintLabManagement/dataRawMaterial.vue
+++ b/src/views/paintLabManagement/dataRawMaterial.vue
@@ -1,110 +1,69 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索部分 -->
-		<div>
-			<el-form :model="search" inline size="mini" label-width="80px">
-				<el-form-item label="开始日期">
-					<el-date-picker
-						:style="{ width: inputWidth }"
-						v-model="search.starttime"
-						value-format="yyyy-MM-dd hh:mm:ss"
-						type="datetime"
-						placeholder="选择日期时间"
-						align="right"
-						:picker-options="pickerOptions"
-					>
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="结束日期">
-					<el-date-picker
-						:style="{ width: inputWidth }"
-						v-model="search.endtime"
-						type="datetime"
-						placeholder="选择日期时间"
-						align="right"
-						:picker-options="pickerOptions"
-					>
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="批次号">
-					<el-input v-model.trim="search.workorderid" placeholder="输入批次号" :style="{ width: inputWidth }"></el-input>
-				</el-form-item>
-				<el-form-item label="颜色代号">
-					<el-input v-model.trim="search.partnumber" placeholder="颜色代号" :style="{ width: inputWidth }"></el-input>
-				</el-form-item>
-				<el-form-item label="产品描述">
-					<el-input v-model.trim="search.description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
-				</el-form-item>
-				<!-- <el-form-item label="班组">
-					<el-select v-model="search.team" placeholder="输入班组" :style="{ width: inputWidth }">
-						<el-option label="A班" value="A"> </el-option>
-						<el-option label="B班" value="B"> </el-option>
-						<el-option label="" value=""> </el-option>
-					</el-select>
-				</el-form-item> -->
-
-				<!-- <el-form-item label="报表类型">
-					<el-select v-model="search.reportType" placeholder="请选择" :style="{ width: inputWidth }">
-						<el-option v-for="item in reportType_options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-					</el-select>
-				</el-form-item> -->
-
-				<BR></BR>
-				<el-form-item label=" ">
-					<el-button size="mini" type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
-					<el-button size="mini" type="primary" @click="dialogVisible = true">增加记录</el-button>
-					<!-- <el-button size="mini" type="primary" @click="dialogVisible = true">删除记录</el-button> -->
-					<!-- <el-button size="mini" type="warning" @click="exportAllDataEvent(false)">日生产报表导出</el-button> --getList()>
-					<el-button size="mini" type="success" @click="exportAllDataEvent(true)">导入数据</el-button>
-					<el-button size="mini" type="success" @click="exportAllDataEvent(true)">导出数据</el-button>
-					<el-button size="mini" type="success" @click="exportDataEvent">缺陷详情导出</el-button> -->
-
-					<el-button size="mini" type="success">导入数据</el-button>
-					<el-button size="mini" type="success" @click="openExportEvent">导出数据</el-button>
-				</el-form-item>
-			</el-form>
-		</div>
+		<el-form :model="searchForm" inline size="mini" label-width="80px">
+			<el-form-item label="开始日期">
+				<el-date-picker :style="{ width: inputWidth }" v-model="searchForm.startDate" type="datetime"
+					placeholder="选择日期时间" align="right" :picker-options="datePickerOptions">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="结束日期">
+				<el-date-picker :style="{ width: inputWidth }" v-model="searchForm.endDate" type="datetime"
+					placeholder="选择日期时间" align="right" :picker-options="datePickerOptions">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="批次号">
+				<el-input v-model.trim="searchForm.batchNumber" placeholder="输入批次号"
+					:style="{ width: inputWidth }"></el-input>
+			</el-form-item>
+			<el-form-item label="颜色代号">
+				<el-input v-model.trim="searchForm.colorCode" placeholder="颜色代号"
+					:style="{ width: inputWidth }"></el-input>
+			</el-form-item>
+			<el-form-item label="产品描述">
+				<el-input v-model.trim="searchForm.productDescription" placeholder="输入产品描述"
+					:style="{ width: inputWidth }"></el-input>
+			</el-form-item>
+			<br />
+			<el-form-item label=" ">
+				<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="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.pageNum"
-				:limit.sync="pagination.pageSize"
-				@pagination="getList"
-			/>
+			<pagination :pageSizes="[20, 30, 40, 50]" :total="pagination.total" :page.sync="pagination.currentPage"
+				:limit.sync="pagination.pageSize" @pagination="fetchData" />
 		</div>
 		<div style="width: 100%">
-			<div style="font-size: 20px;text-align: center; margin 0 auto">
-				{{ reportType_options[search.reportType].label }} 共 {{ realTotal }} 条
+			<div style="font-size: 20px; text-align: center;">
+				原材料数据记录 共 {{ realTotal }} 条
 			</div>
 		</div>
 		<!-- 表格部分 -->
-		<vxe-table
-			@menu-click="contextMenuClickEvent"
-			:menu-config="tableMenu"
-			border
-			:header-cell-style="headerCellStyle"
-			ref="xTable"
-			:column-config="{ resizable: true }"
-			:row-config="{ isHover: false, isCurrent: false, height: 30 }"
-			:loading="loading"
-			:data="QualityStatisticsTable"
-			:merge-cells="mergeCells"
-			:cell-style="cellStyle"
-			size="mini"
-			align="center"
-			max-height="800px"
-			:export-config="{}"
-			:edit-config="{ trigger: 'click', mode: 'cell' }"
-		>
+		<vxe-table @menu-click="handleContextMenuClick" :menu-config="tableMenuConfig" border
+			:header-cell-style="getHeaderCellStyle" ref="dataTable" :column-config="{ resizable: true }"
+			:row-config="{ isHover: false, isCurrent: false, height: 30 }" :loading="isLoading"
+			:data="qualityStatistics" :merge-cells="mergedCells" :cell-style="getCellStyle" size="mini" align="center"
+			height="800px" :export-config="{}" :edit-config="{ trigger: 'click', mode: 'cell' }">
 			<vxe-column field="code" title="颜色/代号" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
 					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.code" type="text"></vxe-textarea>
 				</template>
 			</vxe-column>
-			<vxe-column field="description" title="产品描述" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+			<vxe-column field="description" title="产品描述" width="140px"
+				:edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
-					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.description" type="text"></vxe-textarea>
+					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.description"
+						@input="handleSearchMaterial(row)" type="text"></vxe-textarea>
+
+					<!-- 物料清单下拉建议功能 -->
+					<div class="material-suggestions" v-if="materialList.length">
+						<div v-for="material in materialList" :key="material.key"
+							@click="handleSelectMaterial(row, material)">
+							{{ material.label }}
+						</div>
+					</div>
 				</template>
 			</vxe-column>
 			<vxe-column field="pci" title="批次号" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
@@ -113,10 +72,10 @@
 				</template>
 			</vxe-column>
 			<vxe-column field="value01" title="角度" width="140px"></vxe-column>
-
 			<vxe-column field="value02" title="△L" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
-					<vxe-input v-model="row.value02" type="text" @blur.native.capture="updateUser(row.value02)"></vxe-input>
+					<vxe-input v-model="row.value02" type="text"
+						@blur.native.capture="updateUser(row.value02)"></vxe-input>
 				</template>
 			</vxe-column>
 			<vxe-column field="value03" title="△A" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
@@ -139,28 +98,30 @@
 					<vxe-input v-model="row.value06" type="text"></vxe-input>
 				</template>
 			</vxe-column>
-
 			<vxe-colgroup title="膜厚" align="center">
 				<vxe-column field="value07" title="名称" min-width="80px"></vxe-column>
-				<vxe-column field="value08" title="数值" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+				<vxe-column field="value08" title="数值" min-width="80px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
 					<template #edit="{ row }">
 						<vxe-input v-model="row.value08" type="text"></vxe-input>
 					</template>
 				</vxe-column>
 			</vxe-colgroup>
-
 			<vxe-colgroup title="来料检" align="center">
-				<vxe-column field="value09" title="粘度" min-width="60px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+				<vxe-column field="value09" title="粘度" min-width="60px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
 					<template #edit="{ row }">
 						<vxe-input v-model="row.value09" type="text"></vxe-input>
 					</template>
 				</vxe-column>
-				<vxe-column field="value10" title="固含量" min-width="100px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+				<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="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+				<vxe-column field="value11" title="电阻值" min-width="80px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
 					<template #edit="{ row }">
 						<vxe-input v-model="row.value11" type="text"></vxe-input>
 					</template>
@@ -168,11 +129,11 @@
 			</vxe-colgroup>
 		</vxe-table>
 
-		<el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
+		<el-dialog title="提示" :visible.sync="showAddDialog" width="30%">
 			<span>确定增加一组数据</span>
 			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addData">确 定</el-button>
+				<el-button @click="showAddDialog = false">取 消</el-button>
+				<el-button type="primary" @click="addRecord">确 定</el-button>
 			</span>
 		</el-dialog>
 	</div>
@@ -180,382 +141,247 @@
 
 <script>
 import { downloadStatisticsTableExcel } from '@/api/qualityManagement/qualityStatistics_V2'
-
-import { GetRawMateriallist, AddRawMateriallist, UpdateRawMateriallist, DelRawMateriallist } from '@/api/paintLabManagement/dataRawMaterial'
-
+import { GetRawMateriallist, AddRawMateriallist, UpdateRawMateriallist, DelRawMateriallist, QueryMaterialOptions } from '@/api/paintLabManagement/dataRawMaterial'
+import { debounce } from 'lodash';
 export default {
-	name: 'dataRawMaterial',
+	name: 'DataRawMaterial',
 	data() {
 		return {
 			inputWidth: '180px',
-			pickerOptions: {
+			datePickerOptions: {
 				shortcuts: [
-					{
-						text: '今天',
-						onClick(picker) {
-							picker.$emit('pick', new Date())
-						},
-					},
-					{
-						text: '昨天',
-						onClick(picker) {
-							const date = new Date()
-							date.setTime(date.getTime() - 3600 * 1000 * 24)
-							picker.$emit('pick', date)
-						},
-					},
-					{
-						text: '一周前',
-						onClick(picker) {
-							const date = new Date()
-							date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
-							picker.$emit('pick', date)
-						},
-					},
-				],
+					{ text: '今天', onClick(picker) { picker.$emit('pick', new Date()) } },
+					{ text: '昨天', onClick(picker) { const date = new Date(); date.setTime(date.getTime() - 3600 * 1000 * 24); picker.$emit('pick', date) } },
+					{ text: '一周前', onClick(picker) { const date = new Date(); date.setTime(date.getTime() - 3600 * 1000 * 24 * 7); picker.$emit('pick', date) } }
+				]
 			},
-			search: {
-				starttime: new Date(new Date(new Date().toLocaleDateString()).getTime()),
-				endtime: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
-				team: null,
-				workorderid: null,
-				partnumber: null,
+			searchForm: {
+				startDate: new Date(new Date(new Date().toLocaleDateString()).getTime()),
+				endDate: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
+				batchNumber: null,
+				colorCode: null,
 				reportType: 0,
-				description: '',
-			},
-			reportType_options: [{ label: '原材料记录', value: 0 }],
-			pagination: {
-				total: 0,
-				pageNum: 1,
-				pageSize: 30,
+				productDescription: ''
 			},
+			reportTypes: [{ label: '原材料记录', value: 0 }],
+			pagination: { total: 0, currentPage: 1, pageSize: 30 },
 			realTotal: 0,
-			loading: false,
-			QualityStatisticsTable: [],
-			mergeCells: [
-				// { row: 0, col: 0, rowspan: 3, colspan: 0 },
-			],
-			hiddenCells: [],
-			// 列表对照表
-			tableCellDict: [],
-			// 右键菜单
-			tableMenu: {
-				header: {
-					options: [
-						[
-							{ code: 'hideColumn', name: '隐藏列', disabled: false },
-							{ code: 'showAllColumn', name: '取消所有隐藏列', disabled: false },
-						],
-					],
-				},
-				body: {
-					options: [
-						[
-							// { code: 'copy', name: '复制', prefixIcon: 'vxe-icon-copy', disabled: false },
-							// { code: 'reload', name: '刷新', disabled: false },
-							// { code: 'insertAt', name: '插入', disabled: false },
-							{ code: 'remove', name: '删除', disabled: false },
-							// { code: 'save', name: '保存', prefixIcon: 'vxe-icon-save', disabled: false },
-							{ code: 'update', name: '修改', disabled: false },
-						],
-					],
-				},
-				visibleMethod: this.visibleMethod,
+			isLoading: false,
+			qualityStatistics: [],
+			mergedCells: [],
+			hiddenColumns: [],
+			tableMenuConfig: {
+				header: { options: [[{ code: 'hideColumn', name: '隐藏列' }, { code: 'showAllColumns', name: '取消所有隐藏列' }]] },
+				body: { options: [[{ code: 'removeRow', name: '删除' }, { code: 'updateRow', name: '修改' }]] },
+				visibleMethod: this.isMenuItemVisible
 			},
-			// 后台数据结构
-			serverData: [],
-			dialogVisible: false,
+			showAddDialog: false,
+			materialList: [], // 存储搜索结果
+			searchDebounce: null // 防抖实例
 		}
 	},
-	mounted() {
-		this.getList()
-	},
-	created() {},
+	mounted() { this.fetchData() },
 	methods: {
-		//todo  设置表合并行
-		mergeTable(num) {
-			this.mergeCells = []
-			for (let i = 0; i < this.QualityStatisticsTable.length; i = i + num) {
-				let count = 13 - this.hiddenCells.length
+		updateUser(value) { console.log(value) },
 
-				// 颜色/代号   批次号
-				this.mergeCells.push({ row: i, col: 0, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 1, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 2, rowspan: num, colspan: 0 })
-				// mDE
-				this.mergeCells.push({ row: i, col: 8, rowspan: num, colspan: 0 })
-
-				// 粘度  固含量  电阻值
-				this.mergeCells.push({ row: i, col: 11, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 12, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 13, rowspan: num, colspan: 0 })
-			}
+		addRecord() {
+			this.showAddDialog = false;
+			AddRawMateriallist({ num: 1 }).then(res => {
+				if (res.code === 200) this.fetchData();
+			});
 		},
 
-		updateUser(value) {
-			console.log(value)
-		},
-
-		//todo 添加数据行
-		addData() {
-			this.dialogVisible = false
-			AddRawMateriallist({ num: 1 }).then((res) => {
-				if (res.code == 200) {
-					this.getList()
+		fetchData() {
+			this.isLoading = true;
+			setTimeout(() => this.isLoading = false, 30000);
+			const query = { ...this.searchForm, ...this.pagination };
+			['batchNumber', 'colorCode', 'productDescription'].forEach(key => delete query[key]);
+			GetRawMateriallist(query).then(res => {
+				if (res.code === 200) {
+					this.qualityStatistics = res.data.item1;
+					this.pagination.total = res.data.item2;
+					this.realTotal = Math.ceil(this.pagination.total / 5);
+					this.mergeTableRows(5);
+					this.isLoading = false;
 				}
-			})
+			});
 		},
 
-		//todo 获取数据行
-		getList() {
-			this.loading = true
-			setTimeout(() => {
-				this.loading = false
-			}, 30000)
-
-			let query = { ...this.search, ...this.pagination }
-
-			delete query['team']
-			//query['workorderid']
-			//delete query['partnumber']
-			delete query['reportType']
-			delete query['description']
-			delete query['total']
-
-			//console.log(query)
-
-			GetRawMateriallist(query).then((res) => {
-				if (res.code == 200) {
-					this.QualityStatisticsTable = res.data.item1
-					this.pagination.total = res.data.item2
-					this.realTotal = this.pagination.total / 5
-					this.mergeTable(5)
-					this.loading = false
-					// console.log(res.data)
-					// console.log(this.pagination.total)
-				}
-			})
+		getHeaderCellStyle() {
+			return { backgroundColor: '#2D3D51', color: '#ffffff', border: '1px solid #161823', fontSize: '18px' };
 		},
 
-		//todo 设置表头颜色
-		headerCellStyle() {
-			return {
-				backgroundColor: '#2D3D51',
-				color: '#ffffff',
-				border: '1px solid #161823',
-				fontSize: '18px',
-			}
+		getCellStyle() {
+			return { border: '1px solid #161823', fontSize: '16px', fontWeight: '700' };
 		},
 
-		cellStyle() {
-			return {
-				border: '1px solid #161823',
-				fontSize: '16px',
-				fontWeight: '700',
-			}
+		exportData() {
+			this.$refs.dataTable.openExport()
+			// const data = { ...this.searchForm, ...this.pagination, type: this.searchForm.reportType + 1, isShowDetail: isDetailed };
+			// const fileName = `${this.reportTypes[this.searchForm.reportType].label}${isDetailed ? '-缺陷详情' : '-日生产报表'}.xlsx`;
+			// downloadStatisticsTableExcel(data).then(res => {
+			// 	const blobURL = URL.createObjectURL(res.data);
+			// 	const link = document.createElement('a');
+			// 	link.href = blobURL;
+			// 	link.download = fileName;
+			// 	link.style.display = 'none';
+			// 	document.body.appendChild(link);
+			// 	link.click();
+			// 	document.body.removeChild(link);
+			// 	URL.revokeObjectURL(blobURL);
+			// });
 		},
 
-		//todo 导出excel
-		exportDataEvent() {
-			this.$refs.xTable.openExport()
-		},
-		// 导出全部数据
-		exportAllDataEvent(isShowDetail = false) {
-			let data = { ...this.search, ...this.pagination }
-			data.type = this.search.reportType + 1
-			data.isShowDetail = isShowDetail
-			let fileName = this.reportType_options[this.search.reportType].label + (isShowDetail ? '-缺陷详情' : '-日生产报表') + '.xlsx'
-			downloadStatisticsTableExcel(data).then((res) => {
-				console.log(res)
-				let blobURL = URL.createObjectURL(res.data)
-				//创建标签
-				let link = document.createElement('a')
-				//设置href
-				link.href = blobURL
-				//设置a标签的行为是download,不然就跳转了,同时设置名字是"test.ppt"
-				link.download = fileName
-				//隐藏a标签，他只是下载，没必要出现
-				link.style.display = 'none'
-				//模拟点击
-				link.click()
-				//最后，把这个URL进行销毁,免得他占内存
-				URL.revokeObjectURL()
-			})
-			// this.download('/mes/qc/statistics/downloadStatisticsTableExcel');
-		},
+		offsetRate(num) { return num === null ? '' : parseInt(num); },
+		offsetValue(num) { return num === 0 || num === '0' ? '' : num; },
 
-		// 合格率去除小数
-		offsetRate(num) {
-			if (num === null) {
-				return ''
-			}
-			return parseInt(num)
-		},
-
-		// 数据去除0
-		offsetValue(num) {
-			if (num === 0 || num === '0') {
-				return ''
-			}
-			return num
-		},
-
-		// 右键菜单
-		contextMenuClickEvent({ menu, row, column }) {
-			const $table = this.$refs.xTable
+		handleContextMenuClick({ menu, row }) {
 			switch (menu.code) {
-				case 'hideColumn':
-					this.hideColumn(column)
-					break
-				case 'showAllColumn':
-					this.resetColumn()
-					break
-				case 'remove':
-					this.removeData(row)
-					// $table.remove(row)
-					break
-				case 'update':
-					this.updateData(row)
-					break
+				case 'hideColumn': this.hideColumn(row); break;
+				case 'showAllColumns': this.resetColumns(); break;
+				case 'removeRow': this.removeRow(row); break;
+				case 'updateRow': this.updateRow(row); break;
 			}
 		},
 
-		// 隐藏列
 		hideColumn(column) {
-			const $table = this.$refs.xTable
-			$table.hideColumn(column)
-			this.hiddenCells.push(column.title)
-			this.resetMergeTable()
+			this.$refs.dataTable.hideColumn(column);
+			this.hiddenColumns.push(column.title);
+			this.resetMergedCells();
 		},
 
-		// 取消所有隐藏列
-		resetColumn() {
-			const $table = this.$refs.xTable
-			this.hiddenCells = []
-			$table.resetColumn()
-			this.resetMergeTable()
+		resetColumns() {
+			this.$refs.dataTable.resetColumn();
+			this.hiddenColumns = [];
+			this.resetMergedCells();
 		},
 
-		resetMergeTable() {
-			if (this.search.reportType === 3) {
-				this.mergeTable(2)
-			} else {
-				this.mergeTable(3)
-			}
-		},
+		resetMergedCells() { this.mergeTableRows(this.searchForm.reportType === 3 ? 2 : 3); },
 
-		// 删除数据
-		removeData(row) {
-			this.$confirm('此操作将永久删除改组记录, 是否继续?', '提示', {
+		removeRow(row) {
+			this.$confirm('此操作将永久删除该组记录, 是否继续?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
-				type: 'warning',
+				type: 'warning'
 			}).then(() => {
-				const deleteData = {
-					idGroup: row.idGroup,
-				}
-				DelRawMateriallist(deleteData).then((res) => {
+				DelRawMateriallist({ idGroup: row.idGroup }).then(res => {
 					if (res.code === 200) {
-						this.$message({
-							type: 'success',
-							message: '删除成功!',
-						})
-						this.getList()
+						this.$message.success('删除成功!');
+						this.fetchData();
 					} else {
-						this.$message({
-							type: 'error',
-							message: '删除失败!请检查!',
-						})
+						this.$message.error('删除失败!请检查!');
 					}
-				})
-			})
+				});
+			});
 		},
 
-		//修改数据
-		updateData(row) {
-			// 查找行号
-			var index = 0
-			for (const number of this.QualityStatisticsTable) {
-				if (row.id === number.id) {
-					break // 成功中断循环
-				} else index = index + 1
-			}
-			//onsole.log(index);
+		updateRow(row) {
+			const baseIndex = Math.floor(this.qualityStatistics.indexOf(row) / 5) * 5;
+			const updatedData = Array.from({ length: 5 }, (_, i) => ({
+				id: this.qualityStatistics[baseIndex + i].id,
+				plIdGroup: this.qualityStatistics[baseIndex + i].idGroup,
+				description: this.qualityStatistics[baseIndex].description,
+				plCode: this.qualityStatistics[baseIndex].code,
+				plPci: this.qualityStatistics[baseIndex].pci,
+				plValue01: this.qualityStatistics[baseIndex + i].value01,
+				plValue02: this.qualityStatistics[baseIndex + i].value02,
+				plValue03: this.qualityStatistics[baseIndex + i].value03,
+				plValue04: this.qualityStatistics[baseIndex + i].value04,
+				plValue05: this.qualityStatistics[baseIndex + i].value05,
+				plValue06: this.qualityStatistics[baseIndex].value06,
+				plValue07: this.qualityStatistics[baseIndex + i].value07,
+				plValue08: this.qualityStatistics[baseIndex + i].value08,
+				plValue09: this.qualityStatistics[baseIndex].value09,
+				plValue10: this.qualityStatistics[baseIndex].value10,
+				plValue11: this.qualityStatistics[baseIndex].value11,
+				plCreatedBy: this.qualityStatistics[baseIndex + i].createdBy,
+				plCreatedTime: this.qualityStatistics[baseIndex + i].createdTime,
+				plUpdatedBy: this.qualityStatistics[baseIndex + i].updatedBy,
+				plUpdatedTime: this.qualityStatistics[baseIndex + i].updatedTime
+			}));
 
-			// 计算每组数据的，第一行
-			const baseValue = parseInt(index / 5) * 5
-			const updateData1 = {
-				id: 1,
-				plIdGroup: '',
-				description:'',
-				plCode: '',
-				plPci: '',
-				plValue01: '',
-				plValue02: '',
-				plValue03: '',
-				plValue04: '',
-				plValue05: '',
-				plValue06: '',
-				plValue07: '',
-				plValue08: '',
-				plValue09: '',
-				plValue10: '',
-				plValue11: '',
-				plCreatedBy: '',
-				plCreatedTime: '',
-				plUpdatedBy: '',
-				plUpdatedTime: '',
-			}
-
-			// 获取表格数据
-			this.serverData = []
-			this.serverData.push(updateData1)
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			//console.log(this.QualityStatisticsTable[baseValue])
-			for (var i = 0; i < 5; i++) {
-				this.serverData[i].id = this.QualityStatisticsTable[baseValue + i].id
-				this.serverData[i].plIdGroup = this.QualityStatisticsTable[baseValue + i].idGroup
-				this.serverData[i].description = this.QualityStatisticsTable[baseValue].description // 有合并
-				this.serverData[i].plCode = this.QualityStatisticsTable[baseValue].code // 有合并
-				this.serverData[i].plPci = this.QualityStatisticsTable[baseValue].pci // 有合并
-				this.serverData[i].plValue01 = this.QualityStatisticsTable[baseValue + i].value01
-				this.serverData[i].plValue02 = this.QualityStatisticsTable[baseValue + i].value02
-				this.serverData[i].plValue03 = this.QualityStatisticsTable[baseValue + i].value03
-				this.serverData[i].plValue04 = this.QualityStatisticsTable[baseValue + i].value04
-				this.serverData[i].plValue05 = this.QualityStatisticsTable[baseValue + i].value05
-				this.serverData[i].plValue06 = this.QualityStatisticsTable[baseValue].value06 // 有合并
-				this.serverData[i].plValue07 = this.QualityStatisticsTable[baseValue + i].value07
-				this.serverData[i].plValue08 = this.QualityStatisticsTable[baseValue + i].value08
-				this.serverData[i].plValue09 = this.QualityStatisticsTable[baseValue].value09 // 有合并
-				this.serverData[i].plValue10 = this.QualityStatisticsTable[baseValue].value10 // 有合并
-				this.serverData[i].plValue11 = this.QualityStatisticsTable[baseValue].value11 // 有合并
-				this.serverData[i].plCreatedBy = this.QualityStatisticsTable[baseValue + i].createdBy
-				this.serverData[i].plCreatedTime = this.QualityStatisticsTable[baseValue + i].createdTime
-				this.serverData[i].plUpdatedBy = this.QualityStatisticsTable[baseValue + i].updatedBy
-				this.serverData[i].plUpdatedTime = this.QualityStatisticsTable[baseValue + i].updatedTime
-			}
-
-			// 数据传输到后台
-			UpdateRawMateriallist(this.serverData).then((res) => {
-				if (res.code == 200) {
-					//console.log(res.data)
-					this.$message({
-						showClose: true,
-						message: '更新成功-' + res.data,
-						type: 'success',
-					})
+			UpdateRawMateriallist(updatedData).then(res => {
+				if (res.code === 200) {
+					this.$message.success(`更新成功-${res.data}`);
 				}
-			})
+			});
 		},
-		// 导出
-		openExportEvent() {
-			this.$refs.xTable.openExport()
+
+		mergeTableRows(rowsPerGroup) {
+			this.mergedCells = [];
+			for (let i = 0; i < this.qualityStatistics.length; i += rowsPerGroup) {
+				this.mergedCells.push(
+					{ row: i, col: 0, rowspan: rowsPerGroup },
+					{ row: i, col: 1, rowspan: rowsPerGroup },
+					{ row: i, col: 2, rowspan: rowsPerGroup },
+					{ row: i, col: 8, rowspan: rowsPerGroup },
+					{ row: i, col: 11, rowspan: rowsPerGroup },
+					{ row: i, col: 12, rowspan: rowsPerGroup },
+					{ row: i, col: 13, rowspan: rowsPerGroup }
+				);
+			}
 		},
-	},
+
+		isMenuItemVisible(menu) {
+			// Implement visibility logic if needed
+			return true;
+		},
+		// 初始化防抖函数
+		initDebounce() {
+			this.searchDebounce = debounce(this.doSearchMaterial, 500);
+		},
+
+		// 输入处理
+		handleSearchMaterial(row) {
+			if (!this.searchDebounce) {
+				this.initDebounce();
+			}
+
+			// 清除旧数据
+			if (!row.description) {
+				this.materialList = [];
+				return;
+			}
+
+			this.searchDebounce(row.description);
+		},
+
+		// 实际搜索方法
+		async doSearchMaterial(query) {
+			try {
+				const res = await QueryMaterialOptions({ query });
+				this.materialList = res.data;
+			} catch (e) {
+				console.error('搜索失败', e);
+			}
+		},
+
+		// 选择物料
+		handleSelectMaterial(row, material) {
+			row.description = material.value;
+			this.materialList = [];
+		}
+	}
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+/* 建议列表样式 */
+.material-suggestions {
+	position: absolute;
+	z-index: 999;
+	background: white;
+	border: 1px solid #e8eaec;
+	max-height: 200px;
+	overflow-y: auto;
+}
+
+.material-suggestions div {
+	padding: 8px;
+	cursor: pointer;
+}
+
+.material-suggestions div:hover {
+	background-color: #f5f7fa;
+}
+</style>
diff --git a/src/views/paintLabManagement/dataTest.vue b/src/views/paintLabManagement/dataTest.vue
index dd0248e..5a41b8c 100644
--- a/src/views/paintLabManagement/dataTest.vue
+++ b/src/views/paintLabManagement/dataTest.vue
@@ -4,99 +4,50 @@
 		<div>
 			<el-form :model="search" inline size="mini" label-width="80px">
 				<el-form-item label="开始日期">
-					<el-date-picker
-						:style="{ width: inputWidth }"
-						v-model="search.starttime"
-						type="datetime"
-						placeholder="选择日期时间"
-						align="right"
-						:picker-options="pickerOptions"
-					>
+					<el-date-picker :style="{ width: inputWidth }" v-model="search.starttime" type="datetime"
+						placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
 					</el-date-picker>
 				</el-form-item>
 				<el-form-item label="结束日期">
-					<el-date-picker
-						:style="{ width: inputWidth }"
-						v-model="search.endtime"
-						type="datetime"
-						placeholder="选择日期时间"
-						align="right"
-						:picker-options="pickerOptions"
-					>
+					<el-date-picker :style="{ width: inputWidth }" v-model="search.endtime" type="datetime"
+						placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
 					</el-date-picker>
 				</el-form-item>
 				<el-form-item label="颜色代号">
-					<el-input v-model.trim="search.workorderid" placeholder="颜色代号" :style="{ width: inputWidth }"></el-input>
+					<el-input v-model.trim="search.workorderid" placeholder="颜色代号"
+						:style="{ width: inputWidth }"></el-input>
 				</el-form-item>
 				<el-form-item label="产品描述">
-					<el-input v-model.trim="search.description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
+					<el-input v-model.trim="search.description" placeholder="输入产品描述"
+						:style="{ width: inputWidth }"></el-input>
 				</el-form-item>
-				<!-- <el-form-item label="零件号">
-					<el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
-				</el-form-item> -->
-
-				<!-- <el-form-item label="班组">
-					<el-select v-model="search.team" placeholder="输入班组" :style="{ width: inputWidth }">
-						<el-option label="A班" value="A"> </el-option>
-						<el-option label="B班" value="B"> </el-option>
-						<el-option label="" value=""> </el-option>
-					</el-select>
-				</el-form-item> -->
-				<!-- <el-form-item label="报表类型">
-					<el-select v-model="search.reportType" placeholder="请选择" :style="{ width: inputWidth }">
-						<el-option v-for="item in reportType_options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-					</el-select>
-				</el-form-item> -->
-				<BR></BR>
+				<br />
 				<el-form-item label=" ">
-					<el-button size="mini" type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
-					<el-button size="mini" type="primary" @click="dialogVisible = true">增加记录</el-button>
-					<!-- <el-button size="mini" type="primary" @click="getList">删除记录</el-button> -->
-					<!-- <el-button size="mini" type="warning" @click="exportAllDataEvent(false)">日生产报表导出</el-button>
-					<el-button size="mini" type="success" @click="exportAllDataEvent(true)">缺陷详情导出</el-button> -->
-					<!-- <el-button size="mini" type="success" @click="exportDataEvent">缺陷详情导出</el-button> -->
-
-					<el-button size="mini" type="success">导入数据</el-button>
-					<el-button size="mini" type="success" @click="openExportEvent">导出数据</el-button>
+					<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">增加记录</el-button>
+					<el-button size="mini" type="success" icon="el-icon-download"
+						@click="exportData">导出当前搜索数据</el-button>
 				</el-form-item>
 			</el-form>
 		</div>
 
 		<div style="width: 100%; display: flex; justify-content: flex-end">
-			<pagination
-				:pageSizes="[20, 30, 40, 50]"
-				:total="pagination.total"
-				:page.sync="pagination.pageNum"
-				:limit.sync="pagination.pageSize"
-				@pagination="getList"
-			/>
+			<pagination :pageSizes="[20, 30, 40, 50]" :total="pagination.total" :page.sync="pagination.pageNum"
+				:limit.sync="pagination.pageSize" @pagination="fetchData" />
 		</div>
 
 		<div style="width: 100%">
-			<div style="font-size: 20px;text-align: center; margin 0 auto">
-				{{ reportType_options[search.reportType].label }} 共 {{ realTotal }} 条
+			<div style="font-size: 20px; text-align: center;">
+				调试数据 共 {{ realTotal }} 条
 			</div>
 		</div>
 
 		<!-- 表格部分 -->
-		<vxe-table
-			@menu-click="contextMenuClickEvent"
-			:menu-config="tableMenu"
-			border
-			:header-cell-style="headerCellStyle"
-			ref="xTable"
-			:column-config="{ resizable: true }"
-			:row-config="{ isHover: false, isCurrent: false, height: 30 }"
-			:loading="loading"
-			:data="QualityStatisticsTable"
-			:merge-cells="mergeCells"
-			:cell-style="cellStyle"
-			size="mini"
-			align="center"
-			max-height="800px"
-			:export-config="{}"
-			:edit-config="{ trigger: 'click', mode: 'cell' }"
-		>
+		<vxe-table @menu-click="handleContextMenuClick" :menu-config="tableMenu" border
+			:header-cell-style="getHeaderCellStyle" ref="xTable" :column-config="{ resizable: true }"
+			:row-config="{ isHover: false, isCurrent: false, height: 30 }" :loading="isLoading"
+			:data="qualityStatisticsTable" :merge-cells="mergeCells" :cell-style="getCellStyle" size="mini"
+			align="center" max-height="800px" :export-config="{}" :edit-config="{ trigger: 'click', mode: 'cell' }">
 			<vxe-column field="dt" title="日期" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
 					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.dt" type="text"></vxe-textarea>
@@ -107,9 +58,19 @@
 					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.code" type="text"></vxe-textarea>
 				</template>
 			</vxe-column>
-			<vxe-column field="description" title="产品描述" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+			<vxe-column field="description" title="产品描述" width="140px"
+				:edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
-					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.description" type="text"></vxe-textarea>
+					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.description"
+						@input="handleSearchMaterial(row)" type="text"></vxe-textarea>
+
+					<!-- 物料清单下拉建议功能 -->
+					<div class="material-suggestions" v-if="materialList.length">
+						<div v-for="material in materialList" :key="material.key"
+							@click="handleSelectMaterial(row, material)">
+							{{ material.label }}
+						</div>
+					</div>
 				</template>
 			</vxe-column>
 			<vxe-column field="value01" title="角度" width="140px"></vxe-column>
@@ -146,34 +107,39 @@
 
 				<template #edit="{ row }">
 					<vxe-select v-model="row.value07" transfer>
-						<vxe-option v-for="item in sexList" :key="item.value" :value="item.value" :label="item.label"></vxe-option>
+						<vxe-option v-for="item in sexList" :key="item.value" :value="item.value"
+							:label="item.label"></vxe-option>
 					</vxe-select>
 				</template>
 			</vxe-column>
 			<vxe-column field="value08" title="调整配方" width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
-					<vxe-textarea :autosize="{ minRows: 4 }"  v-model="row.value08" type="text"></vxe-textarea>
+					<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' }">
+				<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' }">
+				<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' }">
+				<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' }">
+				<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>
@@ -182,25 +148,27 @@
 
 			<vxe-colgroup title="膜厚" align="center">
 				<vxe-column field="value14" title="名称" min-width="80px"></vxe-column>
-				<vxe-column field="value15" title="数值" min-width="100px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+				<vxe-column field="value15" title="数值" min-width="100px"
+					:edit-render="{ autofocus: '.vxe-input--inner' }">
 					<template #edit="{ row }">
 						<vxe-input v-model="row.value15" type="text"></vxe-input>
 					</template>
 				</vxe-column>
 			</vxe-colgroup>
 
-			<vxe-column field="value16" title="质量判定" min-width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+			<vxe-column field="value16" title="质量判定" min-width="120px"
+				:edit-render="{ autofocus: '.vxe-input--inner' }">
 				<template #edit="{ row }">
 					<vxe-input v-model="row.value16" type="text"></vxe-input>
 				</template>
 			</vxe-column>
 		</vxe-table>
 
-		<el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
+		<el-dialog title="提示" :visible.sync="isAddDialogVisible" width="30%">
 			<span>确定增加一组数据</span>
 			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="addData">确 定</el-button>
+				<el-button @click="cancelAdd">取 消</el-button>
+				<el-button type="primary" @click="addRecord">确 定</el-button>
 			</span>
 		</el-dialog>
 	</div>
@@ -208,12 +176,10 @@
 
 <script>
 import { downloadStatisticsTableExcel } from '@/api/qualityManagement/qualityStatistics_V2'
-
-import { GetTestlist, AddTestlist, DelTestlist, UpdateTestlist } from '@/api/paintLabManagement/dataRawMaterial'
-import { Switch } from 'vxe-table'
-
+import { GetTestlist, AddTestlist, DelTestlist, UpdateTestlist, QueryMaterialOptions } from '@/api/paintLabManagement/dataRawMaterial'
+import { debounce } from 'lodash';
 export default {
-	name: 'dataCapture',
+	name: 'DataCapture',
 	data() {
 		return {
 			inputWidth: '180px',
@@ -246,153 +212,206 @@ export default {
 			search: {
 				starttime: new Date(new Date(new Date().toLocaleDateString()).getTime()),
 				endtime: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
-				team: null,
 				workorderid: null,
-				partnumber: null,
-				reportType: 0,
 				description: '',
 			},
-			reportType_options: [
-				{ label: '调试记录', value: 0 },
-				{ label: '抛光报表', value: 1 },
-				{ label: '包装报表', value: 2 },
-				{ label: '总报表', value: 3 },
-			],
 			pagination: {
 				total: 0,
 				pageNum: 1,
 				pageSize: 30,
 			},
 			realTotal: 0,
-			loading: false,
-			QualityStatisticsTable: [],
-			mergeCells: [
-				// { row: 0, col: 0, rowspan: 3, colspan: 0 },
-			],
+			isLoading: false,
+			qualityStatisticsTable: [],
+			mergeCells: [],
 			hiddenCells: [],
-			// 列表对照表
-			tableCellDict: [],
-			// 右键菜单
 			tableMenu: {
 				header: {
 					options: [
 						[
 							{ code: 'hideColumn', name: '隐藏列', disabled: false },
-							{ code: 'showAllColumn', name: '取消所有隐藏列', disabled: false },
+							{ code: 'showAllColumns', name: '取消所有隐藏列', disabled: false },
 						],
 					],
 				},
 				body: {
 					options: [
 						[
-							// { code: 'copy', name: '复制', prefixIcon: 'vxe-icon-copy', disabled: false },
-							// { code: 'reload', name: '刷新', disabled: false },
-							// { code: 'insertAt', name: '插入', disabled: false },
 							{ code: 'remove', name: '删除', disabled: false },
-							// { code: 'save', name: '保存', prefixIcon: 'vxe-icon-save', disabled: false },
 							{ code: 'update', name: '修改', disabled: false },
 						],
 					],
 				},
 				visibleMethod: this.visibleMethod,
 			},
-
-			// 后台数据结构
 			serverData: [],
-			dialogVisible: false,
+			isAddDialogVisible: false,
 			sexList: [
 				{ label: '/', value: '0' },
 				{ label: '原漆', value: '1' },
 				{ label: '加浆', value: '2' },
 				{ label: '库存油漆', value: '3' },
 			],
+			materialList: [], // 存储搜索结果
+			searchDebounce: null // 防抖实例
 		}
 	},
 	mounted() {
-		this.getList()
+		this.fetchData()
 	},
-	created() {},
 	methods: {
-		//todo  设置表合并行
-		mergeTable(num) {
-			this.mergeCells = []
-			for (let i = 0; i < this.QualityStatisticsTable.length; i = i + num) {
-				let count = 13 - this.hiddenCells.length
-
-				// 颜色/代号   批次号
-				this.mergeCells.push({ row: i, col: 0, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 1, rowspan: num, colspan: 0 })
-				// 产品描述
-				this.mergeCells.push({ row: i, col: 2, rowspan: num, colspan: 0 })
-				
-				
-				// mDE
-				this.mergeCells.push({ row: i, col: 8, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 9, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 10, rowspan: num, colspan: 0 })
-
-				// 粘度  固含量  电阻值
-				// this.mergeCells.push({ row: i, col: 10, rowspan: num, colspan: 0 })
-				this.mergeCells.push({ row: i, col: 18, rowspan: num, colspan: 0 })
-			}
-		},
-		formatSex(value) {
-			switch (value) {
-				case '0':
-					return '/'
-					break
-				case '1':
-					return '原漆'
-					break
-				case '2':
-					return '加浆'
-					break
-				case '3':
-					return '库存油漆'
-					break
-			}
-			return ''
-		},
-		addData() {
-			this.dialogVisible = false
-			AddTestlist({ num: 1 }).then((res) => {
-				if (res.code == 200) {
-					this.getList()
-				}
-			})
-		},
-
-		//todo 获取统计数据
-		getList() {
-			this.loading = true
+		fetchData() {
+			this.isLoading = true
 			setTimeout(() => {
-				this.loading = false
+				this.isLoading = false
 			}, 30000)
 
 			let query = { ...this.search, ...this.pagination }
 
-			delete query['team']
-			//query['workorderid']
-			delete query['partnumber']
-			delete query['reportType']
+			delete query['workorderid']
 			delete query['description']
-			delete query['total']
 
 			GetTestlist(query).then((res) => {
-				if (res.code == 200) {
-					this.QualityStatisticsTable = res.data.item1
+				if (res.code === 200) {
+					this.qualityStatisticsTable = res.data.item1
 					this.pagination.total = res.data.item2
 					this.realTotal = this.pagination.total / 6
-					this.mergeTable(6)
-					this.loading = false
-					// console.log(res.data)
-					// console.log(this.pagination.total)
+					this.setTableMerging(6)
+					this.isLoading = false
 				}
 			})
 		},
 
-		//todo 设置表头颜色
-		headerCellStyle() {
+		showAddDialog() {
+			this.isAddDialogVisible = true
+		},
+
+		cancelAdd() {
+			this.isAddDialogVisible = false
+		},
+
+		addRecord() {
+			this.cancelAdd()
+			AddTestlist({ num: 1 }).then((res) => {
+				if (res.code === 200) {
+					this.fetchData()
+				}
+			})
+		},
+
+		exportData() {
+			this.$refs.xTable.openExport()
+		},
+
+		handleContextMenuClick({ menu, row }) {
+			switch (menu.code) {
+				case 'hideColumn':
+					this.hideColumn(menu.column)
+					break
+				case 'showAllColumns':
+					this.showAllColumns()
+					break
+				case 'remove':
+					this.deleteRecord(row)
+					break
+				case 'update':
+					this.updateRecord(row)
+					break
+			}
+		},
+
+		hideColumn(column) {
+			this.$refs.xTable.hideColumn(column)
+			this.hiddenCells.push(column.title)
+			this.resetTableMerging()
+		},
+
+		showAllColumns() {
+			this.hiddenCells = []
+			this.$refs.xTable.resetColumn()
+			this.resetTableMerging()
+		},
+
+		resetTableMerging() {
+			if (this.search.reportType === 3) {
+				this.setTableMerging(2)
+			} else {
+				this.setTableMerging(3)
+			}
+		},
+
+		setTableMerging(num) {
+			this.mergeCells = []
+			for (let i = 0; i < this.qualityStatisticsTable.length; i += num) {
+				this.mergeCells.push({ row: i, col: 0, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 1, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 2, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 8, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 9, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 10, rowspan: num, colspan: 0 })
+				this.mergeCells.push({ row: i, col: 18, rowspan: num, colspan: 0 })
+			}
+		},
+
+		formatSex(value) {
+			return this.sexList.find(item => item.value === value)?.label || ''
+		},
+
+		deleteRecord(row) {
+			this.$confirm('此操作将永久删除该组记录, 是否继续?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			}).then(() => {
+				DelTestlist({ idGroup: row.idGroup }).then((res) => {
+					if (res.code === 200) {
+						this.$message.success('删除成功!')
+						this.fetchData()
+					} else {
+						this.$message.error('删除失败!请检查!')
+					}
+				})
+			})
+		},
+
+		updateRecord(row) {
+			const baseIndex = Math.floor(this.qualityStatisticsTable.indexOf(row) / 6) * 6
+			this.serverData = Array.from({ length: 6 }, (_, i) => ({
+				id: this.qualityStatisticsTable[baseIndex + i].id,
+				plIdGroup: this.qualityStatisticsTable[baseIndex + i].idGroup,
+				description: this.qualityStatisticsTable[baseIndex].description,
+				plDt: this.qualityStatisticsTable[baseIndex].dt,
+				plCode: this.qualityStatisticsTable[baseIndex].code,
+				plValue01: this.qualityStatisticsTable[baseIndex + i].value01,
+				plValue02: this.qualityStatisticsTable[baseIndex + i].value02,
+				plValue03: this.qualityStatisticsTable[baseIndex + i].value03,
+				plValue04: this.qualityStatisticsTable[baseIndex + i].value04,
+				plValue05: this.qualityStatisticsTable[baseIndex + i].value05,
+				plValue06: this.qualityStatisticsTable[baseIndex].value06,
+				plValue07: this.qualityStatisticsTable[baseIndex].value07,
+				plValue08: this.qualityStatisticsTable[baseIndex].value08,
+				plValue09: this.qualityStatisticsTable[baseIndex + i].value09,
+				plValue10: this.qualityStatisticsTable[baseIndex + i].value10,
+				plValue11: this.qualityStatisticsTable[baseIndex + i].value11,
+				plValue12: this.qualityStatisticsTable[baseIndex + i].value12,
+				plValue13: this.qualityStatisticsTable[baseIndex + i].value13,
+				plValue14: this.qualityStatisticsTable[baseIndex + i].value14,
+				plValue15: this.qualityStatisticsTable[baseIndex + i].value15,
+				plValue16: this.qualityStatisticsTable[baseIndex].value16,
+				plCreatedBy: this.qualityStatisticsTable[baseIndex + i].createdBy,
+				plCreatedTime: this.qualityStatisticsTable[baseIndex + i].createdTime,
+				plUpdatedBy: this.qualityStatisticsTable[baseIndex + i].updatedBy,
+				plUpdatedTime: this.qualityStatisticsTable[baseIndex + i].updatedTime,
+			}))
+
+			UpdateTestlist(this.serverData).then((res) => {
+				if (res.code === 200) {
+					this.$message.success(`更新成功-${res.data}`)
+				}
+			})
+		},
+
+		getHeaderCellStyle() {
 			return {
 				backgroundColor: '#2D3D51',
 				color: '#ffffff',
@@ -401,7 +420,7 @@ export default {
 			}
 		},
 
-		cellStyle() {
+		getCellStyle() {
 			return {
 				border: '1px solid #161823',
 				fontSize: '16px',
@@ -409,210 +428,66 @@ export default {
 			}
 		},
 
-		//todo 导出excel
-		exportDataEvent() {
-			this.$refs.xTable.openExport()
+		visibleMethod() {
+			return true
 		},
-		// 导出全部数据
-		exportAllDataEvent(isShowDetail = false) {
-			let data = { ...this.search, ...this.pagination }
-			data.type = this.search.reportType + 1
-			data.isShowDetail = isShowDetail
-			let fileName = this.reportType_options[this.search.reportType].label + (isShowDetail ? '-缺陷详情' : '-日生产报表') + '.xlsx'
-			downloadStatisticsTableExcel(data).then((res) => {
-				console.log(res)
-				let blobURL = URL.createObjectURL(res.data)
-				//创建标签
-				let link = document.createElement('a')
-				//设置href
-				link.href = blobURL
-				//设置a标签的行为是download,不然就跳转了,同时设置名字是"test.ppt"
-				link.download = fileName
-				//隐藏a标签，他只是下载，没必要出现
-				link.style.display = 'none'
-				//模拟点击
-				link.click()
-				//最后，把这个URL进行销毁,免得他占内存
-				URL.revokeObjectURL()
-			})
-			// this.download('/mes/qc/statistics/downloadStatisticsTableExcel');
-		},
-		// 合格率去除小数
-		offsetRate(num) {
-			if (num === null) {
-				return ''
-			}
-			return parseInt(num)
-		},
-		// 数据去除0
-		offsetValue(num) {
-			if (num === 0 || num === '0') {
-				return ''
-			}
-			return num
-		},
-		// 右键菜单
-		contextMenuClickEvent({ menu, row, column }) {
-			const $table = this.$refs.xTable
-			switch (menu.code) {
-				case 'hideColumn':
-					this.hideColumn(column)
-					break
-				case 'showAllColumn':
-					this.resetColumn()
-					break
-				case 'remove':
-					this.removeData(row)
-					break
-				// $table.remove(row)
-				case 'update':
-					this.updateData(row)
-					break
-			}
-		},
-		// 隐藏列
-		hideColumn(column) {
-			const $table = this.$refs.xTable
-			$table.hideColumn(column)
-			this.hiddenCells.push(column.title)
-			this.resetMergeTable()
-		},
-		// 取消所有隐藏列
-		resetColumn() {
-			const $table = this.$refs.xTable
-			this.hiddenCells = []
-			$table.resetColumn()
-			this.resetMergeTable()
-		},
-		resetMergeTable() {
-			if (this.search.reportType === 3) {
-				this.mergeTable(2)
-			} else {
-				this.mergeTable(3)
-			}
-		},
-		// 删除数据
-		removeData(row) {
-			this.$confirm('此操作将永久删除改组记录, 是否继续?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			}).then(() => {
-				const deleteData = {
-					idGroup: row.idGroup,
-				}
-				DelTestlist(deleteData).then((res) => {
-					if (res.code === 200) {
-						this.$message({
-							type: 'success',
-							message: '删除成功!',
-						})
-						this.getList()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '删除失败!请检查!',
-						})
-					}
-				})
-			})
-		},
-		//修改数据
-		updateData(row) {
-			// 查找行号
-			var index = 0
-			for (const number of this.QualityStatisticsTable) {
-				if (row.id === number.id) {
-					break // 成功中断循环
-				} else index = index + 1
-			}
-			//onsole.log(index);
 
-			// 计算每组数据的，第一行
-			const baseValue = parseInt(index / 6) * 6
-			const updateData1 = {
-				id: 1,
-				plIdGroup: '',
-				description:'',
-				plDt: '',
-				plCode: '',
-				plValue01: '',
-				plValue02: '',
-				plValue03: '',
-				plValue04: '',
-				plValue05: '',
-				plValue06: '',
-				plValue07: '',
-				plValue08: '',
-				plValue09: '',
-				plValue10: '',
-				plValue11: '',
-				plValue12: '',
-				plValue13: '',
-				plValue14: '',
-				plValue15: '',
-				plValue16: '',
-				plCreatedBy: '',
-				plCreatedTime: '',
-				plUpdatedBy: '',
-				plUpdatedTime: '',
+		// 初始化防抖函数
+		initDebounce() {
+			this.searchDebounce = debounce(this.doSearchMaterial, 500);
+		},
+
+		// 输入处理
+		handleSearchMaterial(row) {
+			if (!this.searchDebounce) {
+				this.initDebounce();
 			}
 
-			// 获取表格数据
-			this.serverData = []
-			this.serverData.push(updateData1)
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			this.serverData.push({ ...updateData1 })
-			//console.log(this.QualityStatisticsTable[baseValue])
-			for (var i = 0; i < 6; i++) {
-				this.serverData[i].id = this.QualityStatisticsTable[baseValue + i].id
-				this.serverData[i].plIdGroup = this.QualityStatisticsTable[baseValue + i].idGroup
-				this.serverData[i].description = this.QualityStatisticsTable[baseValue].description // 有合并
-				this.serverData[i].plDt = this.QualityStatisticsTable[baseValue].dt // 有合并
-				this.serverData[i].plCode = this.QualityStatisticsTable[baseValue].code // 有合并
-				this.serverData[i].plValue01 = this.QualityStatisticsTable[baseValue + i].value01
-				this.serverData[i].plValue02 = this.QualityStatisticsTable[baseValue + i].value02
-				this.serverData[i].plValue03 = this.QualityStatisticsTable[baseValue + i].value03
-				this.serverData[i].plValue04 = this.QualityStatisticsTable[baseValue + i].value04
-				this.serverData[i].plValue05 = this.QualityStatisticsTable[baseValue + i].value05
-				this.serverData[i].plValue06 = this.QualityStatisticsTable[baseValue].value06 // 有合并
-				this.serverData[i].plValue07 = this.QualityStatisticsTable[baseValue].value07 // 有合并
-				this.serverData[i].plValue08 = this.QualityStatisticsTable[baseValue].value08 // 有合并
-				this.serverData[i].plValue09 = this.QualityStatisticsTable[baseValue + i].value09
-				this.serverData[i].plValue10 = this.QualityStatisticsTable[baseValue + i].value10
-				this.serverData[i].plValue11 = this.QualityStatisticsTable[baseValue + i].value11
-				this.serverData[i].plValue12 = this.QualityStatisticsTable[baseValue + i].value12
-				this.serverData[i].plValue13 = this.QualityStatisticsTable[baseValue + i].value13
-				this.serverData[i].plValue14 = this.QualityStatisticsTable[baseValue + i].value14
-				this.serverData[i].plValue15 = this.QualityStatisticsTable[baseValue + i].value15
-				this.serverData[i].plValue16 = this.QualityStatisticsTable[baseValue].value16 // 有合并
-				this.serverData[i].plCreatedBy = this.QualityStatisticsTable[baseValue + i].createdBy
-				this.serverData[i].plCreatedTime = this.QualityStatisticsTable[baseValue + i].createdTime
-				this.serverData[i].plUpdatedBy = this.QualityStatisticsTable[baseValue + i].updatedBy
-				this.serverData[i].plUpdatedTime = this.QualityStatisticsTable[baseValue + i].updatedTime
+			// 清除旧数据
+			if (!row.description) {
+				this.materialList = [];
+				return;
 			}
 
-			// 数据传输到后台
-			UpdateTestlist(this.serverData).then((res) => {
-				if (res.code == 200) {
-					//console.log(res.data)
-					this.$message({
-						showClose: true,
-						message: '更新成功-' + res.data,
-						type: 'success',
-					})
-				}
-			})
+			this.searchDebounce(row.description);
 		},
-		// 导出
-		openExportEvent() {
-			this.$refs.xTable.openExport()
+
+		// 实际搜索方法
+		async doSearchMaterial(query) {
+			try {
+				const res = await QueryMaterialOptions({ query });
+				this.materialList = res.data;
+			} catch (e) {
+				console.error('搜索失败', e);
+			}
 		},
+
+		// 选择物料
+		handleSelectMaterial(row, material) {
+			row.description = material.value;
+			this.materialList = [];
+		}
 	},
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+/* 建议列表样式 */
+.material-suggestions {
+	position: absolute;
+	z-index: 999;
+	background: white;
+	border: 1px solid #e8eaec;
+	max-height: 200px;
+	overflow-y: auto;
+}
+
+.material-suggestions div {
+	padding: 8px;
+	cursor: pointer;
+}
+
+.material-suggestions div:hover {
+	background-color: #f5f7fa;
+}
+</style>