更新 分页

src/views/voyage/voyageList.vue

@@ -324,7 +324,7 @@
           v-model="voyageListPostData.loadPortId"
           placeholder="装货港"
           size="small"
-          @change="getVoyageList"
+          @change="getVoyageList(1)"
           @focus="getPortSelect"
           filterable
           clearable
@@ -344,7 +344,7 @@
           v-model="voyageListPostData.discPortId"
           placeholder="卸货港"
           size="small"
-          @change="getVoyageList"
+          @change="getVoyageList(1)"
           @focus="getPortSelect"
           filterable
           clearable
@@ -364,7 +364,7 @@
           v-model="voyageListPostData.isArrived"
           placeholder="到港状态"
           size="small"
-          @change="getVoyageList"
+          @change="getVoyageList(1)"
         >
           <el-option label="已到港" :value="0" />
           <el-option label="未到港" :value="1" />
@@ -377,7 +377,7 @@
           v-model="voyageListPostData.abnormalStatus"
           placeholder="航次状态"
           size="small"
-          @change="getVoyageList"
+          @change="getVoyageList(1)"
         >
           <el-option label="正常" :value="0" />
           <el-option label="异常" :value="1" />
@@ -387,10 +387,10 @@
         <div class="mr10">货种:</div>
         <el-select
           style="width: 100px"
-          v-model="voyageListPostData.cargo"
+          v-model="voyageListPostData.cargoId"
           placeholder="货种"
           size="small"
-          @change="getVoyageList"
+          @change="getVoyageList(1)"
           @focus="getCargoSelect"
           filterable
           clearable
@@ -398,8 +398,8 @@
           <el-option
             v-for="item in cargoOptions"
             :key="item"
-            :label="item.key"
-            :value="item.value"
+            :label="item.value"
+            :value="item.key"
           />
         </el-select>
       </div>
@@ -410,7 +410,7 @@
           v-model="voyageListPostData.hasInsurance"
           placeholder="保险状态"
           size="small"
-          @change="getVoyageList"
+          @change="getVoyageList(1)"
         >
           <el-option label="未购买" :value="0" />
           <el-option label="已购买" :value="1" />
@@ -599,6 +599,7 @@
         background
         layout="prev, pager, next"
         :total="total"
+        :current-page="currentPage"
         @current-change="pageChange"
       ></el-pagination>
     </div>
@@ -643,16 +644,12 @@ async function getVoyageList(type) {
   } else {
     tableData.value = [];
     total.value = 0;
-    ElNotification({
-      type: "error",
-      title: res.data.msg,
-    });
   }
 }
 function changeVoyageType(s) {
   currentPage.value = 1;
   status.value = s;
-  getVoyageList();
+  getVoyageList(1);
 }
 async function voyageDetail(id) {
   router.push({
@@ -832,16 +829,10 @@ async function addVoyage() {
           type: "success",
         });
         resetAddVoyageForm();
-        getVoyageList();
+        getVoyageList(1);
       } else {
         console.log(res);
-        ElNotification({
-          title: res.data.msg,
-          type: "error",
-        });
       }
-    } else {
-      console.log("未提交", voyageForm.voyageForm);
     }
   });
 }
@@ -1086,17 +1077,17 @@ function selectSingle(e) {
 let loadPortFilterStr = ref("");
 function selectLoadPortFilter(item) {
   voyageListPostData.value.loadPortId = item.key;
-  getVoyageList();
+  getVoyageList(1);
 }
 let discPortFilterStr = ref("");
 function selectDiscPortFilter(item) {
   voyageListPostData.value.discPortId = item.key;
-  getVoyageList();
+  getVoyageList(1);
 }
 let cargoFilterStr = ref("");
 function selectCargoFilter(item) {
   voyageListPostData.value.cargo = item.key;
-  getVoyageList();
+  getVoyageList(1);
 }
 
 function resetFilter() {
@@ -1104,7 +1095,7 @@ function resetFilter() {
   discPortFilterStr.value = "";
   cargoFilterStr.value = "";
   voyageListPostData.value = {};
-  getVoyageList();
+  getVoyageList(1);
 }
 let cargoOptions = ref([]);
 async function getCargoSelect() {
@@ -1127,7 +1118,7 @@ async function getPortSelect() {
 }
 
 onMounted(() => {
-  getVoyageList();
+  getVoyageList(1);
   loginAccountId.value = localStorage.loginAccountId;
 });
 </script>