From dab59f7624a2fb8d4114bb67b554ff09d91f810c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 13:07:36 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/business/inspectionTask/components/InspectionWord.vue | 7 ++++---
src/api/business/rawMaterialOrder.js | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index c40aea1..ac725b8 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -291,8 +291,8 @@
export function saveUnqualifiedContext(query) {
return request({
url: "/insOrderPlan/saveUnqualifiedContext",
- method: "delete",
- params: query,
+ method: "post",
+ data: query,
});
}
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 7991e24..c29c3f4 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -246,12 +246,13 @@
import AddUnPass from "@/views/business/unpass/components/addUnPass.vue";
import {
checkSubmitPlan,
+ determineWhetherToCollectData,
doInsOrder, downFile,
getInsProductUnqualifiedRetest,
search, selectUserCondition,
submitPlan,
verifyPlan
-} from "@/api/business/inspectionTask";
+} from '@/api/business/inspectionTask'
import { getUserNow, saveUnqualifiedContext } from "@/api/business/rawMaterialOrder";
export default {
props: ['sonLaboratory', 'orderId', 'state', 'inspectorList', 'typeSource', 'unPassCheck', 'rawMaterialTag'],
@@ -847,7 +848,7 @@
retestTag: this.retestTag,
rawMaterialTag: this.rawMaterialTag,
}
- let res = getInsProductUnqualifiedRetest(params)
+ let res = await getInsProductUnqualifiedRetest(params)
if (res.code === 200 && res.data.length > 0) {
this.tableLoading = false;
this.scrollInit()
@@ -1281,7 +1282,7 @@
}
})
// 浠ヤ笅鏄牱寮忓鐞嗛�昏緫
- set = Array.sort(set)
+ // set = Array.sort(set)
set.forEach(b => {
let arr = []
a.template.forEach(c => {
--
Gitblit v1.9.3