From f09537dc0d813e7c95e1bca192c01b8326341f9f Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 29 Jul 2022 15:07:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=86=E4=BB=93=E5=85=B3=E8=81=94=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=92=8C=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/invWarehouse.js              |  8 +--
 src/views/basic/BasicEntrutsReceModify.vue |  4 +-
 src/views/basic/invWarehouse.vue           | 62 ++++++++++++++++++----
 src/views/userManage/param/company.vue     |  4 +-
 4 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js
index 5def803..29a7e8b 100644
--- a/src/api/basic/invWarehouse.js
+++ b/src/api/basic/invWarehouse.js
@@ -107,8 +107,8 @@ export function exportJson(query) {
 export function warehouseUserList(query) {
     return axios({
         url: '/warehouse/inout/warehouseUserList',
-        method: 'get',
-        params: query
+        method: 'post',
+        data: query
     });
 }
 
@@ -116,8 +116,8 @@ export function warehouseUserList(query) {
 export function warehouseBussinessTypeList(query) {
     return axios({
         url: '/warehouse/inout/warehouseBussniessTypeList',
-        method: 'get',
-        params: query
+        method: 'post',
+        data: query
     });
 }
 
diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index 68d9523..719a2e8 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -333,14 +333,14 @@ export default {
             //加载用户数据
             warehouseUserList(query).then((res) => {
                 this.entrustUserArray = [];
-                this.entrustUserArray = res.data;
+                this.entrustUserArray = res.data.list;
             }).catch((error) => {
                 this.$message.error("用户数据加载失败")
             });
 
             //加载单据类型数据
             warehouseBussinessTypeList(query).then((res) => {
-                this.entrustBusArray = res.data;
+                this.entrustBusArray = res.data.list;
 
             }).catch((error) => {
                 this.$message.error("单据类型数据加载失败")
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index eab86d2..7b1ba2a 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -240,6 +240,14 @@
                         </template>
                     </el-table-column>
                 </el-table>
+                <el-pagination
+                    :page-size="userQuery.limit"
+                    @current-change="handleCurrentChange"
+                    layout="prev, pager, next"
+                    :total="userTotal"
+                    :current-page="userQuery.page"
+                >
+                </el-pagination>
             </el-card>
 
             <el-card style="width: 49%; float: right; margin-left: 0px;">
@@ -278,6 +286,14 @@
                         </template>
                     </el-table-column>
                 </el-table>
+                <el-pagination
+                    :page-size="busQuery.limit"
+                    @current-change="handleCurrentChange"
+                    layout="prev, pager, next"
+                    :total="busTotal"
+                    :current-page="busQuery.page"
+                >
+                </el-pagination>
             </el-card>
         </div>
 
@@ -836,6 +852,18 @@ export default {
             configParms: {},
             subData: {},
             subFromName: "add",
+            userQuery: {
+                code: null,
+                page: 1,
+                limit: 10
+            },
+            userTotal: 0,
+            busQuery: {
+                code: null,
+                page: 1,
+                limit: 10
+            },
+            busTotal: 0
         };
     },
     methods: {
@@ -1227,19 +1255,35 @@ export default {
         },
 
         loadLinkData(row) {
-            let query = {
-                code: row.code
-            }
+            this.userQuery.page = 1;
+            this.userQuery.code = row.code;
+
+            this.busQuery.page = 1;
+            this.busQuery.code = row.code;
             //加载用户数据
-            warehouseUserList(query).then((res) => {
-                this.userData = res.data;
+            this.loadUserData();
+
+            //加载单据类型数据
+            this.loadBusData();
+        },
+        loadUserData(val) {
+            if (val != null) {
+                this.userQuery.page = val;
+            }
+            warehouseUserList(this.userQuery).then((res) => {
+                this.userData = res.data.list;
+                this.userTotal = res.data.total;
             }).catch((error) => {
                 this.$message.error("用户数据加载失败")
             });
-
-            //加载单据类型数据
-            warehouseBussinessTypeList(query).then((res) => {
-                this.bussinessTypeData = res.data;
+        },
+        loadBusData(val) {
+            if (val != null) {
+                this.busQuery.page = val;
+            }
+            warehouseBussinessTypeList(this.busQuery).then((res) => {
+                this.bussinessTypeData = res.data.list;
+                this.busTotal = res.data.total;
             }).catch((error) => {
                 this.$message.error("单据类型数据加载失败")
             });
diff --git a/src/views/userManage/param/company.vue b/src/views/userManage/param/company.vue
index 3510aa4..7c1637d 100644
--- a/src/views/userManage/param/company.vue
+++ b/src/views/userManage/param/company.vue
@@ -173,7 +173,7 @@
 </template>
 
 <script>
-import {getCompany, modifyComapny} from "../../../api/inout/company";
+import {getCompany, modifyCompany} from "../../../api/inout/company";
 
 export default {
     data() {
@@ -240,7 +240,7 @@ export default {
                 if (valid) {
                     this.loading = true;
                     // eslint-disable-next-line no-unused-vars
-                    modifyComapny(this.inputQuery).then(response => {
+                    modifyCompany(this.inputQuery).then(response => {
                         this.getData();
                         this.loading = false;
                         this.$message.success("修改成功");