From 6a43802ea3d613f5e946576909076dcad96bb372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 19 Mar 2025 11:30:18 +0800
Subject: [PATCH] 123

---
 src/api/paintLabManagement/dataRawMaterial.js |  10 +
 src/views/paintLabManagement/dataBatch.vue    | 888 ++++++++++--------
 .../paintLabManagement/dataRawMaterial.vue    | 737 ++++++++-------
 src/views/paintLabManagement/dataTest.vue     |   1 +
 4 files changed, 879 insertions(+), 757 deletions(-)

diff --git a/src/api/paintLabManagement/dataRawMaterial.js b/src/api/paintLabManagement/dataRawMaterial.js
index 89aefb6..048c263 100644
--- a/src/api/paintLabManagement/dataRawMaterial.js
+++ b/src/api/paintLabManagement/dataRawMaterial.js
@@ -110,6 +110,16 @@ export function UpdateBatchlist(data) {
     data: data,
   })
 }
+
+// 根据工单，批量插入批处理数据
+export function AddBatchListByWorkOrder(query) {
+  return request({
+    url: 'mes/ql/PaintLab/AddBatchListByWorkOrder',
+    method: 'get',
+    params: query,
+  })
+}
+
 // ================================================================================
 
 // 根据传入数据查询物料清单下拉
diff --git a/src/views/paintLabManagement/dataBatch.vue b/src/views/paintLabManagement/dataBatch.vue
index c6e3a10..462a4f4 100644
--- a/src/views/paintLabManagement/dataBatch.vue
+++ b/src/views/paintLabManagement/dataBatch.vue
@@ -1,441 +1,503 @@
 <template>
-	<div class="app-container">
-		<!-- 搜索部分 -->
-		<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="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="[30, 60, 120, 240]" :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;">
-				批量数据 共 {{ realTotal }} 条
-			</div>
-		</div>
-		<!-- 表格部分 -->
-		<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>
-				</template>
-			</vxe-column>
-			<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' }">
-				<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>
-				</template>
-			</vxe-column>
-			<vxe-column field="value03" title="△A" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value03" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value04" title="△B" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value04" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value05" title="△E" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value05" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value06" title="mDE" min-width="100px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value06" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value07" title="备注" min-width="100px" :edit-render="{}">
-				<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-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>
-				</template>
-			</vxe-column>
+  <div class="app-container">
+    <!-- 搜索部分 -->
+    <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="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="[30, 60, 120, 240]" :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">批量数据 共 {{ realTotal }} 条</div>
+    </div>
+    <!-- 表格部分 -->
+    <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>
+        </template>
+      </vxe-column>
+      <vxe-column field="workorder" title="工单号" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-textarea :autosize="{ minRows: 4 }" v-model="row.workorder" type="text"></vxe-textarea>
+        </template>
+      </vxe-column>
+      <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' }">
+        <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>
+        </template>
+      </vxe-column>
+      <vxe-column field="value03" title="△A" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value03" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value04" title="△B" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value04" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value05" title="△E" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value05" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value06" title="mDE" min-width="100px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value06" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value07" title="备注" min-width="100px" :edit-render="{}">
+        <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-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>
+        </template>
+      </vxe-column>
 
-			<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' }">
-					<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>
-				</template>
-			</vxe-column>
-			<vxe-column field="value17" title="附着力" min-width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value17" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value18" title="判定" min-width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value18" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value19" title="检验员" min-width="120px" :edit-render="{}">
-				<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-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>
+      <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' }">
+          <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>
+        </template>
+      </vxe-column>
+      <vxe-column field="value17" title="附着力" min-width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value17" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value18" title="判定" min-width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value18" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value19" title="检验员" min-width="120px" :edit-render="{}">
+        <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-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%">
-			<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="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.actionDate" 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>
+    <el-dialog title="工单自动生成" :visible.sync="batchWorkOrderAddDialog.show" width="30%">
+      <h2>选择工单日期</h2>
+      <div>
+        <el-date-picker v-model="batchWorkOrderAddDialog.actionDate" 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>
 
 <script>
-import {
-	GetBatchlist,
-	AddBatchlist,
-	DelBatchlist,
-	UpdateBatchlist,
-	downloadStatisticsTableExcel,
-} from '@/api/paintLabManagement/dataRawMaterial'
+import { GetBatchlist, AddBatchlist, DelBatchlist, UpdateBatchlist, downloadStatisticsTableExcel, AddBatchListByWorkOrder } from '@/api/paintLabManagement/dataRawMaterial'
 
 export default {
-	name: 'DataCapture',
-	data() {
-		return {
-			inputWidth: '180px',
-			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) } }
-				]
-			},
-			searchForm: {
-				starttime: new Date(new Date(new Date().toLocaleDateString()).getTime()),
-				endtime: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
-				workorderid: null,
-				description: ''
-			},
-			reportTypeOptions: [
-				{ label: '批量生产记录', value: 0 },
-				{ label: '抛光报表', value: 1 },
-				{ label: '包装报表', value: 2 },
-				{ label: '总报表', value: 3 },
-			],
-			pagination: { total: 0, pageNum: 1, pageSize: 30 },
-			realTotal: 0,
-			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: [],
-			showAddDialog: false,
-			batchWorkOrderAddDialog: {
-				show: false,
-				workOrderList: [],
-				total: 0,
-				actionDate: ''
-			},
+  name: 'DataCapture',
+  data() {
+    return {
+      inputWidth: '180px',
+      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)
+            },
+          },
+        ],
+      },
+      searchForm: {
+        starttime: new Date(new Date(new Date().toLocaleDateString()).getTime()),
+        endtime: new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1),
+        workorderid: null,
+        description: '',
+      },
+      reportTypeOptions: [
+        { label: '批量生产记录', value: 0 },
+        { label: '抛光报表', value: 1 },
+        { label: '包装报表', value: 2 },
+        { label: '总报表', value: 3 },
+      ],
+      pagination: { total: 0, pageNum: 1, pageSize: 30 },
+      realTotal: 0,
+      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: [],
+      showAddDialog: false,
+      batchWorkOrderAddDialog: {
+        show: false,
+        workOrderList: [],
+        total: 0,
+        actionDate: '',
+      },
 
-			sexList: [
-				{ label: '/', value: '0' },
-				{ label: '原漆', value: '1' },
-				{ label: '加浆', value: '2' },
-				{ label: '库存油漆', value: '3' },
-			],
-			nameList: [
-				{ label: '刘会芳', value: '0' },
-				{ label: '沈桂华', value: '1' },
-				{ label: '其他', value: '2' },
-			],
-		}
-	},
-	mounted() {
-		this.batchWorkOrderAddDialog.actionDate = new Date();
-		this.fetchData()
-	},
-	methods: {
-		formatSex(value) {
-			switch (value) {
-				case '0': return '/';
-				case '1': return '原漆';
-				case '2': return '加浆';
-				case '3': return '库存油漆';
-			}
-			return '';
-		},
+      sexList: [
+        { label: '/', value: '0' },
+        { label: '原漆', value: '1' },
+        { label: '加浆', value: '2' },
+        { label: '库存油漆', value: '3' },
+      ],
+      nameList: [
+        { label: '刘会芳', value: '0' },
+        { label: '沈桂华', value: '1' },
+        { label: '其他', value: '2' },
+      ],
+    }
+  },
+  mounted() {
+    this.batchWorkOrderAddDialog.actionDate = new Date()
+    this.fetchData()
+  },
+  methods: {
+    formatSex(value) {
+      switch (value) {
+        case '0':
+          return '/'
+        case '1':
+          return '原漆'
+        case '2':
+          return '加浆'
+        case '3':
+          return '库存油漆'
+      }
+      return ''
+    },
 
-		formatName(value) {
-			switch (value) {
-				case '0': return '刘会芳';
-				case '1': return '沈桂华';
-				case '2': return '其他';
-			}
-			return '';
-		},
+    formatName(value) {
+      switch (value) {
+        case '0':
+          return '刘会芳'
+        case '1':
+          return '沈桂华'
+        case '2':
+          return '其他'
+      }
+      return ''
+    },
 
-		addRecord() {
-			this.showAddDialog = false;
-			AddBatchlist({ num: 1 }).then(res => {
-				if (res.code === 200) this.fetchData();
-			});
-		},
+    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;
-				}
-			});
-		},
+    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
+        }
+      })
+    },
 
-		getHeaderCellStyle() {
-			return { backgroundColor: '#2D3D51', color: '#ffffff', border: '1px solid #161823', fontSize: '18px' };
-		},
+    getHeaderCellStyle() {
+      return { backgroundColor: '#2D3D51', color: '#ffffff', border: '1px solid #161823', fontSize: '18px' }
+    },
 
-		getCellStyle() {
-			return { border: '1px solid #161823', fontSize: '16px', fontWeight: '700' };
-		},
+    getCellStyle() {
+      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);
-			// });
-		},
+    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);
+      // });
+    },
 
-		handleContextMenuClick({ menu, row }) {
-			switch (menu.code) {
-				case 'hideColumn': this.hideColumn(row); break;
-				case 'showAllColumns': this.resetColumns(); break;
-				case 'removeRow': this.removeRow(row); break;
-				case 'updateRow': this.updateRow(row); break;
-			}
-		},
+    handleContextMenuClick({ menu, row }) {
+      switch (menu.code) {
+        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) {
-			this.$refs.dataTable.hideColumn(column);
-			this.hiddenColumns.push(column.title);
-			this.resetMergedCells();
-		},
+    hideColumn(column) {
+      this.$refs.dataTable.hideColumn(column)
+      this.hiddenColumns.push(column.title)
+      this.resetMergedCells()
+    },
 
-		resetColumns() {
-			this.$refs.dataTable.resetColumn();
-			this.hiddenColumns = [];
-			this.resetMergedCells();
-		},
+    resetColumns() {
+      this.$refs.dataTable.resetColumn()
+      this.hiddenColumns = []
+      this.resetMergedCells()
+    },
 
-		resetMergedCells() { this.mergeTableRows(this.searchForm.reportType === 3 ? 2 : 3); },
+    resetMergedCells() {
+      this.mergeTableRows(this.searchForm.reportType === 3 ? 2 : 3)
+    },
 
-		removeRow(row) {
-			this.$confirm('此操作将永久删除该组记录, 是否继续?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				DelBatchlist({ idGroup: row.idGroup }).then(res => {
-					if (res.code === 200) {
-						this.$message.success('删除成功!');
-						this.fetchData();
-					} else {
-						this.$message.error('删除失败!请检查!');
-					}
-				});
-			});
-		},
+    removeRow(row) {
+      this.$confirm('此操作将永久删除该组记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        DelBatchlist({ idGroup: row.idGroup }).then((res) => {
+          if (res.code === 200) {
+            this.$message.success('删除成功!')
+            this.fetchData()
+          } else {
+            this.$message.error('删除失败!请检查!')
+          }
+        })
+      })
+    },
 
-		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
-			}));
+    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,
+        workorder: this.qualityStatisticsTable[baseIndex].workorder,
+        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,
+      }))
 
-			UpdateBatchlist(updatedData).then(res => {
-				if (res.code === 200) {
-					this.$message.success(`更新成功-${res.data}`);
-				}
-			});
-		},
+      UpdateBatchlist(updatedData).then((res) => {
+        if (res.code === 200) {
+          this.$message.success(`更新成功-${res.data}`)
+        }
+      })
+    },
 
-		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 }
-				);
-			}
-		},
+    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: 3, rowspan: rowsPerGroup },
 
-		isMenuItemVisible(menu) {
-			// Implement visibility logic if needed
-			return true;
-		},
-		generateDataByWorkOrder() {
-			this.$message.success('生成数据成功');
-			this.fetchData();
-			this.batchWorkOrderAddDialog.show = false;
-		}
-	}
+          { row: i, col: 9, rowspan: rowsPerGroup },
+          { row: i, col: 10, rowspan: rowsPerGroup },
+          { row: i, col: 11, rowspan: rowsPerGroup },
+
+          { row: i, col: 14, rowspan: rowsPerGroup },
+          { row: i, col: 15, rowspan: rowsPerGroup },
+          { row: i, col: 16, rowspan: rowsPerGroup },
+          { row: i, col: 17, 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() {
+      const actionDate = this.$dayjs(this.batchWorkOrderAddDialog.actionDate).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+      const params = {
+        actionDate,
+      }
+      AddBatchListByWorkOrder(params).then((res) => {
+        if (res.code === 200) {
+          this.$message.success('生成数据成功')
+          this.fetchData()
+          this.batchWorkOrderAddDialog.show = false
+        } else {
+          this.$message.error('生成数据失败')
+        }
+      })
+    },
+  },
 }
 </script>
 
diff --git a/src/views/paintLabManagement/dataRawMaterial.vue b/src/views/paintLabManagement/dataRawMaterial.vue
index f8e63c4..06963f5 100644
--- a/src/views/paintLabManagement/dataRawMaterial.vue
+++ b/src/views/paintLabManagement/dataRawMaterial.vue
@@ -1,387 +1,436 @@
 <template>
-	<div class="app-container">
-		<!-- 搜索部分 -->
-		<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.currentPage"
-				:limit.sync="pagination.pageSize" @pagination="fetchData" />
-		</div>
-		<div style="width: 100%">
-			<div style="font-size: 20px; text-align: center;">
-				原材料数据记录 共 {{ realTotal }} 条
-			</div>
-		</div>
-		<!-- 表格部分 -->
-		<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' }">
-				<template #edit="{ row }">
-					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.description"
-						@input="handleSearchMaterial(row)" type="text"></vxe-textarea>
+  <div class="app-container">
+    <!-- 搜索部分 -->
+    <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.currentPage" :limit.sync="pagination.pageSize" @pagination="fetchData" />
+    </div>
+    <div style="width: 100%">
+      <div style="font-size: 20px; text-align: center">原材料数据记录 共 {{ realTotal }} 条</div>
+    </div>
+    <!-- 表格部分 -->
+    <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' }">
+        <template #edit="{ row }">
+          <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' }">
-				<template #edit="{ row }">
-					<vxe-textarea :autosize="{ minRows: 4 }" v-model="row.pci" 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"
-						@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' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value03" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value04" title="△B" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value04" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value05" title="△E" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<vxe-input v-model="row.value05" type="text"></vxe-input>
-				</template>
-			</vxe-column>
-			<vxe-column field="value06" title="mDE" min-width="100px" :edit-render="{ autofocus: '.vxe-input--inner' }">
-				<template #edit="{ row }">
-					<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' }">
-					<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' }">
-					<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' }">
-					<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' }">
-					<template #edit="{ row }">
-						<vxe-input v-model="row.value11" type="text"></vxe-input>
-					</template>
-				</vxe-column>
-			</vxe-colgroup>
-		</vxe-table>
+          <!-- 物料清单下拉建议功能 -->
+          <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' }">
+        <template #edit="{ row }">
+          <vxe-textarea :autosize="{ minRows: 4 }" v-model="row.pci" 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" @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' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value03" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value04" title="△B" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value04" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value05" title="△E" min-width="80px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <vxe-input v-model="row.value05" type="text"></vxe-input>
+        </template>
+      </vxe-column>
+      <vxe-column field="value06" title="mDE" min-width="100px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+        <template #edit="{ row }">
+          <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' }">
+          <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' }">
+          <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' }">
+          <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' }">
+          <template #edit="{ row }">
+            <vxe-input v-model="row.value11" type="text"></vxe-input>
+          </template>
+        </vxe-column>
+      </vxe-colgroup>
+    </vxe-table>
 
-		<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>
-	</div>
+    <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>
+  </div>
 </template>
 
 <script>
 import { downloadStatisticsTableExcel } from '@/api/qualityManagement/qualityStatistics_V2'
 import { GetRawMateriallist, AddRawMateriallist, UpdateRawMateriallist, DelRawMateriallist, QueryMaterialOptions } from '@/api/paintLabManagement/dataRawMaterial'
-import { debounce } from 'lodash';
+import { debounce } from 'lodash'
 export default {
-	name: 'DataRawMaterial',
-	data() {
-		return {
-			inputWidth: '180px',
-			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) } }
-				]
-			},
-			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,
-				productDescription: ''
-			},
-			reportTypes: [{ label: '原材料记录', value: 0 }],
-			pagination: { total: 0, currentPage: 1, pageSize: 30 },
-			realTotal: 0,
-			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
-			},
-			showAddDialog: false,
-			materialList: [], // 存储搜索结果
-			searchDebounce: null // 防抖实例
-		}
-	},
-	mounted() { this.fetchData() },
-	methods: {
-		updateUser(value) { console.log(value) },
+  name: 'DataRawMaterial',
+  data() {
+    return {
+      inputWidth: '180px',
+      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)
+            },
+          },
+        ],
+      },
+      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,
+        productDescription: '',
+      },
+      reportTypes: [{ label: '原材料记录', value: 0 }],
+      pagination: { total: 0, currentPage: 1, pageSize: 30 },
+      realTotal: 0,
+      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,
+      },
+      showAddDialog: false,
+      materialList: [], // 存储搜索结果
+      searchDebounce: null, // 防抖实例
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  methods: {
+    updateUser(value) {
+      console.log(value)
+    },
 
-		addRecord() {
-			this.showAddDialog = false;
-			AddRawMateriallist({ num: 1 }).then(res => {
-				if (res.code === 200) this.fetchData();
-			});
-		},
+    addRecord() {
+      this.showAddDialog = false
+      AddRawMateriallist({ 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 };
-			['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;
-				}
-			});
-		},
+    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
+        }
+      })
+    },
 
-		getHeaderCellStyle() {
-			return { backgroundColor: '#2D3D51', color: '#ffffff', border: '1px solid #161823', fontSize: '18px' };
-		},
+    getHeaderCellStyle() {
+      return { backgroundColor: '#2D3D51', color: '#ffffff', border: '1px solid #161823', fontSize: '18px' }
+    },
 
-		getCellStyle() {
-			return { border: '1px solid #161823', fontSize: '16px', fontWeight: '700' };
-		},
+    getCellStyle() {
+      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);
-			// });
-		},
+    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);
+      // });
+    },
 
-		offsetRate(num) { return num === null ? '' : parseInt(num); },
-		offsetValue(num) { return num === 0 || num === '0' ? '' : num; },
+    offsetRate(num) {
+      return num === null ? '' : parseInt(num)
+    },
+    offsetValue(num) {
+      return num === 0 || num === '0' ? '' : num
+    },
 
-		handleContextMenuClick({ menu, row }) {
-			switch (menu.code) {
-				case 'hideColumn': this.hideColumn(row); break;
-				case 'showAllColumns': this.resetColumns(); break;
-				case 'removeRow': this.removeRow(row); break;
-				case 'updateRow': this.updateRow(row); break;
-			}
-		},
+    handleContextMenuClick({ menu, row }) {
+      switch (menu.code) {
+        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) {
-			this.$refs.dataTable.hideColumn(column);
-			this.hiddenColumns.push(column.title);
-			this.resetMergedCells();
-		},
+    hideColumn(column) {
+      this.$refs.dataTable.hideColumn(column)
+      this.hiddenColumns.push(column.title)
+      this.resetMergedCells()
+    },
 
-		resetColumns() {
-			this.$refs.dataTable.resetColumn();
-			this.hiddenColumns = [];
-			this.resetMergedCells();
-		},
+    resetColumns() {
+      this.$refs.dataTable.resetColumn()
+      this.hiddenColumns = []
+      this.resetMergedCells()
+    },
 
-		resetMergedCells() { this.mergeTableRows(this.searchForm.reportType === 3 ? 2 : 3); },
+    resetMergedCells() {
+      this.mergeTableRows(this.searchForm.reportType === 3 ? 2 : 3)
+    },
 
-		removeRow(row) {
-			this.$confirm('此操作将永久删除该组记录, 是否继续?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				DelRawMateriallist({ idGroup: row.idGroup }).then(res => {
-					if (res.code === 200) {
-						this.$message.success('删除成功!');
-						this.fetchData();
-					} else {
-						this.$message.error('删除失败!请检查!');
-					}
-				});
-			});
-		},
+    removeRow(row) {
+      this.$confirm('此操作将永久删除该组记录, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        DelRawMateriallist({ idGroup: row.idGroup }).then((res) => {
+          if (res.code === 200) {
+            this.$message.success('删除成功!')
+            this.fetchData()
+          } else {
+            this.$message.error('删除失败!请检查!')
+          }
+        })
+      })
+    },
 
-		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
-			}));
+    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,
+      }))
 
-			UpdateRawMateriallist(updatedData).then(res => {
-				if (res.code === 200) {
-					this.$message.success(`更新成功-${res.data}`);
-				}
-			});
-		},
+      UpdateRawMateriallist(updatedData).then((res) => {
+        if (res.code === 200) {
+          this.$message.success(`更新成功-${res.data}`)
+        }
+      })
+    },
 
-		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 }
-				);
-			}
-		},
+    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);
-		},
+    isMenuItemVisible(menu) {
+      // Implement visibility logic if needed
+      return true
+    },
+    // 初始化防抖函数
+    initDebounce() {
+      this.searchDebounce = debounce(this.doSearchMaterial, 500)
+    },
 
-		// 输入处理
-		handleSearchMaterial(row) {
-			if (!this.searchDebounce) {
-				this.initDebounce();
-			}
+    // 输入处理
+    handleSearchMaterial(row) {
+      if (!this.searchDebounce) {
+        this.initDebounce()
+      }
 
-			// 清除旧数据
-			if (!row.description) {
-				this.materialList = [];
-				return;
-			}
+      // 清除旧数据
+      if (!row.description) {
+        this.materialList = []
+        return
+      }
 
-			this.searchDebounce(row.description);
-		},
+      this.searchDebounce(row.description)
+    },
 
-		// 实际搜索方法
-		async doSearchMaterial(query) {
-			try {
-				const res = await QueryMaterialOptions({ query });
-				this.materialList = res.data;
-			} catch (e) {
-				console.error('搜索失败', e);
-			}
-		},
+    // 实际搜索方法
+    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 = [];
-		}
-	}
+    // 选择物料
+    handleSelectMaterial(row, material) {
+      row.description = material.value
+      row.code = material.color
+      this.materialList = []
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
 /* 建议列表样式 */
 .material-suggestions {
-	position: absolute;
-	z-index: 999;
-	background: white;
-	border: 1px solid #e8eaec;
-	max-height: 200px;
-	overflow-y: auto;
+  position: absolute;
+  z-index: 999;
+  background: white;
+  border: 1px solid #e8eaec;
+  max-height: 200px;
+  overflow-y: auto;
 }
 
 .material-suggestions div {
-	padding: 8px;
-	cursor: pointer;
+  padding: 8px;
+  cursor: pointer;
 }
 
 .material-suggestions div:hover {
-	background-color: #f5f7fa;
+  background-color: #f5f7fa;
 }
 </style>
diff --git a/src/views/paintLabManagement/dataTest.vue b/src/views/paintLabManagement/dataTest.vue
index 5a41b8c..b161e65 100644
--- a/src/views/paintLabManagement/dataTest.vue
+++ b/src/views/paintLabManagement/dataTest.vue
@@ -465,6 +465,7 @@ export default {
 		// 选择物料
 		handleSelectMaterial(row, material) {
 			row.description = material.value;
+			row.code = material.color;
 			this.materialList = [];
 		}
 	},