diff --git a/src/pu/pu/buyingreq/card/btnClicks/downloadPlmBtnClick.js b/src/pu/pu/buyingreq/card/btnClicks/downloadPlmBtnClick.js index 56324160..5293c073 100644 --- a/src/pu/pu/buyingreq/card/btnClicks/downloadPlmBtnClick.js +++ b/src/pu/pu/buyingreq/card/btnClicks/downloadPlmBtnClick.js @@ -15,17 +15,19 @@ export default function downloadPlmBtnClick(props) { // 获取选中行 let rows = this.props.cardTable.getCheckedRows(tableId); // console.log('rows = ', rows); - let data = []; + // let data = []; rows.forEach((row) => { - data.push(row.data.values['pk_material'].display); - }); - let params = { - sys_appcode: BUYINGREQ_CARD.cardpageid, - materialCode: data - } - formDownload({ - params, - url: BUYINGREQ_CARD.downloadPlmUrl, - enctype: 1 + // data.push(row.data.values['pk_material'].display); + let params = { + sys_appcode: BUYINGREQ_CARD.cardpageid, + materialCode: row.data.values['pk_material'].display, + materialName: row.data.values['pk_material.name'].value + } + formDownload({ + params, + url: BUYINGREQ_CARD.downloadPlmUrl, + enctype: 1 + }); }); + } diff --git a/src/uapbd/material/material_base/card/event/buttonClick.js b/src/uapbd/material/material_base/card/event/buttonClick.js index 1186f151..ee671242 100644 --- a/src/uapbd/material/material_base/card/event/buttonClick.js +++ b/src/uapbd/material/material_base/card/event/buttonClick.js @@ -640,12 +640,14 @@ export default function (props, id) { break; case 'download_plm': let materialCode = this.props.form.getFormItemsValue(formid, 'code'); + let materialName = this.props.form.getFormItemsValue(formid, 'name'); if (!materialCode || !materialCode.value) { return } let params = { sys_appcode: '10140MAG_base_card', - materialCode: materialCode.value + materialCode: materialCode.value, + materialName: materialName.name.value } formDownload({ params, diff --git a/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js b/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js index b478740a..176425ea 100644 --- a/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js +++ b/src/uapbd/mmbase/bom0202/card/btnClicks/downloadPlmBtnClick.js @@ -19,17 +19,20 @@ export default function downloadPlmBtnClick(props) { showErrorInfo('', '请先选择物料', 'infinity') return; } - let data = []; rows.forEach((row) => { - data.push(row.data.values['cmaterialvid'].display); - }); - let params = { - sys_appcode: BOM_PAGECODE.bom_card, - materialCode: data - } - formDownload({ - params, - url: URL.downloadPlmUrl, - enctype: 1 + // let data = []; + // data.push(row.data.values['cmaterialvid'].display); + let value = row.data.values['cmaterialvid']; + let params = { + sys_appcode: BOM_PAGECODE.bom_card, + materialCode: value.display, + materialName: row.data.values['cmaterialvid.name'].value + } + formDownload({ + params, + url: URL.downloadPlmUrl, + enctype: 1 + }); }); + }