From 10903aca3b8fd5dd7cd8573fa5c99ccf19cb8f29 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:06:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio-frequency-cable' into radio-frequency-cable
---
src/views/business/inspectionTask/inspection.vue | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index c2e85d8..e83d703 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">
+ </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">
+ </el-date-picker>
</template>
<span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)"></span>
</div>
@@ -1947,7 +1961,13 @@
(a.template[b].v.ps.value === "璇曢獙鏂规硶" ||
a.template[b].v.ps.value === "妫�娴嬫柟娉�")
) {
- a.template[b].v.v = id.product.methodS;
+ a.template[b].v.v = id.product.method;
+ }
+ if (
+ a.template[b].v.ps != undefined &&
+ a.template[b].v.ps.value === "璇曢獙鏉′欢"
+ ) {
+ a.template[b].v.v = id.product.radius;
}
}
}
@@ -2036,6 +2056,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].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].equipName.push(b);
+ }
if (b.v.ps != undefined && b.v.ps.value === "鏈�缁堝��") {
// b.v.v = ''
this.$set(b.v, "v", "");
--
Gitblit v1.9.3