更新 添加航次使用船舶信息

src/apis/fetch.js

@@ -89,4 +89,9 @@ export default {
   getShipDetail(data) {
     return $http("post", "/ship/backstage/detail", data);
   },
+
+  // 船舶查询
+  searchShip(data) {
+    return $http("post", "ship/backstage/search", data);
+  },
 };

src/views/voyage/voyageList.vue

@@ -24,7 +24,7 @@
           历史航次
         </div>
         <el-input
-          placeholder="请输入货主名称/联系人/联系人手机号"
+          placeholder="请输入货主名称/船名/MMSi"
           prefix-icon="el-icon-search"
           v-model="term"
           clearable
@@ -50,13 +50,13 @@
             <el-input v-model="voyageForm.voyageName"></el-input>
           </el-form-item>
           <el-form-item label=""></el-form-item>
-          <el-form-item prop="shipOwnerId" label="船东">
+          <el-form-item prop="shipOwnerId" label="船舶">
             <!-- <el-input v-model="voyageForm.shipOwnerId"></el-input> -->
             <el-autocomplete
-              v-model="voyageForm.shipOwnerName"
-              :fetch-suggestions="seachShipOwner"
-              placeholder="选择船东"
-              @select="selectShipOwner"
+              v-model="voyageForm.shipName"
+              :fetch-suggestions="searchShip"
+              placeholder="选择船舶"
+              @select="selectShip"
             />
           </el-form-item>
           <el-form-item prop="cargoOwnerId" label="货主">
@@ -240,9 +240,7 @@ export default {
         voyageName: [
           { required: true, message: "请填写航次名称", trigger: "blur" },
         ],
-        shipOwnerId: [
-          { required: true, message: "请选择船东", trigger: "blur" },
-        ],
+        shipName: [{ required: true, message: "请选择船舶", trigger: "blur" }],
         cargoOwnerId: [
           { required: true, message: "请选择货主", trigger: "blur" },
         ],
@@ -310,21 +308,21 @@ export default {
       });
     }
 
-    async function seachShipOwner(queryString, cb) {
+    async function searchShip(queryString, cb) {
       if (!queryString) return;
-      let res = await api.getUserInfoAndShipInfo({
+      let res = await api.searchShip({
         term: queryString,
       });
-      let shipOwners = [];
+      let ships = [];
       if (res.data.status == 0) {
-        shipOwners = res.data.result;
-        for (let i of shipOwners) {
-          i.value = `${i.shipOwnerName}-${i.shipName}`;
+        ships = res.data.result;
+        for (let i of ships) {
+          i.value = `${i.shipName}`;
         }
-        cb(shipOwners);
+        cb(ships);
       }
     }
-    const selectShipOwner = (item) => {
+    const selectShip = (item) => {
       voyageForm.voyageForm.shipOwnerId = item.shipOwnerId;
       voyageForm.voyageForm.shipId = item.shipId;
     };
@@ -375,8 +373,8 @@ export default {
       addVoyageForm,
       ...toRefs(rules),
       ...toRefs(voyageForm),
-      seachShipOwner,
-      selectShipOwner,
+      searchShip,
+      selectShip,
       seachCargoOwner,
       selectCargoOwner,
       resetAddVoyageForm,