From 406e4fdd9e5a589f24972ff4cc4961ceee78c947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Mon, 27 Feb 2023 17:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=BA=93=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modular/main/CommondbCarrierList.js   | 13 +++++++-
 src/api/modular/main/CommondbForwarder.js     |  8 ++++-
 src/api/modular/main/CommondbPortload.js      |  8 ++++-
 src/api/modular/main/CommondbVessel.js        |  8 ++++-
 src/api/modular/main/CommondbVessellist.js    |  8 ++++-
 src/api/modular/main/CommondbYard.js          |  8 ++++-
 src/api/modular/main/CommondbYardlist.js      |  8 ++++-
 .../modular/main/ShippingCompanyMapping.js    |  7 ++++
 src/views/main/CommondbCarrierList/index.vue  | 32 ++++++++++++++-----
 src/views/main/CommondbForwarder/index.vue    | 32 ++++++++++++++-----
 src/views/main/CommondbPortload/index.vue     | 32 ++++++++++++++-----
 src/views/main/CommondbVessel/index.vue       | 32 ++++++++++++++-----
 src/views/main/CommondbVessellist/index.vue   | 32 ++++++++++++++-----
 src/views/main/CommondbYard/index.vue         | 32 ++++++++++++++-----
 src/views/main/CommondbYardlist/index.vue     | 32 ++++++++++++++-----
 .../main/ShippingCompanyMapping/index.vue     | 32 ++++++++++++++-----
 16 files changed, 253 insertions(+), 71 deletions(-)

diff --git a/src/api/modular/main/CommondbCarrierList.js b/src/api/modular/main/CommondbCarrierList.js
index 27ef2dd..7b67981 100644
--- a/src/api/modular/main/CommondbCarrierList.js
+++ b/src/api/modular/main/CommondbCarrierList.js
@@ -12,7 +12,18 @@ export function CommondbCarrierList(parameter) {
     params: parameter
   })
 }
-
+/**
+ * 获取船公司列表信息(分页)
+ *
+ * @author Myshipping
+ */
+export function CommondbPageCarrierList(parameter) {
+  return axios({
+    url: '/commondbpage/carrierlist',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 新增船公司信息
  *
diff --git a/src/api/modular/main/CommondbForwarder.js b/src/api/modular/main/CommondbForwarder.js
index 9eb1779..074571c 100644
--- a/src/api/modular/main/CommondbForwarder.js
+++ b/src/api/modular/main/CommondbForwarder.js
@@ -12,7 +12,13 @@ export function CommondbList(parameter) {
     params: parameter
   })
 }
-
+export function CommondbPageList(parameter) {
+  return axios({
+    url: '/commondbpage/forwarderlist',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 新增船代信息
  *
diff --git a/src/api/modular/main/CommondbPortload.js b/src/api/modular/main/CommondbPortload.js
index 550deff..1f04326 100644
--- a/src/api/modular/main/CommondbPortload.js
+++ b/src/api/modular/main/CommondbPortload.js
@@ -12,7 +12,13 @@ export function CommondbList(parameter) {
     params: parameter
   })
 }
-
+export function CommondbPageList(parameter) {
+  return axios({
+    url: '/commondbpage/portloadlist',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 新增起始港信息
  *
diff --git a/src/api/modular/main/CommondbVessel.js b/src/api/modular/main/CommondbVessel.js
index ed45c0a..ec5528a 100644
--- a/src/api/modular/main/CommondbVessel.js
+++ b/src/api/modular/main/CommondbVessel.js
@@ -12,7 +12,13 @@ export function CommondbList(parameter) {
     params: parameter
   })
 }
-
+export function CommondbPageList(parameter) {
+  return axios({
+    url: '/commondbpage/vessellist',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 新增船名信息
  *
diff --git a/src/api/modular/main/CommondbVessellist.js b/src/api/modular/main/CommondbVessellist.js
index 3b52a3f..4132478 100644
--- a/src/api/modular/main/CommondbVessellist.js
+++ b/src/api/modular/main/CommondbVessellist.js
@@ -12,7 +12,13 @@ export function CommondbMappingvessellist(parameter) {
     params: parameter
   })
 }
-
+export function CommondbPageMappingvessellist(parameter) {
+  return axios({
+    url: '/commondbpage/mappingvessellist',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 新增编辑船名映射信息
  *
diff --git a/src/api/modular/main/CommondbYard.js b/src/api/modular/main/CommondbYard.js
index 0f3d29a..a54b221 100644
--- a/src/api/modular/main/CommondbYard.js
+++ b/src/api/modular/main/CommondbYard.js
@@ -12,7 +12,13 @@ export function CommondbList(parameter) {
     params: parameter
   })
 }
-
+export function CommondbPageList(parameter) {
+  return axios({
+    url: '/commondbpage/yardlist',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 新增场站信息
  *
diff --git a/src/api/modular/main/CommondbYardlist.js b/src/api/modular/main/CommondbYardlist.js
index 073252c..d8c1d30 100644
--- a/src/api/modular/main/CommondbYardlist.js
+++ b/src/api/modular/main/CommondbYardlist.js
@@ -12,7 +12,13 @@ export function CommondbMappingyardlist(parameter) {
     params: parameter
   })
 }
-
+export function CommondbPageMappingyardlist(parameter) {
+  return axios({
+    url: '/commondbpage/mappingyardlist',
+    method: 'get',
+    params: parameter
+  })
+}
 /**
  * 新增编辑场站映射信息
  *
diff --git a/src/api/modular/main/ShippingCompanyMapping.js b/src/api/modular/main/ShippingCompanyMapping.js
index 4d276b0..fc4ceb5 100644
--- a/src/api/modular/main/ShippingCompanyMapping.js
+++ b/src/api/modular/main/ShippingCompanyMapping.js
@@ -12,6 +12,13 @@ export function CommondbMappingcarrierlist(parameter) {
     params: parameter
   })
 }
+export function CommondbPageMappingcarrierlist(parameter) {
+  return axios({
+    url: '/commondbpage/mappingcarrierlist',
+    method: 'get',
+    params: parameter
+  })
+}
 
 /**
  * 新增编辑船公司映射信息
diff --git a/src/views/main/CommondbCarrierList/index.vue b/src/views/main/CommondbCarrierList/index.vue
index 2e2a67d..d41afc8 100644
--- a/src/views/main/CommondbCarrierList/index.vue
+++ b/src/views/main/CommondbCarrierList/index.vue
@@ -39,7 +39,7 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="546" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="50" fixed="left"></vxe-column>
         <vxe-column
           v-for="item in columns"
@@ -57,13 +57,21 @@
           </template>
         </vxe-column>
       </vxe-table>
+      <vxe-pager
+        :current-page="queryParam.PageNo"
+        :page-size="queryParam.PageSize"
+        :total="queryParam.totalCount"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange1"
+      >
+      </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
   </div>
 </template>
 <script>
-import { CommondbCarrierList } from '@/api/modular/main/CommondbCarrierList'
+import { CommondbPageCarrierList } from '@/api/modular/main/CommondbCarrierList'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -80,9 +88,11 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0,
+        SortField: 'sort',
+        descSort: true
       },
       ColumnsQuery: [],
       columns: [
@@ -123,7 +133,7 @@ export default {
           dataIndex: 'remark'
         }
       ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      tstyle: { 'padding-top': '12px', 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       CodeData: [],
@@ -137,6 +147,11 @@ export default {
     this.init()
   },
   methods: {
+    handlePageChange1({ currentPage, pageSize }) {
+      this.queryParam.PageNo = currentPage
+      this.queryParam.PageSize = pageSize
+      this.FnGetData()
+    },
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
@@ -147,9 +162,10 @@ export default {
     },
     FnGetData() {
       this.loading = true
-      CommondbCarrierList(this.queryParam).then(res => {
+      CommondbPageCarrierList(this.queryParam).then(res => {
         if (res.code == 200) {
-          this.loadData = res.data
+          this.loadData = res.data.items
+          this.queryParam.totalCount = res.data.totalCount
         } else {
           this.loadData = []
           this.$message.warning(res.message)
diff --git a/src/views/main/CommondbForwarder/index.vue b/src/views/main/CommondbForwarder/index.vue
index e9d0169..15b8a23 100644
--- a/src/views/main/CommondbForwarder/index.vue
+++ b/src/views/main/CommondbForwarder/index.vue
@@ -39,7 +39,7 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="546" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="50" fixed="left"></vxe-column>
         <vxe-column
           v-for="item in columns"
@@ -57,13 +57,21 @@
           </template>
         </vxe-column>
       </vxe-table>
+      <vxe-pager
+        :current-page="queryParam.PageNo"
+        :page-size="queryParam.PageSize"
+        :total="queryParam.totalCount"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange1"
+      >
+      </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
   </div>
 </template>
 <script>
-import { CommondbList } from '@/api/modular/main/CommondbForwarder'
+import { CommondbPageList } from '@/api/modular/main/CommondbForwarder'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -80,9 +88,11 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0,
+        SortField: 'sort',
+        descSort: true
       },
       ColumnsQuery: [],
       columns: [
@@ -117,7 +127,7 @@ export default {
           dataIndex: 'remark'
         }
       ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      tstyle: { 'padding-top': '12px', 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       CodeData: [],
@@ -131,6 +141,11 @@ export default {
     this.init()
   },
   methods: {
+    handlePageChange1({ currentPage, pageSize }) {
+      this.queryParam.PageNo = currentPage
+      this.queryParam.PageSize = pageSize
+      this.FnGetData()
+    },
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
@@ -141,9 +156,10 @@ export default {
     },
     FnGetData() {
       this.loading = true
-      CommondbList(this.queryParam).then(res => {
+      CommondbPageList(this.queryParam).then(res => {
         if (res.code == 200) {
-          this.loadData = res.data
+          this.loadData = res.data.items
+          this.queryParam.totalCount = res.data.totalCount
         } else {
           this.loadData = []
           this.$message.warning(res.message)
diff --git a/src/views/main/CommondbPortload/index.vue b/src/views/main/CommondbPortload/index.vue
index 0555c0d..7e168e8 100644
--- a/src/views/main/CommondbPortload/index.vue
+++ b/src/views/main/CommondbPortload/index.vue
@@ -39,7 +39,7 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="546" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="50" fixed="left"></vxe-column>
         <vxe-column
           v-for="item in columns"
@@ -57,13 +57,21 @@
           </template>
         </vxe-column>
       </vxe-table>
+      <vxe-pager
+        :current-page="queryParam.PageNo"
+        :page-size="queryParam.PageSize"
+        :total="queryParam.totalCount"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange1"
+      >
+      </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
   </div>
 </template>
 <script>
-import { CommondbList } from '@/api/modular/main/CommondbPortload'
+import { CommondbPageList } from '@/api/modular/main/CommondbPortload'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -80,9 +88,11 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0,
+        SortField: 'sort',
+        descSort: true
       },
       ColumnsQuery: [],
       columns: [
@@ -123,7 +133,7 @@ export default {
           dataIndex: 'description'
         }
       ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      tstyle: { 'padding-top': '12px', 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       CodeData: [],
@@ -137,6 +147,11 @@ export default {
     this.init()
   },
   methods: {
+    handlePageChange1({ currentPage, pageSize }) {
+      this.queryParam.PageNo = currentPage
+      this.queryParam.PageSize = pageSize
+      this.FnGetData()
+    },
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
@@ -147,9 +162,10 @@ export default {
     },
     FnGetData() {
       this.loading = true
-      CommondbList(this.queryParam).then(res => {
+      CommondbPageList(this.queryParam).then(res => {
         if (res.code == 200) {
-          this.loadData = res.data
+          this.loadData = res.data.items
+          this.queryParam.totalCount = res.data.totalCount
         } else {
           this.loadData = []
           this.$message.warning(res.message)
diff --git a/src/views/main/CommondbVessel/index.vue b/src/views/main/CommondbVessel/index.vue
index 6d1f3c2..a4e7079 100644
--- a/src/views/main/CommondbVessel/index.vue
+++ b/src/views/main/CommondbVessel/index.vue
@@ -39,7 +39,7 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="546" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="50" fixed="left"></vxe-column>
         <vxe-column
           v-for="item in columns"
@@ -57,13 +57,21 @@
           </template>
         </vxe-column>
       </vxe-table>
+      <vxe-pager
+        :current-page="queryParam.PageNo"
+        :page-size="queryParam.PageSize"
+        :total="queryParam.totalCount"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange1"
+      >
+      </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
   </div>
 </template>
 <script>
-import { CommondbList } from '@/api/modular/main/CommondbVessel'
+import { CommondbPageList } from '@/api/modular/main/CommondbVessel'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -80,9 +88,11 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0,
+        SortField: 'sort',
+        descSort: true
       },
       ColumnsQuery: [],
       columns: [
@@ -111,7 +121,7 @@ export default {
           dataIndex: 'remark'
         }
       ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      tstyle: { 'padding-top': '12px', 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       CodeData: [],
@@ -125,6 +135,11 @@ export default {
     this.init()
   },
   methods: {
+    handlePageChange1({ currentPage, pageSize }) {
+      this.queryParam.PageNo = currentPage
+      this.queryParam.PageSize = pageSize
+      this.FnGetData()
+    },
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
@@ -135,9 +150,10 @@ export default {
     },
     FnGetData() {
       this.loading = true
-      CommondbList(this.queryParam).then(res => {
+      CommondbPageList(this.queryParam).then(res => {
         if (res.code == 200) {
-          this.loadData = res.data
+          this.loadData = res.data.items
+          this.queryParam.totalCount = res.data.totalCount
         } else {
           this.loadData = []
           this.$message.warning(res.message)
diff --git a/src/views/main/CommondbVessellist/index.vue b/src/views/main/CommondbVessellist/index.vue
index 83260e4..d9534fb 100644
--- a/src/views/main/CommondbVessellist/index.vue
+++ b/src/views/main/CommondbVessellist/index.vue
@@ -66,7 +66,7 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="546" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="40" fixed="left"></vxe-column>
         <vxe-column
           v-for="item in columns"
@@ -88,13 +88,21 @@
           </template>
         </vxe-column>
       </vxe-table>
+      <vxe-pager
+        :current-page="queryParam.PageNo"
+        :page-size="queryParam.PageSize"
+        :total="queryParam.totalCount"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange1"
+      >
+      </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
   </div>
 </template>
 <script>
-import { CommondbMappingvessellist, commondbVessellist } from '@/api/modular/main/CommondbVessellist'
+import { CommondbPageMappingvessellist, commondbVessellist } from '@/api/modular/main/CommondbVessellist'
 import { commondbModules } from '@/api/modular/main/ShippingCompanyMapping'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
@@ -112,9 +120,11 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0,
+        SortField: 'sort',
+        descSort: true
       },
       ColumnsQuery: [],
       columns: [
@@ -143,7 +153,7 @@ export default {
           dataIndex: 'remark'
         }
       ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      tstyle: { 'padding-top': '12px', 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       CodeData: [],
@@ -156,6 +166,11 @@ export default {
     this.init()
   },
   methods: {
+    handlePageChange1({ currentPage, pageSize }) {
+      this.queryParam.PageNo = currentPage
+      this.queryParam.PageSize = pageSize
+      this.FnGetData()
+    },
     handleSearch(data) {
       commondbVessellist({ Name: data }).then(res => {
         this.WCodeData = res.data
@@ -197,9 +212,10 @@ export default {
     FnGetData() {
       if (this.queryParam.module) {
         this.loading = true
-        CommondbMappingvessellist(this.queryParam).then(res => {
+        CommondbPageMappingvessellist(this.queryParam).then(res => {
           if (res.code == 200) {
-            this.loadData = res.data
+            this.loadData = res.data.items
+            this.queryParam.totalCount = res.data.totalCount
           } else {
             this.loadData = []
             this.$message.warning(res.message)
diff --git a/src/views/main/CommondbYard/index.vue b/src/views/main/CommondbYard/index.vue
index f5f61a1..332dd81 100644
--- a/src/views/main/CommondbYard/index.vue
+++ b/src/views/main/CommondbYard/index.vue
@@ -39,7 +39,7 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="546" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="50" fixed="left"></vxe-column>
         <vxe-column
           v-for="item in columns"
@@ -57,13 +57,21 @@
           </template>
         </vxe-column>
       </vxe-table>
+      <vxe-pager
+        :current-page="queryParam.PageNo"
+        :page-size="queryParam.PageSize"
+        :total="queryParam.totalCount"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange1"
+      >
+      </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
   </div>
 </template>
 <script>
-import { CommondbList } from '@/api/modular/main/CommondbYard'
+import { CommondbPageList } from '@/api/modular/main/CommondbYard'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 export default {
@@ -80,9 +88,11 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0,
+        SortField: 'sort',
+        descSort: true
       },
       ColumnsQuery: [],
       columns: [
@@ -117,7 +127,7 @@ export default {
           dataIndex: 'remark'
         }
       ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      tstyle: { 'padding-top': '12px', 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       CodeData: [],
@@ -131,6 +141,11 @@ export default {
     this.init()
   },
   methods: {
+    handlePageChange1({ currentPage, pageSize }) {
+      this.queryParam.PageNo = currentPage
+      this.queryParam.PageSize = pageSize
+      this.FnGetData()
+    },
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
@@ -141,9 +156,10 @@ export default {
     },
     FnGetData() {
       this.loading = true
-      CommondbList(this.queryParam).then(res => {
+      CommondbPageList(this.queryParam).then(res => {
         if (res.code == 200) {
-          this.loadData = res.data
+          this.loadData = res.data.items
+          this.queryParam.totalCount = res.data.totalCount
         } else {
           this.loadData = []
           this.$message.warning(res.message)
diff --git a/src/views/main/CommondbYardlist/index.vue b/src/views/main/CommondbYardlist/index.vue
index 2f1d319..39765d5 100644
--- a/src/views/main/CommondbYardlist/index.vue
+++ b/src/views/main/CommondbYardlist/index.vue
@@ -48,7 +48,7 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="546" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="40" fixed="left"></vxe-column>
         <vxe-column
           v-for="item in columns"
@@ -70,13 +70,21 @@
           </template>
         </vxe-column>
       </vxe-table>
+      <vxe-pager
+        :current-page="queryParam.PageNo"
+        :page-size="queryParam.PageSize"
+        :total="queryParam.totalCount"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange1"
+      >
+      </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
   </div>
 </template>
 <script>
-import { CommondbMappingyardlist, commondbYardlist } from '@/api/modular/main/CommondbYardlist'
+import { CommondbPageMappingyardlist, commondbYardlist } from '@/api/modular/main/CommondbYardlist'
 import { commondbModules } from '@/api/modular/main/ShippingCompanyMapping'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
@@ -94,9 +102,11 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0,
+        SortField: 'sort',
+        descSort: true
       },
       ColumnsQuery: [],
       columns: [
@@ -131,7 +141,7 @@ export default {
           dataIndex: 'remark'
         }
       ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      tstyle: { 'padding-top': '12px', 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       CodeData: [],
@@ -144,6 +154,11 @@ export default {
     this.init()
   },
   methods: {
+    handlePageChange1({ currentPage, pageSize }) {
+      this.queryParam.PageNo = currentPage
+      this.queryParam.PageSize = pageSize
+      this.FnGetData()
+    },
     handleSearch(data) {
       commondbYardlist({ Name: data }).then(res => {
         this.WCodeData = res.data
@@ -186,9 +201,10 @@ export default {
     FnGetData() {
       if (this.queryParam.module) {
         this.loading = true
-        CommondbMappingyardlist(this.queryParam).then(res => {
+        CommondbPageMappingyardlist(this.queryParam).then(res => {
           if (res.code == 200) {
-            this.loadData = res.data
+            this.loadData = res.data.items
+            this.queryParam.totalCount = res.data.totalCount
           } else {
             this.loadData = []
             this.$message.warning(res.message)
diff --git a/src/views/main/ShippingCompanyMapping/index.vue b/src/views/main/ShippingCompanyMapping/index.vue
index 96b6eec..881a8de 100644
--- a/src/views/main/ShippingCompanyMapping/index.vue
+++ b/src/views/main/ShippingCompanyMapping/index.vue
@@ -48,7 +48,7 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="546" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="40" fixed="left"></vxe-column>
         <vxe-column
           v-for="item in columns"
@@ -70,6 +70,14 @@
           </template>
         </vxe-column>
       </vxe-table>
+      <vxe-pager
+        :current-page="queryParam.PageNo"
+        :page-size="queryParam.PageSize"
+        :total="queryParam.totalCount"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange1"
+      >
+      </vxe-pager>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
     </a-card>
@@ -77,7 +85,7 @@
 </template>
 <script>
 import {
-  CommondbMappingcarrierlist,
+  CommondbPageMappingcarrierlist,
   commondbCarrierlist,
   commondbModules
 } from '@/api/modular/main/ShippingCompanyMapping'
@@ -99,9 +107,11 @@ export default {
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
+        PageNo: 1,
+        PageSize: 10,
+        totalCount: 0,
+        SortField: 'sort',
+        descSort: true
       },
       ColumnsQuery: [],
       columns: [
@@ -136,7 +146,7 @@ export default {
           dataIndex: 'remark'
         }
       ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      tstyle: { 'padding-top': '12px', 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: [],
       CodeData: [],
@@ -149,6 +159,11 @@ export default {
     this.init()
   },
   methods: {
+    handlePageChange1({ currentPage, pageSize }) {
+      this.queryParam.PageNo = currentPage
+      this.queryParam.PageSize = pageSize
+      this.FnGetData()
+    },
     handleSearch(data) {
       commondbCarrierlist({ cnName: data }).then(res => {
         this.WCodeData = res.data
@@ -191,9 +206,10 @@ export default {
     FnGetData() {
       if (this.queryParam.module) {
         this.loading = true
-        CommondbMappingcarrierlist(this.queryParam).then(res => {
+        CommondbPageMappingcarrierlist(this.queryParam).then(res => {
           if (res.code == 200) {
-            this.loadData = res.data
+            this.loadData = res.data.items
+            this.queryParam.totalCount = res.data.totalCount
           } else {
             this.loadData = []
             this.$message.warning(res.message)