diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue index cb294023..21e72d3c 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue @@ -768,6 +768,8 @@ export default { getGoodsAreaoptionList().then(res=>{ const data = res.data.data; this.areaoption = data + console.log("this.areaoption>>>>>>>>>>>>>",this.areaoption + ); }) getTemplateData("9").then(res=>{ console.log(res.data.data); @@ -925,16 +927,16 @@ export default { if (!this.form.id) { console.log("this.form>>>>>>>", this.form); console.log("this.optioner>>>>>>>", this.optioner); - if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){ - //这里需要截取最后一个ID - let a = this.form.goodsAreaId; - this.form.goodsAreaId = a[a.length - 1]; - } - this.optioner.map(item => { - if (item.id == this.form.goodsAreaId) { - this.form.goodsAreaName = item.headline - } - }) + // if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){ + // //这里需要截取最后一个ID + // let a = this.form.goodsAreaId; + // this.form.goodsAreaId = a[a.length - 1]; + // } + // this.optioner.map(item => { + // if (item.id == this.form.goodsAreaId) { + // this.form.goodsAreaName = item.headline + // } + // }) add(this.form).then(() => { this.box = false; this.onLoad(this.page); diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index f6a5dce1..e3544589 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -524,6 +524,7 @@ function initpage() { } function handleExportArea() { let id=details.arrlist[details.checkselect]?.id||0 + let name=details.arrlist[details.checkselect]?.name||'' if (id ===0){ proxy.$message({ type: "success", @@ -543,7 +544,7 @@ function handleExportArea() { }).then(() => { NProgress.start(); exportBlob(downloadUrl, values).then(res => { - downloadXls(res.data, `仓库${dateNow()}.xlsx`); + downloadXls(res.data, name+`${dateNow()}.xlsx`); NProgress.done(); }) });