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 | 154 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 128 insertions(+), 26 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 99272dd..d91e8d5 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -110,6 +110,10 @@
<el-tab-pane label="妫�楠岄」鐩�">
<el-row>
<el-col v-if="resultVal == null" :span="24" class="inspectionProject_span" style="text-align: right;">
+ <el-button size="small"
+ type="primary"
+ v-if="inspectionItems&&inspectionItems.length>0"
+ @click="saveTable()">淇濆瓨</el-button>
<el-button size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
<el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</el-col>
@@ -284,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">
@@ -350,6 +402,7 @@
queryById,
updateDeviceBypppId,
updateProcessInsProduct,
+ updateProcessInsProduct2,
updateProcessInspectsById,
} from '@/api/quality/processInspect'
import {
@@ -357,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
@@ -421,6 +476,8 @@
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
+ configFileTableData:[],
+ dataForm:null
}
},
watch: {
@@ -443,6 +500,47 @@
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) => {
+ if(item.children&&item.children.length>0){
+ item.children.forEach((child)=>{
+ let obj = {}
+ obj.id = child.iid;
+ obj.eId = child.eId;
+ obj.note = child.inote;
+ obj.inspectionValue = child.empiricalValueAddss.join(',');
+ obj.required = child.required;
+ processInsProduct.push(obj)
+ })
+ }
+ })
+ if(processInsProduct.length>0){
+ updateProcessInsProduct2(processInsProduct).then(res => {
+ if (res.data.code == 0) {
+ this.$message.success("鏇存柊鎴愬姛")
+ } else {
+ this.$message.error("鏇存柊澶辫触")
+ }
+ this.init()
+ })
+ }
+ },
delProcessConfigFile(row) {
this.$confirm('鏄惁鍒犻櫎璇ラ檮浠�', '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -611,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
@@ -635,7 +734,7 @@
if (obj.inspectionValue) {
arr = obj.inspectionValue.split(",")
}
- obj.empiricalValueAddss = arr
+ this.$set(obj, "empiricalValueAddss", arr)
if(!obj.inote){
obj.inote = null
}
@@ -668,6 +767,7 @@
userName: Array.from(new Set(userList)).join(","),
result: this.resultVal == null ? rVal : this.resultVal,
}]
+ this.getProcessConfigFile()
}).catch(error => {
console.log(error)
})
@@ -711,30 +811,30 @@
return
}
}
- if (row.iid != null && row.iid != '') {
- let str = ""
- row.empiricalValueAddss.forEach(e => {
- str += e + ","
- })
- str = str.slice(0, -1);
- if (str === undefined || str === '' || str === null) {
- return
- }
- let obj = {
- devideId: row.eId,
- ppid: row.iid,
- inspectionValue: str,
- note : row.inote
- }
- updateProcessInsProduct(obj).then(res => {
- if (res.data.code == 0) {
- this.$message.success("鏇存柊鎴愬姛")
- } else {
- this.$message.error("鏇存柊澶辫触")
- }
- this.init()
- })
- }
+ // if (row.iid != null && row.iid != '') {
+ // let str = ""
+ // row.empiricalValueAddss.forEach(e => {
+ // str += e + ","
+ // })
+ // str = str.slice(0, -1);
+ // if (str === undefined || str === '' || str === null) {
+ // return
+ // }
+ // let obj = {
+ // devideId: row.eId,
+ // ppid: row.iid,
+ // inspectionValue: str,
+ // note : row.inote
+ // }
+ // updateProcessInsProduct(obj).then(res => {
+ // if (res.data.code == 0) {
+ // this.$message.success("鏇存柊鎴愬姛")
+ // } else {
+ // this.$message.error("鏇存柊澶辫触")
+ // }
+ // this.init()
+ // })
+ // }
},
addTestProject() {
let val = this.processInspectVo
@@ -779,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
@@ -826,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=>{
@@ -834,6 +935,7 @@
})
}
});
+ _than.saveTable();
}
}
},
--
Gitblit v1.9.3