From 820e0a3ba5a1cb735c85a82d5ee5855dfd7afd60 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 05 十二月 2023 13:05:42 +0800
Subject: [PATCH] 修复工艺bug
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index e13c447..320ecd9 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -8,15 +8,21 @@
<h2 v-else>缂栬緫-浜у搧妫�楠屽崟</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="addTestProject" type="primary" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
+ <el-button @click="addTestProject" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
</div>
</div>
<div class="page-main">
<div class="finishedProduct-basic">
<el-form :model="processInspectVo" ref="addInspectionform" class="l-mes"
- label-position="right" label-width="120px" style="width: 100%" size="small">
+ label-position="right" label-width="120px" style="width: 100%" size="small">
<div class="formwrapper">
<el-row>
+ <el-col :span="6">
+ <el-form-item label="浜у搧妫�楠岀紪鍙凤細">
+ <el-input @blur="selectInfoByOrderId" disabled
+ v-model="processInspectVo.finInsNo" autocomplete="off" />
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="璁㈠崟鍙凤細">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
@@ -35,6 +41,8 @@
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%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
@@ -45,8 +53,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="浜у搧缂栫爜锛�">
<el-input disabled v-model="processInspectVo.mcode"
@@ -65,6 +71,8 @@
placeholder="璇疯緭鍏ュ崟浣�" 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="璇疯緭鍏ユ暟閲�"
@@ -134,7 +142,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
+ <el-table-column prop="inspectionValue" :key="index"
label="妫�楠屾弿杩�" width="240" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
@@ -241,6 +249,7 @@
empiricalValueAddMaxNumber: 0,
processInspectVo: {
id: null,
+ finInsNo: null,
material: null,
mcode: null,
prname: null,
@@ -250,7 +259,8 @@
quantity: null,
specificationsModel: null,
unit: null,
- technologyId: null
+ technologyId: null,
+ documentId: null
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
@@ -276,7 +286,7 @@
this.init()
},
methods: {
-
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -339,6 +349,7 @@
if(id != null){
queryById(id).then(res=>{
let result = res.data.data
+ this.processInspectVo.finInsNo = result.finInsNo
this.processInspectVo.orderNumber = result.orderNumber
this.processInspectVo.mcode = result.materialCode
this.processInspectVo.prname = result.customerName
@@ -347,6 +358,7 @@
this.processInspectVo.specificationsModel = result.specs
this.processInspectVo.unit = result.punit
this.processInspectVo.quantity = result.quantity
+ this.processInspectVo.documentId = result.documentId
let userList = []
result.children.forEach(item=>{
item.iid = Math.random()
@@ -390,15 +402,26 @@
})
},
updateDevice(row,index){
- updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{
+ let rowId=JSON.stringify(row.iid)
+ console.log(row);
+ updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{
this.inspectionItems.forEach(obj=>{
- if(obj.children){
- obj.children[index-1].inspectionValue = ''
- 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=''
+ }
+ })
- }
+ // if(obj.children){
+ // obj.children[index-1].inspectionValue = ''
+ // obj.children[index-1].iresult = null
+ // obj.children[index-1].empiricalValueAddss = []
+ // obj.children[index-1].inote=''
+
+ // }
})
}).catch(error=>{
console.log(error)
@@ -413,6 +436,7 @@
this.processInspectVo.material = sample.material
this.processInspectVo.specificationsModel = sample.specs
this.processInspectVo.unit = sample.unit
+ this.processInspectVo.documentId = sample.documentId
},
changeState(row, index) {
if (row.iid != null && row.iid != '') {
@@ -425,7 +449,7 @@
return
}
let obj = {
- equiomentId: row.eId,
+ deviceId: row.eId,
fpid: row.iid,
inspectionValue: str,
note : row.inote
@@ -443,6 +467,7 @@
addTestProject() {
let val = this.processInspectVo
let data = {
+ finInsNo: val.finInsNo,
customerName: val.prname,
material: val.material,
materialCode: val.mcode,
@@ -451,6 +476,7 @@
quantity: val.quantity,
specs: val.specificationsModel,
unit: val.unit,
+ documentId: val.documentId
}
addFinish(data).then(res=>{
let id = res.data.data
@@ -495,6 +521,7 @@
this.processInspectVo.material = null
this.processInspectVo.specificationsModel = null
this.processInspectVo.unit = null
+ this.processInspectVo.documentId = null
}
})
},
@@ -531,7 +558,7 @@
flex-wrap: wrap;
}
-.finishedProduct-result {
+basic.finishedProduct-result {
width: 100%;
height: 150px;
padding: 10px 20px;
@@ -545,7 +572,7 @@
.finishedProduct-basic {
background-color: #fff;
- height: 120px;
+ height: 155px;
display: flex;
flex-wrap: wrap;
padding: 10px 20px;
--
Gitblit v1.9.3