diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue index 2dc7e4c..780c7b3 100644 --- a/src/views/basic/UdiInfoRelevance.vue +++ b/src/views/basic/UdiInfoRelevance.vue @@ -15,55 +15,58 @@
- - - - - - - - - - - - - - - - - - - - - - {{ item.thirdName }} - {{ item.thirdId }} - - - - - 查询 - + + + + + + + + + + + + + + + + + + + + + + + + {{ item.thirdName }} + {{ item.thirdId }} + + + + + 查询 + + { - 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); @@ -1461,12 +1466,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/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue index 4633440..7d1ae03 100644 --- a/src/views/inventory/invUdiTraceOrder.vue +++ b/src/views/inventory/invUdiTraceOrder.vue @@ -142,6 +142,7 @@ :page-size="filterQuery.limit" @current-change="handleCurrentChange" layout="prev, pager, next" + :current-page="filterQuery.page" :total="total" > @@ -505,7 +506,6 @@ export default { this.getList(); }, handleSelectionChange(val) { - console.log(val); this.multipleSelection = val; }, @@ -515,7 +515,6 @@ export default { this.errDialogVisible = true; }, findMethod(query) { - console.log(query); this.fromOptions = []; let cQuery = { key: query, @@ -584,7 +583,6 @@ export default { this.loading = true; this.filterQuery.customerId = store.getters.customerId; if (!this.$isBlank(this.filterQuery.code)) { - console.log(this.filterQuery.code) let code = this.filterQuery.code; this.filterQuery.code = code.replace("\r","") } @@ -597,6 +595,9 @@ export default { this.total = response.data.total || 0; } else { this.loading = false; + this.list = []; + this.detailList = []; + this.total = 0; this.$message.error(response.message); } @@ -685,7 +686,6 @@ export default { this.successOrderExportPDFSettingVisible = true; }, successOrderExportPDF(row) { - console.log(row) let tQuery = { orderId: row.id, customerId: store.getters.customerId @@ -720,7 +720,6 @@ export default { }, selectUnit(row) { - console.log(row.id); this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.fromCorp = row.name; this.unitUpdateQuery.fromCorpId = row.unitid; @@ -892,7 +891,6 @@ export default { }, uploadOrderDialog(value) { - console.log(value.id + "---" + value.orderid); this.uploadQuery = { orderId: value.id, }; diff --git a/src/views/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue index e666587..7fbd649 100644 --- a/src/views/warehouse/DialogSelectErpOrder.vue +++ b/src/views/warehouse/DialogSelectErpOrder.vue @@ -56,10 +56,6 @@ >导入比对 - - 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 b2126b8..a7ccf62 100644 --- a/src/views/warehouse/IOWaitOrder.vue +++ b/src/views/warehouse/IOWaitOrder.vue @@ -947,7 +947,6 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.getSubInvList(); this.getList(); } }) diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 33a952d..b8c53e2 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -821,12 +821,22 @@ export default { }); } else if (response.code == 507) { - this.editTitle = response.message; this.editOriginCodeVisible = true; + this.editTitle = response.message; this.formData.produceDate = response.data.produceDate; this.formData.expireDate = response.data.expireDate; this.formData.batchNo = response.data.batchNo; this.formData.serialNo = response.data.serialNo; + + this.$message({ + type: 'error', + message: "提交失败！" + this.editTitle, + customClass: 'messageIndex' + }); + + // this.$message.error("提交失败！" + this.editTitle); + + } else { this.$alert(response.message, '提示', { confirmButtonText: '确定', @@ -1051,6 +1061,7 @@ export default { filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; + this.fromSubStorageOptions = response.data || []; if (this.subInvList != null && this.subInvList.length == 1) { this.formData.invWarehouseCode = this.subInvList[0].code; this.getBusType(); @@ -1246,7 +1257,7 @@ export default { } } this.findSubInvByInv(this.formData.locStorageCode); - this.findSubStorageMethod(); + // this.findSubStorageMethod(); this.getBusType(); @@ -1256,6 +1267,9 @@ export default {