From 4e7a6ae099b3ff04fbab8c409f0c3d72affd8cde Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 14 Mar 2022 22:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8Bbug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=20=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=89=93=E5=8D=B0bug=E4=BF=AE=E5=A4=8D=EF=BC=9B=20?= =?UTF-8?q?=E4=BB=93=E5=BA=93=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BussinessType.vue | 3 +- src/views/basic/BussinessTypeLocl.vue | 554 +++++++++--------- src/views/basic/BussinessTypeLoclModify.vue | 16 +- src/views/basic/BussinessTypeModify.vue | 9 +- src/views/basic/invWarehouse.vue | 138 +++-- src/views/warehouse/IOCheckErrOrder.vue | 25 +- src/views/warehouse/IONewOrder.vue | 23 + src/views/warehouse/IOSearchOrder.vue | 30 +- src/views/warehouse/IOWaitOrder.vue | 24 + src/views/warehouse/addOrder.vue | 14 +- src/views/warehouse/stockHospOrderNew.vue | 120 ++-- .../warehouse/stockOrderNewDistribution.vue | 84 +-- 12 files changed, 571 insertions(+), 469 deletions(-) diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index 624df4d..37f42b7 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -87,7 +87,7 @@ -
- - - - - - - - - - - - - - - - 查询 - 新增 - - +
+ + + + + + + + + + + + + + + + 查询 + 新增 + + - - + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - -
- 提交 - - 取消 - -
- + + +
+ 提交 + + 取消 + +
+ - - -
- 提交 - - 取消 - -
- - -
+ + +
+ 提交 + + 取消 + +
+ + +
diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue index c5a821b..a12ca6d 100644 --- a/src/views/basic/BussinessTypeLoclModify.vue +++ b/src/views/basic/BussinessTypeLoclModify.vue @@ -84,7 +84,7 @@
+ :disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn'"> 缺量自动补单
@@ -98,7 +98,6 @@
- @@ -266,10 +265,12 @@ export default { if (this.inputQuery.changeEnable) { this.visibleChange = true; } - if (this.changeList.length == 0) - this.changeEnable = false; - else - this.changeEnable = true; + + this.changeEnable = true; + // if (this.changeList.length == 0) + // this.changeEnable = false; + // else + // this.changeEnable = true; } else { // this.$message.error(response.message); @@ -289,8 +290,7 @@ export default { }) .catch(() => { }); - this.getBusTypes(null); - + this.getBusTypes(); }, getBusTypes() { diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 013ac59..302f7e6 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -36,7 +36,6 @@
出入库类型: 
- @@ -268,13 +267,13 @@
- 手持终端未校验单据 + 手持终端未校验单据
- 手持终端已校验单据 + 手持终端已校验单据
@@ -309,10 +308,9 @@ import { } from "../../api/basic/basicThirdSys"; import { - getLocalBusType, getLocalJoinNoUse + getLocalJoinNoUse } from "../../api/basic/busLocalType"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; -import {getJoinBussinessType} from "../../api/basic/bussinessType"; import {getCandidateBussinessType} from "../../api/receipts/bussinessType"; export default { @@ -329,6 +327,7 @@ export default { filterQuery: { enabled: true, isBuType: true, + isFilterBind: true, }, storageList: [], orderTypeList: [], diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 1c1019e..a957d6b 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -116,73 +116,6 @@ - -
- -
- 添加用户 -
- - - - - - - - - - - - - - - -
- 添加单据类型 -
- - - - - - - -
- - @@ -194,7 +127,70 @@ - +
+ +
+ 添加用户 +
+ + + + + + + + + + + + + + + +
+ 添加单据类型 +
+ + + + + + + +
- - + +
@@ -236,7 +231,6 @@ :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="bussinessTypeFormVisible" - class="dialog" > - + + + + {{ item.name }} + + + 创建日期: { + this.storageList = response.data || []; + }) + .catch(() => { + }); + }, getBusType() { let query = { enabled: true, @@ -1190,6 +1212,7 @@ export default { }, created() { + this.getStorage(); this.getBusType(); let query = this.$route.query; this.query = Object.assign(this.query, query); diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue index fe04356..081b45f 100644 --- a/src/views/warehouse/IONewOrder.vue +++ b/src/views/warehouse/IONewOrder.vue @@ -25,6 +25,17 @@ + + + + {{ item.name }} + + + { }); }, + getStorage() { + this.storageList = []; + filterAllByUser() + .then((response) => { + this.storageList = response.data || []; + }) + .catch(() => { + }); + }, addOrders(row) { console.log(row) this.idQuery.id = ''; @@ -638,6 +660,7 @@ export default { }; }, created() { + this.getStorage(); this.getBusType(); let query = this.$route.query; this.filterQuery = Object.assign(this.filterQuery, query); diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue index e40f144..3c27f00 100644 --- a/src/views/warehouse/IOSearchOrder.vue +++ b/src/views/warehouse/IOSearchOrder.vue @@ -35,6 +35,18 @@ + + + {{ item.name }} + + + + 创建日期: @@ -401,6 +413,8 @@ import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf"; import selectErpOrder from "./DialogSelectErpOrder"; import {getBussinessType} from "../../api/basic/bussinessType"; import {formatDate} from "../../utils/date"; +import {filterAllByUser} from "@/api/basic/invWarehouse"; + const formJson = { site_id: "", site_name: "", @@ -448,6 +462,7 @@ export default { unitlist: [], list: [], detailList: [], + storageList: [], unitUpdateQuery: { id: "", fromCorpId: "", @@ -589,7 +604,15 @@ export default { console.log(val); this.multipleSelection = val; }, - + getStorage() { + this.storageList = []; + filterAllByUser() + .then((response) => { + this.storageList = response.data || []; + }) + .catch(() => { + }); + }, handleErrorDetail(poistion) { var mOrder = this.list[poistion]; this.errorDetail = mOrder.remark; @@ -670,8 +693,8 @@ export default { // window.open(url); this.loading = false; const eleLink = document.createElement('a'); - var timestamp=formatDate(new Date(),"yyyy-MM-dd_hh:mm") - eleLink.download = "已完成单据导出"+timestamp+".json"; + var timestamp = formatDate(new Date(), "yyyy-MM-dd_hh:mm") + eleLink.download = "已完成单据导出" + timestamp + ".json"; eleLink.style.display = 'none'; eleLink.href = url; document.body.appendChild(eleLink) @@ -924,6 +947,7 @@ export default { , created() { + this.getStorage(); this.getBusType(); let query = this.$route.query; this.query = Object.assign(this.query, query); diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue index 7cc5c29..7382220 100644 --- a/src/views/warehouse/IOWaitOrder.vue +++ b/src/views/warehouse/IOWaitOrder.vue @@ -34,6 +34,18 @@ + + + {{ item.name }} + + + + 创建日期: @@ -397,6 +409,7 @@ import successOrderExportPDFSetting from "./successOrderExportPDF"; import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf"; import selectErpOrder from "./DialogSelectErpOrder"; import {getBussinessType} from "../../api/basic/bussinessType"; +import {filterAllByUser} from "@/api/basic/invWarehouse"; const formJson = { site_id: "", @@ -497,6 +510,7 @@ export default { orderId: "", }, busTypes: [], + storageList: [], multipleSelection: [], dialogTableVisible: false, formLoading: false, @@ -932,6 +946,15 @@ export default { } } }, + getStorage() { + this.storageList = []; + filterAllByUser() + .then((response) => { + this.storageList = response.data || []; + }) + .catch(() => { + }); + }, }, filters: { statusFilterType(status) { @@ -950,6 +973,7 @@ export default { }, created() { + this.getStorage(); this.getBusType(); let query = this.$route.query; this.query = Object.assign(this.query, query); diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 526a039..755cf8d 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -71,7 +71,8 @@ - + --> - + { this.storageList = response.data || []; }) diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index 4342dbf..ffdb48b 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -64,18 +64,20 @@
- 业务类型： + 当前仓库：
+ - - + + - {{ item.localName }} + v-for="item in storageList" + :key="item.name" + :label="item.name" + :value="item.code"> + {{ item.name }} @@ -147,23 +149,25 @@
- 当前仓库： + 业务类型：
- - - + + - {{ item.name }} + v-for="item in busTypes" + :key="item.localAction" + :label="item.localName" + :value="item.localAction"> + {{ item.localName }} + +
@@ -248,44 +252,44 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1198,9 +1202,10 @@ export default { } }); }, - getBusType() { + getBusType(invCode) { let query = { enabled: true, + code: invCode, }; getLocalJoinByUser(query) .then((response) => { @@ -1248,6 +1253,7 @@ export default { console.log(item); this.formData.locStorageCode = item; this.$forceUpdate(); + this.getBusType(item); } }, filters: {}, @@ -1258,7 +1264,7 @@ export default { }; }, created() { - this.getBusType(); + this.getBusType("NOCODE"); this.getStorage(); this.formData = {}; this.codeArray = []; diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue index 5fe24fa..e1c91bb 100644 --- a/src/views/warehouse/stockOrderNewDistribution.vue +++ b/src/views/warehouse/stockOrderNewDistribution.vue @@ -74,7 +74,7 @@ - + --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1082,6 +1082,7 @@ export default { getBusType() { let query = { enabled: true, + }; getLocalJoinBusType(query) .then((response) => { @@ -1095,9 +1096,10 @@ export default { console.log("-----" + event); let query = { advanceType: this.getActionName(event), + isDefault: true, }; this.storageList = []; - filterAllByUser(query) + filterAll(query) .then((response) => { this.storageList = response.data || []; })