From 404073efa3cadbc99a39fd2cdbdf1c4b1d661914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Fri, 26 Dec 2025 16:58:56 +0800
Subject: [PATCH] 1

---
 src/views/modules/qc/FAIResultEntry.vue  | 18 ++++++-----
 src/views/modules/qc/FQCResultEntry.vue  | 18 ++++++-----
 src/views/modules/qc/IPQCResultEntry.vue | 38 +++++++++++++-----------
 3 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index a08faf5..7f544d3 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -534,8 +534,8 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
-            <el-option label="下达" value="下达"></el-option>
-            <el-option label="关闭" value="关闭"></el-option>
+            <el-option label="下达" value="N"></el-option>
+            <el-option label="关闭" value="Y"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -1948,7 +1948,7 @@ export default {
         operationDesc: '',
         qtyrequired: '',
         lotsize: '',
-        status: '下达'
+        status: 'N'
       },
       seqDetailColumnList: [
         {
@@ -2672,22 +2672,26 @@ export default {
         return
       }
       if (this.operatorData.flag === '1') {
+        this.detailData.operator = ''
+        this.detailData.operatorName = ''
         for (let i = 0; i < this.dataListSelections2.length; i++) {
-          if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) {
+          //if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) {
             this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName
             this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID
-          }
+          //}
         }
         if (this.detailData.operator.charAt(0) === ';') {
           this.detailData.operator = this.detailData.operator.substring(1)
           this.detailData.operatorName = this.detailData.operatorName.substring(1)
         }
       } else {
+        this.detailData.responsiblePerson = ''
+        this.detailData.responsiblePersonName = ''
         for (let i = 0; i < this.dataListSelections2.length; i++) {
-          if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
+          //if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
             this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
             this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
-          }
+          //}
         }
         if (this.detailData.responsiblePerson.charAt(0) === ';') {
           this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 593da3f..c6ae106 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -716,8 +716,8 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
-            <el-option label="下达" value="下达"></el-option>
-            <el-option label="关闭" value="关闭"></el-option>
+            <el-option label="下达" value="N"></el-option>
+            <el-option label="关闭" value="Y"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -1921,7 +1921,7 @@
           operationDesc: '',
           qtyrequired: '',
           lotsize: '',
-          status: '下达'
+          status: 'N'
         },
         seqDetailColumnList: [
           {
@@ -2638,22 +2638,26 @@
           return
         }
         if (this.operatorData.flag === '1') {
+          this.detailData.operator = ''
+          this.detailData.operatorName = ''
           for (let i = 0; i < this.dataListSelections2.length; i++) {
-            if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) {
+            //if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) {
               this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName
               this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID
-            }
+            //}
           }
           if (this.detailData.operator.charAt(0) === ';') {
             this.detailData.operator = this.detailData.operator.substring(1)
             this.detailData.operatorName = this.detailData.operatorName.substring(1)
           }
         } else {
+          this.detailData.responsiblePerson = ''
+          this.detailData.responsiblePersonName = ''
           for (let i = 0; i < this.dataListSelections2.length; i++) {
-            if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
+            //if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
               this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
               this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
-            }
+            //}
           }
           if (this.detailData.responsiblePerson.charAt(0) === ';') {
             this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index ffa1451..17ed570 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -608,8 +608,8 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
-            <el-option label="下达" value="下达"></el-option>
-            <el-option label="关闭" value="关闭"></el-option>
+            <el-option label="下达" value="N"></el-option>
+            <el-option label="关闭" value="Y"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -1968,7 +1968,7 @@
           operationDesc: '',
           qtyrequired: '',
           lotsize: '',
-          status: '下达'
+          status: 'N'
         },
         seqDetailColumnList: [
           {
@@ -2598,16 +2598,16 @@
       getOperatorList () {
         this.operatorData.flag = '1'
         this.operatorData.bu = this.detailData.site + '_' + this.detailData.buNo
-        if (this.roleList.length > 0) {
-          let filterList = this.roleList.filter(item => item.roleName === '机修人员')
-          if (filterList.length > 0) {
-            this.operatorData.roleId = filterList[0].roleId
-          } else {
-            this.operatorData.roleId = this.roleList[0].roleId
-          }
-        } else {
-          this.operatorData.roleId = ''
-        }
+        // if (this.roleList.length > 0) {
+        //   let filterList = this.roleList.filter(item => item.roleName === '机修人员')
+        //   if (filterList.length > 0) {
+        //     this.operatorData.roleId = filterList[0].roleId
+        //   } else {
+        //     this.operatorData.roleId = this.roleList[0].roleId
+        //   }
+        // } else {
+        //   this.operatorData.roleId = ''
+        // }
         // 先清空缓存选中
         this.$nextTick(() => this.$refs.operatorTable.clearSelection())
         // 拿到选中的人员编号
@@ -2711,22 +2711,26 @@
           return
         }
         if (this.operatorData.flag === '1') {
+          this.detailData.operator = ''
+          this.detailData.operatorName = ''
           for (let i = 0; i < this.dataListSelections2.length; i++) {
-            if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) {
+            //if (!this.detailData.operator.split(';').includes(this.dataListSelections2[i].adminID)) {
               this.detailData.operatorName = this.detailData.operatorName + ";" + this.dataListSelections2[i].adminName
               this.detailData.operator = this.detailData.operator + ";" + this.dataListSelections2[i].adminID
-            }
+            //}
           }
           if (this.detailData.operator.charAt(0) === ';') {
             this.detailData.operator = this.detailData.operator.substring(1)
             this.detailData.operatorName = this.detailData.operatorName.substring(1)
           }
         } else {
+          this.detailData.responsiblePerson = ''
+          this.detailData.responsiblePersonName = ''
           for (let i = 0; i < this.dataListSelections2.length; i++) {
-            if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
+            //if (!this.detailData.responsiblePerson.split(';').includes(this.dataListSelections2[i].adminID)) {
               this.detailData.responsiblePersonName = this.detailData.responsiblePersonName + ";" + this.dataListSelections2[i].adminName
               this.detailData.responsiblePerson = this.detailData.responsiblePerson + ";" + this.dataListSelections2[i].adminID
-            }
+            //}
           }
           if (this.detailData.responsiblePerson.charAt(0) === ';') {
             this.detailData.responsiblePerson = this.detailData.responsiblePerson.substring(1)