diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index 416698592..2d4f136cf 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -22,6 +22,7 @@ window.SITE_CONFIG['client_secret'] = '1q2w3E*' window.SITE_CONFIG['reportsUrl'] = 'http://dev.ccwin-in.com:60079/#/',//74/#/reports/ window.SITE_CONFIG['versionUrl'] = 'http://dev.ccwin-in.com:60070' window.SITE_CONFIG['companyName'] = '长春富维东阳汽车零部件有限公司(长春卓越工厂)' +window.SITE_CONFIG['companyAddress'] = '长春市高新开发区成缘路556号' //pad-kitting组包页面刷新时间(毫秒) window.SITE_CONFIG['padKittingPackUpdate'] = 180000 // 高拍仪获取地址 diff --git a/fe/PC/src/App.vue b/fe/PC/src/App.vue index b8504734d..e9406e083 100644 --- a/fe/PC/src/App.vue +++ b/fe/PC/src/App.vue @@ -28,6 +28,7 @@ localStorage.setItem('supplierOuterURL',window.SITE_CONFIG['supplierOuterURL']) localStorage.setItem('apifoxToken',window.SITE_CONFIG['apifoxToken']) localStorage.setItem('reportsUrl',window.SITE_CONFIG['reportsUrl']) localStorage.setItem('companyName',window.SITE_CONFIG['companyName']) +localStorage.setItem('companyAddress',window.SITE_CONFIG['companyAddress']) localStorage.setItem('interfaceBoardUrl',window.SITE_CONFIG['interfaceBoardUrl']) localStorage.setItem('MOrDFasterUrl_store',window.SITE_CONFIG['MOrDFasterUrl_store']) localStorage.setItem('MOrDFasterUrl_job',window.SITE_CONFIG['MOrDFasterUrl_job']) diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue index 1ecdd3587..20e262e69 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue @@ -154,6 +154,7 @@ export default { SkipCount: 0, MaxResultCount: 20 } + this.Loading.appMainLoading = true let priceInfo = await getPageList(price_params,"basedata/sale-price-sheet"); // 获取客户相关信息 let customer_params = { @@ -185,17 +186,22 @@ export default { if(priceInfo && priceInfo.items && priceInfo.items.length > 0){ let _priceObj = {} priceInfo.items.forEach(priceitem=>{ _priceObj[priceitem.itemCode] = priceitem }) - item.price = _priceObj[item.itemCode].salePrice - item.rowTotal = (item.qty * item.price).toFixed(6) + if(_priceObj[item.itemCode]){item.price = _priceObj[item.itemCode].salePrice} + if(item.qty && item.price)item.rowTotal = Number((Number(item.qty) * Number(item.price)).toFixed(6)) } }) let _alltotal = 0 - this.tableDataDetails.details.forEach(item=>{ _alltotal += Number(item.rowTotal) }) - this.tableDataDetails.details.forEach(item=>{ item.alltotal = _alltotal}) + this.tableDataDetails.details.forEach(item=>{ + if(item.rowTotal)_alltotal += Number(item.rowTotal) + }) + this.tableDataDetails.details.forEach(item=>{ + if(_alltotal!=0){item.alltotal = _alltotal} + else{item.alltotal = ""} + item.nevAddress = localStorage.getItem('companyAddress') + }) // let data = await initPrintAllData(this.tableDataDetails,'chdmxb.rdlx',false,_option); // todo:打印单据更改 let data = await initPrintAllData(this.tableDataDetails,'fhd.rdlx',false,_option); - this.Loading.appMainLoading = true this.Print(data) sumPrint(this.propsData.number, this.URL).then(res => { this.paging()