From 295456c9f5b9fbdc1fd448e5e57c5b9046afbe5e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 29 Jun 2026 14:46:46 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-29=20lab=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/lab/labRecord.vue | 122 +++++++++++++---------------
 1 file changed, 58 insertions(+), 64 deletions(-)

diff --git a/src/views/modules/lab/labRecord.vue b/src/views/modules/lab/labRecord.vue
index 5e98eaf..2523433 100644
--- a/src/views/modules/lab/labRecord.vue
+++ b/src/views/modules/lab/labRecord.vue
@@ -131,7 +131,7 @@
     <el-dialog
       :title="modalTitle"
       :visible.sync="modalFlag"
-      width="1025px"
+      width="965px"
       top="5vh"
       v-drag
       :close-on-click-modal="false"
@@ -337,7 +337,39 @@
           </div>
         </el-tab-pane>
 
-        <el-tab-pane label="结果信息" name="resultInfo">
+        <el-tab-pane label="审批信息" name="approvalInfo">
+          <div style="height: 715px; overflow-y: auto;">
+            <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
+              <el-form-item label="备注（部门经理）" style="display: block;">
+                <el-input type="textarea" :rows="3" v-model="modalData.departmentManagerComments" :disabled="isLabFieldDisabled('departmentManagerComments')" resize="none" style="width: 772px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: 45px;">
+              <el-form-item label="备注（实验室）" style="display: block;">
+                <el-input type="textarea" :rows="3" v-model="modalData.labComments" :disabled="isLabFieldDisabled('labComments')" resize="none" style="width: 772px"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: 45px">
+              <el-form-item>
+                <span style="cursor: pointer" v-if="!isLabFieldDisabled('tester')" slot="label" @click="openTesterChooseModal"><a herf="#">测试人</a></span>
+                <span v-else slot="label">测试人</span>
+                <el-input
+                  v-model="modalData.testerName"
+                  readonly
+                  :disabled="isLabFieldDisabled('tester')"
+                  style="width: 772px"
+                  placeholder="请选择测试人"
+                  @focus="openTesterChooseModal">
+                  <span slot="suffix" v-show="modalData.testerName && !isLabFieldDisabled('tester')" @click.stop="clearTesterSelection">
+                    <i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i>
+                  </span>
+                </el-input>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="测试结果" name="resultInfo">
           <div style="height: 715px; overflow-y: auto;">
             <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
               <el-form-item label="测试开始时间">
@@ -382,43 +414,6 @@
             </el-form>
           </div>
         </el-tab-pane>
-
-        <el-tab-pane label="审批信息-部门经理" name="departmentManagerInfo">
-          <div style="height: 715px; overflow-y: auto;">
-            <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
-              <el-form-item label="备注" style="display: block;">
-                <el-input type="textarea" :rows="4" v-model="modalData.departmentManagerComments" :disabled="isLabFieldDisabled('departmentManagerComments')" resize="none" style="width: 772px"></el-input>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="审批信息-实验室" name="labInfo">
-          <div style="height: 715px; overflow-y: auto;">
-            <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
-              <el-form-item label="备注（实验室）" style="display: block;">
-                <el-input type="textarea" :rows="3" v-model="modalData.labComments" :disabled="isLabFieldDisabled('labComments')" resize="none" style="width: 772px"></el-input>
-              </el-form-item>
-            </el-form>
-            <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: 45px">
-              <el-form-item>
-                <span style="cursor: pointer" v-if="!isLabFieldDisabled('tester')" slot="label" @click="openTesterChooseModal"><a herf="#">测试人</a></span>
-                <span v-else slot="label">测试人</span>
-                <el-input
-                  v-model="modalData.testerName"
-                  readonly
-                  :disabled="isLabFieldDisabled('tester')"
-                  style="width: 772px"
-                  placeholder="请选择测试人"
-                  @focus="openTesterChooseModal">
-                  <span slot="suffix" v-show="modalData.testerName && !isLabFieldDisabled('tester')" @click.stop="clearTesterSelection">
-                    <i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i>
-                  </span>
-                </el-input>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-tab-pane>
       </el-tabs>
 
       <el-footer style="height:35px;margin-top: 15px;text-align:center">
@@ -804,7 +799,27 @@
           </el-form>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="结果信息" name="resultInfo">
+      <el-tab-pane label="审批信息" name="approvalInfoDetail">
+        <div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
+          <el-form :inline="true" label-position="top" :model="currentDetail">
+            <el-form-item label="备注（部门经理）" style="display: block;">
+              <el-input type="textarea" :rows="3" :value="currentDetail.departmentManagerComments || ''" disabled resize="none" style="width: 772px"></el-input>
+            </el-form-item>
+          </el-form>
+          <el-form :inline="true" label-position="top" :model="currentDetail" style="margin-top: 45px">
+            <el-form-item label="备注（实验室）" style="display: block;">
+              <el-input type="textarea" :rows="3" :value="currentDetail.labComments || ''" disabled resize="none" style="width: 772px"></el-input>
+            </el-form-item>
+          </el-form>
+          <el-form :inline="true" label-position="top" :model="currentDetail" style="margin-top: 45px">
+            <el-form-item label="测试人">
+              <el-input :value="currentDetail.testerName || currentDetail.tester || ''" disabled style="width: 772px"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
+
+      <el-tab-pane label="测试结果" name="resultInfo">
         <div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
           <el-form :inline="true" label-position="top" :model="currentDetail">
             <el-form-item label="测试开始时间">
@@ -846,32 +861,11 @@
           </el-form>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="审批信息-部门经理" name="departmentManagerInfo">
-        <div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
-          <el-form :inline="true" label-position="top" :model="currentDetail">
-            <el-form-item label="备注" style="display: block;">
-              <el-input type="textarea" :rows="4" :value="currentDetail.departmentManagerComments || ''" disabled resize="none" style="width: 772px"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="审批信息-实验室" name="labInfo">
-        <div :style="{height: secondHeight + 'px'}" style="margin-left: 5px;margin-top: 5px; overflow-y: auto;">
-          <el-form :inline="true" label-position="top" :model="currentDetail">
-            <el-form-item label="备注" style="display: block;">
-              <el-input type="textarea" :rows="3" :value="currentDetail.labComments || ''" disabled resize="none" style="width: 772px"></el-input>
-            </el-form-item>
-          </el-form>
-          <el-form :inline="true" label-position="top" :model="currentDetail" style="margin-top: 45px">
-            <el-form-item label="测试人">
-              <el-input :value="currentDetail.testerName || currentDetail.tester || ''" disabled style="width: 772px"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="审批信息" name="approvalInformation">
+
+      <el-tab-pane label="审批记录" name="approvalInformation">
         <approval-information v-model:data-list="approvalList" :height="secondHeight"></approval-information>
       </el-tab-pane>
+
     </el-tabs>
 
     <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>