From c3120ddb00e32824fe07b3781962baa007f7ede7 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Wed, 7 Jul 2021 14:37:15 +0800 Subject: [PATCH] no message --- components/field/index.js | 3 +++ components/field/index.wxml | 2 +- pages/process/check-list/index.js | 2 +- pages/process/order-check/index.js | 15 ++++++------- pages/process/order-check/index.wxml | 24 +++++++++++++++------ pages/process/order-list/index.js | 2 +- pages/process/outside-check-item/index.js | 13 +++++------ pages/process/outside-check-item/index.wxml | 20 ++++++++--------- pages/process/outside-item/index.js | 10 ++++----- pages/process/outside-item/index.wxml | 24 +++++++++++++++------ pages/process/outside-price/index.wxml | 22 ------------------- 11 files changed, 71 insertions(+), 66 deletions(-) diff --git a/components/field/index.js b/components/field/index.js index 714ad11..e27bae4 100644 --- a/components/field/index.js +++ b/components/field/index.js @@ -42,6 +42,9 @@ VantComponent({ this.setShowClear() this.$emit('blur', event.detail) }, + onClickInput(event) { + this.$emit('click-input', event.detail); + }, onClickIcon() { this.$emit('click-icon') }, diff --git a/components/field/index.wxml b/components/field/index.wxml index 46305f5..b9da54d 100644 --- a/components/field/index.wxml +++ b/components/field/index.wxml @@ -24,7 +24,7 @@ placeholder-style="{{ placeholderStyle }}" placeholder-class="{{ utils.bem('field__placeholder', { error }) }}" confirm-type="{{ confirmType }}" confirm-hold="{{ confirmHold }}" hold-keyboard="{{ holdKeyboard }}" cursor-spacing="{{ cursorSpacing }}" adjust-position="{{ adjustPosition }}" selection-end="{{ selectionEnd }}" - selection-start="{{ selectionStart }}" password="{{ password || type === 'password' }}" bindinput="onInput" + selection-start="{{ selectionStart }}" password="{{ password || type === 'password' }}" bindinput="onInput" bindtap="onClickInput" bindblur="onBlur" bindfocus="onFocus" bindconfirm="onConfirm" bindkeyboardheightchange="onKeyboardHeightChange" /> diff --git a/pages/process/check-list/index.js b/pages/process/check-list/index.js index a88d03f..3bcf973 100644 --- a/pages/process/check-list/index.js +++ b/pages/process/check-list/index.js @@ -127,7 +127,7 @@ Scene({ wx.navigateTo({ url: '/pages/process/order-price/index?id=' + e.currentTarget.dataset.id }) }, repriceOrder: function(e){ - wx.redirectTo({ url: `/pages/process/order-check/index?id=${e.currentTarget.dataset.id}` }) + wx.navigateTo({ url: `/pages/process/order-check/index?id=${e.currentTarget.dataset.id}` }) }, checkOrder: function(e){ wx.navigateTo({ url: '/pages/process/order-info/index?id=' + e.currentTarget.dataset.id }) diff --git a/pages/process/order-check/index.js b/pages/process/order-check/index.js index 9395f2f..7d170c4 100644 --- a/pages/process/order-check/index.js +++ b/pages/process/order-check/index.js @@ -69,25 +69,24 @@ Scene({ this.setData({ visible: false }) }, changeDeductType: function(e){ - this.setData({ ['form.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type }) + var type = Number(e.currentTarget.dataset.type) + this.setData({ ['form.sign']: type, focus: type }) }, bindInput: function (e) { - this.data.form[e.target.id] = e.detail.value + this.data.form[e.target.id] = e.detail if(e.target.id == 'deductPercent'){ - if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ + if(util.isEmpty(e.detail) || Number(e.detail) <= 0){ this.data.form.deductWeight = null this.data.form.deductPercent = null } else { - this.data.form.deductWeight = math.divide(math.times(this.data.form.totalWeight, Number(e.detail.value)), 100).toFixed(2) - // this.setData({ ['form.deductWeight']: math.divide(math.times(this.data.form.totalWeight, Number(e.detail.value)), 100).toFixed(3) }) + this.data.form.deductWeight = math.divide(math.times(this.data.form.netWeight, Number(e.detail)), 100).toFixed(2) } } else if(e.target.id == 'deductWeight'){ - if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ + if(util.isEmpty(e.detail) || Number(e.detail) <= 0){ this.data.form.deductWeight = null this.data.form.deductPercent = null } else { - this.data.form.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.form.totalWeight), 100).toFixed(2) - // this.setData({ ['form.deductPercent']: math.times(math.divide(Number(e.detail.value), this.data.form.totalWeight), 100).toFixed(2) }) + this.data.form.deductPercent = math.times(math.divide(Number(e.detail), this.data.form.netWeight), 100).toFixed(2) } } this.statAmount() diff --git a/pages/process/order-check/index.wxml b/pages/process/order-check/index.wxml index ddcde8d..921a9f9 100644 --- a/pages/process/order-check/index.wxml +++ b/pages/process/order-check/index.wxml @@ -61,28 +61,40 @@ 单价(元/公斤) - + + + + + 扣重(公斤) + + + + + + + 扣点(%) + + 结算重量(公斤) diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js index 7ee9e93..532c6fb 100644 --- a/pages/process/order-list/index.js +++ b/pages/process/order-list/index.js @@ -152,7 +152,7 @@ Scene({ } }, repriceOrder: function(e){ - wx.redirectTo({ url: `/pages/process/order-check/index?id=${e.currentTarget.dataset.id}` }) + wx.navigateTo({ url: `/pages/process/order-check/index?id=${e.currentTarget.dataset.id}` }) }, priceOrder: function(e){ wx.navigateTo({ url: '/pages/process/order-price/index?id=' + e.currentTarget.dataset.id }) diff --git a/pages/process/outside-check-item/index.js b/pages/process/outside-check-item/index.js index 0f113bf..6c07146 100644 --- a/pages/process/outside-check-item/index.js +++ b/pages/process/outside-check-item/index.js @@ -46,21 +46,21 @@ Component({ this.setData({ visible: false }) }, bindInput: function (e) { - this.data.item[e.currentTarget.id] = e.detail.value + this.data.item[e.currentTarget.id] = e.detail if(e.currentTarget.id == 'deductPercent'){ - if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ + if(util.isEmpty(e.detail) || Number(e.detail) <= 0){ this.data.item.deductWeight = null this.data.item.deductPercent = null } else { - this.data.item.deductWeight = math.divide(math.times(this.data.item.netWeight, Number(e.detail.value)), 100).toFixed(2) + this.data.item.deductWeight = math.divide(math.times(this.data.item.netWeight, Number(e.detail)), 100).toFixed(2) } this.statAmount() } else if(e.currentTarget.id == 'deductWeight'){ - if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ + if(util.isEmpty(e.detail) || Number(e.detail) <= 0){ this.data.item.deductWeight = null this.data.item.deductPercent = null } else { - this.data.item.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.item.netWeight), 100).toFixed(2) + this.data.item.deductPercent = math.times(math.divide(Number(e.detail), this.data.item.netWeight), 100).toFixed(2) } this.statAmount() } else if(e.currentTarget.id == 'settleUnitPrice'){ @@ -83,7 +83,8 @@ Component({ this.setData({ item: this.data.item, visible: false, cIndex: this.data.cIndex }) }, changeDeductType: function(e){ - this.setData({ ['item.sign']: e.currentTarget.dataset.type, focus: e.currentTarget.dataset.type }) + var type = Number(e.currentTarget.dataset.type) + this.setData({ ['item.sign']: type, focus: type }) } } diff --git a/pages/process/outside-check-item/index.wxml b/pages/process/outside-check-item/index.wxml index 2894bac..9b09cca 100644 --- a/pages/process/outside-check-item/index.wxml +++ b/pages/process/outside-check-item/index.wxml @@ -31,40 +31,40 @@ {{item.netWeight || ''}} - + + 扣重(公斤) - --> - + + + 扣点(%) - --> + 结算重量(公斤) diff --git a/pages/process/outside-item/index.js b/pages/process/outside-item/index.js index ebf4f84..2f319d2 100644 --- a/pages/process/outside-item/index.js +++ b/pages/process/outside-item/index.js @@ -41,7 +41,7 @@ Component({ } }, bindInput: function (e) { - this.data.item[e.currentTarget.id] = e.detail.value + this.data.item[e.currentTarget.id] = e.detail if(e.currentTarget.id == 'grossWeight' || e.currentTarget.id == 'tareWeight'){ if(Number(this.data.item.grossWeight) > 0){ if(Number(this.data.item.tareWeight) > 0){ @@ -59,19 +59,19 @@ Component({ this.setData({['item.netWeight']: null, ['item.estimatedAmount']: null}) } } else if(e.currentTarget.id == 'deductPercent'){ - if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ + if(util.isEmpty(e.detail) || Number(e.detail) <= 0){ this.data.item.deductWeight = null this.data.item.deductPercent = null } else { - this.data.item.deductWeight = math.divide(math.times(this.data.item.netWeight, Number(e.detail.value)), 100).toFixed(2) + this.data.item.deductWeight = math.divide(math.times(this.data.item.netWeight, Number(e.detail)), 100).toFixed(2) } this.statAmount() } else if(e.currentTarget.id == 'deductWeight'){ - if(util.isEmpty(e.detail.value) || Number(e.detail.value) <= 0){ + if(util.isEmpty(e.detail) || Number(e.detail) <= 0){ this.data.item.deductWeight = null this.data.item.deductPercent = null } else { - this.data.item.deductPercent = math.times(math.divide(Number(e.detail.value), this.data.item.netWeight), 100).toFixed(2) + this.data.item.deductPercent = math.times(math.divide(Number(e.detail), this.data.item.netWeight), 100).toFixed(2) } this.statAmount() } else if(e.currentTarget.id == 'settleUnitPrice'){ diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml index 57d7310..3c9c67b 100644 --- a/pages/process/outside-item/index.wxml +++ b/pages/process/outside-item/index.wxml @@ -62,28 +62,40 @@ 结算单价(元/公斤) - + + + + + 扣重(公斤) + + + + + + + 扣点(%) + + 结算重量(公斤) diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml index b149fcc..578c924 100644 --- a/pages/process/outside-price/index.wxml +++ b/pages/process/outside-price/index.wxml @@ -120,34 +120,12 @@ {{form.estimatedAmount || '- -'}} - * 厂外皮重(公斤) - *