From baa4c7e861b674cdf0ec86a3f055da9a8778e31e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 26 三月 2026 17:44:53 +0800
Subject: [PATCH] 电压分选工序的报工详情,修复不良数量和作业员显示

---
 src/views/qualityManagement/nonconformingManagement/index.vue |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index 327fc88..33c1ee3 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -5,9 +5,8 @@
         <div>
           <span class="search_title">绫诲瀷锛�</span>
           <el-select v-model="searchForm.inspectType" clearable style="width: 200px" @change="handleQuery">
-            <el-option label="鍘熸潗鏂欐楠�" :value="0" />
             <el-option label="杩囩▼妫�楠�" :value="1" />
-            <el-option label="鍑哄巶妫�楠�" :value="2" />
+            <el-option label="鎴愬搧妫�楠�" :value="2" />
           </el-select>
         </div>
         <div style="margin-left: 10px">
@@ -60,10 +59,10 @@
 
 <script setup>
 import { Search } from "@element-plus/icons-vue";
-import {onMounted, ref} from "vue";
+import {onMounted, ref, reactive, toRefs, nextTick, getCurrentInstance} from "vue";
 import FormDia from "@/views/qualityManagement/nonconformingManagement/components/formDia.vue";
 import {ElMessageBox} from "element-plus";
-import {qualityUnqualifiedDel, qualityUnqualifiedListPage} from "@/api/qualityManagement/nonconformingManagement.js";
+import {qualityUnqualifiedDel, qualityUnqualifiedListPage, liftTheQuarantineQualityUnqualified} from "@/api/qualityManagement/nonconformingManagement.js";
 import InspectionFormDia from "@/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue";
 import dayjs from "dayjs";
 
@@ -113,12 +112,10 @@
     dataType: "tag",
     width: 120,
     formatData: (params) => {
-      if (params == 0) {
-        return "鍘熸潗鏂欐楠�";
-      } else if (params == 1) {
+      if (params == 1) {
         return "杩囩▼妫�楠�";
       } else {
-        return '鍑哄巶妫�楠�';
+        return '鎴愬搧妫�楠�';
       }
     },
     formatType: (params) => {
@@ -179,6 +176,14 @@
     fixed: "right",
     width: 100,
     operation: [
+      {
+        name: "鍙栨秷闅旂",
+        type: "text",
+        clickFun: (row) => {
+          liftTheQuarantine(row);
+        },
+        showHide: (row) => row.dealResult === '闅旂' && !row.quarantineLifted
+      },
       {
         name: "澶勭悊",
         type: "text",
@@ -260,6 +265,14 @@
   })
 };
 
+const liftTheQuarantine = (row) => {
+  proxy.$modal.confirm("鏄惁纭鍙栨秷闅旂?").then(function () {
+    return liftTheQuarantineQualityUnqualified(row)
+  }).then(() => {
+    proxy.$modal.msgSuccess("鍙栨秷闅旂鎴愬姛");
+    getList();
+  }).catch(() => {})
+}
 // 鍒犻櫎
 const handleDelete = () => {
   let ids = [];

--
Gitblit v1.9.3