From e61eb3be4fc933c67cbe3a1a9d08d41ac2d26a1b Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 18 三月 2026 11:48:13 +0800
Subject: [PATCH] Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventory-management into dev_衡阳_鹏创电子
---
src/views/qualityManagement/nonconformingManagement/index.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/qualityManagement/nonconformingManagement/index.vue b/src/views/qualityManagement/nonconformingManagement/index.vue
index c8b2b15..7b4d55b 100644
--- a/src/views/qualityManagement/nonconformingManagement/index.vue
+++ b/src/views/qualityManagement/nonconformingManagement/index.vue
@@ -60,10 +60,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";
@@ -177,15 +177,15 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 120,
+ width: 100,
operation: [
{
- name: "缂栬緫",
+ name: "鍙栨秷闅旂",
type: "text",
clickFun: (row) => {
- openForm("edit", row);
+ liftTheQuarantine(row);
},
- disabled: (row) => row.inspectState === 1,
+ showHide: (row) => row.dealResult === '闅旂' && !row.quarantineLifted
},
{
name: "澶勭悊",
@@ -268,6 +268,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