diff --git a/pages/agent/select-list/index.js b/pages/agent/select-list/index.js index 083c4d3..d9f9239 100644 --- a/pages/agent/select-list/index.js +++ b/pages/agent/select-list/index.js @@ -62,6 +62,7 @@ Scene({ var orderItem = order.orderItems[e.currentTarget.dataset.oindex] var data = { millName: order.paperMillName, createTime: order.createTime } data.categoryName = orderItem.paperCategoryName + data.categoryId = orderItem.paperCategoryId data.plateNumber = orderItem.plateNumber data.id = orderItem.id const channel = this.getOpenerEventChannel() diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml index 8fe780a..31634f1 100644 --- a/pages/storage/order-info/index.wxml +++ b/pages/storage/order-info/index.wxml @@ -158,22 +158,16 @@ {{ form.deductPercent || ''}} - - - 其他费用(元) - {{ form.otherFee}} - - 结算金额(元) - {{ form.adjustedPrice}} + {{ form.settlePrice}} 代卖费(元) - {{ form.settlePrice}} + {{ form.proxyPaySurcharge}} @@ -194,6 +188,12 @@ {{ form.subsidy}} + + + 收入金额(元) + {{ form.netIncome}} + + 纸厂磅单 diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js index 9195740..840a5a6 100644 --- a/pages/storage/order-settlement/index.js +++ b/pages/storage/order-settlement/index.js @@ -286,6 +286,10 @@ Scene({ } var params = { id: this.data.orderInfo.id, categoryId: this.data.form.categoryId } params.otherFee = this.data.form.otherFee + params.subsidy = this.data.form.subsidy + params.proxyPaySurcharge = this.data.form.proxyPaySurcharge + params.freight = this.data.form.freight + params.deductPercent = this.data.form.deductPercent params.unitPrice = this.data.form.unitPrice params.estimatedAmount = this.data.form.estimatedAmount params.deductPercent = this.data.form.deductPercent diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml index 6ae4724..2f16470 100644 --- a/pages/storage/order-settlement/index.wxml +++ b/pages/storage/order-settlement/index.wxml @@ -31,7 +31,7 @@ - +