diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 77c2927..fc3904d 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -825,8 +825,8 @@ export default {
pidData: {},
deleteLoading: false,
uploadFileUrl: null,
- userData: null,
- bussinessTypeData: null,
+ userData: [],
+ 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 = {
- 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);
@@ -1455,12 +1460,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/warehouse/DialogcChangeNewOrder.vue b/src/views/warehouse/DialogcChangeNewOrder.vue
index c76054c..f61548d 100644
--- a/src/views/warehouse/DialogcChangeNewOrder.vue
+++ b/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;
- this.findSubStorageMethod();
+ 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) {
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 162b6c6..fa8771b 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/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();
}
})
diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue
index 4cd3f32..f93a12f 100644
--- a/src/views/warehouse/errorCode.vue
+++ b/src/views/warehouse/errorCode.vue
@@ -52,7 +52,7 @@
>
-
-
-
@@ -298,9 +289,9 @@
"8": "平衡补录单据",
},
erpCheckStatus: {
- 1: "已完成",
- 0: "已完成",
- 2: "已完成",
+ 0: "未校验",
+ 1: "失败",
+ 2: "成功",
},
isSp: store.getters.customerId,
detailFormData: {},
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index fa85a1c..feab805 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/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 {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
+import {getLocalJoinByUser} from "../../api/basic/busLocalType";
+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,15 +959,20 @@ export default {
invChange() {
this.query.invWarehouseCode = "";
this.subInvList = [];
- let query = {
- pcode: this.query.locStorageCode
- };
- filterSubByInv(query)
- .then((response) => {
- this.subInvList = response.data || [];
- })
- .catch(() => {
- });
+
+ if (!isBlank(this.query.locStorageCode)) {
+ let query = {
+ pcode: this.query.locStorageCode
+ };
+ filterSubByInv(query)
+ .then((response) => {
+ this.subInvList = response.data || [];
+ })
+ .catch(() => {
+ });
+ } else {
+ this.subInvList = [];
+ }
},
getSubInvList() {