wzh 3 роки тому
батько
коміт
0dbec74a63

+ 14 - 2
src/apis/fetch.js

@@ -10,6 +10,18 @@ export default {
     return $http("user/list", data);
   },
 
+  getShipOwnerList(data) {
+    return $http("/shipOwner/list", data);
+  },
+
+  getShipOwnerDetail(data) {
+    return $http("/shipOwner/details", data);
+  },
+
+  updateShipOwner(data) {
+    return $http("/shipOwner/update", data);
+  },
+
   // 添加用户
   addUser(data) {
     return $http("user/add", data);
@@ -17,7 +29,7 @@ export default {
 
   // 添加船东
   addShipOwner(data) {
-    return $http("user/saveShipOwner", data);
+    return $http("/shipOwner/add", data);
   },
 
   // 获取用户详情
@@ -92,7 +104,7 @@ export default {
 
   // 更新船东信息
   updateShipOwner(data) {
-    return $http("/user/update", data);
+    return $http("/shipOwner/update", data);
   },
 
   // 获取船舶详情

+ 8 - 8
src/views/shipOwnerManage/shipOwnerDetail.vue

@@ -191,8 +191,8 @@ export default {
     let unchangeableShipOwner = ref(true);
     let unchangeableShip = ref(true);
     async function getUserDetail() {
-      let res = await api.getUserDetail({
-        userId: route.query.userId,
+      let res = await api.getShipOwnerDetail({
+        shipOwnerId: route.query.shipOwnerId,
       });
       if (res.data.status == 0) {
         let r = res.data.result;
@@ -208,7 +208,7 @@ export default {
           idcardNo,
           phone,
           preferenceCargo,
-          userId,
+          userId: shipOwnerId,
           userName,
 
           // 船舶信息
@@ -227,7 +227,7 @@ export default {
           idcardNo,
           phone,
           preferenceCargo,
-          userId,
+          shipOwnerId,
           userName,
         };
         idFrontFile.value = idcardFrontFileKey
@@ -274,12 +274,12 @@ export default {
     let idParams = ref({
       type: 1,
       location: "",
-      userId: 0,
+      shipOwnerId: 0,
     });
 
     let shipParams = ref({
       type: 2,
-      userId: 0,
+      shipOwnerId: 0,
       location: "",
     });
 
@@ -359,7 +359,7 @@ export default {
             idBackFile.value[0]?.idcardBackViewUrl ||
             "",
         };
-        let res = await api.updateUserDetail(postData);
+        let res = await api.updateShipOwner(postData);
         if (res.data.status == 0) {
           ElNotification({
             type: "success",
@@ -378,7 +378,7 @@ export default {
         shipDetail.value.shipCerts = certs.value.sendCerts();
         let postData = {
           ...shipDetail.value,
-          userId: route.query.userId,
+          shipOwnerId: route.query.shipOwnerId,
         };
         postData.shipId = postData.shipId || 0;
         let res = await api.updateShip(postData);

+ 15 - 10
src/views/shipOwnerManage/shipOwnerList.vue

@@ -71,7 +71,7 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="userPhone"
+          prop="phone"
           label="手机号"
           min-width="160"
           align="center"
@@ -85,7 +85,7 @@
         <el-table-column label="操作" min-width="80" align="center">
           <template v-slot="scope">
             <el-button
-              @click="shipOwnerDetail(scope.row.userId, tableData)"
+              @click="shipOwnerDetail(scope.row.shipOwnerId, tableData)"
               type="text"
               size="small"
             >
@@ -176,12 +176,14 @@ export default {
     }
     let currentPage = ref(1);
     let term = ref("");
-    let tableData = ref();
-    let total = ref();
-    async function getShipOwnerList() {
+    let tableData = ref([]);
+    let total = ref(0);
+    async function getShipOwnerList(type) {
       tableData.value = [];
-      let res = await api.getUserList({
-        identity: 1,
+      if (type == 1) {
+        currentPage.value = 1;
+      }
+      let res = await api.getShipOwnerList({
         currentPage: currentPage.value,
         size: 10,
         term: term.value,
@@ -189,20 +191,23 @@ export default {
       if (res.data.status == 0) {
         tableData.value = res.data.result;
         total.value = res.data.total;
+      } else {
+        tableData.value = [];
+        total.value = 0;
       }
     }
 
-    async function shipOwnerDetail(userId) {
+    async function shipOwnerDetail(shipOwnerId) {
       router.push({
         path: "/shipOwnerManage/shipOwnerDetail",
         query: {
-          userId,
+          shipOwnerId,
         },
       });
     }
     function pageChange(e) {
       currentPage.value = e;
-      getShipOwnerList();
+      getShipOwnerList(1);
     }
     getShipOwnerList();
     onMounted(() => {});