From fc803522c643740f0a1907bcb74b26b1d50d5099 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 12 十二月 2023 13:07:19 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/processInspect/processInspect-form.vue | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 068e5c7..9a3454a 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -18,6 +18,12 @@
<div class="formwrapper">
<el-row>
<el-col :span="6">
+ <el-form-item label="杩囩▼妫�楠岀紪鍙凤細">
+ <el-input @blur="selectInfoByOrderId" disabled
+ v-model="processInspectVo.proInsNo" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="璁㈠崟鍙凤細">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
@@ -40,14 +46,15 @@
autocomplete="off" />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
<el-input disabled v-model="processInspectVo.specs" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
autocomplete="off" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
+
<el-col :span="6">
<el-form-item label="宸ュ簭鍚嶇О">
<el-select style="width: 100%" :disabled="processInspectVo.id != null"
@@ -64,8 +71,6 @@
autocomplete="off" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="鏁伴噺锛�">
<el-input v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off"
@@ -86,14 +91,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 +125,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 +148,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 +175,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 +222,7 @@
</div>
</div>
</template>
-
+
<script>
import {
chooseMater,
@@ -232,11 +237,11 @@
data() {
return {
dataVal: [{
- label: '1',
- value: '1'
+ label: '鏄�',
+ value: '鏄�'
}, {
- label: '0',
- value: '0'
+ label: '鍚�',
+ value: '鍚�'
}],
resultVal: null,
technologyList: [],
@@ -249,6 +254,7 @@
empiricalValueAddMaxNumber: 0,
processInspectVo: {
id: null,
+ proInsNo: null,
material: null,
materialCode: null,
orderNumber: "ZTTIC20230001",
@@ -283,7 +289,6 @@
methods: {
submitSave() {
let pro = 0
- console.log(this.inspectionItems);
this.inspectionItems.forEach(item => {
if (item.children) {
let arr = item.children.filter(obj => {
@@ -352,6 +357,7 @@
if (id != null) {
queryById(id).then(res => {
let result = res.data.data
+ this.processInspectVo.proInsNo = result.proInsNo
this.processInspectVo.orderNumber = result.orderNumber
this.processInspectVo.materialCode = result.materialCode
this.processInspectVo.material = result.material
@@ -382,7 +388,6 @@
}
})
this.inspectionItems = result.children
- console.log(this.inspectionItems);
this.inspectionResultForm = [{
materialCode: result.materialCode,
material: result.material,
@@ -428,22 +433,15 @@
this.technologyList = sample.children
},
changeState(row, index) {
- console.log(row)
if (row.iid != null && row.iid != '') {
let str = ""
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
-
- // if (note === undefined || note === '' || note === null) {
- // return
- // }
- console.log(str)
str = str.slice(0, -1);
if (str === undefined || str === '' || str === null) {
return
}
-
let obj = {
devideId: row.eId,
@@ -452,7 +450,6 @@
note : row.inote
}
- console.log(obj)
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.$message.success("鏇存柊鎴愬姛")
@@ -469,7 +466,6 @@
let id = res.data.data
if (id != null) {
queryById(id).then(response => {
- console.log(response.data.data.children)
let proList = response.data.data.children
proList.forEach(item => {
item.iid = Math.random();
@@ -526,7 +522,7 @@
},
}
</script>
-
+
<style scoped>
.finishedProduct-detail {
width: 100%;
@@ -590,4 +586,4 @@
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3