From bd3670cf1f3ddf4201941a1673d870cc185fe184 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 13:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processInspect/processInspect-form.vue | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 94f62b5..2f5837d 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -86,10 +86,15 @@
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table border :data="inspectionItems" height="400"
+ <el-table border
+ :data="inspectionItems"
+ height="400"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
- :cell-style="{ textAlign: 'center' }" row-key="iid" default-expand-all style="width: 100%"
- ref="table" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ :cell-style="{ textAlign: 'center' }"
+ row-key="iid"
+ default-expand-all style="width: 100%"
+ ref="table"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father" width="240"></el-table-column>
<el-table-column prop="iname" label="鎸囨爣" width="240"></el-table-column>
@@ -138,7 +143,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
+ <el-table-column
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
@@ -146,26 +151,26 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ @blur="changeState(scope.row, inote)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
</el-col>
- <el-col v-else>
+ <el-col v-else>
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <!-- <el-input :disabled="scope.row.eId == null"
- v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input> -->
- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
+ <el-input :disabled="scope.row.eId == null"
+ v-model="scope.row.inote"
+ @blur="changeState(scope.row, inote)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ <!-- <el-select style="width: 100%;" @change="changeState(scope.row, inote)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
- </el-select>
- <span v-if="resultVal != null && processInspectVo.id != null"
+ </el-select> -->
+ <span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
- </el-col>
+ </el-col>
</template>
</el-table-column>
<el-table-column label="缁撹" fixed="right" min-width="100">
@@ -278,7 +283,7 @@
methods: {
submitSave() {
let pro = 0
- console.log(this.inspectionItems);
+ console.log(this.inspectionItems);
this.inspectionItems.forEach(item => {
if (item.children) {
let arr = item.children.filter(obj => {
@@ -377,6 +382,7 @@
}
})
this.inspectionItems = result.children
+ console.log(this.inspectionItems);
this.inspectionResultForm = [{
materialCode: result.materialCode,
material: result.material,
--
Gitblit v1.9.3