|
|
@ -793,6 +793,8 @@ |
|
|
dataAcquisitionByItem, // 根据项目数据采集 |
|
|
dataAcquisitionByItem, // 根据项目数据采集 |
|
|
cancelApproval, // 取消审核 |
|
|
cancelApproval, // 取消审核 |
|
|
overLoadSearchPartInfo, // 查询物料属性信息 |
|
|
overLoadSearchPartInfo, // 查询物料属性信息 |
|
|
|
|
|
getEamPropertiesItemByItemNo, |
|
|
|
|
|
getCollectorDataByItem, |
|
|
} from "@/api/qc/qc.js" |
|
|
} from "@/api/qc/qc.js" |
|
|
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" |
|
|
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" |
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
@ -2085,8 +2087,46 @@ |
|
|
|
|
|
|
|
|
// 根据项目数据采集 |
|
|
// 根据项目数据采集 |
|
|
dataAcquisitionByItem (row) { |
|
|
dataAcquisitionByItem (row) { |
|
|
|
|
|
let params = { |
|
|
|
|
|
site: row.site, |
|
|
|
|
|
buNo: row.buNo, |
|
|
|
|
|
itemNo: row.itemNo, |
|
|
|
|
|
} |
|
|
this.loadFlag = true |
|
|
this.loadFlag = true |
|
|
let tempDate = { |
|
|
|
|
|
|
|
|
getEamPropertiesItemByItemNo(params).then(({data}) => { |
|
|
|
|
|
if (data.code === 0) { |
|
|
|
|
|
let itemData = data.itemData |
|
|
|
|
|
console.log("this", itemData); |
|
|
|
|
|
console.log("itemData.colss)",itemData.collectionFlag == 'Y' && itemData.collectionMethod.includes('thickness')); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(itemData.collectionFlag == 'Y' && itemData.collectionMethod.includes('thickness')){ |
|
|
|
|
|
let param = { |
|
|
|
|
|
site: row.site, |
|
|
|
|
|
sopType: 'iqc', |
|
|
|
|
|
bu: row.buNo, |
|
|
|
|
|
itemNo: row.itemNo, |
|
|
|
|
|
inspectionNo: row.inspectionNo, |
|
|
|
|
|
} |
|
|
|
|
|
getCollectorDataByItem(param).then(({data}) => { |
|
|
|
|
|
if (data.code === 0 && data.rows.length > 0) { |
|
|
|
|
|
this.changeMyString(data.rows) |
|
|
|
|
|
this.$message({ |
|
|
|
|
|
message: '数据采集成功', |
|
|
|
|
|
type: 'success', |
|
|
|
|
|
duration: 1500 |
|
|
|
|
|
}) |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$message({ |
|
|
|
|
|
message: data.msg||'未采集到数据', |
|
|
|
|
|
type: 'warning', |
|
|
|
|
|
duration: 1500 |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
this.loadFlag = false |
|
|
|
|
|
}) |
|
|
|
|
|
}else{ |
|
|
|
|
|
let tempDate = { |
|
|
site: row.site, |
|
|
site: row.site, |
|
|
buNo: row.buNo, |
|
|
buNo: row.buNo, |
|
|
inspectionNo: row.inspectionNo, |
|
|
inspectionNo: row.inspectionNo, |
|
|
@ -2113,6 +2153,14 @@ |
|
|
}).catch(()=>{ |
|
|
}).catch(()=>{ |
|
|
this.loadFlag = false |
|
|
this.loadFlag = false |
|
|
}) |
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
|
|
confirmButtonText: '确定' |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
// 获取用户角色 |
|
|
// 获取用户角色 |
|
|
|