From 1f9c32908a68eef81f549b6986a9bc1f05056108 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 16 十一月 2023 16:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/processInspect/processInspect-form.vue | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 068e5c7..6a85e93 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -86,14 +86,14 @@
</el-row>
<el-row style="width:100%;">
<el-col :span="24">
- <el-table border
- :data="inspectionItems"
+ <el-table border
+ :data="inspectionItems"
height="400"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
- :cell-style="{ textAlign: 'center' }"
- row-key="iid"
+ :cell-style="{ textAlign: 'center' }"
+ row-key="iid"
default-expand-all style="width: 100%"
- ref="table"
+ 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>
@@ -120,9 +120,9 @@
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.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
- <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '鏄�' : '鍚�')" :value="item.value"></el-option>
-
-
+ <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"
v-text="scope.row.empiricalValueAddss[index]"></span>
@@ -143,7 +143,7 @@
</div>
</template>
</el-table-column>
- <el-table-column
+ <el-table-column
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
@@ -170,7 +170,7 @@
<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">
@@ -217,7 +217,7 @@
</div>
</div>
</template>
-
+
<script>
import {
chooseMater,
@@ -232,11 +232,11 @@
data() {
return {
dataVal: [{
- label: '1',
- value: '1'
+ label: '鏄�',
+ value: '鏄�'
}, {
- label: '0',
- value: '0'
+ label: '鍚�',
+ value: '鍚�'
}],
resultVal: null,
technologyList: [],
@@ -434,7 +434,7 @@
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
-
+
// if (note === undefined || note === '' || note === null) {
// return
// }
@@ -444,7 +444,7 @@
return
}
-
+
let obj = {
devideId: row.eId,
ppid: row.iid,
@@ -526,7 +526,7 @@
},
}
</script>
-
+
<style scoped>
.finishedProduct-detail {
width: 100%;
@@ -590,4 +590,4 @@
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3