From 568ef514f8245b4ff17370bf0d088a91854a64f0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 12 八月 2024 10:51:59 +0800
Subject: [PATCH] 检验任务调整
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 5 +++--
src/components/view/b1-inspect-order-plan.vue | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 28e8886..9743c17 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -366,10 +366,10 @@
<el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
v-model="n.v.v"
:disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`,'getDataType')" />
+ @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`,n,'getDataType')" />
<el-select v-else-if="getInspectionValueType(n.i) == 5" class="table_input" v-model="n.v.v"
:disabled="state>1||getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')" @visible-change="e=>getDic(e,n.i)"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`,'getDataType')">
+ @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`,n,'getDataType')">
<el-option v-for="(e, i) in enumList" :key="i" :label="e.label" :value="e.value"></el-option>
</el-select>
<span :style="`font-family:${n.v.ff} !important;`"
@@ -2738,6 +2738,7 @@
const [numerator, denominator] = fraction.split('/'); // 鍒嗗瓙鍜屽垎姣�
return !(!denominator || !numerator);
}
+ console.log("aaa------>>>>",n);
const isTrue = isValidFraction(n.v.v)
if (!isTrue) {
n.v.v = n.v.v.replace('/', '')
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 68dd071..49818f8 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -598,6 +598,10 @@
if(row.userName){
inspectorList = row.userName.split(',')
}
+ let user = JSON.parse(localStorage.getItem('user'))
+ if(user){
+ inspectorList.push(user.name)
+ }
this.inspectorList = inspectorList
this.state = 1;
this.orderId = row.id
--
Gitblit v1.9.3