更新 禁用及船名代入

miniprogram/pages/voyageManage/createVoyage/createVoyage.js

@@ -215,12 +215,12 @@ Page({
         shipId
       } = options
       this.setData({
+        currentShipName: shipName,
         voyage: {
           shipName,
           shipId
         }
       })
     }
-
   }
 })

miniprogram/pages/voyages/detail/detail.js

@@ -126,7 +126,8 @@ Page({
         currentPortId: voyage?.voyageDetails[0].portId,
         dischargePortIds,
         dischargePorts,
-        discLength
+        discLength,
+        tab2disabled: voyage.voyageStatus == 2
       })
       this.getCarLoadRecordList()
       this.getDischargeList()

miniprogram/pages/voyages/detail/detail.wxml

@@ -1,6 +1,6 @@
-<view wx:if="{{canComplete}}" bindtap="completeVoyage" class="voyage-btn back-blue">完成航次</view>
+<view wx:if="{{canComplete&&voyageStatus!=2}}" bindtap="completeVoyage" class="voyage-btn back-blue">完成航次</view>
 <map enable-zoom="{{false}}" enable-scroll="{{false}}" markers="{{markers}}" include-points="{{points}}" latitude="{{latitude}}" longitude="{{longitude}}" style="width: 100%;height: 294rpx;" name="map" class="map"></map>
-<view wx:if="{{canCancel}}" bindtap="cancelVoyage" class="cancel-voyage">取消航次</view>
+<view wx:if="{{canCancel&&voyageStatus!=2}}" bindtap="cancelVoyage" class="cancel-voyage">取消航次</view>
 <view class="df aic jcsa tabs" style="padding: 0 20rpx;margin-bottom:32rpx">
   <view class="tabsview {{tab==1?'current-tab':''}}" bindtap="changeTab" data-tab="{{1}}">航次信息</view>
   <view class="tabsview {{tab==2?'current-tab':''}}" bindtap="changeTab" data-tab="{{2}}">运输记录</view>
@@ -44,7 +44,7 @@
       <view class="line-full-item">
         <view class="line-full-title">卸货港 #{{index+1}}:</view>
         <view class="line-text">{{item}}</view>
-        <NewPicker wx:if="{{dischargePorts.length-1==index}}" value="{{currentDischargePort}}" placeholder="添加卸货港" inputStyle="width: 180rpx;height: 56rpx;background: #0089FD;border-radius: 12rpx;font-size: 26rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;color: #FFFFFF;line-height: 56rpx;text-align:center" bind:selectItem="selectDischargePort" url="/port/getCol"></NewPicker>
+        <NewPicker wx:if="{{dischargePorts.length-1==index&&voyageStatus!=2}}" value="{{currentDischargePort}}" placeholder="添加卸货港" inputStyle="width: 180rpx;height: 56rpx;background: #0089FD;border-radius: 12rpx;font-size: 26rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;color: #FFFFFF;line-height: 56rpx;text-align:center" bind:selectItem="selectDischargePort" url="/port/getCol"></NewPicker>
       </view>
     </view>
     <view class="line">
@@ -74,7 +74,7 @@
           <view class="line-full-title">到达装货港时间:</view>
           <picker class="" disabled="{{tab2disabled}}" mode="date" model:value="{{arrivalLoadPortTime}}">
             <view>
-              {{arrivalLoadPortTime ||"请选择时间"}}
+              {{arrivalLoadPortTime ||(tab2disabled?"":"请选择时间")}}
             </view>
           </picker>
         </view>
@@ -103,7 +103,7 @@
           <view class="line-full-title">装货开始时间:</view>
           <picker disabled="{{tab2disabled}}" mode="date" model:value="{{loadStartTime}}">
             <view>
-              {{loadStartTime||"请选择时间"}}
+              {{loadStartTime||(tab2disabled?"":"请选择时间")}}
             </view>
           </picker>
         </view>
@@ -116,7 +116,7 @@
           <view class="line-full-title">装货结束时间:</view>
           <picker disabled="{{tab2disabled}}" mode="date" model:value="{{loadEndTime}}">
             <view>
-              {{loadEndTime||"请选择时间"}}
+              {{loadEndTime||(tab2disabled?"":"请选择时间")}}
             </view>
           </picker>
         </view>
@@ -138,7 +138,7 @@
           <view class="line-full-title">开航时间:</view>
           <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="setSailTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].setSailTime}}">
             <view>
-              {{voyageDetails[currentDischargeIndex].setSailTime||"请选择时间"}}
+              {{voyageDetails[currentDischargeIndex].setSailTime||(tab2disabled?"":"请选择时间")}}
             </view>
           </picker>
         </view>
@@ -152,7 +152,7 @@
           <view class="line-full-title">预计到港时间:</view>
           <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="expectedArrivalTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].expectedArrivalTime}}">
             <view>
-              {{voyageDetails[currentDischargeIndex].expectedArrivalTime||"请选择时间"}}
+              {{voyageDetails[currentDischargeIndex].expectedArrivalTime||(tab2disabled?"":"请选择时间")}}
             </view>
           </picker>
         </view>
@@ -166,7 +166,7 @@
           <view class="line-full-title">实际到港时间:</view>
           <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="actualArrivalTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].actualArrivalTime}}">
             <view>
-              {{voyageDetails[currentDischargeIndex].actualArrivalTime||"请选择时间"}}
+              {{voyageDetails[currentDischargeIndex].actualArrivalTime||(tab2disabled?"":"请选择时间")}}
             </view>
           </picker>
         </view>
@@ -179,7 +179,7 @@
           <view class="line-full-title">卸货开始时间:</view>
           <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="dischargeStartTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].dischargeStartTime}}">
             <view>
-              {{voyageDetails[currentDischargeIndex].dischargeStartTime||"请选择时间"}}
+              {{voyageDetails[currentDischargeIndex].dischargeStartTime||(tab2disabled?"":"请选择时间")}}
             </view>
           </picker>
         </view>
@@ -193,7 +193,7 @@
           <view class="line-full-title">卸货结束时间:</view>
           <picker bindchange="bindDischargePortChange" data-index="{{currentDischargeIndex}}" data-param="dischargeEndTime" disabled="{{tab2disabled}}" mode="date" value="{{voyageDetails[currentDischargeIndex].dischargeEndTime}}">
             <view>
-              {{voyageDetails[currentDischargeIndex].dischargeEndTime||"请选择时间"}}
+              {{voyageDetails[currentDischargeIndex].dischargeEndTime||(tab2disabled?"":"请选择时间")}}
             </view>
           </picker>
         </view>
@@ -215,7 +215,7 @@
         <view class="unit">件</view>
       </view>
     </view>
-    <view class="update" style="margin-top: 60rpx;" bindtap="updateVoyage">更新航次</view>
+    <view wx:if="{{!tab2disabled}}" class="update" style="margin-top: 60rpx;" bindtap="updateVoyage">更新航次</view>
   </view>
   <view class="type3" wx:if="{{tab==4}}">
     <view class="title">保险单</view>
@@ -223,12 +223,12 @@
       <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="mt20 mb20"></view>
     </view>
-    <view class="update" style="margin:60rpx auto" bindtap="uploadBill" data-type="{{3}}">上传保险单</view>
+    <view wx:if="{{!tab2disabled}}" class="update" style="margin:60rpx auto" bindtap="uploadBill" data-type="{{3}}">上传保险单</view>
     <view class="title">运单</view>
     <view wx:for="{{waybills}}" class="mt20 mb20" 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>
-    <view class="update" style="margin-top: 60rpx;" bindtap="uploadBill" data-type="{{1}}">上传运单</view>
+    <view wx:if="{{!tab2disabled}}" class="update" style="margin-top: 60rpx;" bindtap="uploadBill" data-type="{{1}}">上传运单</view>
   </view>
   <view wx:if="{{tab==3}}">
     <PortsBar arr="{{voyageDetails}}" key="portId" currentIndex="{{tab3CurrentDischargeIndex}}" label="portName" bind:tapTab="changePort"></PortsBar>
@@ -252,7 +252,7 @@
         <view class="tr tr-2" wx:else>暂无</view>
       </view>
       <!-- <view bindtap="scrollShip" class="bottom-text">{{shipDischargeTotal==0?'暂无数据':(shipDischargeTotal>pageSize*shipDischargeCurrentPage?'点击或滑动加载更多...':'已加载完毕')}}</view> -->
-      <view class="update" style="margin-top: 60rpx;" bindtap="goTo" data-url="/pages/voyages/uploadDischarge/uploadDischarge">上传磅单</view>
+      <view wx:if="{{!tab2disabled}}" class="update" style="margin-top: 60rpx;" bindtap="goTo" data-url="/pages/voyages/uploadDischarge/uploadDischarge">上传磅单</view>
     </view>
     <view class="truck-load-list" wx:if="{{infoType=='truck'}}">
       <view wx:if="{{truckLoadList.length}}" class="df aic jcsb th">
@@ -274,7 +274,7 @@
         <view class="tr tr-2" wx:else>暂无</view>
       </view>
       <!-- <view bindtap="scrollTruck" class="bottom-text">{{truckLoadTotal==0?'暂无数据':(truckLoadTotal>pageSize*truckLoadCurrentPage?'点击或滑动加载更多...':'已加载完毕')}}</view> -->
-      <view class="update" style="margin-top: 60rpx;" bindtap="goTo" data-url="/pages/voyages/uploadCarLoadRecord/uploadCarLoadRecord">上传运单</view>
+      <view wx:if="{{!tab2disabled}}" class="update" style="margin-top: 60rpx;" bindtap="goTo" data-url="/pages/voyages/uploadCarLoadRecord/uploadCarLoadRecord">上传运单</view>
     </view>
   </view>
   <view class="type5" wx:if="{{tab==5}}">
@@ -284,14 +284,4 @@
     </view>
     <view wx:if="{{medias.length==0}}" class="no-data">暂无照片</view>
   </view>
-</scroll-view>
-<view wx:if="{{dischargeModal}}" class="mask" catchtouchmove="doNothing">
-  <view>
-    <view class="ship-owner-title">添加卸货港</view>
-    <NewPicker placeholder="添加卸货港" inputStyle="width:400rpx;margin:0 auto" bind:selectItem="selectDischargePort" url="/port/getCol"></NewPicker>
-    <view class="df btns">
-      <view class="btn btn-1" bindtap="cancelAddDischargePort">取消</view>
-      <view class="btn btn-2" bindtap="addDischargePort">确定</view>
-    </view>
-  </view>
-</view>
+</scroll-view>