From c4cc315e6b46adabc9f649c7b14e6c2b0bcc3346 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 14:00:42 +0800
Subject: [PATCH] 修改检验任务
---
src/views/business/inspectionTask/inspection.vue | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index c2e85d8..c0d9c56 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -285,7 +285,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 === '鏈�缁堝��' &&
@@ -318,6 +318,20 @@
" :style="`font-family:${n.v.ff} !important;`">
{{ currentSample.model }}
</div>
+ </template>
+ <template v-else-if="n.v.ps != undefined && n.v.ps.value === '璧峰鏃堕棿'
+ ">
+ <span v-if="state > 1 || (n.u != userId && n.u != undefined && n.u != '')">{{ n.v.v }}</span>
+ <el-date-picker v-else v-model="n.v.v" type="datetime" placeholder="" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" @change="m => saveInsContext(n.i)">
+ </el-date-picker>
+ </template>
+ <template v-else-if="n.v.ps != undefined && n.v.ps.value === '缁堟鏃堕棿'
+ ">
+ <span v-if="state > 1 || (n.u != userId && n.u != undefined && n.u != '')">{{ n.v.v }}</span>
+ <el-date-picker v-else v-model="n.v.v" type="datetime" placeholder="" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" @change="m => saveInsContext(n.i)">
+ </el-date-picker>
</template>
<span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)"></span>
</div>
@@ -823,6 +837,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
// 鍘婚噸妯℃澘锛岃繑鍥炴湁鍑犱釜妯℃澘
@@ -977,6 +993,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
if (this.currentSample.index == undefined)
@@ -1544,6 +1562,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
// 澶勭悊椤甸潰鍒楄〃鏁版嵁
@@ -1589,6 +1609,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
this.getTableLists0(list);
@@ -1949,6 +1971,12 @@
) {
a.template[b].v.v = id.product.methodS;
}
+ if (
+ a.template[b].v.ps != undefined &&
+ a.template[b].v.ps.value === "璇曢獙鏉′欢"
+ ) {
+ a.template[b].v.v = id.product.radius;
+ }
}
}
});
@@ -2035,6 +2063,26 @@
}
// b.v.v = ''
b.i && this.param[b.i] && this.param[b.i].equipName.push(b);
+ }
+ if (b.v.ps != undefined && b.v.ps.value === "璧峰鏃堕棿") {
+ this.$set(b.v, "v", "");
+ b.u = "";
+ let obj = this.currentSample.insProduct.find(m => m.id == b.i)
+ if (obj) {
+ this.$set(b, "u", obj.checkUserId);
+ }
+ // b.v.v = ''
+ b.i && this.param[b.i] && (this.param[b.i].testStartTime = b);
+ }
+ if (b.v.ps != undefined && b.v.ps.value === "缁堟鏃堕棿") {
+ this.$set(b.v, "v", "");
+ b.u = "";
+ let obj = this.currentSample.insProduct.find(m => m.id == b.i)
+ if (obj) {
+ this.$set(b, "u", obj.checkUserId);
+ }
+ // b.v.v = ''
+ b.i && this.param[b.i] && (this.param[b.i].testEndTime = b);
}
if (b.v.ps != undefined && b.v.ps.value === "鏈�缁堝��") {
// b.v.v = ''
@@ -2175,6 +2223,20 @@
} catch (e) {
console.log("璁惧鍚嶇О璧嬪��----", e);
}
+ try {
+ // 璧峰鏃堕棿璧嬪��
+ let testStartTime = JSON.parse(a.insProductResult.testStartTime);
+ for (let i = 0; i < testStartTime.length; i++) {
+ this.param[a.id].testStartTime.v.v = testStartTime.v;
+ }
+ } catch (e) { }
+ try {
+ // 缁堟鏃堕棿璧嬪��
+ let testEndTime = JSON.parse(a.insProductResult.testEndTime);
+ for (let i = 0; i < testEndTime.length; i++) {
+ this.param[a.id].testEndTime.v.v = testEndTime.v;
+ }
+ } catch (e) { }
try {
// 鏈�缁堝�艰祴鍊�
this.param[a.id].resValue.v.v = this.toFixed(
@@ -2371,6 +2433,14 @@
console.log(888, error);
}
}
+ break;
+ // 璧嬪�艰捣濮嬫椂闂�
+ case "testEndTime":
+ this.tableList[0][m] = value ? value.v.v : "";
+ break;
+ // 璧嬪�肩粓姝㈡椂闂�
+ case "testStartTime":
+ this.tableList[0][m] = value ? value.v.v : "";
break;
// 璧嬪�兼渶缁堝��
case "resValue":
@@ -2820,6 +2890,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
// 椤甸潰鏁版嵁澶勭悊
--
Gitblit v1.9.3