From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/processInspect/processInspect-form.vue | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 1a487ec..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"
@@ -143,7 +148,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'">
@@ -151,26 +156,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">
@@ -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,
@@ -400,15 +405,17 @@
})
},
updateDevice(row, index) {
+ let rowId=JSON.stringify(row.iid)
updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
this.inspectionItems.forEach(obj => {
- console.log(obj);
- if (obj.children) {
- obj.children[index - 1].inspectionValue = null
- obj.children[index - 1].iresult = null
- obj.children[index - 1].empiricalValueAddss = []
- obj.children[index-1].inote=''
- }
+ obj.children.forEach(c=>{
+ if(c.iid==rowId){
+ c.inspectionValue = null
+ c.iresult = null
+ c.empiricalValueAddss = []
+ c.inote=''
+ }
+ })
})
}).catch(error => {
console.log(error)
@@ -426,23 +433,16 @@
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,
ppid: row.iid,
@@ -450,7 +450,6 @@
note : row.inote
}
- console.log(obj)
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.$message.success("鏇存柊鎴愬姛")
@@ -467,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();
--
Gitblit v1.9.3