diff --git a/src/views/modules/dm/DMQcMethod.vue b/src/views/modules/dm/DMQcMethod.vue index 8ac318e..6202886 100644 --- a/src/views/modules/dm/DMQcMethod.vue +++ b/src/views/modules/dm/DMQcMethod.vue @@ -189,7 +189,7 @@ export default { modalFlag: false, modalDisableFlag: false, modalData: { - site: "", + site: this.$store.state.user.site, bu: "2_03-RFID", flag: "", methodNo: "", diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 87cfa2a..13f9ba2 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -2582,7 +2582,7 @@ getEamPropertiesItemByItemNo(params).then(({data}) => { if (data.code === 0) { let itemData = data.itemData - console.log("this", itemData); + console.log("this", itemData,row); console.log("itemData.colss)",itemData.collectionFlag == 'Y' && itemData.collectionMethod.includes('thickness')); @@ -2593,15 +2593,24 @@ bu: row.buNo, itemNo: row.itemNo, inspectionNo: row.inspectionNo, + order: row.orderNo, } getCollectorDataByItem(param).then(({data}) => { if (data.code === 0 && data.rows.length > 0) { this.changeMyString(data.rows) - this.$message({ - message: '数据采集成功', - type: 'success', - duration: 1500 - }) + if(data.abnormal){ + this.$message({ + message: '数据采集成功,且存在异常数据,请注意查看', + type: 'warning', + duration: 1500 + }) + }else{ + this.$message({ + message: '数据采集成功', + type: 'success', + duration: 1500 + }) + } } else { this.$message({ message: data.msg||'未采集到数据',