From c66451d90710fa215a3b86c03f35437b597a2f26 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Sat, 15 May 2021 10:52:27 +0800
Subject: [PATCH] no message

---
 pages/agent/appointment/index.js      |  2 +-
 pages/process/outside-info/index.js   | 11 +++++++++++
 pages/process/outside-info/index.json |  1 +
 pages/process/outside-info/index.wxml |  1 +
 pages/process/outside-list/index.js   |  2 ++
 pages/process/outside-price/index.js  |  1 +
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pages/agent/appointment/index.js b/pages/agent/appointment/index.js
index 1dd67e0..6c53c3b 100644
--- a/pages/agent/appointment/index.js
+++ b/pages/agent/appointment/index.js
@@ -175,7 +175,7 @@ Scene({
         this.data.form.publicSubsidies = 0
       }
       this.data.cateName = element.categoryName
-      this.data.form.paperCategoryId = detail.value
+      this.data.form.paperCategoryId = element.categoryId
       this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.publicSubsidies']: this.data.form.publicSubsidies, 
         cateName: this.data.cateName, picking: false, visible: false })
     }
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index e0a27fa..4787e1b 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -1,5 +1,6 @@
 // pages/process/order-check/index.js
 import Scene from '../../index/scene'
+import Dialog from '../../../components/dialog/dialog'
 import { checkSideOrder, getSideOrderInfo, printOrder} from "../../../api/saas"
 const event = require('../../../utils/event')
 const util = require('../../../utils/util')
@@ -43,6 +44,16 @@ Scene({
     wx.redirectTo({url: `/pages/process/outside-check/index?id=${this.data.id}` })
   },
   submitForm: function(){
+    if(this.data.form.grossWeight) {
+      this.checkPass()
+    } else {
+      var message = '此订单没有厂内毛重数据，按照正常流程请刷卡过磅，获取厂内毛重数据，如果已经无法获取，请仔细查验纸品，确定没有问题后，进行审核。'
+      Dialog.confirm({ title: '温馨提示',  message, confirmButtonText: '确定审核' }).then(() => {
+        this.checkPass()
+      })
+    }
+  },
+  checkPass: function(){
     wx.showLoading({ title: '处理中', mask: true })
     checkSideOrder(this.data.form).then(result => {
       wx.hideLoading()
diff --git a/pages/process/outside-info/index.json b/pages/process/outside-info/index.json
index b1e44b4..ea075b0 100644
--- a/pages/process/outside-info/index.json
+++ b/pages/process/outside-info/index.json
@@ -8,6 +8,7 @@
     "van-loading": "/components/loading/index",
     "van-image": "/components/image/index",
     "van-field": "/components/field/index",
+    "van-dialog": "/components/dialog/index",
     "van-switch": "/components/switch/index",
     "van-uploader": "/components/uploader/index",
     "submit-layout": "/components/submit-layout/index",
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index 72c5f92..ba7d2bf 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -183,4 +183,5 @@
   </van-button>
 </view>
 
+<van-dialog id="van-dialog" />
 <notification id="qn-notification"/>
\ No newline at end of file
diff --git a/pages/process/outside-list/index.js b/pages/process/outside-list/index.js
index 26a1e82..f25f9b9 100644
--- a/pages/process/outside-list/index.js
+++ b/pages/process/outside-list/index.js
@@ -149,6 +149,8 @@ Scene({
     var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
     if(item.orderStatus == 0 || item.orderStatus == 1){
       wx.navigateTo({ url: `/pages/process/outside-price/index?id=${item.orderId}` })
+    } else if(item.orderStatus == 4 || item.orderStatus == 42){
+      wx.navigateTo({ url: `/pages/process/payment/index?id=${item.orderId}` })
     } else {
       wx.navigateTo({ url: `/pages/process/outside-info/index?id=${item.orderId}` })
     }
diff --git a/pages/process/outside-price/index.js b/pages/process/outside-price/index.js
index 766ef3f..d4e3e58 100644
--- a/pages/process/outside-price/index.js
+++ b/pages/process/outside-price/index.js
@@ -96,6 +96,7 @@ Scene({
       item.scrapPaperPurchaseOrderId = element.scrapPaperPurchaseOrderId
       weightNoteList.push(item)
     }
+    this.data.param.scrapPaperReceiptId = this.data.form.scrapPaperReceiptId
     this.data.param.weightNoteList = weightNoteList
     wx.showLoading({ title: '处理中', mask: true })
     saveSideOrder(this.data.param).then(result => {