diff --git a/src/views/modules/code/generation.vue b/src/views/modules/code/generation.vue index 01317c2..a4859e8 100644 --- a/src/views/modules/code/generation.vue +++ b/src/views/modules/code/generation.vue @@ -174,19 +174,19 @@ export default { }, async prefillDialogByDrawingNo(drawingNo, token) { try { - const [listRes, detailStarRes] = await Promise.all([ - searchDrawingList({ - site: this.$store.state.user.site, - drawingNo - }), - searchDrawingDetailList({ site: '*', drawingNo }) + const query = { + drawingNo, + exactFlag: 'Y' + } + const [listRes, detailRes] = await Promise.all([ + searchDrawingList(query), + searchDrawingDetailList(query) ]) if (token !== this.dialogInitToken) { return } if (listRes.data && listRes.data.code === 0) { - const drawingRows = listRes.data.rows || [] - const drawingRow = drawingRows.find(item => item.drawingNo === drawingNo) || drawingRows[0] + const drawingRow = (listRes.data.rows || [])[0] if (drawingRow) { this.searchModel = { ...this.searchModel, @@ -201,13 +201,11 @@ export default { } } let detailRows = [] - if (detailStarRes.data && detailStarRes.data.code === 0) { - detailRows = detailStarRes.data.rows || [] - } - if (detailRows.length === 0) { - const detailRes = await searchDrawingDetailList({ drawingNo }) - if (detailRes.data && detailRes.data.code === 0) { - detailRows = detailRes.data.rows || [] + if (detailRes.data && detailRes.data.code === 0) { + const rows = detailRes.data.rows || [] + if (rows.length > 0) { + const firstSite = rows[0].site + detailRows = rows.filter(item => item.site === firstSite) } } await this.applyDrawingDetailToForm(detailRows, token)