From c28c70146740a2ef23761e5b6403277298a5544b Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 12 Aug 2022 09:04:42 +0800 Subject: [PATCH 1/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=86=E5=BA=93?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=92=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/invWarehouse.vue | 36 ++++++++++++++++--------- src/views/business/stockOrderDelete.vue | 9 ------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 784f22e..72716b4 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -829,10 +829,10 @@ export default { pidData: {}, deleteLoading: false, uploadFileUrl: null, - userData: null, - bussinessTypeData: null, - userList: null, - bussinessTypeList: null, + userData: [], + bussinessTypeData: [], + userList: [], + bussinessTypeList: [], userFormVisible: false, currentCode: null, superRow: null, @@ -1401,13 +1401,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); @@ -1456,12 +1461,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/business/stockOrderDelete.vue b/src/views/business/stockOrderDelete.vue index 8edddda..cc68ce4 100644 --- a/src/views/business/stockOrderDelete.vue +++ b/src/views/business/stockOrderDelete.vue @@ -109,15 +109,6 @@ - - - From 3613199fe48c4eea6d8317fadf877b0efaea9551 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 12 Aug 2022 16:05:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/UdiInfoRelevance.vue | 103 +++++++++--------- src/views/business/DialogcChangeNewOrder.vue | 5 + .../business/stockOrderNewDistribution.vue | 4 +- src/views/inventory/invPreInProducts.vue | 10 +- 4 files changed, 64 insertions(+), 58 deletions(-) diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue index d2f3733..63fff08 100644 --- a/src/views/basic/UdiInfoRelevance.vue +++ b/src/views/basic/UdiInfoRelevance.vue @@ -19,56 +19,59 @@
- - - - - - - - - - - - - - - - - - - - - - {{ item.thirdName }} - {{ item.thirdId }} - - - - - - 查询 - + + + + + + + + + + + + + + + + + + + + + + + + {{ item.thirdName }} + {{ item.thirdId }} + + + + + + 查询 + + - +
业务类型： @@ -164,7 +164,7 @@ - +
当前仓库： diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue index 6d2340d..2fb8981 100644 --- a/src/views/inventory/invPreInProducts.vue +++ b/src/views/inventory/invPreInProducts.vue @@ -26,11 +26,11 @@ > - {{ item.companyName }} + {{ item.name }} @@ -307,12 +307,10 @@ export default { }); }, findMethod(query) { - console.log(query); this.fromOptions = []; let cQuery = { key: query, customerName: query, - }; getBasicUnitMaintains(cQuery) .then((response) => { From 296f15a93c3f750bc8ce23e2e7cf526c696258c7 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 12 Aug 2022 18:16:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=A7=94=E6=89=98?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E8=AE=BE=E7=BD=AE=E6=96=B0=E5=A2=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=BC=83=E7=94=A8=E5=88=A4=E6=96=AD=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BasicEntrutsRece.vue | 1 + src/views/inventory/InvProductsDetail.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index b4a2161..29362a9 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -352,6 +352,7 @@ export default { }, created() { this.getList(); + this.getSyncConfig(); }, }; diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue index 10f42f4..1a51545 100644 --- a/src/views/inventory/InvProductsDetail.vue +++ b/src/views/inventory/InvProductsDetail.vue @@ -77,7 +77,7 @@ - + From 34c50eda59e79d9074fd485c41ed7cd5a8732209 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 15 Aug 2022 16:47:26 +0800 Subject: [PATCH 4/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/stockOrderNewDistribution.vue | 5 ++++- src/views/business/stockOrderNewSelectProduct.vue | 5 ++--- src/views/inout/IOAdditionalOrder.vue | 14 ++++++-------- src/views/inventory/DialogInvProduct.vue | 10 ++++------ src/views/inventory/InvStatistics.vue | 3 ++- 5 files changed, 18 insertions(+), 19 deletions(-) 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(); }, }; From c1711903329564610f0054f0179ac9ed9807f407 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 16 Aug 2022 15:16:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/IOAddOrder.vue | 12 +++++------- src/views/inout/IONewOrder.vue | 11 +++++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index da226c6..fd6db4e 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -437,6 +437,7 @@ import selectRlDialog from "./DialogSelectRl"; import editCodeDialog from "./editCode"; import A from "../../plugin/KeyScaner" import {deleteLog} from "@/api/basic/udiinfolog"; +import {isBlank} from "@/utils/strUtil"; export default { @@ -880,6 +881,9 @@ export default { code: this.formData.invWarehouseCode, enabled: true, }; + if (isBlank(query.code)) { + query.code = this.$store.getters.locSubInvCode; + } getLocalJoinByUser(query) .then((response) => { this.busTypes = response.data.list || []; @@ -1201,15 +1205,9 @@ export default { this.findStorageMethod(); } } - - this.findSubInvByInv(this.formData.locStorageCode); - - } - , -} -; +}; diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index 9c61421..d731b9f 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -261,8 +261,6 @@ diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index c6f35d7..4d63d47 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -106,11 +106,7 @@ - - - - - +