From 947af8bf7588827470269cbbaff4157eb5cf258f Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 14 May 2021 20:02:26 +0800
Subject: [PATCH] no message

---
 api/saas.js                           |   4 +++-
 assets/image/icon-print.png           | Bin 1336 -> 0 bytes
 pages/process/order-info/index.wxml   |   8 ++++----
 pages/process/outside-info/index.js   |  16 +++++++++++++---
 pages/process/outside-info/index.wxml |   6 ++++++
 5 files changed, 26 insertions(+), 8 deletions(-)
 delete mode 100644 assets/image/icon-print.png

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 29d454a3d0acdeba43d1facf8d41f37c0a73cad5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1336
zcmV-81;_e{P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000F4Nkl<ZcwX(B
zNvK^#5Qe{B98sLnAh-|&XGMZWBN|+|h?<B)7C{_{AUFjQ6-=B^6Q@NS0s%z{26dr{
z;*>l$q9K@J5k;dW2!cUSH;Rf=9Db?LC!ROmbIyHteD~Dybai$0-_?DptGYx*vVAUa
z18^pADzI-w5v^wb6W9iP3_K@kQ<VW!mf7}xz=OaYz+Pqhb(rrT;Bnx7Nq?0Yy9xj=
z0#}z2+5<eRBwbfVk5T~Go&~&_6Zl@Tgl%P!E~88{Jht}%jt8y+?gREtaxRv%u1IEC
z06qj_?+3jLgz$fhgm=2#_VvKZH0}mT=NIWv2!QSVfnRdS9xLgaBEj8ixBWX1I>#As
zV3CEE0U%IZpC+_j(n;N#T$yoge*&DAc+Zm*);lhh0bn-pMv|~u(m7=m=@yUe&A{1d
z{MnM;ssX4ipxy%Y8899K^&vPGGPc9lKLa=fm<}vWd|v=Jck6^NIqnJ|`&BOnHUdAz
zWl54p${1z=$>~{^eEx$=4%jbjKLalT3nl%LDZK{(+eZT*04MazjGEMQ2QWj@_t8HO
zz*=BtlS2Eg+geGN>;b@bcz3Z^g8okXe2t_Z`fX<8oN0#xR{+oE7JZteExRqi_HDq^
zsq@Q{`sLnVX?<+R7QY~Mx<%5841lMA`Ke*4q<bn!?h|I)4+D#mx=%`4kO8n9xHUB_
zk#ujL%&C%^wjTnr#a%9Gehol60|vzcmH>Arvl&PWr~w#s3y3>S+z)~VatjPR0C_)P
zAT6K<Am<4Vvw-+F#xEjhwWK+fT&zA}w!J1@ibCVXk{-!C!ApTGe*PP9vZSy3WL~Az
zw0#`#8E`=AFjLY{20-NaKZ=Rxq<soZit8|NBydV@ZrdZ|CuvtcATkx$kn(D!Q0-Hu
z2!~CV6bt@;L@3<}A{-WJu*n)0i!E@aqzH@crcq&W+wm>pgRy7gRmfzB3P;9xr=)L3
zT5Z+5z!pi<dfD_xBu8gSdb^RnH2_7cX*-`DuPvb70`(a%`Vh1|1vs&2J58W{$5<!$
zSn@i42-?03com4}YVD#()?6g%{h|T70YJRWyt7EL7PK#t^k|WsZU7MPg&zQpC{k_$
z?eP{k0Ep*$4XNV*6e-l{_8NfU&*W-Pu<fpJx;$MDoL<q~<Jrm!txmyrd<)o)Y-<D?
zo1v|eA`a0qY6k!jAABWgxL(qXytcL@+ZtKdW~k+FkJ|yj0w5kv1&w+<VLQT2bDQ`L
zMybnC7MW=Vy|MbV1Av%(fDrVUq`O+BY&+!G4xb^5|6N$*J(h_FL=jRJ1eqggbvqPq
zl}y`VSy>_1F-3QXh5)2c@>fZ@UBID|BD~a-WIIY{zD&yfD(RpiMT-E)=hNSj6#0Xm
zCENM@#wJNwna{X7j|+h9Fr)8)!&2{glCpZ7o&>@6D&U%=+)7FFiWF@Gz_sD1BmqAH
zQzDU2B(PiUwj-4Pd9J2$VpU_dW3{6SE9ePH3%fPBGUM8Q4G51kXrrVE=ND2V3wQ>&
zF-ce^>GnctU1G2urv7|x_^Fb%mQkk>0I`>1PX$FfDLle;lA=7d>y!#6<B4xLVK?Oz
zdR<aHi!DWs0En#6PT;6gl6r$FD#jw~8)sH2D*6qEM-_3naCdv1;tZHu^`I`}2}a61
uD#p)B>GNKx9FIRzWV46Tog&itmFYjbC5>M#(!yZ?0000<MNUMnLSTZ4SXJ);

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 @@
   <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 42}}">客户结算</van-button>
 </view>
 
-<view class="booking-tool" style="bottom:300rpx" bindtap="printOrder" wx:if="{{form && (form.status == 3 || form.status == 4)}}">
-	<view class="roder-add flex flex-center">
-    <image src="/assets/image/icon-print.png" style="width:50rpx;height:50rpx"></image>
-	</view>
+<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{form && (form.status == 3 || form.status == 4)}}">
+  <van-button round type="info" bind:click="printOrder" custom-style="width: 100rpx;height: 100rpx;">
+    <van-icon name="printer" size="30px"/>
+  </van-button>
 </view>
 
 <vehicle-keyboard id="wux-keyboard" safeBottom="{{safeBottom}}" triplet="{{1}}" bind:change="onPlatenumber"></vehicle-keyboard>
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 @@
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">审核通过</van-button>
 </submit-layout>
 
+<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{form}}">
+  <van-button round type="info" bind:click="printOrder" custom-style="width: 100rpx;height: 100rpx;">
+    <van-icon name="printer" />
+  </van-button>
+</view>
+
 <notification id="qn-notification"/>
\ No newline at end of file