From 162f4a3fc7768f0e28e00b8be49925e04179222e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Mon, 29 Sep 2025 10:02:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E7=82=B9=E5=87=BB=E5=88=B0?=
 =?UTF-8?q?=E8=BE=BE=20=E7=9A=84=E4=BA=BA=E5=91=98=E9=99=90=E5=88=B6=202.?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3pqc=E4=BB=BB=E5=8A=A1=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=80=BC=20=E7=BB=93=E8=AE=BA=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/PQCResultEntry.vue       |  4 ++++
 .../reportWorkOrder/reportDefectOrder.vue     | 23 +++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/qc/PQCResultEntry.vue b/src/views/modules/qc/PQCResultEntry.vue
index fc672d4..0dda441 100644
--- a/src/views/modules/qc/PQCResultEntry.vue
+++ b/src/views/modules/qc/PQCResultEntry.vue
@@ -4276,6 +4276,10 @@ export default {
       if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
         return;
       }
+      if (row.numberValue==row.defaultValue){
+        row.itemResult = 'Y'
+        return
+      }
       if (row.maxValue == null && row.minValue == null) {
         if (row.numberValue!=row.defaultValue){
           row.itemResult = 'N'
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 909a8c9..ba91373 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -598,7 +598,7 @@
     <el-dialog title="到达" :close-on-click-modal="false" v-drag :visible.sync="chooseReachModelFlag" width="410px">
       <el-form :inline="true" label-position="top">
         <el-form-item >
-          <span style="cursor: pointer" slot="label" @click="getOperatorList()"><a>选择到达人员</a></span>
+          <span style="cursor: pointer" slot="label" @click="getOperatorList(1)"><a>选择到达人员</a></span>
           <el-input v-model="saveData.operatorName" style="width: 389px"></el-input>
         </el-form-item>
       </el-form>
@@ -1979,10 +1979,15 @@
       },
 
       // 获取机修人员列表
-      getOperatorList () {
+      getOperatorList (param) {
         this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
         if (this.roleList.length > 0) {
-          let filterList = this.roleList.filter(item => item.roleName === '机修人员')
+          let filterList
+          if (param === 1) {
+            filterList = this.roleList.filter(item => item.roleName === '换线组')
+          } else {
+            filterList = this.roleList.filter(item => item.roleName === '机修人员')
+          }
           if (filterList.length > 0) {
             this.operatorData.roleId = filterList[0].roleId
           } else {
@@ -2302,12 +2307,12 @@
           this.$message.warning('请选择到达人员！')
           return
         }
-        if (this.buNo != '01-Label' && this.planPeople){
-          if (!this.saveData.operatorName.includes(this.planPeople)){
-            this.$message.warning('到达人员中不包含计划人员！')
-            return
-          }
-        }
+        // if (this.buNo != '01-Label' && this.planPeople){
+        //   if (!this.saveData.operatorName.includes(this.planPeople)){
+        //     this.$message.warning('到达人员中不包含计划人员！')
+        //     return
+        //   }
+        // }
         let tempData = {
           site: this.saveData.site,
           buNo: this.saveData.buNo,