diff --git a/src/views/paintLabManagement/dataBatch.vue b/src/views/paintLabManagement/dataBatch.vue
index 462a4f4..6f37922 100644
--- a/src/views/paintLabManagement/dataBatch.vue
+++ b/src/views/paintLabManagement/dataBatch.vue
@@ -3,33 +3,96 @@
     <!-- 搜索部分 -->
     <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
+          :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
+          :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-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-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-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" />
+      <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 style="font-size: 20px; text-align: center">
+        批量数据 共 {{ realTotal }} 条
+      </div>
     </div>
+    <el-button
+      size="mini"
+      type="primary"
+      icon="el-icon-check"
+      @click="saveAllChanges"
+      :disabled="Object.keys(modifiedRows).length === 0"
+    >
+      保存所有修改（已修改 {{ Object.keys(modifiedRows).length }} 处）
+    </el-button>
     <!-- 表格部分 -->
     <vxe-table
       @menu-click="handleContextMenuClick"
@@ -48,120 +111,258 @@
       max-height="800px"
       :export-config="{}"
       :edit-config="{ trigger: 'click', mode: 'cell' }"
+      @edit-actived="handleEditActived"
+      @edit-closed="handleEditClosed"
     >
-      <vxe-column field="dt" title="日期" width="140px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+      <vxe-column
+        field="dt"
+        title="日期"
+        width="140px"
+        :edit-render="{ autofocus: '.vxe-input--inner' }"
+      >
+        <template #default="{ row }">
+          <span v-if="row.dt && isValidDate(row.dt)">
+            {{ formatDate(row.dt) }}
+          </span>
+          <span v-else>-</span>
+        </template>
         <template #edit="{ row }">
-          <vxe-textarea :autosize="{ minRows: 4 }" v-model="row.dt" type="text"></vxe-textarea>
+          <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' }">
+      <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>
+          <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' }">
+      <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>
+          <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"
+            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' }">
+      <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' }">
+      <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' }">
+      <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' }">
+      <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' }">
+      <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="{}">
+      <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-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' }">
+      <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="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-column field="value17" title="附着力" min-width="120px" :edit-render="{ autofocus: '.vxe-input--inner' }">
+      <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' }">
+      <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="{}">
+      <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-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' }">
+        <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>
@@ -177,64 +378,92 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="工单自动生成" :visible.sync="batchWorkOrderAddDialog.show" width="30%">
+    <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>
+        <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>
+        <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, AddBatchListByWorkOrder } from '@/api/paintLabManagement/dataRawMaterial'
+import {
+  GetBatchlist,
+  AddBatchlist,
+  DelBatchlist,
+  UpdateBatchlist,
+  downloadStatisticsTableExcel,
+  AddBatchListByWorkOrder,
+} from "@/api/paintLabManagement/dataRawMaterial";
 
 export default {
-  name: 'DataCapture',
+  name: "DataCapture",
   data() {
     return {
-      inputWidth: '180px',
+      modifiedRows: {}, // 改为响应式对象
+      inputWidth: "180px",
       datePickerOptions: {
         shortcuts: [
           {
-            text: '今天',
+            text: "今天",
             onClick(picker) {
-              picker.$emit('pick', new Date())
+              picker.$emit("pick", new Date());
             },
           },
           {
-            text: '昨天',
+            text: "昨天",
             onClick(picker) {
-              const date = new Date()
-              date.setTime(date.getTime() - 3600 * 1000 * 24)
-              picker.$emit('pick', date)
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24);
+              picker.$emit("pick", date);
             },
           },
           {
-            text: '一周前',
+            text: "一周前",
             onClick(picker) {
-              const date = new Date()
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', date)
+              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),
+        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: '',
+        description: "",
       },
       reportTypeOptions: [
-        { label: '批量生产记录', value: 0 },
-        { label: '抛光报表', value: 1 },
-        { label: '包装报表', value: 2 },
-        { label: '总报表', value: 3 },
+        { label: "批量生产记录", value: 0 },
+        { label: "抛光报表", value: 1 },
+        { label: "包装报表", value: 2 },
+        { label: "总报表", value: 3 },
       ],
       pagination: { total: 0, pageNum: 1, pageSize: 30 },
       realTotal: 0,
@@ -246,16 +475,16 @@ export default {
         header: {
           options: [
             [
-              { code: 'hideColumn', name: '隐藏列' },
-              { code: 'showAllColumns', name: '取消所有隐藏列' },
+              { code: "hideColumn", name: "隐藏列" },
+              { code: "showAllColumns", name: "取消所有隐藏列" },
             ],
           ],
         },
         body: {
           options: [
             [
-              { code: 'removeRow', name: '删除' },
-              { code: 'updateRow', name: '修改' },
+              { code: "removeRow", name: "删除" },
+              { code: "updateRow", name: "修改" },
             ],
           ],
         },
@@ -267,86 +496,317 @@ export default {
         show: false,
         workOrderList: [],
         total: 0,
-        actionDate: '',
+        actionDate: "",
       },
 
       sexList: [
-        { label: '/', value: '0' },
-        { label: '原漆', value: '1' },
-        { label: '加浆', value: '2' },
-        { label: '库存油漆', value: '3' },
+        { label: "/", value: "0" },
+        { label: "原漆", value: "1" },
+        { label: "加浆", value: "2" },
+        { label: "库存油漆", value: "3" },
       ],
       nameList: [
-        { label: '刘会芳', value: '0' },
-        { label: '沈桂华', value: '1' },
-        { label: '其他', value: '2' },
+        { label: "刘会芳", value: "0" },
+        { label: "沈桂华", value: "1" },
+        { label: "其他", value: "2" },
       ],
-    }
+    };
   },
   mounted() {
-    this.batchWorkOrderAddDialog.actionDate = new Date()
-    this.fetchData()
+    this.batchWorkOrderAddDialog.actionDate = new Date();
+    this.fetchData();
   },
   methods: {
+      isValidDate(date) {
+    return this.$dayjs(date).isValid();
+  },
+
+  formatDate(date) {
+    return this.$dayjs(date).format("YYYY-MM-DD HH:mm:ss");
+  },
+    handleEditActived({ row }) {
+      if (!this.modifiedRows[row.id]) {
+        // 深拷贝原始数据
+        this.$set(this.modifiedRows, row.id, JSON.parse(JSON.stringify(row)));
+      }
+    },
+
+    handleEditClosed({ row }) {
+      const original = this.modifiedRows[row.id];
+      if (original) {
+        // 深度比较对象差异
+        const changed = Object.keys(original).some((key) => {
+          // 特殊处理日期类型
+          if (key === "dt") {
+            return (
+              this.$dayjs(original[key]).format() !==
+              this.$dayjs(row[key]).format()
+            );
+          }
+          return original[key] !== row[key];
+        });
+
+        if (!changed) {
+          this.$delete(this.modifiedRows, row.id);
+        }
+      }
+    },
+
+    async saveAllChanges() {
+      if (Object.keys(this.modifiedRows).length === 0) {
+        this.$message.warning("没有需要保存的修改");
+        return;
+      }
+
+      try {
+        // 创建分组映射
+        const groupMap = new Map();
+
+        // 遍历所有修改的行
+        Object.values(this.modifiedRows).forEach((row) => {
+          // 找到当前行在表格中的索引
+          const rowIndex = this.qualityStatisticsTable.findIndex(
+            (r) => r.id === row.id
+          );
+          // 计算所属分组的起始索引（每6行一组）
+          const groupIndex = Math.floor(rowIndex / 6) * 6;
+
+          // 如果该组还未创建，初始化分组
+          if (!groupMap.has(groupIndex)) {
+            groupMap.set(groupIndex, {
+              baseRow: this.qualityStatisticsTable[groupIndex],
+              modifiedRows: new Set(),
+            });
+          }
+
+          // 将修改行添加到对应分组
+          const group = groupMap.get(groupIndex);
+          group.modifiedRows.add(rowIndex % 6); // 记录组内修改的位置
+        });
+
+        // 构建最终更新数据
+        const updateList = [];
+        groupMap.forEach((group, groupIndex) => {
+          const groupRows = this.qualityStatisticsTable.slice(
+            groupIndex,
+            groupIndex + 6
+          );
+
+          // 生成6条更新记录（即使部分未修改）
+          Array.from({ length: 6 }).forEach((_, i) => {
+            const row = groupRows[i] || {};
+            updateList.push({
+              id: row.id,
+              plIdGroup: row.idGroup,
+              workorder: group.baseRow.workorder,
+              description: group.baseRow.description,
+              plDt: group.baseRow.dt,
+              plCode: group.baseRow.code,
+              plValue01: row.value01,
+              plValue02: row.value02,
+              plValue03: row.value03,
+              plValue04: row.value04,
+              plValue05: row.value05,
+              plValue06: group.baseRow.value06,
+              plValue07: group.baseRow.value07,
+              plValue08: group.baseRow.value08,
+              plValue09: row.value09,
+              plValue10: row.value10,
+              plValue11: row.value11,
+              plValue12: row.value12,
+              plValue13: row.value13,
+              plValue14: row.value14,
+              plValue15: row.value15,
+              plValue16: group.baseRow.value16,
+              plValue17: group.baseRow.value17,
+              plValue18: group.baseRow.value18,
+              plValue19: group.baseRow.value19,
+              plCreatedBy: row.createdBy,
+              plCreatedTime: row.createdTime,
+              plUpdatedBy: row.updatedBy,
+              plUpdatedTime: row.updatedTime,
+            });
+          });
+        });
+
+        const { code, data } = await UpdateBatchlist(updateList);
+        if (code === 200) {
+          this.$message.success(`成功保存${data}条记录`);
+          this.modifiedRows = {};
+          await this.fetchData();
+          // 保持合并单元格状态
+          this.mergeTableRows(6);
+        }
+      } catch (error) {
+        console.error("保存失败:", error);
+        this.$message.error(
+          "保存失败: " + (error.response?.data?.message || error.message)
+        );
+      }
+    },
+
+    // // 修改后的mergeTableRows方法
+    // mergeTableRows(rowsPerGroup) {
+    //   this.mergedCells = [];
+    //   const visibleColumns = this.$refs.dataTable.getColumns().filter(col => col.visible);
+
+    //   const shouldMerge = (colIndex) => {
+    //     const col = visibleColumns[colIndex];
+    //     return col && !['value02','value03','value04','value05','value10','value11','value12','value13','value15'].includes(col.field);
+    //   };
+
+    //   for (let i = 0; i < this.qualityStatisticsTable.length; i += rowsPerGroup) {
+    //     visibleColumns.forEach((col, colIndex) => {
+    //       if (shouldMerge(colIndex)) {
+    //         this.mergedCells.push({
+    //           row: i,
+    //           col: colIndex,
+    //           rowspan: rowsPerGroup,
+    //           colspan: 1
+    //         });
+    //       }
+    //     });
+    //   }
+    // },
+
+    // 修改后的fetchData方法
+    async fetchData() {
+      this.isLoading = true;
+      try {
+        const query = {
+          ...this.searchForm,
+          ...this.pagination,
+          starttime: this.$dayjs(this.searchForm.starttime).format(
+            "YYYY-MM-DD HH:mm:ss"
+          ),
+          endtime: this.$dayjs(this.searchForm.endtime).format(
+            "YYYY-MM-DD HH:mm:ss"
+          ),
+        };
+
+        const { code, data } = await GetBatchlist(query);
+        if (code === 200) {
+          this.qualityStatisticsTable = data.item1.map((item) => ({
+            ...item,
+            // 确保日期字段正确处理
+            dt: this.$dayjs(item.dt).format("YYYY-MM-DD HH:mm:ss"),
+          }));
+          this.pagination.total = data.item2;
+          this.realTotal = Math.ceil(this.pagination.total / 6);
+          this.mergeTableRows(6);
+        }
+      } catch (error) {
+        console.error("数据加载失败:", error);
+      } finally {
+        this.isLoading = false;
+      }
+    },
+
+    // 优化后的合并单元格方法
+    mergeTableRows(rowsPerGroup) {
+      this.mergedCells = [];
+      const visibleColumns = this.$refs.dataTable
+        .getColumns()
+        .filter((col) => !col.visible);
+
+      for (
+        let i = 0;
+        i < this.qualityStatisticsTable.length;
+        i += rowsPerGroup
+      ) {
+        const mergeFields = [
+          0,
+          1,
+          2,
+          3, // 前4列
+          9,
+          10,
+          11, // 备注列区域
+          14,
+          15,
+          16,
+          17, // 工艺参数列区域
+        ];
+
+        mergeFields.forEach((colIndex) => {
+          if (visibleColumns[colIndex]?.visible !== false) {
+            this.mergedCells.push({
+              row: i,
+              col: colIndex,
+              rowspan: rowsPerGroup,
+            });
+          }
+        });
+      }
+    },
     formatSex(value) {
       switch (value) {
-        case '0':
-          return '/'
-        case '1':
-          return '原漆'
-        case '2':
-          return '加浆'
-        case '3':
-          return '库存油漆'
+        case "0":
+          return "/";
+        case "1":
+          return "原漆";
+        case "2":
+          return "加浆";
+        case "3":
+          return "库存油漆";
       }
-      return ''
+      return "";
     },
 
     formatName(value) {
       switch (value) {
-        case '0':
-          return '刘会芳'
-        case '1':
-          return '沈桂华'
-        case '2':
-          return '其他'
+        case "0":
+          return "刘会芳";
+        case "1":
+          return "沈桂华";
+        case "2":
+          return "其他";
       }
-      return ''
+      return "";
     },
 
     addRecord() {
-      this.showAddDialog = false
+      this.showAddDialog = false;
       AddBatchlist({ num: 1 }).then((res) => {
-        if (res.code === 200) this.fetchData()
-      })
+        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' }
+      return {
+        backgroundColor: "#2D3D51",
+        color: "#ffffff",
+        border: "1px solid #161823",
+        fontSize: "18px",
+      };
     },
 
     getCellStyle() {
-      return { border: '1px solid #161823', fontSize: '16px', fontWeight: '700' }
+      return {
+        border: "1px solid #161823",
+        fontSize: "16px",
+        fontWeight: "700",
+      };
     },
 
     exportData() {
-      this.$refs.dataTable.openExport()
+      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 => {
@@ -364,56 +824,57 @@ export default {
 
     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
+        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()
+      this.$refs.dataTable.hideColumn(column);
+      this.hiddenColumns.push(column.title);
+      this.resetMergedCells();
     },
 
     resetColumns() {
-      this.$refs.dataTable.resetColumn()
-      this.hiddenColumns = []
-      this.resetMergedCells()
+      this.$refs.dataTable.resetColumn();
+      this.hiddenColumns = [];
+      this.resetMergedCells();
     },
 
     resetMergedCells() {
-      this.mergeTableRows(this.searchForm.reportType === 3 ? 2 : 3)
+      this.mergeTableRows(this.searchForm.reportType === 3 ? 2 : 3);
     },
 
     removeRow(row) {
-      this.$confirm('此操作将永久删除该组记录, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
+      this.$confirm("此操作将永久删除该组记录, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(() => {
         DelBatchlist({ idGroup: row.idGroup }).then((res) => {
           if (res.code === 200) {
-            this.$message.success('删除成功!')
-            this.fetchData()
+            this.$message.success("删除成功!");
+            this.fetchData();
           } else {
-            this.$message.error('删除失败!请检查!')
+            this.$message.error("删除失败!请检查!");
           }
-        })
-      })
+        });
+      });
     },
 
     updateRow(row) {
-      const baseIndex = Math.floor(this.qualityStatisticsTable.indexOf(row) / 6) * 6
+      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,
@@ -444,61 +905,63 @@ export default {
         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}`)
+          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: 3, 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 },
 
-          { row: i, col: 9, rowspan: rowsPerGroup },
-          { row: i, col: 10, rowspan: rowsPerGroup },
-          { row: i, col: 11, rowspan: rowsPerGroup },
+    //       { 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 },
-        )
-      }
-    },
+    //       { 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
+      return true;
     },
     generateDataByWorkOrder() {
-      const actionDate = this.$dayjs(this.batchWorkOrderAddDialog.actionDate).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+      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
+          this.$message.success("生成数据成功");
+          this.fetchData();
+          this.batchWorkOrderAddDialog.show = false;
         } else {
-          this.$message.error('生成数据失败')
+          this.$message.error("生成数据失败");
         }
-      })
+      });
     },
   },
-}
+};
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>
\ No newline at end of file