From c733b4fc98e348f4f60f71a291c3acfa6d7d4ce9 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 24 四月 2025 10:38:59 +0800
Subject: [PATCH] 网分仪调整
---
src/views/business/inspectionTask/components/InspectionWord.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 3a169e1..e938b4c 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -241,19 +241,18 @@
</template>
<script>
-// import ValueTable from '../../tool/value-table.vue'
-import file from '@/utils/file'
import excelFunction from '@/utils/excelFountion'
import UnPassDialog from "@/views/business/unpass/components/unPassDialog.vue";
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'],
@@ -849,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()
@@ -1283,7 +1282,8 @@
}
})
// 浠ヤ笅鏄牱寮忓鐞嗛�昏緫
- set = Array.sort(set)
+ // set = Array.sort(set)
+ set = [...set]
set.forEach(b => {
let arr = []
a.template.forEach(c => {
@@ -1403,6 +1403,9 @@
// 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
if (typeof n.v.v == 'string') {
function isValidFraction(fraction) {
+ if (typeof fraction == 'number') {
+ return true
+ }
const [numerator, denominator] = fraction.split('/'); // 鍒嗗瓙鍜屽垎姣�
return !(!denominator || !numerator);
}
@@ -1921,7 +1924,7 @@
}
},
getAuthorizedPerson() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition({ type: 1 }).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
@@ -2033,7 +2036,7 @@
downFile({
id: row.id,
}).then(res => {
- this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
+ this.$download.saveAs(res.data.fileUrl, row.fileName);
}).catch(error => {
})
--
Gitblit v1.9.3