From 6bb974d770dab084ccdd651ae77a74fb8d44e0f5 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 31 May 2021 18:47:14 +0800
Subject: [PATCH] no message

---
 pages/agent/order-detail/pound-info/index.wxml |  8 ++++----
 pages/process/index/index.js                   |  2 +-
 pages/process/outside-price/index.js           | 10 ++++++++++
 pages/process/outside-price/index.wxml         |  6 ++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pages/agent/order-detail/pound-info/index.wxml b/pages/agent/order-detail/pound-info/index.wxml
index 207c53d..b06a4ea 100644
--- a/pages/agent/order-detail/pound-info/index.wxml
+++ b/pages/agent/order-detail/pound-info/index.wxml
@@ -12,14 +12,14 @@
     <text class="text-black">净重</text>
     <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</text>
   </view>
-  <view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.settleWeight}}">
-    <text class="text-black">结算重量</text>
-    <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}吨</text>
-  </view>
   <view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.deductedPoint}}">
     <text class="text-black">扣点</text>
     <text class="text-gray">{{item.weightnoteInfo.deductedPoint}}%</text>
   </view>
+  <view class="flex flex-justify text-sg" style="margin-top:20rpx" wx:if="{{item.weightnoteInfo.settleWeight}}">
+    <text class="text-black">结算重量</text>
+    <text class="text-gray">{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}吨</text>
+  </view>
   <view class="flex flex-justify text-sg" style="margin-top:20rpx">
     <text class="text-black">代卖费</text>
     <text class="text-gray">{{formate.formatePrice(item.unitSurcharge==null?0:item.unitSurcharge)}}元/吨</text>
diff --git a/pages/process/index/index.js b/pages/process/index/index.js
index 88c46ff..c23dc2d 100644
--- a/pages/process/index/index.js
+++ b/pages/process/index/index.js
@@ -2,7 +2,6 @@
 import { getStatisticsInfo } from "../../../api/saas"
 import util from '../../../utils/util'
 const event = require('../../../utils/event')
-// const worker = wx.createWorker('/workers/process.js')
 const app = getApp()
 
 Component({
@@ -79,6 +78,7 @@ Component({
         } else {
           this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString })
         }
+        // const worker = wx.createWorker('/workers/process.js')
         // worker.postMessage({ x : 10, y : 2 })
         // worker.onMessage(function(res){
         //   console.log('这是主线程打印的')
diff --git a/pages/process/outside-price/index.js b/pages/process/outside-price/index.js
index 43c52a1..1442ef6 100644
--- a/pages/process/outside-price/index.js
+++ b/pages/process/outside-price/index.js
@@ -187,6 +187,16 @@ Scene({
       util.showToast(err)
     })
   },
+  printOrderInfo: function(){
+    wx.showLoading({ title: '正在处理', mask: true })
+    printOrder({id: this.data.id, printType: 2}).then(result => {
+      wx.hideLoading()
+      util.showToast('即将打印，请稍后')
+    }).catch(err => {
+      wx.hideLoading()
+      util.showToast(err)
+    })
+  },
   checkForm: function(){
     
   }
diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml
index 73587ac..81eb595 100644
--- a/pages/process/outside-price/index.wxml
+++ b/pages/process/outside-price/index.wxml
@@ -150,5 +150,11 @@
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkForm">审核</van-button>
 </submit-layout>
 
+<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{form && form.orderStatus == 3}}">
+  <van-button round type="info" bind:click="printOrderInfo" custom-style="width: 100rpx;height: 100rpx;">
+    <van-icon name="printer" size="30px"/>
+  </van-button>
+</view>
+
 <van-dialog id="van-dialog" />
 <notification id="qn-notification" />
\ No newline at end of file