1.修复分库添加用户和单据类型数据未刷新问题

2.修复分页导致搜索无数据问题

src/views/basic/invWarehouse.vue

@@ -825,8 +825,8 @@ export default {
             pidData: {},
             deleteLoading: false,
             uploadFileUrl: null,
-            userData: null,
+            userData: [],
-            bussinessTypeData: null,
+            bussinessTypeData: [],
             userList: null,
             bussinessTypeList: null,
             userFormVisible: false,
@@ -1400,13 +1400,18 @@ export default {
                 if (res.code === 20000) {
                     this.userFormVisible = false;
                     this.$message.success("添加成功");
-                    let loadParam = {
+                    this.userQuery = {
-                        code: this.currentCode
+                        code: this.currentCode,
-                    };
+                        page: 1,
+                        limit: 10
+                    }
                     //重新加载数据
-                    warehouseUserList(loadParam).then((res) => {
+                    warehouseUserList(this.userQuery).then((res) => {
-                        this.userData = res.data;
+                        this.userData = res.data.list;
+                        this.userTotal = res.data.total;
                     }).catch((error) => {
+                        this.userData = [];
+                        this.userTotal = 0;
                     });
                 } else {
                     this.$message.error(res.message);
@@ -1455,12 +1460,17 @@ export default {
                 saveWarehouseBussinessType(query).then((res) => {
                     this.$message.success("添加成功");
                     //重新加载数据表格
-                    let loadParam = {
+                    this.busQuery = {
-                        code: this.currentCode
+                        code: this.currentCode,
+                        page: 1,
+                        limit: 10
                     }
-                    warehouseBussinessTypeList(loadParam).then((res) => {
+                    warehouseBussinessTypeList(this.busQuery).then((res) => {
-                        this.bussinessTypeData = res.data;
+                        this.bussinessTypeData = res.data.list;
+                        this.busTotal = res.data.total;
                     }).catch((error) => {
+                        this.bussinessTypeData = [];
+                        this.busTotal = 0;
                     });
                 }).catch((error) => {
                 });

src/views/warehouse/DialogcChangeNewOrder.vue

@@ -226,6 +226,7 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {submitOrderWeb} from "@/api/warehouse/order";
 import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     name: "DialogcChangeNewOrder",
@@ -432,7 +433,12 @@ export default {
         storageChange(row) {
             this.formData.fromCorpId = row.code;
             this.formData.fromCorp = row.name;
+            if (isBlank(this.formData.fromCorp)) {
+                this.fromSubStorageOptions = [];
+                this.formData.fromSubInvCode = null;
+            } else {
                 this.findSubStorageMethod();
+            }
         },
 
         unitChange(row) {
@@ -441,7 +447,8 @@ export default {
         },
         actionChange(item) {
             this.curAction = this.getActionItem(item);
-            // this.formData.locStorageCode = this.curAction.storageCode;
+            this.formData.fromCorp = null;
+            this.formData.fromSubInvCode = null;
             this.findMethod();
         },
         getActionItem(action) {

src/views/warehouse/IOWaitOrder.vue

@@ -1010,7 +1010,6 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.getSubInvList();
                         this.getList();
                     }
                 })

src/views/warehouse/errorCode.vue

@@ -52,7 +52,7 @@
             ></el-table-column>
             <el-table-column
                 label="供应商"
-                prop="supId"
+                prop="supName"
                 show-overflow-tooltip
             ></el-table-column>
             <el-table-column

src/views/warehouse/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">
@@ -298,9 +289,9 @@
                     "8": "平衡补录单据",
                 },
                 erpCheckStatus: {
-                    1: "已完成",
+                    0: "未校验",
-                    0: "已完成",
+                    1: "失败",
-                    2: "已完成",
+                    2: "成功",
                 },
                 isSp: store.getters.customerId,
                 detailFormData: {},

src/views/warehouse/stockOrderSearch.vue

@@ -467,10 +467,11 @@ import stockQRCodeExport from "./stockQRCodeExport";
 import draggable from "vuedraggable";
 import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
 import store from "../../store";
-import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
+import {getLocalJoinByUser} from "../../api/basic/busLocalType";
-import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
 import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     name: "stockOrderSearch",
@@ -948,7 +949,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.getSubInvList();
+                        // this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -958,6 +959,8 @@ export default {
         invChange() {
             this.query.invWarehouseCode = "";
             this.subInvList = [];
+
+            if (!isBlank(this.query.locStorageCode)) {
                 let query = {
                     pcode: this.query.locStorageCode
                 };
@@ -967,6 +970,9 @@ export default {
                     })
                     .catch(() => {
                     });
+            } else {
+                this.subInvList = [];
+            }
         },
 
         getSubInvList() {