From c9030d537526938436e836a00390dccb28cd5908 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 8 Jul 2026 13:50:59 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-08=20Lab=20Test=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=96=E6=B6=88=E2=80=9C=E5=AE=9E=E9=AA=8C=E5=AE=A4?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E2=80=9D=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E2=80=9C=E6=B5=8B=E8=AF=95=E4=BA=BA=E2=80=9D=E5=8F=96=E2=80=9C?=
 =?UTF-8?q?Test=20Lab=E2=80=9D=E7=9A=84=E5=80=BC=E4=BD=9C=E4=B8=BA?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=EF=BC=8C=E2=80=9CTest=20Lab=E2=80=9D?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=8F=9641=E5=B7=A5=E5=8E=82=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/lab/labRecord.vue | 52 ++++++++++++-----------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/lab/labRecord.vue b/src/views/modules/lab/labRecord.vue
index dfb07ed..a87f202 100644
--- a/src/views/modules/lab/labRecord.vue
+++ b/src/views/modules/lab/labRecord.vue
@@ -230,25 +230,7 @@
                 <el-input v-model="modalData.applicationSurface" :disabled="isLabFieldDisabled('applicationSurface')" style="width: 533px"></el-input>
               </el-form-item>
               <el-form-item label="Test Lab">
-                <dict-data-select v-model="modalData.testLab" clearable :disabled="isLabFieldDisabled('testLab')" style="width: 225px" dict-type="lab_test_lab" @change="handleTestLabChange"></dict-data-select>
-              </el-form-item>
-            </el-form>
-
-            <el-form :inline="true" label-position="top" :model="modalData">
-              <el-form-item>
-                <span style="cursor: pointer" v-if="!isLabFieldDisabled('labApprover')" slot="label" @click="openLabApproverChooseModal"><a herf="#">实验室审批人</a></span>
-                <span v-else slot="label">实验室审批人</span>
-                <el-input
-                  v-model="modalData.labApproverName"
-                  readonly
-                  clearable
-                  :disabled="isLabFieldDisabled('labApprover')"
-                  style="width: 772px"
-                  @focus="openLabApproverChooseModal">
-                  <span slot="suffix" v-show="modalData.labApproverName && !isLabFieldDisabled('labApprover')" @click.stop="clearLabApproverSelection">
-                    <i class="el-icon-circle-close"></i>
-                  </span>
-                </el-input>
+                <dict-data-select v-model="modalData.testLab" clearable :disabled="isLabFieldDisabled('testLab')" style="width: 225px" dict-type="lab_test_lab" site="41" @change="handleTestLabChange"></dict-data-select>
               </el-form-item>
             </el-form>
 
@@ -738,12 +720,6 @@
             </el-form-item>
           </el-form>
 
-          <el-form :inline="true" label-position="top" :model="currentDetail" style="margin-top: 0px">
-            <el-form-item label="实验室审批人" style="display: block;">
-              <el-input :value="currentDetail.labApproverName || currentDetail.labApprover || ''" disabled style="width: 772px"></el-input>
-            </el-form-item>
-          </el-form>
-
           <div class="rq" style="width: 772px;margin-top: 0px">
             <el-table
               :data="currentDetail.propertyItemList || []"
@@ -1285,6 +1261,18 @@ export default {
         return
       }
       this.$set(this.modalData, 'testLab', value || '')
+      this.testerFlag = false
+      this.testerOptionList = []
+      this.testerDisplayList = []
+      this.testerSelectionCache = []
+      this.testerSearchData = {
+        operatorId: '',
+        operatorName: ''
+      }
+      this.$set(this.modalData, 'testerCodeList', [])
+      this.$set(this.modalData, 'testerList', [])
+      this.$set(this.modalData, 'tester', '')
+      this.$set(this.modalData, 'testerName', '')
       this.resetLabApproverOptionState()
       this.clearLabApproverFieldData()
     },
@@ -1804,7 +1792,8 @@ export default {
       this.$set(this.modalData, 'testerCodeList', testerList)
       this.$set(this.modalData, 'testerList', testerList)
       this.$set(this.modalData, 'tester', testerList.join(';'))
-      this.$set(this.modalData, 'testerName', testerList.map(item => this.resolveTesterNameById(item)).join(';'))
+      const testerName = testerList.map(item => this.resolveTesterNameById(item)).join(';')
+      this.$set(this.modalData, 'testerName', testerName)
     },
     resolveLabApproverNameById (operatorId) {
       const normalizedId = String(operatorId || '').trim()
@@ -1833,7 +1822,7 @@ export default {
       })
     },
     loadTesterOptions () {
-      if (!this.modalData || !this.modalData.site) {
+      if (!this.modalData || !this.modalData.site || !String(this.modalData.testLab || '').trim()) {
         this.testerOptionList = []
         this.testerDisplayList = []
         this.testerSelectionCache = []
@@ -1841,7 +1830,7 @@ export default {
       }
       const params = {
         site: this.modalData.site,
-        roleNo: 'R025',
+        roleNo: String(this.modalData.testLab || '').trim(),
         active: 'Y'
       }
       return searchUserListForRole(params).then(({data}) => {
@@ -1878,6 +1867,10 @@ export default {
         this.$message.warning('请先选择工厂')
         return
       }
+      if (!String(this.modalData.testLab || '').trim()) {
+        this.$message.warning('请先选择Test Lab')
+        return
+      }
       this.loadTesterOptions().then(() => {
         if (!this.testerOptionList || this.testerOptionList.length === 0) {
           this.$message.warning('未查询到可选测试人')
@@ -2477,7 +2470,6 @@ export default {
             this.$set(this.modalData, 'testerName', this.modalData.testerName || this.modalData.tester || '')
             this.$set(this.modalData, 'labApproverName', this.modalData.labApproverName || this.modalData.labApprover || '')
             this.loadTesterOptions()
-            this.loadLabApproverOptions()
             this.loadModalButtonCondition()
             this.loadNodeAuthority(this.modalData.site || row.site, this.modalData.stepId !== null && this.modalData.stepId !== undefined ? this.modalData.stepId : 10)
             this.refreshJudgeCriteriaFileList()
@@ -2573,7 +2565,6 @@ export default {
         return
       }
       this.syncTesterField()
-      this.syncLabApproverField()
       this.syncPropertyItemList()
       const payload = this.buildLabPayload(this.modalData)
       const submitMethod = this.modalTitle === 'Lab 新增' ? api.saveLab : api.updateLab
@@ -2629,7 +2620,6 @@ export default {
         return
       }
       this.syncTesterField()
-      this.syncLabApproverField()
       this.syncPropertyItemList()
       if (!this.nodeAuthorityLoaded) {
         this.$message.warning('节点权限加载中，请稍后重试')