diff --git a/api/saas.js b/api/saas.js index eca3bf5..75ed688 100644 --- a/api/saas.js +++ b/api/saas.js @@ -74,6 +74,7 @@ const saveSideOrder = (params) => mPost(`/ztb-factory/save/scrap-paper-offsite-r 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) export { sconfig, @@ -139,5 +140,6 @@ export { saveSideOrder, poundSideOrder, priceSideOrder, - repeatSideOrder + repeatSideOrder, + checkSideOrder } \ No newline at end of file diff --git a/assets/image/icon-print.png b/assets/image/icon-print.png deleted file mode 100644 index 29d454a..0000000 Binary files a/assets/image/icon-print.png and /dev/null differ diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml index 1c0202a..ec6df32 100644 --- a/pages/process/order-info/index.wxml +++ b/pages/process/order-info/index.wxml @@ -166,10 +166,10 @@ 客户结算 - - - - + + + + diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js index a307856..e0a27fa 100644 --- a/pages/process/outside-info/index.js +++ b/pages/process/outside-info/index.js @@ -1,6 +1,6 @@ // pages/process/order-check/index.js import Scene from '../../index/scene' -import { pricingOrder, getSideOrderInfo} from "../../../api/saas" +import { checkSideOrder, getSideOrderInfo, printOrder} from "../../../api/saas" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -29,14 +29,24 @@ Scene({ }) } }, + printOrder: function(){ + wx.showLoading({ title: '正在获取', mask: true }) + printOrder({id: this.data.id}).then(result => { + wx.hideLoading() + util.showToast('即将打印,请稍后') + }).catch(err => { + wx.hideLoading() + util.showToast(err) + }) + }, checkForm: function(){ wx.redirectTo({url: `/pages/process/outside-check/index?id=${this.data.id}` }) }, submitForm: function(){ wx.showLoading({ title: '处理中', mask: true }) - pricingOrder(this.data.form).then(result => { + checkSideOrder(this.data.form).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 d93ca15..72c5f92 100644 --- a/pages/process/outside-info/index.wxml +++ b/pages/process/outside-info/index.wxml @@ -177,4 +177,10 @@ 审核通过 + + + + + + \ No newline at end of file