diff --git a/pages/process/order-check/index.js b/pages/process/order-check/index.js index 6d6aa29..514c544 100644 --- a/pages/process/order-check/index.js +++ b/pages/process/order-check/index.js @@ -33,7 +33,7 @@ Scene({ }) getFactoryOrderInfo(options.id).then(result => { wx.hideLoading() - result.data.sign = 1 + result.data.deductType = 1 if(Number(result.data.deductPercent) <= 0){ result.data.deductPercent = null } @@ -70,7 +70,7 @@ Scene({ }, changeDeductType: function(e){ var type = Number(e.currentTarget.dataset.type) - this.setData({ ['form.sign']: type, focus: type }) + this.setData({ ['form.deductType']: type, focus: type }) }, bindInput: function (e) { this.data.form[e.target.id] = e.detail @@ -140,7 +140,7 @@ Scene({ } data.plateNumber = this.data.form.plateNumber data.productId = this.data.form.productId - data.sign = this.data.form.sign + data.deductType = this.data.form.deductType data.unitPrice = Number(this.data.form.unitPrice) checkingOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => { wx.hideLoading() diff --git a/pages/process/order-check/index.wxml b/pages/process/order-check/index.wxml index a990b95..ee11f71 100644 --- a/pages/process/order-check/index.wxml +++ b/pages/process/order-check/index.wxml @@ -70,34 +70,34 @@ - + - + 扣重(公斤) - + - + 扣点(%) diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js index db17be2..fee5eb2 100644 --- a/pages/process/order-price/index.js +++ b/pages/process/order-price/index.js @@ -34,7 +34,7 @@ Scene({ util.showToast(err) }) getFactoryOrderInfo(options.id).then(result => { - result.data.sign = 1 + result.data.deductType = 1 this.data.step = 1 for (let index = 0; index < 2; index++) { if(util.isEmpty(result.data.totalWeighingPicture[index])){ @@ -103,7 +103,7 @@ Scene({ }, changeDeductType: function(e){ var type = Number(e.currentTarget.dataset.type) - this.setData({ ['form.sign']: type, focus: type }) + this.setData({ ['form.deductType']: type, focus: type }) }, bindInput: function (e) { this.data.form[e.target.id] = e.detail @@ -183,7 +183,7 @@ Scene({ } data.plateNumber = this.data.form.plateNumber data.productId = this.data.form.productId - data.sign = this.data.form.sign + data.deductType = this.data.form.deductType data.unitPrice = Number(this.data.form.unitPrice) data.isWithoutTare = Number(this.data.form.isWithoutTare) pricingOrder(data).then(result => { diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index edae00b..06f657c 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -79,34 +79,34 @@ - + - + 扣重(公斤) - + - + 扣点(%) diff --git a/pages/process/outside-check-item/index.js b/pages/process/outside-check-item/index.js index 91654e5..9612987 100644 --- a/pages/process/outside-check-item/index.js +++ b/pages/process/outside-check-item/index.js @@ -84,7 +84,7 @@ Component({ }, changeDeductType: function(e){ var type = Number(e.currentTarget.dataset.type) - this.setData({ ['item.sign']: type, focus: type }) + this.setData({ ['item.deductType']: type, focus: type }) } } diff --git a/pages/process/outside-check-item/index.wxml b/pages/process/outside-check-item/index.wxml index 9b09cca..19e0e36 100644 --- a/pages/process/outside-check-item/index.wxml +++ b/pages/process/outside-check-item/index.wxml @@ -34,34 +34,34 @@ - + - + 扣重(公斤) - + - + 扣点(%) diff --git a/pages/process/outside-item/index.js b/pages/process/outside-item/index.js index f79bb75..9f3625e 100644 --- a/pages/process/outside-item/index.js +++ b/pages/process/outside-item/index.js @@ -101,7 +101,7 @@ Component({ }, changeDeductType: function(e){ var type = Number(e.currentTarget.dataset.type) - this.setData({ ['item.sign']: type, focus: type }) + this.setData({ ['item.deductType']: type, focus: type }) }, fileChange: function({detail}){ this.data.fileList = detail.fileList diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml index 054bb03..51f5cbf 100644 --- a/pages/process/outside-item/index.wxml +++ b/pages/process/outside-item/index.wxml @@ -65,34 +65,34 @@ - + - + 扣重(公斤) - + - + 扣点(%)