From 71468119e8b2a3071671eeac3126ae5d682df563 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 1 Sep 2022 16:03:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=92=8C=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8=E4=B8=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/invWarehouse.vue      | 48 +++------------------------
 src/views/business/selectThrOrder.vue |  2 +-
 2 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 7ac6e4e..5f010f7 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -307,15 +307,6 @@
                 <el-table-column label="用户名" prop="employeeName" fixed></el-table-column>
             </el-table>
 
-            <el-pagination
-                :page-size="hospitalUserQuery.limit"
-                @current-change="getHospitalUser"
-                layout="prev, pager, next"
-                :total="hospitalUserTotal"
-                :current-page="hospitalUserQuery.page"
-            >
-            </el-pagination>
-
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="userFormVisible = !userFormVisible"
                 >取消
@@ -348,15 +339,6 @@
                 <el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
             </el-table>
 
-            <el-pagination
-                :page-size="bussinessTypeQuery.limit"
-                @current-change="getBussinessType"
-                layout="prev, pager, next"
-                :total="bussinessTypeTotal"
-                :current-page="bussinessTypeQuery.page"
-            >
-            </el-pagination>
-
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="bussinessTypeFormVisible = !bussinessTypeFormVisible"
                 >取消
@@ -889,17 +871,6 @@ export default {
                 limit: 10
             },
             busTotal: 0,
-            hospitalUserQuery: {
-                page: 1,
-                limit: 10
-            },
-            hospitalUserTotal: 0,
-            bussinessTypeQuery: {
-                enabled: true,
-                page: 1,
-                limit: 100
-            },
-            bussinessTypeTotal: 0,
             curSeleUser: null,
         };
     },
@@ -1332,21 +1303,16 @@ export default {
                 this.$message.error("请先选择当前分库！")
             } else {
                 this.userFormVisible = true;
-                this.hospitalUserQuery.page = 1;
                 this.getHospitalUser();
             }
         },
         cancelRelBusDiaolog() {
             this.relBusUserVisile = false;
         },
-        getHospitalUser(val) {
-            if (val != null) {
-                this.hospitalUserQuery.page = val;
-            }
-            getHospitalUserList(this.hospitalUserQuery).then((res) => {
+        getHospitalUser() {
+            getHospitalUserList().then((res) => {
                 this.selectUserList = [];
-                this.userList = res.data.list;
-                this.hospitalUserTotal = res.data.total;
+                this.userList = res.data;
                 var that = this;
                 that.$nextTick(() => {
                     if (that.$refs.checkUserList) {
@@ -1362,11 +1328,8 @@ export default {
                 })
             });
         },
-        getBussinessType(val) {
-            if (val != null) {
-                this.bussinessTypeQuery.page = val;
-            }
-            getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
+        getBussinessType() {
+            getJoinBussinessType().then((res) => {
                 this.selectBussinessTypeList = [];
                 this.bussinessTypeList = res.data.list;
 
@@ -1453,7 +1416,6 @@ export default {
                 this.$message.error("请先选择当前分库！")
             } else {
                 this.bussinessTypeFormVisible = true;
-                this.bussinessTypeQuery.page = 1;
                 this.getBussinessType();
             }
         },
diff --git a/src/views/business/selectThrOrder.vue b/src/views/business/selectThrOrder.vue
index fa08c4b..c10eea9 100644
--- a/src/views/business/selectThrOrder.vue
+++ b/src/views/business/selectThrOrder.vue
@@ -124,7 +124,7 @@ import store from "../../store";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 
-import selectInvDialog from "./DialogSelectInv";
+import selectInvDialog from "../inout/DialogSelectInv";
 
 export default {
     name: "closeDialog",