更新 创建航次

miniprogram/pages/voyageManage/createVoyage/createVoyage.js

@@ -9,8 +9,7 @@ Page({
     defaultParams: {
 
     },
-    dischargePorts: [''],
-    dischargePortIds: [''],
+    dischargePorts: [{}],
     voyage: {},
     startTime: '',
     currentCargoOwnerId: 0
@@ -34,43 +33,44 @@ Page({
   },
   selectCargo(e) {
     console.log(e)
-    this.data.voyage.cargo = e.detail.value
+    this.data.voyage.cargoId = e.detail.value
+    this.data.voyage.cargo = e.detail.label
   },
   selectLoadPort(e) {
     this.data.voyage.loadPortId = e.detail.value
     this.data.voyage.loadPort = e.detail.label
   },
   selectDiscPort(e) {
-    this.data.dischargePortIds[e.currentTarget.dataset.index] = e.detail.value
-    this.data.dischargePorts[e.currentTarget.dataset.index] = e.detail.label
+    console.log(e)
+    let {
+      label: dischargePort,
+      value: id
+    } = e.detail
+    this.data.dischargePorts[e.currentTarget.dataset.index] = {
+      dischargePort,
+      id,
+      reasonableUnloadingDays: 0
+    }
     this.setData({
       dischargePorts: this.data.dischargePorts,
-      dischargePortIds: this.data.dischargePortIds
     })
   },
   addDischargePort() {
     let dischargePorts = this.data.dischargePorts
-    let dischargePortIds = this.data.dischargePortIds
-    dischargePorts.push('')
-    dischargePortIds.push('')
+    dischargePorts.push({})
     this.setData({
-      dischargePortIds,
       dischargePorts
     })
   },
   deleteDischargePort(e) {
     let dischargePorts = this.data.dischargePorts
-    let dischargePortIds = this.data.dischargePortIds
     if (dischargePorts.length == 1) {
-      dischargePortIds = ['']
-      dischargePorts = ['']
+      dischargePorts = [{}]
     } else {
       dischargePorts.splice(e.currentTarget.dataset.index, 1)
-      dischargePortIds.splice(e.currentTarget.dataset.index, 1)
     }
 
     this.setData({
-      dischargePortIds,
       dischargePorts
     })
   },
@@ -103,7 +103,7 @@ Page({
       })
       return
     }
-    if (!this.data.dischargePortIds.length || !this.data.dischargePorts.length) {
+    if (!this.data.dischargePorts.length) {
       wx.showToast({
         title: '请添加卸货港',
         icon: "error"
@@ -117,6 +117,15 @@ Page({
       })
       return
     }
+    if (!this.data.reasonableUnloadingDays) {
+      wx.showToast({
+        title: '请输入合理卸货天数',
+        icon: "none"
+      })
+      return
+    }
+
+
     // if(!this.data.pieces){
     //   wx.showToast({
     //     title: '请输入件数',
@@ -142,21 +151,18 @@ Page({
       fail: (res) => {},
       complete: (res) => {},
     })
-    let dischargePortIds = this.data.dischargePortIds.filter(item => {
-      return item
-    })
-    let dischargePorts = this.data.dischargePorts.filter(item => {
-      return item
-    })
+
+
     let startTime = this.data.startTime.replaceAll('-', '/')
     let postData = {
       ...this.data.voyage,
       loginAccountId: wx.getStorageSync('loginAccountId'),
-      dischargePortIds: dischargePortIds.join(','),
-      dischargePorts: dischargePorts.join(','),
+      dischargePorts: this.data.dischargePorts,
       startTime,
       tons: this.data.tons,
       pieces: this.data.pieces,
+      reasonableUnloadingDays: this.data.reasonableUnloadingDays
+
     }
 
     let res = await postApi('/voyage/add', postData)
@@ -187,15 +193,18 @@ Page({
     })
   },
   onLoad(options) {
-    let {
-      shipName,
-      shipId
-    } = options
-    this.setData({
-      voyage: {
+    if (options) {
+      let {
         shipName,
         shipId
-      }
-    })
+      } = options
+      this.setData({
+        voyage: {
+          shipName,
+          shipId
+        }
+      })
+    }
+
   }
 })

miniprogram/pages/voyageManage/createVoyage/createVoyage.wxml

@@ -33,7 +33,7 @@
   </view>
   <view wx:if="{{dischargePorts[dischargePorts.length - 1]}}" class="df aic jcsb line">
     <view></view>
-    <view class="next" bindtap="addDischargePort" style="width: 200rpx;height: 50rpx;line-height: 50rpx;font-size: 26rpx;margin: 0;">添加卸货港</view>
+    <view class="next" bindtap="addDischargePort" style="padding:0 30rpx;height: 70rpx;line-height: 70rpx;font-size: 30rpx;margin: 0;">添加卸货港</view>
   </view>
   <view class="df aic jcsb line">
     <view>货量</view>
@@ -46,6 +46,12 @@
       </view>
     </view>
   </view>
+  <view class="df aic jcsb line">
+    <view>合理卸货天数</view>
+    <view>
+      <input style="width: 50vw;padding-left: 10px;border: 1px solid grey;height: 40px;" model:value="{{reasonableUnloadingDays}}" type="number" placeholder="必填" />
+    </view>
+  </view>
   <!-- <view class="df aic jcsb line">
     <view>开始时间</view>
     <picker mode="date" model:value="{{startTime}}" style="border: 1px solid grey;height: 80rpx;width: 50vw;padding-left: 20rpx;">