From b34e4348df3f9f697fcb4da64ee7ff11deca3170 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 02 四月 2025 10:26:42 +0800
Subject: [PATCH] 修改检验任务分页和文件预览
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 12f3f6d..86f67e1 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -574,7 +574,7 @@
state == 1
"><span :style="`font-family:${n.v.ff} !important;`">{{
toFixed(n.v.v, n.v.ct)
- }}</span></template>
+ }}</span></template>
<template v-else-if="
n.v.ps != undefined &&
n.v.ps.value === '鏈�缁堝��' &&
@@ -961,7 +961,7 @@
sampleId: id,
sonLaboratory: sonLaboratory
}" v-if="state == 1 && fileAdd" :on-success="handleSuccessUp" :show-file-list="false"
- accept=".jpg,.jpeg,.png,.gif,.docx,.xls,.xlsx,.pdf,.zip,.rar,.csv" :headers="headers"
+ accept=".jpg,.jpeg,.png,.gif,.docx,.doc,.xls,.xlsx,.pdf,.zip,.rar,.csv" :headers="headers"
:before-upload="beforeUpload" style="width: 80px !important;" :on-error="onError" ref="upload">
<el-button size="small" type="primary" v-if="state == 1">闄勪欢涓婁紶</el-button></el-upload>
<!-- <span v-if="sonLaboratory === '杩滃満'||sonLaboratory === '杩戝満'" style="color: red;font-size: 12px;">杈愬皠璇曢獙灏介噺涓婁紶璁惧瀵煎嚭鐨刢sv鏂囦欢锛屼笉鐒惰Е鍙戜笉浜嗘姤鍛婄敓鎴�</span> -->
@@ -3477,9 +3477,9 @@
}
}
// 閫氫俊鐗规畩澶勭悊锛屾楠屽�煎～鍏ヤ箣鍚庣洿鎺ヤ繚瀛樻暟鎹紝鍒ゆ柇缁撴灉榛樿涓�3
- for (var i in this.param) {
- this.param[i].insResult = { v: { v: 3 } };
- }
+ // for (var i in this.param) {
+ // this.param[i].insResult = { v: { v: 3 } };
+ // }
this.saveInsContext(n.i);
return;
// 浠ヤ笅鏄甯哥殑鍒ゆ柇娴佺▼锛屽悗闈㈡湁闇�瑕佸垯杩涘叆姝ゆ祦绋�
@@ -3927,8 +3927,13 @@
if (name == '妫�楠屽師濮嬭褰�' || name == '杈愬皠璇曢獙妫�娴嬪師濮嬭褰�') {
let num = 0
for (let i in this.param) {
- if (this.param[i].insResult.v.v != 0 && this.param[i].insResult.v.v != 1) {
- num++;
+ if (!this.param[i].insResult || !this.param[i].insResult.v || (!this.param[i].insResult.v.v && this.param[i].insResult.v.v !== 0)) {
+ this.$message.error("璇疯緭鍏ユ楠岃繃绋嬪��");
+ return;
+ } else {
+ if (this.param[i].insResult.v.v != 0 && this.param[i].insResult.v.v != 1) {
+ num++;
+ }
}
}
console.log(3333, num)
@@ -4236,10 +4241,13 @@
this.saveInsContext(n.i);
} else if ('瀹為獙缁撴灉') {
// 瀹為獙缁撴灉
- this.$set(this.param[n.i].insResult, "v", {});
if (val == '鏃犲紓甯�') {
+ this.$set(this.param[n.i], "insResult", {});
+ this.$set(this.param[n.i].insResult, "v", {});
this.$set(this.param[n.i].insResult.v, "v", 1);
} else if (val == '涓嶅悎鏍�') {
+ this.$set(this.param[n.i], "insResult", {});
+ this.$set(this.param[n.i].insResult, "v", {});
this.$set(this.param[n.i].insResult.v, "v", 0);
}
this.saveInsContext(n.i);
@@ -4430,14 +4438,42 @@
if (this.sonLaboratory === "鐢佃矾璇曢獙") {
// // 鐢佃矾璇曢獙鏁伴噰
// 鑾峰彇褰撳墠鏍峰搧鐨勬楠岄」
- let list = await this.getCurrentProduct(this.currentSample.id, 0);
- this.currentSample.insProduct = this.HaveJson(list);
- this.currentNum++;
+ if (response.data &&
+ ((response.data.includes('xlsx') && response.data.includes('浜よ皟')) ||
+ (response.data.includes('csv') && response.data.includes('椹绘尝')))) {
+ let list = await this.getCurrentProduct(this.currentSample.id, 0);
+ this.currentSample.insProduct = this.HaveJson(list);
+ this.currentNum++;
+ }
+ } else if (this.sonLaboratory === "鎸姩") {
+ this.getDocAnalysis(response.data)
}
} else {
this.$message.error(response.message);
}
},
+ getDocAnalysis(data) {
+ const psToDataKeyMap = {
+ '妫�楠屽��1': '1',
+ '妫�楠屽��9': '9',
+ '妫�楠屽��10': '10',
+ '妫�楠屽��11': '11',
+ '妫�楠屽��12': '12',
+ '妫�楠屽��13': '13',
+ };
+
+ for (let i in this.param) {
+ this.param[i].insValue.forEach(a => {
+ // 妫�鏌ュ綋鍓嶇殑ps.value鏄惁鍦ㄦ槧灏勮〃涓瓨鍦�
+ if (a.v.ps.value && psToDataKeyMap.hasOwnProperty(a.v.ps.value)) {
+ // 浣跨敤鏄犲皠琛ㄤ腑鐨勫�间粠data瀵硅薄鑾峰彇瀵瑰簲鐨勫��
+ a.v.v = data[psToDataKeyMap[a.v.ps.value]];
+ // 璋冪敤淇濆瓨涓婁笅鏂囩殑鏂规硶
+ this.saveInsContext(a.i);
+ }
+ });
+ }
+ },
beforeUpload(file) {
if (
this.sonLaboratory === "鐢佃矾璇曢獙" &&
--
Gitblit v1.9.3