更新 汽车装货记录

miniprogram/pages/voyages/detail/detail.js

@@ -9,7 +9,7 @@ import {
 Page({
   data: {
     id: '',
-    tab: 3,
+    tab: 1,
     shipDischargeCurrentPage: 1,
     truckLoadCurrentPage: 1,
     coordinates: [],
@@ -465,4 +465,10 @@ Page({
     })
     this.getVoyageDetail()
   },
+  onShow() {
+    if (wx.getStorageSync('addStatus') == "success") {
+      this.getVoyageDetail()
+      wx.removeStorageSync('addStatus')
+    }
+  }
 })

miniprogram/pages/voyages/uploadCarLoadRecord/uploadCarLoadRecord.js

@@ -8,10 +8,13 @@ import {
 } from "../../../utils/uploadImage"
 Page({
   data: {
-    dischargeTime: '',
-    dischargeTons: 0,
-    dischargePieces: 0,
-    fileList: [],
+    weighTime: '',
+    carNum: '',
+    receivingUnit: '',
+    grossWeight: 0,
+    tare: 0,
+    netWeight: 0,
+    fileObj: {}
   },
   async uploadBill(e) {
     let {
@@ -24,40 +27,46 @@ Page({
 
     let res = await uploadImage("/voyage/uploadVoyageWayBill", postData)
     let {
-      id,
-      viewUrl
+      fileKey,
+      viewUrl,
+      downloadUrl
     } = res.result
-    this.data.fileList.push({
-      id,
-      viewUrl
-    })
     this.setData({
-      fileList: this.data.fileList
+      fileKey,
+      viewUrl,
+      downloadUrl
     })
   },
   async submit() {
     let {
-      dischargeTime,
-      dischargeTons,
-      dischargePieces,
-      fileList,
+      weighTime,
+      carNum,
+      receivingUnit,
+      grossWeight,
+      tare,
+      netWeight,
       portId,
-      voyageId
+      voyageId,
+      fileKey,
+      viewUrl,
+      downloadUrl
     } = this.data
-    let arr = []
-    for (let i of fileList) {
-      arr.push(i.id)
-    }
     let postData = {
       loginAccountId: wx.getStorageSync('loginAccountId'),
       voyageId,
       portId,
-      dischargeTons,
-      dischargePieces,
-      dischargeTime: dischargeTime.replaceAll('-', '/') + " 00:00:00",
-      voyageFileIds: arr.join(',')
+      carNum,
+      receivingUnit,
+      grossWeight,
+      tare,
+      netWeight,
+      weighTime: weighTime.replaceAll('-', '/') + " 00:00:00",
+      fileKey,
+      viewUrl,
+      downloadUrl
     }
-    let res = await postApi("/voyage/addDischarge", postData)
+    let res = await postApi("/voyage/addCarLoadRecord", postData)
+    wx.setStorageSync('addStatus', 'success')
     wx.navigateBack()
   },
   onLoad(options) {

miniprogram/pages/voyages/uploadCarLoadRecord/uploadCarLoadRecord.wxml

@@ -1,26 +1,37 @@
 <view class="box">
   <view class="df jcsb line">
-    <view>卸货时间</view>
+    <view>称重时间</view>
     <view>
-      <picker mode="date" model:value="{{dischargeTime}}" style="width: 40vw;">
+      <picker mode="date" model:value="{{weighTime}}" style="width: 40vw;">
         <view style="border: 1rpx solid grey;">
-          {{dischargeTime ||"请选择"}}
+          {{weighTime ||"请选择"}}
         </view>
       </picker>
     </view>
   </view>
   <view class="df jcsb line">
-    <view>卸货吨位</view>
-    <view><input model:value="{{dischargeTons}}" type="text" placeholder="必填" /></view>
+    <view>车号</view>
+    <view><input model:value="{{carNum}}" type="text" placeholder="必填" /></view>
   </view>
   <view class="df jcsb line">
-    <view>卸货件数</view>
-    <view><input model:value="{{dischargePieces}}" type="number" /></view>
+    <view>收货单位</view>
+    <view><input model:value="{{receivingUnit}}" type="text" /></view>
+  </view>
+  <view class="df jcsb line">
+    <view>毛重</view>
+    <view><input model:value="{{grossWeight}}" type="digit" placeholder="必填" /></view>
+  </view>
+  <view class="df jcsb line">
+    <view>皮重</view>
+    <view><input model:value="{{tare}}" type="digit" /></view>
+  </view>
+  <view class="df jcsb line">
+    <view>净重</view>
+    <view><input model:value="{{netWeight}}" type="digit" placeholder="必填" /></view>
   </view>
   <view>
-    <view>卸货记录</view>
-    <image wx:for="{{fileList}}" class="upload-image" src="{{item.viewUrl}}"></image>
-    <view class="next" style="width: 200rpx;height: 60rpx;line-height: 60rpx;font-size: 26rpx;" bindtap="uploadBill" data-type="{{1}}">上传运单</view>
+    <image wx:if="{{viewUrl}}" class="upload-image" src="{{viewUrl}}"></image>
+    <view wx:else class="next" style="width: 200rpx;height: 60rpx;line-height: 60rpx;font-size: 26rpx;" bindtap="uploadBill" data-type="{{4}}">上传汽运单</view>
     <view class="next" bindtap="submit">提交</view>
   </view>
 </view>

miniprogram/pages/voyages/uploadDischarge/uploadDischarge.js

@@ -58,6 +58,7 @@ Page({
       voyageFileIds: arr.join(',')
     }
     let res = await postApi("/voyage/addDischarge", postData)
+    wx.setStorageSync('addStatus', 'success')
     wx.navigateBack()
   },
   onLoad(options) {