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">
@@ -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)