From 9f7cf75456bee2237dc811e8a92eb47e70ba21fa Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 25 Feb 2023 22:17:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E5=85=A5=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE=EF=BC=8C=E9=80=89=E5=85=A5?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/busType/bussinessTypeModify.vue | 6 +- src/views/inout/DialogSelectReceiveOrder.vue | 724 +++++++++--------- src/views/inout/DialogSelectThrOrder.vue | 269 ++++--- .../{thrOrderNew.vue => DialogNewReceive.vue} | 0 src/views/inout/receive/receiveAdd.vue | 2 +- 5 files changed, 525 insertions(+), 476 deletions(-) rename src/views/inout/receive/{thrOrderNew.vue => DialogNewReceive.vue} (100%) diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 19f0a8f2..675789c5 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -116,17 +116,19 @@ {{ item.name }} {{ - item.action + item.thirdSysName }} diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue index 8481063a..2d2a5e30 100644 --- a/src/views/inout/DialogSelectReceiveOrder.vue +++ b/src/views/inout/DialogSelectReceiveOrder.vue @@ -1,129 +1,144 @@ @@ -382,10 +412,10 @@ export default { diff --git a/src/views/inout/DialogSelectThrOrder.vue b/src/views/inout/DialogSelectThrOrder.vue index 76ab0345..54cc575e 100644 --- a/src/views/inout/DialogSelectThrOrder.vue +++ b/src/views/inout/DialogSelectThrOrder.vue @@ -2,76 +2,89 @@
- + - - - - - - - - - - {{ item.name }} - {{ - item.thirdSysName - }} - - - - - 单据日期: - - - - - - - 查询 - 确定 - + + + + + + + + + + + + + + {{ item.name }} + {{ + item.thirdSysName + }} + + + + + + + + + - - + + + +
+ + 显示/隐藏搜索栏 + + 重置 + + 查询 + 确定 + + +
+ @@ -82,11 +95,11 @@
@@ -106,17 +119,17 @@ + v-if="storageVisible" + title="请选择单据所属仓库信息" + :close-on-click-modal="false" + :close-on-press-escape="false" + append-to-body + :visible.sync="storageVisible"> @@ -156,6 +169,7 @@ export default { type: 0, customerId: null, }, + showSearch: true, detailList: [], storageVisible: false, dataList: [], @@ -255,23 +269,23 @@ export default { } this.listQuery.customerId = store.getters.customerId; getCloudErp(this.listQuery) - .then((response) => { - console.log(response) - this.loading = false; - if (response.code === 20000) { - this.dataList = response.data.list || []; - this.pageTotal = response.data.total || 0; - } else { - this.$message.error(response.message); + .then((response) => { + console.log(response) + this.loading = false; + if (response.code === 20000) { + this.dataList = response.data.list || []; + this.pageTotal = response.data.total || 0; + } else { + this.$message.error(response.message); + this.dataList = []; + this.pageTotal = 0; + } + }) + .catch(() => { + this.loading = false; this.dataList = []; this.pageTotal = 0; - } - }) - .catch(() => { - this.loading = false; - this.dataList = []; - this.pageTotal = 0; - }); + }); }, intentBack() { this.closeDialog(); @@ -290,17 +304,20 @@ export default { invWarehouseCode: this.currentRow.invWarehouseCode, } addStockOrder(tQuery) - .then((response) => { - if (response.code === 20000) { - this.closeDialog(); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { - }); + .then((response) => { + if (response.code === 20000) { + this.closeDialog(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); } }, + hideSearch() { + this.showSearch = !this.showSearch; + }, submitFind() { this.listQuery.page = 1; this.getList(); @@ -312,16 +329,16 @@ export default { locStorageCode: this.curLocInv, } addStockOrder(tQuery) - .then((response) => { - if (response.code === 20000) { - this.storageVisible = false; - this.closeDialog(); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { - }); + .then((response) => { + if (response.code === 20000) { + this.storageVisible = false; + this.closeDialog(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + }); }, handleSelectionUdiChange(val) { @@ -333,23 +350,23 @@ export default { enabled: true, }; getOriginBusType(query) - .then((response) => { - this.originTypes = response.data.list || []; - }) - .catch(() => { - }); + .then((response) => { + this.originTypes = response.data.list || []; + }) + .catch(() => { + }); }, getStorage(event) { this.storageList = []; filterAllByUser() - .then((response) => { - this.storageList = response.data || []; - if (this.storageList.length == 1) { - this.curLocInv = this.storageList[0].code; - } - }) - .catch(() => { - }); + .then((response) => { + this.storageList = response.data || []; + if (this.storageList.length == 1) { + this.curLocInv = this.storageList[0].code; + } + }) + .catch(() => { + }); }, diff --git a/src/views/inout/receive/thrOrderNew.vue b/src/views/inout/receive/DialogNewReceive.vue similarity index 100% rename from src/views/inout/receive/thrOrderNew.vue rename to src/views/inout/receive/DialogNewReceive.vue diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue index f472ca93..080c1795 100644 --- a/src/views/inout/receive/receiveAdd.vue +++ b/src/views/inout/receive/receiveAdd.vue @@ -128,7 +128,7 @@ import {getOriginBusType} from "@/api/basic/busOriginType"; import {delReceive} from "@/api/thrsys/thrOrderReceive"; import {filterDetailByKey} from "@/api/basic/basicThirdSys"; import {selectIp} from "@/api/param/systemParamConfig"; -import thrOrderNew from "./thrOrderNew"; +import thrOrderNew from "./DialogNewReceive"; import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder"; export default {