From b8ff5958ad735b69a7f83d28de4bd7215d8bf7b1 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 19 Mar 2024 18:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E5=8C=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/basic.js | 12 ++++++------ src/common/record.js | 6 +----- src/mycomponents/detail/comDetailCard.vue | 12 ++++++------ src/mycomponents/detail/comJobDetailCard.vue | 4 +--- src/mycomponents/location/locationCompare.vue | 6 +++--- src/mycomponents/location/requiredLocation.vue | 6 +++--- src/mycomponents/record/recordDetailCard.vue | 4 ++-- src/mycomponents/scan/winScanLocation.vue | 18 ++++++------------ .../container/record/containerBindRecord.vue | 6 ------ .../container/record/containerUnBindRecord.vue | 1 - src/pages/count/record/countRecord.vue | 9 +++------ src/pages/customerReturn/job/returnDetail.vue | 8 ++++---- .../customerReturn/record/returnRecord.vue | 13 ++++++------- .../request/customerReturnRequestCreate.vue | 14 ++++++-------- src/pages/deliver/record/deliverRecord.vue | 13 ++++++------- src/pages/inventoryMove/coms/comMove.vue | 12 ++++++------ src/pages/inventoryMove/coms/comMoveRecord.vue | 12 ++++++------ .../inventoryMove/job/inventoryMoveDetail.vue | 1 - src/pages/issue/record/issueRecord.vue | 1 - src/pages/issue/request/issueRequestCreate.vue | 1 - src/pages/issue/request/issueScanRequest.vue | 1 - .../package/record/mergePackageRecord.vue | 9 +++------ src/pages/package/record/overPackageRecord.vue | 7 +------ .../package/record/splitPackageRecord.vue | 9 +++------ src/pages/pick/job/pickJobDetail.vue | 8 ++++---- .../job/productDismantleDetail.vue | 6 +++--- .../record/productDismantleRecord.vue | 14 ++++++-------- .../job/productPutawayDetail.vue | 8 ++++---- .../record/productPutawayRecord.vue | 9 ++++----- .../request/putawayRequestCreate.vue | 12 ++++++------ .../coms/comProductDetailCard.vue | 10 +++++----- .../job/productReceiptDetail.vue | 8 ++++---- .../record/productReceiptRecord.vue | 4 ---- .../job/productionReceiptDetail.vue | 8 ++++---- .../record/productionReceiptRecord.vue | 13 ++++++------- src/pages/productionReturn/coms/comReturn.vue | 5 ++--- .../coms/comReturnDetailCard.vue | 10 +++++----- .../productionReturn/job/returnDetail.vue | 9 +++------ .../productionReturn/record/returnToHold.vue | 3 --- .../productionReturn/record/returnToStore.vue | 3 --- .../coms/comReceiptDetailCard.vue | 4 ++-- .../purchaseReceipt/job/receiptDetail.vue | 11 +++++------ .../purchaseReturn/record/returnRecord.vue | 8 +++----- .../request/returnRequestCreate.vue | 8 +++----- src/pages/putaway/job/putawayDetail.vue | 10 +++++----- src/pages/putaway/record/putawayRecord.vue | 12 ++++++------ .../putaway/request/putawayRequestCreate.vue | 12 ++++++------ .../coms/comRepleinshRequestPopup.vue | 4 ++-- src/pages/repleinsh/job/repleinshDetail.vue | 6 +++--- src/pages/repleinsh/record/repleinshRecord.vue | 11 +++-------- .../repleinsh/request/repleinshRequest.vue | 6 ------ src/pages/scrap/record/scrapRecord.vue | 11 +++++------ src/pages/scrap/request/scrapRequestCreate.vue | 11 +++++------ .../record/supplierDeliverRecordDetail.vue | 1 - .../transfer/coms/comReceiptDetailCard.vue | 12 +++++------- src/pages/transfer/coms/comTransferRecord.vue | 13 ++++++------- src/pages/transfer/job/issueDetail.vue | 8 ++++---- src/pages/transfer/job/receiptDetail.vue | 8 ++++---- src/pages/transfer/job/transferDetail.vue | 1 - src/pages/transfer/record/deliverRecord.vue | 13 ++++++------- src/pages/transfer/record/receiptRecord.vue | 9 +++------ .../unPlanned/coms/comReceiptDetailCard.vue | 6 +++--- src/pages/unPlanned/job/receiptJobDetail.vue | 8 ++++---- src/pages/unPlanned/record/issueRecord.vue | 6 +++--- src/pages/unPlanned/record/receiptRecord.vue | 10 ++++------ .../unPlanned/request/issueRequestCreate.vue | 6 +++--- 66 files changed, 221 insertions(+), 309 deletions(-) diff --git a/src/common/basic.js b/src/common/basic.js index 3288bec0..d770a26d 100644 --- a/src/common/basic.js +++ b/src/common/basic.js @@ -7,7 +7,7 @@ import { calc } from '@/common/calc' let jobStatusList = []; let itemStatusList = []; -let locationTypeList = []; +let locationAreaTypeList = []; let uomList = []; let inventoryStatusList = []; let containerTypeList = []; @@ -24,7 +24,7 @@ let inspectFailedReasonList = []; export function clearCacheData() { jobStatusList = []; itemStatusList = []; - locationTypeList = []; + locationAreaTypeList = []; uomList = []; inventoryStatusList = []; containerTypeList = []; @@ -152,11 +152,11 @@ export function getItemStateInfo(value) { //获取库位类型 export function getLocationTypeInfo(value) { var resultInfo = ""; - if (locationTypeList.length == 0) { - locationTypeList = getDirectoryInfo("location_type") + if (locationAreaTypeList.length == 0) { + locationAreaTypeList = getDirectoryInfo("location_type") } - if (locationTypeList.length > 0) { - for (let item of locationTypeList) { + if (locationAreaTypeList.length > 0) { + for (let item of locationAreaTypeList) { if (item.value == value) { resultInfo = item break; diff --git a/src/common/record.js b/src/common/record.js index cf6763c6..ab5d0c9a 100644 --- a/src/common/record.js +++ b/src/common/record.js @@ -78,10 +78,8 @@ export function getBusinessType(typeCode, callback) { let result = { success: true, businessType: '', - fromlocationTypeList: '', fromLocationAreaTypeList:'', - toAreaTypes:'', - tolocationTypeList: '', + toLocationAreaTypeList:'', itemCodeTypeList:"", useOnTheWay:"FALSE", fromInventoryStatuses: '', @@ -93,8 +91,6 @@ export function getBusinessType(typeCode, callback) { result.businessType = res.data.list[0]; result.fromLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].outAreaTypes) ; result.toLocationAreaTypeList = getDirectoryItemArray(res.data.list[0].inAreaTypes) ; - result.fromlocationTypeList = getDirectoryItemArray(res.data.list[0].outLocationTypes) - result.tolocationTypeList = getDirectoryItemArray(res.data.list[0].inLocationTypes) result.itemCodeTypeList = getDirectoryItemArray(res.data.list[0].itemTypes) result.fromInventoryStatuses = res.data.list[0].outInventoryStatuses; result.toInventoryStatuses = res.data.list[0].inInventoryStatuses; diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue index e6e2fda6..708a35d4 100644 --- a/src/mycomponents/detail/comDetailCard.vue +++ b/src/mycomponents/detail/comDetailCard.vue @@ -7,7 +7,7 @@ - + + :locationAreaTypeList="locationAreaTypeList"> @@ -47,11 +47,11 @@ props: { dataContent: { type: Object, - default: {} + default: null }, settingParam: { type: Object, - default: {} + default: null }, isShowPack: { type: Boolean, @@ -65,9 +65,9 @@ type: Boolean, default: true }, - locationTypeList: { + locationAreaTypeList: { type: Array, - default: [] + default: null }, }, watch: { diff --git a/src/mycomponents/detail/comJobDetailCard.vue b/src/mycomponents/detail/comJobDetailCard.vue index 3988d82f..7f1d1111 100644 --- a/src/mycomponents/detail/comJobDetailCard.vue +++ b/src/mycomponents/detail/comJobDetailCard.vue @@ -27,7 +27,6 @@ import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue' import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue' - import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import pack from '@/mycomponents/balance/pack.vue' import detailList from '@/mycomponents/detail/detailList.vue' import packageList from '@/mycomponents/package/packageList.vue' @@ -45,7 +44,6 @@ recommendQtyEdit, jobDetailPopup, receiptDetailInfoPopup, - winScanLocation, detailList, packageList }, @@ -58,7 +56,7 @@ type: Object, default: null }, - locationTypeList: { + locationAreaTypeList: { type: Object, default: null }, diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue index 56f3a287..00d3428b 100644 --- a/src/mycomponents/location/locationCompare.vue +++ b/src/mycomponents/location/locationCompare.vue @@ -15,7 +15,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -48,9 +48,9 @@ type: Boolean, default: true }, - locationTypeList: { + locationAreaTypeList: { type: Array, - default: [] + default: null } }, diff --git a/src/mycomponents/location/requiredLocation.vue b/src/mycomponents/location/requiredLocation.vue index ff43f421..aac2b2d7 100644 --- a/src/mycomponents/location/requiredLocation.vue +++ b/src/mycomponents/location/requiredLocation.vue @@ -14,7 +14,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -43,9 +43,9 @@ type: Boolean, default: true }, - locationTypeList: { + locationAreaTypeList: { type: Array, - default: [] + default: null } }, diff --git a/src/mycomponents/record/recordDetailCard.vue b/src/mycomponents/record/recordDetailCard.vue index afd6e57b..ecaceb37 100644 --- a/src/mycomponents/record/recordDetailCard.vue +++ b/src/mycomponents/record/recordDetailCard.vue @@ -13,7 +13,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -53,7 +53,7 @@ type: Object, default: null }, - locationTypeList: { + locationAreaTypeList: { type: Object, default: null }, diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue index 95b191c2..3b4b460d 100644 --- a/src/mycomponents/scan/winScanLocation.vue +++ b/src/mycomponents/scan/winScanLocation.vue @@ -42,7 +42,7 @@ type: String, default: '' }, - locationTypeList: { + locationAreaTypeList: { type: Array, default: null }, @@ -98,20 +98,14 @@ if (res.data.total > 0) { let result = res.data.list[0]; var type = result.type; - var areaType = "" - if(this.code=="RAW"){ - areaType="RAW" - }else { - areaType="SUPPER" - } - + var areaType = result.areaType var available = result.available; if (available == "TRUE") { - if (checkDirectoryItemExist(this.locationTypeList, areaType)) { + if (checkDirectoryItemExist(this.locationAreaTypeList, areaType)) { this.location = result; this.callBack(); } else { - var hint = getListLocationAreaTypeDesc(this.locationTypeList); + var hint = getListLocationAreaTypeDesc(this.locationAreaTypeList); this.showErrorMessage("扫描库位[" + this.code + "]是[" + getLocationAreaTypeName(areaType) + "],需要的库区是[" + hint + "]") } @@ -133,10 +127,10 @@ }, checkLocationType(type) { var isPass = false; - if (this.locationTypeList.length == 0) { + if (this.locationAreaTypeList.length == 0) { isPass = true; } else { - var temp = this.locationTypeList.filter(res => { + var temp = this.locationAreaTypeList.filter(res => { if (res == type) { return res } diff --git a/src/pages/container/record/containerBindRecord.vue b/src/pages/container/record/containerBindRecord.vue index 1a43624a..64e0d7e7 100644 --- a/src/pages/container/record/containerBindRecord.vue +++ b/src/pages/container/record/containerBindRecord.vue @@ -98,14 +98,10 @@ id: '', scanCount: 0, detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], toLocationInfo: {}, fromLocationInfo: {}, - toLocationInfo: {}, containerCode: "", containerInfo: {}, - fromlocationTypeList: [], - tolocationTypeList: [], allowModifyLocation: false, inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 @@ -130,8 +126,6 @@ getBusinessType('ContainerBind', res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.showContainerPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/container/record/containerUnBindRecord.vue b/src/pages/container/record/containerUnBindRecord.vue index 73cfdba7..c985da11 100644 --- a/src/pages/container/record/containerUnBindRecord.vue +++ b/src/pages/container/record/containerUnBindRecord.vue @@ -61,7 +61,6 @@ } from '@/common/directory.js'; import { - getBusinessType, createItemInfo, createDetailInfo, calcHandleQty diff --git a/src/pages/count/record/countRecord.vue b/src/pages/count/record/countRecord.vue index 3fe4cea1..d3dd04f6 100644 --- a/src/pages/count/record/countRecord.vue +++ b/src/pages/count/record/countRecord.vue @@ -6,7 +6,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -37,7 +37,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -98,10 +98,9 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], + locationAreaTypeList: [], toLocationInfo: {}, businessTypeInfo: {}, - fromLocationTypeArray: [], toLocationTypeArray: [], fromLocationInfo: {}, fromLocationCode: "", @@ -114,8 +113,6 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue index a53d6dd4..785c5ea2 100644 --- a/src/pages/customerReturn/job/returnDetail.vue +++ b/src/pages/customerReturn/job/returnDetail.vue @@ -6,7 +6,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -20,7 +20,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -87,7 +87,7 @@ managementList: [], fromLocationCode: "", toLocationCode: "", - tolocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"", jobToLocationCode:"" }; @@ -169,7 +169,7 @@ that.detailSource = getDataSource(that.subList) that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) } else { that.showMessage('列表数据为0'); } diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue index 45dd23fc..d9aff0f0 100644 --- a/src/pages/customerReturn/record/returnRecord.vue +++ b/src/pages/customerReturn/record/returnRecord.vue @@ -21,7 +21,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -98,12 +98,11 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], + fromLocationAreaTypeList:[], businessType: {}, fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + toLocationAreaTypeList: [], managementList: [], toWarehouseCode: '', }; @@ -113,8 +112,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/customerReturn/request/customerReturnRequestCreate.vue b/src/pages/customerReturn/request/customerReturnRequestCreate.vue index d9727036..5c92ef4d 100644 --- a/src/pages/customerReturn/request/customerReturnRequestCreate.vue +++ b/src/pages/customerReturn/request/customerReturnRequestCreate.vue @@ -34,7 +34,7 @@ @@ -49,7 +49,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -112,19 +112,17 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], businessType: {}, fromLocationCode: "", fromLocation: {}, toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], toWarehouseCode: '', customerCode: '', showCustomer: false, customerList: [], customerName: "请选择退货客户", - customerCode: "" }; }, onLoad(option) { @@ -132,8 +130,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue index b8b13599..71e76b70 100644 --- a/src/pages/deliver/record/deliverRecord.vue +++ b/src/pages/deliver/record/deliverRecord.vue @@ -35,7 +35,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -48,7 +48,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -105,11 +105,10 @@ id: '', subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], businessType: {}, customerList: [], customerText: "", @@ -124,8 +123,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/inventoryMove/coms/comMove.vue b/src/pages/inventoryMove/coms/comMove.vue index 8ed05bfe..7bc3165e 100644 --- a/src/pages/inventoryMove/coms/comMove.vue +++ b/src/pages/inventoryMove/coms/comMove.vue @@ -24,7 +24,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"> @@ -36,7 +36,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -120,8 +120,8 @@ title: "", dataContent: {}, toWarehouseCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], } }, @@ -129,8 +129,8 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 652f54eb..946aaced 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -23,7 +23,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList" :isShowEdit="isShowEditLocation"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -121,8 +121,8 @@ detailSource: [], //绑定在页面上的数据源 title: "", dataContent: {}, - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], isShowEditLocation:false } }, @@ -131,8 +131,8 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 9e89c75e..a2d0866f 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -94,7 +94,6 @@ detailSource: [], //绑定在页面上的数据源 toLocationInfo: {}, businessTypeInfo: {}, - locationTypeList: [], managementList: [], businessTypeCode: '', toLocationCode: '', diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue index 028f2145..364db871 100644 --- a/src/pages/issue/record/issueRecord.vue +++ b/src/pages/issue/record/issueRecord.vue @@ -129,7 +129,6 @@ if (res.success) { this.businessType = res.businessType; this.itemCodeTypeList = res.itemCodeTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.fromInventoryStatuses = res.fromInventoryStatuses this.toInventoryStatuses = res.toInventoryStatuses this.goScan(true) diff --git a/src/pages/issue/request/issueRequestCreate.vue b/src/pages/issue/request/issueRequestCreate.vue index 328b78b2..fe896681 100644 --- a/src/pages/issue/request/issueRequestCreate.vue +++ b/src/pages/issue/request/issueRequestCreate.vue @@ -90,7 +90,6 @@ getBusinessType(typeCode, res => { if (res.success) { this.itemCodeTypeList = res.itemCodeTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.useOnTheWay = res.useOnTheWay; this.fromInventoryStatuses = res.fromInventoryStatuses this.toInventoryStatuses = res.toInventoryStatuses diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue index b2efb683..d69caa27 100644 --- a/src/pages/issue/request/issueScanRequest.vue +++ b/src/pages/issue/request/issueScanRequest.vue @@ -70,7 +70,6 @@ getBusinessType(typeCode, res => { if (res.success) { this.itemCodeTypeList = res.itemCodeTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.useOnTheWay = res.useOnTheWay; this.fromInventoryStatuses = res.fromInventoryStatuses this.toInventoryStatuses = res.toInventoryStatuses diff --git a/src/pages/package/record/mergePackageRecord.vue b/src/pages/package/record/mergePackageRecord.vue index 938983c9..01d0127e 100644 --- a/src/pages/package/record/mergePackageRecord.vue +++ b/src/pages/package/record/mergePackageRecord.vue @@ -36,7 +36,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -88,11 +88,9 @@ id: '', scanCount: 0, detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", isShowLocation: false, - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -107,8 +105,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 88c4977c..e2273eb4 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -57,7 +57,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -114,12 +114,9 @@ id: '', scanCount: 0, detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", isShowLocation: false, - fromlocationTypeList: [], fromLocationAreaTypeList: [], - tolocationTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -137,9 +134,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList - this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue index 166691a7..5cf86210 100644 --- a/src/pages/package/record/splitPackageRecord.vue +++ b/src/pages/package/record/splitPackageRecord.vue @@ -34,7 +34,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -90,11 +90,9 @@ return { id: '', detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -108,8 +106,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/pick/job/pickJobDetail.vue b/src/pages/pick/job/pickJobDetail.vue index 6759a483..b3baa289 100644 --- a/src/pages/pick/job/pickJobDetail.vue +++ b/src/pages/pick/job/pickJobDetail.vue @@ -15,7 +15,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -29,7 +29,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -101,7 +101,7 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - toLocationTypeList: [], + toLocationAreaTypeList: [], managementList: [], jobStatus:"", jobToLocationCode:"" @@ -184,7 +184,7 @@ that.subList = res.data.subList; that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode - that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) } else { that.showMessage('列表数据为0'); diff --git a/src/pages/productDismantle/job/productDismantleDetail.vue b/src/pages/productDismantle/job/productDismantleDetail.vue index 760e1e38..ac74debf 100644 --- a/src/pages/productDismantle/job/productDismantleDetail.vue +++ b/src/pages/productDismantle/job/productDismantleDetail.vue @@ -30,7 +30,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -108,7 +108,7 @@ fromLocationCode: "", toLocationCode: "", toLocationInfo: {}, - tolocationTypeList: [], + toLocationAreaTypeList: [], }; }, onLoad(option) { @@ -184,7 +184,7 @@ that.subList = res.data.subList; that.fromLocationCode = that.subList[0].fromLocationCode that.toLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) that.getLocationInfo(that.toLocationCode); } else { diff --git a/src/pages/productDismantle/record/productDismantleRecord.vue b/src/pages/productDismantle/record/productDismantleRecord.vue index b352c641..1a6f1930 100644 --- a/src/pages/productDismantle/record/productDismantleRecord.vue +++ b/src/pages/productDismantle/record/productDismantleRecord.vue @@ -19,7 +19,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -92,16 +92,14 @@ jobContent: {}, //任务内容 detailList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], toLocationInfo: {}, businessTypeInfo: {}, fromLocationInfo: {}, fromLocationCode: "", - toLocationInfo: {}, toLocationCode: "", isShowLocation: false, - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], allowModifyLocation: false, inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 @@ -113,8 +111,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 98fe32e3..4c2b5d53 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -15,7 +15,7 @@ + :locationAreaTypeList='toLocationAreaTypeList'> @@ -28,7 +28,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -107,7 +107,7 @@ managementList: [], fromLocationCode: "", toLocationCode: "", - tolocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"", jobToLocationCode: "", }; @@ -183,7 +183,7 @@ that.jobStatus = res.data.status that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) } else { that.showMessage('列表数据为0'); diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index c994dbba..0973435b 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -23,7 +23,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="tolocationTypeList"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -93,10 +93,9 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], + fromLocationAreaTypeList: [], tolocationTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 @@ -109,7 +108,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.tolocationTypeList = res.tolocationTypeList; this.showFromLocationPopup(); } else { diff --git a/src/pages/productPutaway/request/putawayRequestCreate.vue b/src/pages/productPutaway/request/putawayRequestCreate.vue index 5a835e63..28c7b5f8 100644 --- a/src/pages/productPutaway/request/putawayRequestCreate.vue +++ b/src/pages/productPutaway/request/putawayRequestCreate.vue @@ -28,7 +28,7 @@ style="background-color:ghostwhite; width: 100%; "> + @getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"> --> @@ -41,7 +41,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -104,8 +104,8 @@ detailSource: [], //绑定在页面上的数据源 fromLocationInfo: {}, fromLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -121,8 +121,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/productReceipt/coms/comProductDetailCard.vue b/src/pages/productReceipt/coms/comProductDetailCard.vue index 1c94c2fa..0f22e954 100644 --- a/src/pages/productReceipt/coms/comProductDetailCard.vue +++ b/src/pages/productReceipt/coms/comProductDetailCard.vue @@ -22,7 +22,7 @@ @confirm="confirm"> + :locationAreaTypeList="locationAreaTypeList"> @@ -53,15 +53,15 @@ props: { dataContent: { type: Object, - default: {} + default: null }, settingParam: { type: Object, - default: {} + default: null }, - locationTypeList: { + locationAreaTypeList: { type: Array, - default: [] + default: null }, diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 6759a483..b3baa289 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -15,7 +15,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -29,7 +29,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -101,7 +101,7 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - toLocationTypeList: [], + toLocationAreaTypeList: [], managementList: [], jobStatus:"", jobToLocationCode:"" @@ -184,7 +184,7 @@ that.subList = res.data.subList; that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode - that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) } else { that.showMessage('列表数据为0'); diff --git a/src/pages/productReceipt/record/productReceiptRecord.vue b/src/pages/productReceipt/record/productReceiptRecord.vue index 64fca126..87aca59e 100644 --- a/src/pages/productReceipt/record/productReceiptRecord.vue +++ b/src/pages/productReceipt/record/productReceiptRecord.vue @@ -91,8 +91,6 @@ data() { return { detailSource: [], //绑定在页面上的数据源 - toLocationTypeList: [], - toLocationInfo: {}, toLocationCode: "", fromLocationTypeList: [], fromLocationCode: "", @@ -117,8 +115,6 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.openScanPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index 78b17015..f231f6af 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -15,7 +15,7 @@ + :locationAreaTypeList='toLocationAreaTypeList'> @@ -30,7 +30,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -105,7 +105,7 @@ managementList: [], fromLocationCode: "", toLocationCode: "", - tolocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"", jobToLocationCode: "", }; @@ -181,7 +181,7 @@ that.subList = res.data.subList; that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.subList) // updateTitle(this.jobContent.number); } else { diff --git a/src/pages/productionReceipt/record/productionReceiptRecord.vue b/src/pages/productionReceipt/record/productionReceiptRecord.vue index d373181a..424e01ad 100644 --- a/src/pages/productionReceipt/record/productionReceiptRecord.vue +++ b/src/pages/productionReceipt/record/productionReceiptRecord.vue @@ -19,7 +19,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -88,13 +88,12 @@ scanCount: 0, jobContent: {}, //任务内容 detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], businessTypeInfo: {}, fromLocationCode: "", toLocationCode: "", isShowLocation: false, - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], allowModifyLocation: false, inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 @@ -107,8 +106,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/productionReturn/coms/comReturn.vue b/src/pages/productionReturn/coms/comReturn.vue index 2a802115..a4baeb6d 100644 --- a/src/pages/productionReturn/coms/comReturn.vue +++ b/src/pages/productionReturn/coms/comReturn.vue @@ -115,7 +115,7 @@ fromLocationCode: '', fromLocationTypeList: [], toLocationCode: '', - tolocationTypeList: [], + toLocationAreaTypeList: [], businessType: {}, inventoryStatus: '', managementList: [], @@ -138,8 +138,7 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.openScanPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/productionReturn/coms/comReturnDetailCard.vue b/src/pages/productionReturn/coms/comReturnDetailCard.vue index eec41e63..a8b5c6c3 100644 --- a/src/pages/productionReturn/coms/comReturnDetailCard.vue +++ b/src/pages/productionReturn/coms/comReturnDetailCard.vue @@ -22,7 +22,7 @@ @confirm="confirm"> + :locationAreaTypeList="locationAreaTypeList"> @@ -53,15 +53,15 @@ props: { dataContent: { type: Object, - default: {} + default: null }, settingParam: { type: Object, - default: {} + default: null }, - locationTypeList: { + locationAreaTypeList: { type: Array, - default: [] + default: null }, diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue index d86800bc..b9324915 100644 --- a/src/pages/productionReturn/job/returnDetail.vue +++ b/src/pages/productionReturn/job/returnDetail.vue @@ -18,7 +18,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -32,7 +32,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -104,12 +104,10 @@ jobContent: {}, toLocationCode: '', scanCount: 0, - jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 fromLocationCode: '', - toLocationCode: '', - toLocationTypeList: [], + toLocationAreaTypeList: [], toLocationInfo: {}, businessTypeInfo: {}, titleInfo: "", @@ -194,7 +192,6 @@ that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) that.titleInfo = that.subList[0]; } else { that.showMessage('列表数据为0'); diff --git a/src/pages/productionReturn/record/returnToHold.vue b/src/pages/productionReturn/record/returnToHold.vue index 3f892dba..da2793a6 100644 --- a/src/pages/productionReturn/record/returnToHold.vue +++ b/src/pages/productionReturn/record/returnToHold.vue @@ -115,7 +115,6 @@ fromLocationCode: '', fromLocationTypeList: [], toLocationCode: '', - tolocationTypeList: [], businessType: {}, inventoryStatus: '', managementList: [], @@ -139,8 +138,6 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.openScanPopup(true); } else { this.showErrorMessage(res.message) diff --git a/src/pages/productionReturn/record/returnToStore.vue b/src/pages/productionReturn/record/returnToStore.vue index 7d2908a7..96a07773 100644 --- a/src/pages/productionReturn/record/returnToStore.vue +++ b/src/pages/productionReturn/record/returnToStore.vue @@ -106,7 +106,6 @@ fromLocationCode: '', fromLocationTypeList: [], toLocationCode: '', - tolocationTypeList: [], businessType: {}, inventoryStatus: '', managementList: [], @@ -133,8 +132,6 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; this.openScanPopup(true); } else { this.showErrorMessage(res.message) diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue index ed3d3bdc..f174b405 100644 --- a/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue +++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue @@ -13,7 +13,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -56,7 +56,7 @@ type: Object, default: null }, - locationTypeList: { + locationAreaTypeList: { type: Object, default: null }, diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index e54887bd..99cc4624 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -24,7 +24,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -37,7 +37,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -112,7 +112,7 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - toLocationTypeList: [], + toLocationAreaTypeList: [], toLocationCode: '', jobToLocationCode: "", toLocationInfo: {}, @@ -198,13 +198,12 @@ } else { if (res.data.subList.length > 0) { that.jobContent = res.data; - that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); - // that.jobContent.toLocationTypeList = that.toLocationTypeList; + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes); + // that.jobContent.toLocationAreaTypeList = that.toLocationAreaTypeList; that.subList = res.data.subList; that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode that.detailSource = getTreeDataSource(that.subList) - console.log(JSON.stringify(this.detailSource)) } else { that.showMessage('列表数据为0'); } diff --git a/src/pages/purchaseReturn/record/returnRecord.vue b/src/pages/purchaseReturn/record/returnRecord.vue index 2ba1de42..ae52e6c1 100644 --- a/src/pages/purchaseReturn/record/returnRecord.vue +++ b/src/pages/purchaseReturn/record/returnRecord.vue @@ -41,7 +41,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -92,8 +92,7 @@ subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 fromLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], businessType: {}, //业务类型 supplierCode: '', //供应商代码 poNumber: '', @@ -113,8 +112,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/purchaseReturn/request/returnRequestCreate.vue b/src/pages/purchaseReturn/request/returnRequestCreate.vue index d308530e..cea6503c 100644 --- a/src/pages/purchaseReturn/request/returnRequestCreate.vue +++ b/src/pages/purchaseReturn/request/returnRequestCreate.vue @@ -33,7 +33,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -84,8 +84,7 @@ subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 fromLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], businessType: {}, //业务类型 poNumber: '', dataContent : {} @@ -97,8 +96,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 55e831bc..a6cc7858 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -15,7 +15,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -28,7 +28,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -100,9 +100,9 @@ managementList: [], fromLocationCode: "", toLocationCode: "", - tolocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"", - jobToLocationCode:"" + jobToLocationCode:"", }; }, onLoad(option) { @@ -182,7 +182,7 @@ that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode; - that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) } else { that.showMessage('列表数据为0'); diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index a6c1680f..015deabf 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -30,7 +30,7 @@ style="background-color:ghostwhite; width: 100%; "> + @getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"> --> @@ -43,7 +43,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -112,8 +112,8 @@ detailSource: [], //绑定在页面上的数据源 fromLocationInfo: {}, fromLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -128,8 +128,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/putaway/request/putawayRequestCreate.vue b/src/pages/putaway/request/putawayRequestCreate.vue index 3dcbcfcc..0d3b1789 100644 --- a/src/pages/putaway/request/putawayRequestCreate.vue +++ b/src/pages/putaway/request/putawayRequestCreate.vue @@ -32,7 +32,7 @@ style="background-color:ghostwhite; width: 100%; "> + @getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"> --> @@ -45,7 +45,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -111,8 +111,8 @@ detailSource: [], //绑定在页面上的数据源 fromLocationInfo: {}, fromLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -128,8 +128,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue b/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue index 2fd08f2d..b10267c5 100644 --- a/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue +++ b/src/pages/repleinsh/coms/comRepleinshRequestPopup.vue @@ -68,7 +68,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -129,7 +129,7 @@ type: String, default: '补料需求信息' }, - toLocationTypeList: { + toLocationAreaTypeList: { type: Array, default: [] }, diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 9f0cd006..3a65959b 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -26,7 +26,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -97,7 +97,7 @@ detailOptions: [], scanOptions: [], toLocationCode: '', - tolocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"" }; }, @@ -183,7 +183,7 @@ that.jobStatus = res.data.status that.subList = res.data.subList; that.toLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) that.detailSource = getDataSource(that.detailSource, that.subList) that.resizeCollapse(); } else { diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue index c3f5cd00..8d8404de 100644 --- a/src/pages/repleinsh/record/repleinshRecord.vue +++ b/src/pages/repleinsh/record/repleinshRecord.vue @@ -32,7 +32,7 @@ - @@ -87,7 +87,6 @@ import winScanButton from '@/mycomponents/scan/winScanButton.vue' import winScanPack from '@/mycomponents/scan/winScanPack.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue' - import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import comRepleinshRequestPopup from '@/pages/repleinsh/coms/comRepleinshRequestPopup.vue' @@ -99,7 +98,6 @@ winScanButton, winScanPack, comBlankView, - winScanLocation, winScanPackAndLocation, recordComDetailCard, comRepleinshRequestPopup, @@ -112,12 +110,10 @@ receiptJob: {}, subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], businessTypeInfo: {}, fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + toLocationAreaTypeList: [], allowModifyLocation: false, businessType: {}, requestList: [], @@ -132,8 +128,7 @@ if (res.success) { this.businessType = res.businessType; this.itemCodeTypeList = res.itemCodeTypeList; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showRequestPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/repleinsh/request/repleinshRequest.vue b/src/pages/repleinsh/request/repleinshRequest.vue index 0a257dc8..37de925d 100644 --- a/src/pages/repleinsh/request/repleinshRequest.vue +++ b/src/pages/repleinsh/request/repleinshRequest.vue @@ -23,10 +23,6 @@ import requestInfoPopup from '@/pages/repleinsh/coms/requestInfoPopup.vue' import requestButton from '@/mycomponents/button/requestButton.vue' - import { - getBusinessType, - } from '@/common/record.js'; - import { goHome, updateTitle @@ -55,8 +51,6 @@ pageNo: 1, pageSize: 10, businessType: "", - fromlocationTypeList: [], - tolocationTypeList: [], toLocationCode: '', status: [], creationTimeStart: "", diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue index 96d09286..b5879d33 100644 --- a/src/pages/scrap/record/scrapRecord.vue +++ b/src/pages/scrap/record/scrapRecord.vue @@ -44,7 +44,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -94,10 +94,9 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -112,8 +111,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/scrap/request/scrapRequestCreate.vue b/src/pages/scrap/request/scrapRequestCreate.vue index 3f378baa..ba0b8eb7 100644 --- a/src/pages/scrap/request/scrapRequestCreate.vue +++ b/src/pages/scrap/request/scrapRequestCreate.vue @@ -44,7 +44,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -101,12 +101,11 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationInfo: {}, fromLocationCode: "", isShowLocation: false, - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], allowModifyLocation: false, inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 @@ -123,8 +122,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue b/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue index 9dc93624..793bd58c 100644 --- a/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue +++ b/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue @@ -79,7 +79,6 @@ dataContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], toLocationCode: '', toLocationInfo: {}, businessTypeInfo: {}, diff --git a/src/pages/transfer/coms/comReceiptDetailCard.vue b/src/pages/transfer/coms/comReceiptDetailCard.vue index 3ffa47a1..60d60586 100644 --- a/src/pages/transfer/coms/comReceiptDetailCard.vue +++ b/src/pages/transfer/coms/comReceiptDetailCard.vue @@ -22,7 +22,7 @@ @confirm="confirm"> + :locationAreaTypeList="locationAreaTypeList"> @@ -34,7 +34,6 @@ import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue' import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue' - import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import { getDetailOption, @@ -47,24 +46,23 @@ recommend, recommendQtyEdit, detailInfoPopup, - winScanLocation }, props: { dataContent: { type: Object, - default: {} + default: null }, settingParam: { type: Object, - default: {} + default:null }, isShowLocation: { type: Boolean, default: false }, - locationTypeList: { + locationAreaTypeList: { type: Object, - default: {} + default: null }, }, watch: { diff --git a/src/pages/transfer/coms/comTransferRecord.vue b/src/pages/transfer/coms/comTransferRecord.vue index cf58ebca..f190e416 100644 --- a/src/pages/transfer/coms/comTransferRecord.vue +++ b/src/pages/transfer/coms/comTransferRecord.vue @@ -22,7 +22,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -96,11 +96,10 @@ id: '', subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -121,8 +120,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue index a813d7d1..d8d4f544 100644 --- a/src/pages/transfer/job/issueDetail.vue +++ b/src/pages/transfer/job/issueDetail.vue @@ -14,7 +14,7 @@ + :locationAreaTypeList='toLocationAreaTypeList'> @@ -28,7 +28,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -97,7 +97,7 @@ toLocationCode: "", businessTypeInfo: {}, managementList: [], - tolocationTypeList:[], + toLocationAreaTypeList:[], jobStatus:"", jobToLocationCode:"" }; @@ -185,7 +185,7 @@ that.detailSource = getDataSource(that.subList) that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) } else { that.showMessage('列表数据为0'); } diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue index 381a7578..036358b1 100644 --- a/src/pages/transfer/job/receiptDetail.vue +++ b/src/pages/transfer/job/receiptDetail.vue @@ -18,7 +18,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -31,7 +31,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -106,7 +106,7 @@ toLocationCode: "", businessTypeInfo: {}, managementList: [], - toLocationTypeList: [], + toLocationAreaTypeList: [], jobStatus:"", jobToLocationCode:"" }; @@ -195,7 +195,7 @@ that.detailSource = getDataSource(that.subList) that.fromLocationCode = that.subList[0].fromLocationCode that.jobToLocationCode = that.subList[0].toLocationCode - that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes) } else { that.showMessage('列表数据为0'); } diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue index 6cbcc5a7..53f29c5e 100644 --- a/src/pages/transfer/job/transferDetail.vue +++ b/src/pages/transfer/job/transferDetail.vue @@ -91,7 +91,6 @@ detailSource: [], //绑定在页面上的数据源 toLocationInfo: {}, businessTypeInfo: {}, - locationTypeList: [], managementList: [], }; diff --git a/src/pages/transfer/record/deliverRecord.vue b/src/pages/transfer/record/deliverRecord.vue index a99a719c..4248dbbc 100644 --- a/src/pages/transfer/record/deliverRecord.vue +++ b/src/pages/transfer/record/deliverRecord.vue @@ -22,7 +22,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -35,7 +35,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -89,11 +89,10 @@ id: '', subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], fromLocationCode: "", toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + fromLocationAreaTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -108,8 +107,8 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/transfer/record/receiptRecord.vue b/src/pages/transfer/record/receiptRecord.vue index 51c6e5a1..d3af90da 100644 --- a/src/pages/transfer/record/receiptRecord.vue +++ b/src/pages/transfer/record/receiptRecord.vue @@ -23,7 +23,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -83,10 +83,8 @@ id: '', subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - locationTypeList: [], toLocationCode: "", - fromlocationTypeList: [], - tolocationTypeList: [], + toLocationAreaTypeList: [], inInventoryStatus: "", //目标入库库存状态 outInventoryStatus: "", //来源出库库存状态 businessType: {}, @@ -102,8 +100,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.openScanPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/unPlanned/coms/comReceiptDetailCard.vue b/src/pages/unPlanned/coms/comReceiptDetailCard.vue index 6c50a268..59820522 100644 --- a/src/pages/unPlanned/coms/comReceiptDetailCard.vue +++ b/src/pages/unPlanned/coms/comReceiptDetailCard.vue @@ -22,7 +22,7 @@ + :locationAreaTypeList="locationAreaTypeList"> @@ -62,9 +62,9 @@ type: Boolean, default: false }, - locationTypeList: { + locationAreaTypeList: { type: Object, - default: {} + default: null }, }, watch: { diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index 8750e324..e794e623 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -15,7 +15,7 @@ + @remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @@ -29,7 +29,7 @@ + :locationAreaTypeList="toLocationAreaTypeList"> @@ -90,7 +90,7 @@ jobContent: {}, //任务内容 subList: [], //接口返回的任务subList detailSource: [], //绑定在页面上的数据源 - toLocationTypeList: [], + toLocationAreaTypeList: [], toLocationCode: '', toLocationInfo: {}, businessTypeInfo: {}, @@ -166,7 +166,7 @@ if (res.data.subList.length > 0) { that.jobContent = res.data; that.jobStatus = res.data.status - that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); + that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes); that.subList = res.data.subList; that.jobToLocationCode = that.subList[0].toLocationCode that.detailSource = getDataSource(that.subList) diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue index 412dddbf..de9faeb0 100644 --- a/src/pages/unPlanned/record/issueRecord.vue +++ b/src/pages/unPlanned/record/issueRecord.vue @@ -36,7 +36,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -86,7 +86,7 @@ data() { return { fromLocationCode: "", - fromLocationTypeArray: [], + fromLocationAreaTypeList: [], fromInventoryStatus: [], toInventoryStatus: [], businessType: {}, //业务类型 @@ -104,7 +104,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromLocationTypeArray = res.fromlocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/unPlanned/record/receiptRecord.vue b/src/pages/unPlanned/record/receiptRecord.vue index 0cc7ced9..b306fc69 100644 --- a/src/pages/unPlanned/record/receiptRecord.vue +++ b/src/pages/unPlanned/record/receiptRecord.vue @@ -28,7 +28,7 @@ style="background-color:ghostwhite; width: 100%; "> + :locationAreaTypeList="toLocationAreaTypeList"> @@ -48,7 +48,6 @@ import requiredLocation from '@/mycomponents/location/requiredLocation.vue' import comReceiptRecord from '@/pages/unPlanned/coms/comReceiptRecord.vue' import comBlankView from '@/mycomponents/common/comBlankView.vue' - import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import winScanPack from "@/mycomponents/scan/winScanPack.vue" import { @@ -90,7 +89,6 @@ requiredLocation, comReceiptRecord, comBlankView, - winScanLocation, winScanPack, }, props: { @@ -107,7 +105,8 @@ reasonCode: "", reasonList: [], dataContent: {}, - managementList: [] + managementList: [], + toLocationAreaTypeList:[] } }, @@ -116,8 +115,7 @@ getBusinessType(this.businessTypeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromlocationTypeList = res.fromlocationTypeList; - this.tolocationTypeList = res.tolocationTypeList; + this.toLocationAreaTypeList = res.toLocationAreaTypeList; this.openScanPopup(); } else { this.showErrorMessage(res.message) diff --git a/src/pages/unPlanned/request/issueRequestCreate.vue b/src/pages/unPlanned/request/issueRequestCreate.vue index e95c04d0..af297c18 100644 --- a/src/pages/unPlanned/request/issueRequestCreate.vue +++ b/src/pages/unPlanned/request/issueRequestCreate.vue @@ -42,7 +42,7 @@ + :locationAreaTypeList="fromLocationAreaTypeList"> @@ -96,7 +96,7 @@ return { fromLocationCode: "", fromLocationInfo: {}, - fromLocationTypeArray: [], + fromLocationAreaTypeList: [], fromInventoryStatus: [], toInventoryStatus: [], businessType: {}, //业务类型 @@ -118,7 +118,7 @@ getBusinessType(typeCode, res => { if (res.success) { this.businessType = res.businessType; - this.fromLocationTypeArray = res.fromlocationTypeList; + this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.showFromLocationPopup(); } else { this.showErrorMessage(res.message)