Browse Source

刀模

master
shenzhouyu 1 month ago
parent
commit
d2e02b749a
  1. 2
      src/views/modules/dm/DMQcMethod.vue
  2. 21
      src/views/modules/qc/IPQCResultEntry.vue

2
src/views/modules/dm/DMQcMethod.vue

@ -189,7 +189,7 @@ export default {
modalFlag: false, modalFlag: false,
modalDisableFlag: false, modalDisableFlag: false,
modalData: { modalData: {
site: "",
site: this.$store.state.user.site,
bu: "2_03-RFID", bu: "2_03-RFID",
flag: "", flag: "",
methodNo: "", methodNo: "",

21
src/views/modules/qc/IPQCResultEntry.vue

@ -2582,7 +2582,7 @@
getEamPropertiesItemByItemNo(params).then(({data}) => { getEamPropertiesItemByItemNo(params).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
let itemData = data.itemData let itemData = data.itemData
console.log("this", itemData);
console.log("this", itemData,row);
console.log("itemData.colss)",itemData.collectionFlag == 'Y' && itemData.collectionMethod.includes('thickness')); console.log("itemData.colss)",itemData.collectionFlag == 'Y' && itemData.collectionMethod.includes('thickness'));
@ -2593,15 +2593,24 @@
bu: row.buNo, bu: row.buNo,
itemNo: row.itemNo, itemNo: row.itemNo,
inspectionNo: row.inspectionNo, inspectionNo: row.inspectionNo,
order: row.orderNo,
} }
getCollectorDataByItem(param).then(({data}) => { getCollectorDataByItem(param).then(({data}) => {
if (data.code === 0 && data.rows.length > 0) { if (data.code === 0 && data.rows.length > 0) {
this.changeMyString(data.rows) 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 { } else {
this.$message({ this.$message({
message: data.msg||'未采集到数据', message: data.msg||'未采集到数据',

Loading…
Cancel
Save