From 786563298fa34e83409aec052a1bf21329164d67 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 06 五月 2024 14:58:56 +0800
Subject: [PATCH] 2023-11-20 过程检bug修改
---
src/views/quality/processInspect/processInspect-form.vue | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 012c095..d91e8d5 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -288,6 +288,54 @@
</el-table-column>
</el-table>
</el-tab-pane>
+ <el-tab-pane label="闄勪欢">
+ <el-table :data="configFileTableData" height="400px">
+ <el-table-column
+ prop="orderNumber"
+ align="center"
+ label="璁㈠崟鍙�"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column
+ prop="originalFileName"
+ align="center"
+ label="鍘熸枃浠跺悕"
+ width="200"
+ >
+ </el-table-column>
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
+ </el-table-column>
+ <el-table-column prop="createUser" align="center" label="涓婁紶浜�">
+ </el-table-column>
+ <el-table-column
+ prop="createTime"
+ align="center"
+ label="涓婁紶鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column prop="updateUser" align="center" label="鏇存柊浜�">
+ </el-table-column>
+ <el-table-column
+ prop="updateTime"
+ align="center"
+ label="鏇存柊鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column fixed="right" align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button
+ @click="downloadProcessConfigFiles(scope.row)"
+ type="text"
+ size="small"
+ >涓嬭浇</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
</el-tabs>
</div>
<div class="finishedProduct-result">
@@ -362,11 +410,13 @@
deleteProcessConfigFile,
downloadProcessConfigFile
} from '@/api/quality/attachment'
+import { getProcessConfigFile } from '@/api/plan/manufacturingorder'
import processPart from '@/views/common/processinspect-part'
import { selectDevice } from '@/api/quality/processInspect'
import qrCodeApp from '@/views/common/qrCodeApp'
import { validatePositiveInteger } from '@/util/validate'
import { getStore } from '@/util/store'
+import * as customerorder from '@/api/plan/customerorder'
export default {
components:{
qrCodeApp,processPart
@@ -426,6 +476,8 @@
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
+ configFileTableData:[],
+ dataForm:null
}
},
watch: {
@@ -448,6 +500,21 @@
this.init()
},
methods: {
+ getProcessConfigFile(){
+ getProcessConfigFile({
+ orderNumber: this.dataForm.orderNumber,
+ lineNumber: this.dataForm.customerNo
+ }).then((res)=>{
+ this.configFileTableData = res.data.data
+ })
+ },
+ downloadProcessConfigFiles(row){
+ customerorder.downloadProcessConfigFile(
+ row.fileName,
+ row.bucketName,
+ row.originalFileName
+ )
+ },
saveTable(){
let processInsProduct = [];
this.inspectionItems.forEach((item) => {
@@ -455,7 +522,7 @@
item.children.forEach((child)=>{
let obj = {}
obj.id = child.iid;
- obj.eId = child.ieId;
+ obj.eId = child.eId;
obj.note = child.inote;
obj.inspectionValue = child.empiricalValueAddss.join(',');
obj.required = child.required;
@@ -642,6 +709,7 @@
queryById(id).then(res => {
let result = res.data.data
this.processInspectVo.moNo = result.moNo
+ this.dataForm = result;
this.processInspectVo.operationTaskId = result.technologyOperationName
this.processInspectVo.proInsNo = result.proInsNo
this.processInspectVo.projectName = result.projectName
@@ -666,7 +734,7 @@
if (obj.inspectionValue) {
arr = obj.inspectionValue.split(",")
}
- obj.empiricalValueAddss = arr
+ this.$set(obj, "empiricalValueAddss", arr)
if(!obj.inote){
obj.inote = null
}
@@ -699,6 +767,7 @@
userName: Array.from(new Set(userList)).join(","),
result: this.resultVal == null ? rVal : this.resultVal,
}]
+ this.getProcessConfigFile()
}).catch(error => {
console.log(error)
})
@@ -810,6 +879,7 @@
this.processInspectVo.orderNumber = data.orderNumber
this.processInspectVo.projectName = data.projectName
this.processInspectVo.customerName = data.customerName
+ this.processInspectVo.customerNo = data.customerNo
this.processInspectVo.material = data.material
this.processInspectVo.specs = data.specs
this.processInspectVo.unit = data.unit
@@ -857,7 +927,7 @@
} else {
if (_than.empiricalValueAddMaxNumber != _than.empiricalValueAdd - 1) {
_than.empiricalValueAdd = _than.empiricalValueAdd - 1;
- _than.changeRowResult()
+ // _than.changeRowResult()
_than.inspectionItems.forEach(i => {
if(i.children){
i.children.forEach(ele=>{
@@ -865,6 +935,7 @@
})
}
});
+ _than.saveTable();
}
}
},
--
Gitblit v1.9.3