更新 上传参数;航次详情

miniprogram/pages/shipOwnerManage/addShipOnwer/addShipOnwer.js

@@ -69,7 +69,9 @@ Page({
     })
   },
   async uploadId(e) {
-    let res = await uploadImage(1)
+    let res = await uploadImage("/cos/upload", {
+      type
+    })
     if (res.status == 0) {
       if (e.currentTarget.dataset.type == 'head') {
         let {
@@ -103,7 +105,9 @@ Page({
     }
   },
   async uploadShipCerts(e) {
-    let res = await uploadImage(2)
+    let res = await uploadImage("/cos/upload", {
+      type: 2
+    })
     if (res.status == 0) {
       let {
         downloadUrl,

miniprogram/pages/voyages/detail/detail.js

@@ -2,10 +2,14 @@
 import {
   postApi
 } from "../../../apis/api"
+
+import {
+  uploadImage
+} from "../../../utils/uploadImage"
 Page({
   data: {
     id: '',
-    tab: 2,
+    tab: 3,
     shipDischargeCurrentPage: 1,
     truckLoadCurrentPage: 1,
     coordinates: [],
@@ -346,7 +350,7 @@ Page({
 
   },
 
-  bindDischargePort(e) {
+  bindDischargePortChange(e) {
     let {
       index,
       param
@@ -372,15 +376,32 @@ Page({
         console.log(i[key])
         if ((typeof i[key]) == 'string') {
           i[key] = i[key].replaceAll('-', '/')
-
+          if (i[key].length == 10) i[key] = i[key] + " 00:00:00"
         }
       })
     }
-    let res = await postApi("/voyage/backstage/update", this.data)
+    if (this.data.arrivalLoadPortTime.length == 10) this.data.arrivalLoadPortTime = this.data.arrivalLoadPortTime + " 00:00:00"
+    if (this.data.actualLoadTons.length == 10) this.data.actualLoadTons = this.data.actualLoadTons + " 00:00:00"
+    if (this.data.actualLoadPieces.length == 10) this.data.actualLoadPieces = this.data.actualLoadPieces + " 00:00:00"
+    if (this.data.loadStartTime.length == 10) this.data.loadStartTime = this.data.loadStartTime + " 00:00:00"
+    if (this.data.loadEndTime.length == 10) this.data.loadEndTime = this.data.loadEndTime + " 00:00:00"
+
+
+    let res = await postApi("/voyage/backstage/update", {
+      ...this.data,
+      loginAccountId: wx.getStorageSync('loginAccountId')
+    })
     console.log(res)
   },
+  async uploadBill(e) {
+    let postData = {
+      type: e.currentTarget.dataset.type,
+      voyageId: this.data.id
+    }
+    let res = await uploadImage("/voyage/uploadVoyageWayBill", postData)
 
-
+    console.log(res)
+  },
   onLoad(options) {
     let {
       id

miniprogram/pages/voyages/detail/detail.wxml

@@ -1,6 +1,6 @@
 <map enable-zoom="{{false}}" enable-scroll="{{false}}" markers="{{markers}}" include-points="{{points}}" style="width: 100%;height: 400rpx;" name="map"></map>
 <view class="df aic jcfe p10 fs24">
-  <view class="voyage-btn back-blue">完成航次</view>
+  <view wx:if="{{canComplete}}" class="voyage-btn back-blue">完成航次</view>
   <view class="voyage-btn back-red">取消航次</view>
 </view>
 <view class="df aic jcsb p20" style="border-bottom: 1px solid #999;border-top: 1px solid #999;">
@@ -8,7 +8,7 @@
   <view class="tabsview" bindtap="changeTab" data-tab="{{2}}" style="color:{{tab==2?'#0d8fcc':''}};border-bottom:{{tab==2?'2rpx solid #0d8fcc':''}}">航次详情</view>
   <view class="tabsview" bindtap="changeTab" data-tab="{{3}}" style="color:{{tab==3?'#0d8fcc':''}};border-bottom:{{tab==3?'2rpx solid #0d8fcc':''}}">单据信息</view>
   <view class="tabsview" bindtap="changeTab" data-tab="{{4}}" style="color:{{tab==4?'#0d8fcc':''}};border-bottom:{{tab==4?'2rpx solid #0d8fcc':''}}">卸货信息</view>
-  <view class="tabsview" bindtap="changeTab" data-tab="{{5}}" style="color:{{tab==5?'#0d8fcc':''}};border-bottom:{{tab==5?'2rpx solid #0d8fcc':''}}">航次照片</view>
+  <!-- <view class="tabsview" bindtap="changeTab" data-tab="{{5}}" style="color:{{tab==5?'#0d8fcc':''}};border-bottom:{{tab==5?'2rpx solid #0d8fcc':''}}">航次照片</view> -->
 </view>
 <scroll-view scroll-y="true" style="height:calc(100vh - 570rpx);font-size: 28rpx;color:#222;padding-bottom: 50rpx;" lower-threshold="50" bindscrolltolower="test">
   <view wx:if="{{tab==1}}">
@@ -109,7 +109,7 @@
     <view class="line">
       <view class="line-full-item">
         <view class="line-full-title">装货结束时间:</view>
-        <picker disabled="{{tab2disabled}}" mode="date" model:value="{{loadStartTime}}" style="width: 40vw;">
+        <picker disabled="{{tab2disabled}}" mode="date" model:value="{{loadEndTime}}" style="width: 40vw;">
           <view>
             {{loadStartTime||"请选择"}}
           </view>
@@ -125,7 +125,7 @@
     <view class="line">
       <view class="line-full-item">
         <view class="line-full-title">开航时间:</view>
-        <picker bindchange="bindDischargePort" data-index="{{currentDischargeIndex}}" data-param="setSailTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].setSailTime}}" style="width: 40vw;">
+        <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="setSailTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].setSailTime}}" style="width: 40vw;">
           <view>
             {{voyageDetails[currentDischargeIndex].setSailTime||"请选择"}}
           </view>
@@ -135,7 +135,7 @@
     <view class="line">
       <view class="line-full-item">
         <view class="line-full-title">预计到港时间:</view>
-        <picker bindchange="bindDischargePort" data-index="{{currentDischargeIndex}}" data-param="expectedArrivalTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].expectedArrivalTime}}" style="width: 40vw;">
+        <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="expectedArrivalTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].expectedArrivalTime}}" style="width: 40vw;">
           <view>
             {{voyageDetails[currentDischargeIndex].expectedArrivalTime||"请选择"}}
           </view>
@@ -145,7 +145,7 @@
     <view class="line">
       <view class="line-full-item">
         <view class="line-full-title">实际到港时间:</view>
-        <picker bindchange="bindDischargePort" data-index="{{currentDischargeIndex}}" data-param="actualArrivalTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].actualArrivalTime}}" style="width: 40vw;">
+        <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="actualArrivalTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].actualArrivalTime}}" style="width: 40vw;">
           <view>
             {{voyageDetails[currentDischargeIndex].actualArrivalTime||"请选择"}}
           </view>
@@ -155,7 +155,7 @@
     <view class="line">
       <view class="line-full-item">
         <view class="line-full-title">卸货开始时间:</view>
-        <picker bindchange="bindDischargePort" data-index="{{currentDischargeIndex}}" data-param="dischargeStartTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].dischargeStartTime}}" style="width: 40vw;">
+        <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="dischargeStartTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].dischargeStartTime}}" style="width: 40vw;">
           <view>
             {{voyageDetails[currentDischargeIndex].dischargeStartTime||"请选择"}}
           </view>
@@ -165,7 +165,7 @@
     <view class="line">
       <view class="line-full-item">
         <view class="line-full-title">卸货结束时间:</view>
-        <picker bindchange="bindDischargePort" data-index="{{currentDischargeIndex}}" data-param="dischargeEndTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].dischargeEndTime}}" style="width: 40vw;">
+        <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="dischargeEndTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].dischargeEndTime}}" style="width: 40vw;">
           <view>
             {{voyageDetails[currentDischargeIndex].dischargeEndTime||"请选择"}}
           </view>
@@ -175,24 +175,26 @@
     <view class="line">
       <view class="line-full-item">
         <view class="line-full-title">实际卸货量:</view>
-        <input disabled="{{tab2disabled}}" bindblur="bindDischargePort" value="{{voyageDetails[currentDischargeIndex].actualDischargeTons}}" data-index="{{currentDischargeIndex}}" data-param="actualDischargeTons" type="text" style="width: 10vw;" />{{' 吨'}}
-        <input disabled="{{tab2disabled}}" bindblur="bindDischargePort" value="{{voyageDetails[currentDischargeIndex].actualDischargePieces}}" data-index="{{currentDischargeIndex}}" data-param="actualDischargePieces" type="text" style="width: 10vw;" />{{' 件'}}
+        <input disabled="{{tab2disabled}}" bindblur="bindDischargePortChange" value="{{voyageDetails[currentDischargeIndex].actualDischargeTons}}" data-index="{{currentDischargeIndex}}" data-param="actualDischargeTons" type="text" style="width: 10vw;" />{{' 吨'}}
+        <input disabled="{{tab2disabled}}" bindblur="bindDischargePortChange" value="{{voyageDetails[currentDischargeIndex].actualDischargePieces}}" data-index="{{currentDischargeIndex}}" data-param="actualDischargePieces" type="text" style="width: 10vw;" />{{' 件'}}
       </view>
     </view>
     <button bindtap="updateVoyage">更新航次</button>
   </view>
-  <view wx:if="{{tab==3}}">
+  <view class="p30" wx:if="{{tab==3}}">
     <view>保险单</view>
     <view wx:for="{{policys}}" wx:key="index" style="text-align: center;">
       <image data-src="{{item.viewUrl}}" bindtap="previewImage" src="{{item.viewUrl}}" style="width: 60%;height: 240rpx;" mode="aspectFit"></image>
       <view wx:if="{{policys.length&&policys.length!=1}}" class="mt10 mb10" style="border-bottom: 2rpx solid #eee;"></view>
     </view>
+    <view class="upload" bindtap="uploadBill" data-type="{{3}}">上传保险单</view>
     <view class="mt30 mb30" style="border-bottom: 2rpx solid #ccc;"></view>
     <view>运单</view>
     <view wx:for="{{waybills}}" wx:key="index" style="text-align: center;">
       <image data-src="{{item.viewUrl}}" bindtap="previewImage" src="{{item.viewUrl}}" style="width: 60%;height: 240rpx;" mode="aspectFit"></image>
       <view wx:if="{{waybills.length&&waybills.length!=1}}" class="mt10 mb10" style="border-bottom: 2rpx solid #eee;"></view>
     </view>
+    <view class="upload" bindtap="uploadBill" data-type="{{1}}">上传运单</view>
   </view>
   <view wx:if="{{tab==4}}">
     <scroll-view scroll-x="{{true}}" style="white-space: nowrap;">

miniprogram/pages/voyages/detail/detail.wxss

@@ -201,4 +201,13 @@ picker,
 input {
   border: 1rpx solid grey;
   padding: 0rpx 10rpx;
+}
+
+.upload {
+  width: 60%;
+  height: 200rpx;
+  text-align: center;
+  line-height: 200rpx;
+  border: 1px solid grey;
+  margin: 3vw auto;
 }

miniprogram/utils/uploadImage.js

@@ -2,10 +2,10 @@ import {
   apiUrl
 } from "../apis/apiConfig"
 
-function uploadFile(filePath, formData) {
+function uploadFile(path, filePath, formData) {
   return new Promise((resolve, reject) => {
     wx.uploadFile({
-      url: `${apiUrl}/cos/upload`,
+      url: `${apiUrl}/${path}`,
       filePath,
       name: 'file',
       formData,
@@ -19,7 +19,7 @@ function uploadFile(filePath, formData) {
 
 
 
-function uploadImage(type) {
+function uploadImage(path, params) {
   return new Promise((resolve, reject) => {
     wx.chooseMedia({
       mediaType: ["image"],
@@ -38,9 +38,7 @@ function uploadImage(type) {
             wx.showLoading({
               title: '正在上传...',
             })
-            let res = await uploadFile(e.tempFilePath, {
-              type
-            })
+            let res = await uploadFile(path, e.tempFilePath, params)
             console.log("上传结束", res)
             if (res.status == 0) {
               wx.showToast({

project.private.config.json

@@ -82,7 +82,7 @@
         {
           "name": "",
           "pathName": "pages/voyages/detail/detail",
-          "query": "id=169",
+          "query": "id=110",
           "launchMode": "default",
           "scene": null
         }