新增 选择船东创建航次

miniprogram/components/localPicker/localPicker.js

@@ -25,6 +25,9 @@ Component({
     placeholder: {
       type: String
     },
+    autoGet: {
+      type: Boolean
+    }
   },
   data: {
     arr: [],
@@ -32,13 +35,16 @@ Component({
   },
   lifetimes: {
     ready() {
-      this._getList()
+      if (this.data.autoGet) {
+        this._getList()
+      }
     }
   },
   methods: {
-    async _getList() {
+    async _getList(params) {
       let res = await postApi(this.data.url, {
         ...this.data.params,
+        ...params,
         term: this.data.label
       })
       this.setData({

miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.js

@@ -70,6 +70,29 @@ Page({
       currentLetter: e.currentTarget.dataset.letter
     })
   },
+
+  createVoyage(e) {
+    console.log(e)
+    let {shipId,shipName} =  e.currentTarget.dataset.shipowner
+    wx.showModal({
+      title: '是否创建航次?',
+      content: shipName,
+      success(res) {
+        if (res.confirm) {
+          wx.navigateTo({
+            url: `/pages/voyageManage/createVoyage/createVoyage?shipId=${shipId}&shipName=${shipName}`,
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      },
+      fail: e => {
+        console.log(e)
+      }
+    })
+
+
+  },
   onLoad() {
 
   },

miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.wxml

@@ -4,11 +4,11 @@
     <view class="letter" id="{{item.letter=='?'?'index':item.letter}}">
       {{item.letter}}
     </view>
-    <view class="df aic jcsb phones" wx:for="{{item.data}}" wx:for-item="item1" wx:key="userId">
+    <view class="df aic jcsb phones" wx:for="{{item.data}}" wx:for-item="item1" wx:key="userId" bindtap="createVoyage" data-shipowner="{{item1}}">
       <view style="width: 200rpx;">{{item1.userName}}</view>
       <view class="tac" style="width: 360rpx;text-align: left;">{{item1.shipName}}</view>
       <view class="tac" style="width: 120rpx;text-align: left;">{{item1.cargo}}</view>
-      <image mode="aspectFit" style="width: 52rpx;height: 52rpx;" bindtap="call" data-phone="{{item1.userPhone}}" src="../../../images/phone.png"></image>
+      <image mode="aspectFit" style="width: 52rpx;height: 52rpx;" catchtap="call" data-phone="{{item1.userPhone}}" src="../../../images/phone.png"></image>
     </view>
   </block>
 </scroll-view>

miniprogram/pages/voyageManage/createVoyage/createVoyage.js

@@ -13,6 +13,7 @@ Page({
     dischargePortIds: [''],
     voyage: {},
     startTime: '',
+    currentCargoOwnerId: 0
   },
   selectShip(e) {
     console.log(e)
@@ -20,8 +21,19 @@ Page({
   },
   selectCargoOwner(e) {
     this.data.voyage.cargoOwnerId = e.detail.value
+    this.setData({
+      currentCargoOwnerId: this.data.voyage
+    })
+
+    let cargoCmp = this.selectComponent('#cargoCmp');
+    cargoCmp._getList({
+      cargoOwnerId: e.detail.value
+    })
+
+
   },
   selectCargo(e) {
+    console.log(e)
     this.data.voyage.cargo = e.detail.value
   },
   selectLoadPort(e) {
@@ -174,4 +186,16 @@ Page({
       }
     })
   },
+  onLoad(options) {
+    let {
+      shipName,
+      shipId
+    } = options
+    this.setData({
+      voyage: {
+        shipName,
+        shipId
+      }
+    })
+  }
 })

miniprogram/pages/voyageManage/createVoyage/createVoyage.wxml

@@ -2,19 +2,20 @@
   <view class="df aic jcsb line">
     <view>选择船舶</view>
     <view>
-      <NewPicker placeholder="请搜索船舶" bind:selectItem="selectShip" url="/ship/select" params="{{defaultParams}}"></NewPicker>
+      <view wx:if="{{voyage.shipName}}">{{voyage.shipName}}</view>
+      <NewPicker wx:else placeholder="请搜索船舶" bind:selectItem="selectShip" url="/ship/select" params="{{defaultParams}}"></NewPicker>
     </view>
   </view>
   <view class="df aic jcsb line">
     <view>选择货主</view>
     <view>
-      <LocalPicker placeholder="请选择货主" bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}"></LocalPicker>
+      <LocalPicker autoGet placeholder="请选择货主" bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}"></LocalPicker>
     </view>
   </view>
-  <view class="df aic jcsb line">
+  <view class="df aic jcsb line" wx:if="{{currentCargoOwnerId}}">
     <view>选择货种</view>
     <view>
-      <LocalPicker placeholder="请选择货种" bind:selectItem="selectCargo" url="/cargo/select"></LocalPicker>
+      <LocalPicker id="cargoCmp" placeholder="请选择货种" bind:selectItem="selectCargo" url="/cargo/select"></LocalPicker>
     </view>
   </view>
   <view class="df aic jcsb line">

project.private.config.json

@@ -71,6 +71,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/shipOwnerManage/shipOwnerList/shipOwnerList",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }