diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js index 8225c6e..c890c95 100644 --- a/pages/storage/order-create/index.js +++ b/pages/storage/order-create/index.js @@ -133,13 +133,13 @@ Scene({ this.setData({ activeNames: detail }) }, bindInput: function (e) { - this.data.form[e.currentTarget.id] = e.detail.value + this.data.form[e.currentTarget.id] = e.detail if(e.currentTarget.id == 'unitPrice'){ var amount = '' - if(!util.isEmpty(this.data.form.unitPrice) && Number(this.data.form.unitPrice) > 0){ - amount = math.times(this.data.form.unitPrice, this.data.poundInfo.netWeight) - } - this.setData({ visible: false, ['form.productName']: detail.value, ['form.estimatedAmount']: amount }) + if(!util.isEmpty(this.data.form.unitPrice) && Number(this.data.form.unitPrice) > 0){ + amount = math.times(this.data.form.unitPrice, this.data.poundInfo.netWeight) + } + this.setData({ visible: false, ['form.estimatedAmount']: amount }) } }, onInputChange: function(e){ diff --git a/pages/storage/order-create/index.json b/pages/storage/order-create/index.json index 537125e..5ed4770 100644 --- a/pages/storage/order-create/index.json +++ b/pages/storage/order-create/index.json @@ -2,6 +2,7 @@ "usingComponents": { "van-index-anchor": "/components/index-anchor/index", "van-cell": "/components/cell/index", + "van-field": "/components/field/index", "van-button": "/components/button/index", "van-checkbox": "/components/checkbox/index", "van-loading": "/components/loading/index", diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml index e892bfb..3a452b1 100644 --- a/pages/storage/order-create/index.wxml +++ b/pages/storage/order-create/index.wxml @@ -5,8 +5,9 @@ - - 出货信息 + + + 出货信息 @@ -25,7 +26,7 @@ {{form.consigneeName || '请选择收货方'}} - + * @@ -34,14 +35,8 @@ {{form.productName || '请选择废纸品类'}} - - - 纸品包数 - - - - + + * @@ -50,33 +45,20 @@ {{form.plateNumber || '请输入车牌号码'}} - - - - 司机姓名 - - - - - - - 出货单价(元/公斤) - - - - - - 预估金额 - - - + + + + + + - + + + + 过磅信息 + 第一次过磅(皮重) diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml index e81a72b..882f4e3 100644 --- a/pages/storage/order-info/index.wxml +++ b/pages/storage/order-info/index.wxml @@ -7,7 +7,10 @@ - + + + 出货信息 + 收货方名称 @@ -58,7 +61,11 @@ - + + + + 过磅信息 + 第一次过磅(皮重) @@ -104,7 +111,10 @@ - + + + 结算信息 + 纸品品类 @@ -156,7 +166,11 @@ - + + + + 出货信息 + 收货方名称 @@ -189,7 +203,11 @@ - + + + + 过磅信息 + 第一次过磅(皮重) diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js index 6cda1e5..a129f8d 100644 --- a/pages/storage/order-settlement/index.js +++ b/pages/storage/order-settlement/index.js @@ -105,13 +105,13 @@ Scene({ this.setData({ visible: false, ['form.categoryName']: detail.value }) }, bindInput: function (e) { - this.data.form[e.target.id] = Number(e.detail.value) + this.data.form[e.target.id] = Number(e.detail) if(e.target.id == 'netWeight'){ if(!util.isEmpty(this.data.form.deductPercent) && Number(this.data.form.deductPercent) > 0){ var deductWeight = math.divide(math.times(this.data.form.netWeight, this.data.form.deductPercent), 100) this.setData({ ['form.settleWeight']: math.minus(this.data.form.netWeight, deductWeight) }) } else { - this.setData({ ['form.settleWeight']: e.detail.value }) + this.setData({ ['form.settleWeight']: e.detail }) } } else if(e.target.id == 'deductPercent'){ if(!util.isEmpty(this.data.form.netWeight) && Number(this.data.form.netWeight) > 0){ @@ -131,7 +131,7 @@ Scene({ this.setData({ ['form.deductPercent']: '' }) } } else { - this.setData({ ['form.netWeight']: e.detail.value }) + this.setData({ ['form.netWeight']: e.detail }) } } this.statAmount() diff --git a/pages/storage/order-settlement/index.json b/pages/storage/order-settlement/index.json index a360800..a6e8214 100644 --- a/pages/storage/order-settlement/index.json +++ b/pages/storage/order-settlement/index.json @@ -1,6 +1,7 @@ { "usingComponents": { "van-cell": "/components/cell/index", + "van-field": "/components/field/index", "van-loading": "/components/loading/index", "van-image": "/components/image/index", "van-button": "/components/button/index", diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml index 9fd4539..9d3bf5c 100644 --- a/pages/storage/order-settlement/index.wxml +++ b/pages/storage/order-settlement/index.wxml @@ -5,10 +5,11 @@ - - 结算信息 + + + 结算信息 - + * @@ -17,57 +18,29 @@ {{form.categoryName || '请选择废纸品类'}} - - - - * - 结算单价(元/吨) - - - - - - - - * - 净重(吨) - - - - - - - 扣点(%) - + + + * + 结算单价(元/吨) - - - - 结算重量(吨) - + + + + * + 净重(吨) - - - - 其他费用(元) - - - - - - 结算金额(元) - - - + + + + + + - 纸厂磅单 + + + 纸厂磅单 + 最多3张,每图片大小限制5M @@ -75,8 +48,11 @@ - - + + + + 出货信息 + 收货方名称 @@ -122,7 +98,11 @@ - + + + + 过磅信息 + 第一次过磅(皮重)