From c28c70146740a2ef23761e5b6403277298a5544b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 12 Aug 2022 09:04:42 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=86=E5=BA=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E5=92=8C=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=88=B7=E6=96=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/invWarehouse.vue        | 36 ++++++++++++++++---------
 src/views/business/stockOrderDelete.vue |  9 -------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 784f22e..72716b4 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -829,10 +829,10 @@ export default {
             pidData: {},
             deleteLoading: false,
             uploadFileUrl: null,
-            userData: null,
-            bussinessTypeData: null,
-            userList: null,
-            bussinessTypeList: null,
+            userData: [],
+            bussinessTypeData: [],
+            userList: [],
+            bussinessTypeList: [],
             userFormVisible: false,
             currentCode: null,
             superRow: null,
@@ -1401,13 +1401,18 @@ export default {
                 if (res.code === 20000) {
                     this.userFormVisible = false;
                     this.$message.success("添加成功");
-                    let loadParam = {
-                        code: this.currentCode
-                    };
+                    this.userQuery = {
+                        code: this.currentCode,
+                        page: 1,
+                        limit: 10
+                    }
                     //重新加载数据
-                    warehouseUserList(loadParam).then((res) => {
-                        this.userData = res.data;
+                    warehouseUserList(this.userQuery).then((res) => {
+                        this.userData = res.data.list;
+                        this.userTotal = res.data.total;
                     }).catch((error) => {
+                        this.userData = [];
+                        this.userTotal = 0;
                     });
                 } else {
                     this.$message.error(res.message);
@@ -1456,12 +1461,17 @@ export default {
                 saveWarehouseBussinessType(query).then((res) => {
                     this.$message.success("添加成功");
                     //重新加载数据表格
-                    let loadParam = {
-                        code: this.currentCode
+                    this.busQuery = {
+                        code: this.currentCode,
+                        page: 1,
+                        limit: 10
                     }
-                    warehouseBussinessTypeList(loadParam).then((res) => {
-                        this.bussinessTypeData = res.data;
+                    warehouseBussinessTypeList(this.busQuery).then((res) => {
+                        this.bussinessTypeData = res.data.list;
+                        this.busTotal = res.data.total;
                     }).catch((error) => {
+                        this.bussinessTypeData = [];
+                        this.busTotal = 0;
                     });
                 }).catch((error) => {
                 });
diff --git a/src/views/business/stockOrderDelete.vue b/src/views/business/stockOrderDelete.vue
index 8edddda..cc68ce4 100644
--- a/src/views/business/stockOrderDelete.vue
+++ b/src/views/business/stockOrderDelete.vue
@@ -109,15 +109,6 @@
                     </template>
                 </el-table-column>
             </el-table>
-
-            <el-pagination
-                :page-size="query.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="query.page"
-            >
-            </el-pagination>
         </el-card>
 
         <el-card class="el-card" v-if="true">