Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventor...

chenhj

4 天以前 e61eb3be4fc933c67cbe3a1a9d08d41ac2d26a1b

 src/views/qualityManagement/nonconformingManagement/index.vue

@@ -63,7 +63,7 @@
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";

@@ -180,6 +180,14 @@
    width: 100,
    operation: [
      {
        name: "取消隔离",
        type: "text",
        clickFun: (row) => {
          liftTheQuarantine(row);
        },
        showHide: (row) => row.dealResult === '隔离' && !row.quarantineLifted
      },
      {
        name: "处理",
        type: "text",
        clickFun: (row) => {
@@ -260,6 +268,14 @@
  })
};

const liftTheQuarantine = (row) => {
  proxy.$modal.confirm("是否确认取消隔离?").then(function () {
    return liftTheQuarantineQualityUnqualified(row)
  }).then(() => {
    proxy.$modal.msgSuccess("取消隔离成功");
    getList();
  }).catch(() => {})
}
// 删除
const handleDelete = () => {
  let ids = [];