diff --git a/api/saas.js b/api/saas.js
index 75ed688..6ca10f5 100644
--- a/api/saas.js
+++ b/api/saas.js
@@ -73,8 +73,7 @@ const editSideOrder = (params) => mPost(`/ztb-factory/modify/scrap-paper-offsite
const saveSideOrder = (params) => mPost(`/ztb-factory/save/scrap-paper-offsite-receipt-weight-note`, params, sconfig)
const poundSideOrder = (params) => mPost(`/ztb-factory/submit/scrap-paper-offsite-receipt-weight-note`, params, sconfig)
const priceSideOrder = (params) => mPost(`/ztb-factory/submit/scrap-paper-offsite-receipt-order-price`, params, sconfig)
-const repeatSideOrder = (params) => mPost(`/ztb-factory/submit/scrap-paper-offsite-receipt-order-price`, params, sconfig)
-const checkSideOrder = (params) => mPost(`/ztb-factory/check/scrap-paper-offsite-receipt-order`, params, sconfig)
+const repeatSideOrder = (params) => mPost(`/ztb-factory/renew/scrap-paper-offsite-receipt-order-price`, params, sconfig)
export {
sconfig,
@@ -140,6 +139,5 @@ export {
saveSideOrder,
poundSideOrder,
priceSideOrder,
- repeatSideOrder,
- checkSideOrder
+ repeatSideOrder
}
\ No newline at end of file
diff --git a/pages/process/outside-check/index.js b/pages/process/outside-check/index.js
index 29cfb88..ac91535 100644
--- a/pages/process/outside-check/index.js
+++ b/pages/process/outside-check/index.js
@@ -61,7 +61,7 @@ Scene({
this.setData({ ['form.settleTotalAmount']: estimatedAmount.toFixed(2) })
},
checkForm: function(){
- if(this.data.form.grossWeight) {
+ if(this.data.form.onsideGrossWeight) {
this.checkOrder()
} else {
var message = '此订单没有厂内毛重数据,按照正常流程请刷卡过磅,获取厂内毛重数据,如果已经无法获取,请仔细查验纸品,确定没有问题后,进行审核。'
@@ -109,8 +109,7 @@ Scene({
item.settleUnitPrice = element.settleUnitPrice
weightNoteList.push(item)
}
- var data = {scrapPaperReceiptId: this.data.form.scrapPaperReceiptId, weightNoteList }
- repeatSideOrder({ id: this.data.form.id, editOrderPriceDto: data }).then(result => {
+ repeatSideOrder({scrapPaperReceiptId: this.data.form.scrapPaperReceiptId, productCategorySettleInfoDtoList: weightNoteList }).then(result => {
wx.hideLoading()
event.emit('OrderMessage', { what: 12, desc: 'repeatSideOrder' })
util.showBackToast('订单审核已通过')
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index 52ebb64..232bab2 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -1,7 +1,7 @@
// pages/process/order-check/index.js
import Scene from '../../index/scene'
import Dialog from '../../../components/dialog/dialog'
-import { checkSideOrder, getSideOrderInfo, printOrder} from "../../../api/saas"
+import { repeatSideOrder, getSideOrderInfo, printOrder} from "../../../api/saas"
const event = require('../../../utils/event')
const util = require('../../../utils/util')
const app = getApp()
@@ -51,7 +51,7 @@ Scene({
wx.redirectTo({url: `/pages/process/outside-check/index?id=${this.data.id}` })
},
submitForm: function(){
- if(this.data.form.grossWeight) {
+ if(this.data.form.onsideGrossWeight) {
this.checkPass()
} else {
var message = '此订单没有厂内毛重数据,按照正常流程请刷卡过磅,获取厂内毛重数据,如果已经无法获取,请仔细查验纸品,确定没有问题后,进行审核。'
@@ -62,9 +62,9 @@ Scene({
},
checkPass: function(){
wx.showLoading({ title: '处理中', mask: true })
- checkSideOrder(this.data.form).then(result => {
+ repeatSideOrder({scrapPaperReceiptId: this.data.form.scrapPaperReceiptId }).then(result => {
wx.hideLoading()
- util.showBackToast('审核成功')
+ util.showBackToast('订单审核已通过')
event.emit('OrderMessage', { what: 12, desc: 'pricingOrder' })
}).catch(err => {
wx.hideLoading()
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index c6d4945..ce179df 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -120,6 +120,12 @@
{{form.totalSettleWeight || '- -'}}
+
+
+ 厂内毛重(公斤)
+ {{form.onsideGrossWeight || '- -'}}
+
+
厂外皮重(公斤)
diff --git a/pages/process/outside-price/index.js b/pages/process/outside-price/index.js
index 68d3217..08d22a5 100644
--- a/pages/process/outside-price/index.js
+++ b/pages/process/outside-price/index.js
@@ -170,7 +170,12 @@ Scene({
wx.showLoading({ title: '处理中', mask: true })
priceSideOrder(data).then(result => {
wx.hideLoading()
- util.showBackToast('定价成功')
+ if(this.data.form.onsideGrossWeight) {
+ util.showBackToast('定价成功')
+ } else {
+ Dialog.confirm({ title: '温馨提示', message: '定价成功,请过磅刷卡获取厂内毛重!' }).then(() => {
+ })
+ }
event.emit('OrderMessage', { what: 12, desc: 'pricingOrder' })
}).catch(err => {
wx.hideLoading()