新增 创建航次;远程搜索自定义组件

miniprogram/app.json

@@ -9,7 +9,11 @@
     "pages/shipOwnerManage/shipOwnerList/shipOwnerList",
     "pages/shipOwnerManage/addShipOnwer/addShipOnwer",
     "pages/financialManage/financialManage",
-    "pages/sharePage/sharePage"
+    "pages/sharePage/sharePage",
+    "pages/voyageManage/createVoyage/createVoyage",
+    "pages/voyageManage/myBills/myBills",
+    "pages/voyageManage/myDaily/myDaily",
+    "pages/voyageManage/myVoyages/myVoyages"
 
   ],
   "window": {

miniprogram/pages/index/index.js

@@ -50,5 +50,11 @@ Page({
       }
     ]
 
-  }
+  },
+  goTo(e) {
+    let url = e.currentTarget.dataset.url
+    wx.navigateTo({
+      url
+    })
+  },
 })

miniprogram/pages/index/index.wxml

@@ -19,21 +19,21 @@
   </view>
   <view class="tools">
     <view class="df">
-      <view>
+      <view bindtap="goTo" data-url="/pages/voyageManage/myDaily/myDaily">
         <image src="../../images/camera.png"></image>
         <view>日报{{indexInfo.dayReportNum}}</view>
       </view>
-      <view>
+      <view bindtap="goTo" data-url="/pages/voyageManage/myVoyages/myVoyages">
         <image src="../../images/ship.png"></image>
         <view>卸货{{indexInfo.discVoyageNum}}</view>
       </view>
     </view>
     <view class="df">
-      <view>
+      <view bindtap="goTo" data-url="/pages/voyageManage/myBills/myBills">
         <image src="../../images/bills.png"></image>
         <view>单据{{indexInfo.billNum}}</view>
       </view>
-      <view>
+      <view bindtap="goTo" data-url="/pages/voyageManage/createVoyage/createVoyage">
         <image src="../../images/rudder.png"></image>
         <view>创建航次</view>
       </view>

miniprogram/pages/shipOwnerManage/addShipOnwer/addShipOnwer.js

@@ -38,14 +38,8 @@ Page({
     })
     console.log(res)
     if (res.data.status == 0) {
-      let {
-        userName,
-        userId,
-      } = res.data.result
-
       this.setData({
-        userName,
-        userId,
+        ...res.data.result,
         step: 2
       })
     } else {

miniprogram/pages/voyageManage/createVoyage/createVoyage.js

@@ -0,0 +1,8 @@
+// pages/voyageManage/createVoyage/createVoyage.js
+Page({
+  data: {
+    shipParams: {
+      loginAccountId: wx.getStorageSync('loginAccountId')
+    }
+  },
+})

miniprogram/pages/voyageManage/createVoyage/createVoyage.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "RemotePicker": "/components/remotePicker/remotePicker"
+  },
+  "navigationBarTitleText": "创建航次"
+}

miniprogram/pages/voyageManage/createVoyage/createVoyage.wxml

@@ -0,0 +1,28 @@
+<view class="df jcsb line">
+  <view>选择船舶</view>
+  <view>
+    <RemotePicker url="/ship/select" params="{{shipParams}}"></RemotePicker>
+  </view>
+</view>
+<view class="df jcsb line">
+  <view>选择货主</view>
+  <view><input model:value="{{shipId}}" type="text" placeholder="必填" /></view>
+</view>
+<view class="df jcsb line">
+  <view>选择货种</view>
+  <view>
+    <RemotePicker url="/cargo/select"></RemotePicker>
+  </view>
+</view>
+<view class="df jcsb line">
+  <view>装货港</view>
+  <view><input model:value="{{shipId}}" type="text" placeholder="必填" /></view>
+</view>
+<view class="df jcsb line">
+  <view>卸货港</view>
+  <view><input model:value="{{shipId}}" type="text" placeholder="必填" /></view>
+</view>
+<view class="df jcsb line">
+  <view>货量</view>
+  <view><input model:value="{{shipId}}" type="text" placeholder="必填" /></view>
+</view>

miniprogram/pages/voyageManage/createVoyage/createVoyage.wxss

@@ -0,0 +1,18 @@
+/* pages/voyageManage/createVoyage/createVoyage.wxss */
+
+.line {
+  width: 80%;
+  margin: 30rpx auto;
+  font-size: 28rpx;
+}
+
+.line view {
+  line-height: 48rpx;
+
+}
+
+.line input {
+  border: 1px solid grey;
+  height: 48rpx;
+  width: 50vw;
+}