From 879e23c5a00f634aefdf11d3e6a4ed4c22d8b500 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 9 Sep 2021 17:34:59 +0800
Subject: [PATCH] no message

---
 pages/storage/order-create/index.js     | 1 -
 pages/storage/order-settlement/index.js | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js
index 6c7be4e..f0cbf5e 100644
--- a/pages/storage/order-create/index.js
+++ b/pages/storage/order-create/index.js
@@ -87,7 +87,6 @@ Scene({
       } else if (data.what == 62) {
         that.data.form.agencySellOrderItemId = data.detail.id
         that.data.form.plateNumber = data.detail.plateNumber
-        that.data.form.productName = data.detail.categoryName
         that.data.form.consigneeName = data.detail.millName
         that.data.form.factoryDeliveryChannelId = ''
         that.data.form.deliveryChannelType = 2
diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js
index 548c386..4e3100f 100644
--- a/pages/storage/order-settlement/index.js
+++ b/pages/storage/order-settlement/index.js
@@ -73,7 +73,6 @@ Scene({
           if(Number(result.data.outboundDeliveryOrderSettlementInfo.settleWeight) > 0){
             result.data.outboundDeliveryOrderSettlementInfo.settleWeight = math.divide(result.data.outboundDeliveryOrderSettlementInfo.settleWeight, 1000)
           }
-          
           this.setData({ 
             safeBottom: app.globalData.safeBottom, 
             poundInfo: result.data.weightNote, 
@@ -84,8 +83,13 @@ Scene({
           this.statAmount()
         } else {
           this.data.form.id = result.data.outboundDeliveryOrder.id
+          if(result.data.outboundDeliveryOrder.productId && result.data.outboundDeliveryOrder.productName){
+            this.data.form.categoryId = result.data.outboundDeliveryOrder.productId
+            this.data.form.categoryName = result.data.outboundDeliveryOrder.productName
+          }
           this.setData({ 
             safeBottom: app.globalData.safeBottom, 
+            form: this.data.form,
             poundInfo: result.data.weightNote, 
             orderInfo: result.data.outboundDeliveryOrder 
           })