diff --git a/pages/process/outside-item/index.js b/pages/process/outside-item/index.js index 5b3cd25..2c2e2b1 100644 --- a/pages/process/outside-item/index.js +++ b/pages/process/outside-item/index.js @@ -76,7 +76,10 @@ Component({ this.statAmount() } else if(e.currentTarget.id == 'settleUnitPrice'){ this.statAmount() - } + } else if(e.currentTarget.id == 'netWeight'){ + var estimatedAmount = math.times(this.data.item.netWeight, this.data.item.unitPrice).toFixed(2) + this.setData({['item.estimatedAmount']: estimatedAmount}) + } wx.nextTick(() => { this.triggerEvent('change', {index: this.data.index, item: this.data.item}); }) diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml index 80992b8..3fe2a13 100644 --- a/pages/process/outside-item/index.wxml +++ b/pages/process/outside-item/index.wxml @@ -12,44 +12,24 @@ {{item.unitPrice || '请输入单价'}} - - + - + --> + + + + * + 净重(公斤) - + 预估金额(元) diff --git a/pages/process/outside-price/index.js b/pages/process/outside-price/index.js index 8f69056..27c59ba 100644 --- a/pages/process/outside-price/index.js +++ b/pages/process/outside-price/index.js @@ -115,14 +115,14 @@ Scene({ var weightNoteList = [] for (let index = 0; index < this.data.form.productCategoryInfos.length; index++) { const element = this.data.form.productCategoryInfos[index] - if(util.isEmpty(element.grossWeight) || Number(element.grossWeight) <= 0){ - util.showToast('请输入第' + (index + 1) + '项废纸品类毛重') - return - } - if(util.isEmpty(element.tareWeight) || Number(element.tareWeight) <= 0){ - util.showToast('请输入第' + (index + 1) + '项废纸品类皮重') + if(util.isEmpty(element.netWeight) || Number(element.netWeight) <= 0){ + util.showToast('请输入第' + (index + 1) + '项废纸品类净重') return } + // if(util.isEmpty(element.tareWeight) || Number(element.tareWeight) < 0){ + // util.showToast('请输入第' + (index + 1) + '项废纸品类皮重') + // return + // } if(util.isEmpty(element.weightNoteImages)){ util.showToast('请上传第' + (index + 1) + '项废纸品类过磅凭证') return