diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 1b56468..8870c31 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -789,8 +789,11 @@ export default { if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) { this.invQueryData = { locStorageCode: this.formData.locStorageCode, - invWarehouseCode: this.formData.invWarehouseCode, + invWarehouseCode: this.formData.invWarehouseCode }; + if (!isBlank(this.formData.unitIdFk) && this.formData.unitIdFk === this.formData.corpId) { + this.invQueryData.corpId = this.formData.corpId; + } this.selectInvProductVisible = true; } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) { diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue index 8298cc3..56ac7c2 100644 --- a/src/views/business/stockOrderNewSelectProduct.vue +++ b/src/views/business/stockOrderNewSelectProduct.vue @@ -165,8 +165,7 @@ export default { keys: [], }, dataList: [], - pageTotal: 1, - total: 1, + pageTotal: 0, currentRow: null, loading: false, udiRlDetailVisible: false, @@ -224,7 +223,7 @@ export default { nameCode: "", ggxh: null, page: 1, - limit: 20, + limit: 10, addType: 1, billType: this.data.formData.billType, corpId: this.data.formData.corpId, diff --git a/src/views/inout/IOAdditionalOrder.vue b/src/views/inout/IOAdditionalOrder.vue index 3d5d68d..87fefbf 100644 --- a/src/views/inout/IOAdditionalOrder.vue +++ b/src/views/inout/IOAdditionalOrder.vue @@ -262,19 +262,18 @@ import { orderListError, deleteByOrderId, - commitOrder, addCommitOrder, + addCommitOrder, updateUnit, } from "../../api/inout/order"; - import draggable from "vuedraggable"; import codeDetail from "./IONewCode"; import addOrder from "./IOAddOrder"; import store from "../../store"; -import {getBussinessType} from "../../api/basic/bussinessType"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {filterAllByUser} from "@/api/basic/invWarehouse"; import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {isBlank} from "@/utils/strUtil"; const formJson = { site_id: "", @@ -412,7 +411,6 @@ export default { }, selectUnit(row) { - console.log(row.id); this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.fromCorp = row.name; this.unitUpdateQuery.fromCorpId = row.erpId; @@ -432,7 +430,6 @@ export default { this.filterQuery.customerId = store.getters.customerId; orderListError(this.filterQuery) .then((response) => { - console.log(response) this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; @@ -449,7 +446,6 @@ export default { this.deleteData.id = data; deleteByOrderId(this.deleteData) .then((response) => { - if (response.code == 20000) { this.getList(); this.$message({ @@ -460,13 +456,16 @@ export default { this.$message.error("补录单据列表已不存在该扫码单据!"); this.getList(); } - }) .catch(() => { }); }, deleteDialog(rowId) { + if (isBlank(rowId)) { + this.$message.error("请选择需要删除的数据!"); + return; + } this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -503,7 +502,6 @@ export default { var corpOrderId = mOrder.remark; this.errorDetail = mOrder.remark; - console.log(corpOrderId + " " + mOrder + " " + mOrder.remark); this.dialogVisible = true; }, diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue index c67c7a5..0aad9db 100644 --- a/src/views/inventory/DialogInvProduct.vue +++ b/src/views/inventory/DialogInvProduct.vue @@ -83,6 +83,7 @@ import store from "../../store"; import {getBussinessType} from "../../api/basic/bussinessType"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; import {getStockOrderDetailInstrumentById} from "@/api/inout/stockOrder"; +import {isBlank} from "@/utils/strUtil"; export default { @@ -115,12 +116,6 @@ export default { unitFk: null, invStorageCode: null, }, - detailQuery: { - code: null, - productIdFk: null, - page: 1, - limit: 20, - }, list: [], codeDetailVisible: false, total: 0, @@ -327,6 +322,9 @@ export default { this.filterQuery.invStorageCode = this.invQueryData.locStorageCode; this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery.limit = parseInt(this.filterQuery.limit); + if (!isBlank(this.invQueryData.corpId)) { + this.filterQuery.supId = this.invQueryData.corpId; + } // 加载表格数据 this.getList(); }, diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue index 7eb0b70..1038032 100644 --- a/src/views/inventory/InvStatistics.vue +++ b/src/views/inventory/InvStatistics.vue @@ -146,7 +146,7 @@ import codeDetail from "./InvProductsDetail"; import store from "../../store"; import {getBussinessType} from "../../api/basic/bussinessType"; import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"; -import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse"; +import {filterUplLocInv} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; @@ -377,6 +377,7 @@ export default { this.getList(); this.findStorageCode(); this.getStorage(); + this.findMethod(); }, };