修改来源库区校验

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;

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;

src/mycomponents/detail/comDetailCard.vue

@@ -7,7 +7,7 @@
 					</item-compare-qty>
 				</template>
 				<u-line></u-line>
-				<view class="" v-for="(item,index) in dataContent.subList">
+				<view class="" v-for="(item,index) in dataContent.subList" :key="index">
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions"
@@ -21,7 +21,7 @@
 		</uni-collapse>
 		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<comMessage ref="message"></comMessage>
 	</view>
 </template>
@@ -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: {

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
 			},

src/mycomponents/location/locationCompare.vue

@@ -15,7 +15,7 @@
 			<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
 		</view>
 		<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 	</view>
 </template>
 
@@ -48,9 +48,9 @@
 				type: Boolean,
 				default: true
 			},
-			locationTypeList: {
+			locationAreaTypeList: {
 				type: Array,
-				default: []
+				default: null
 			}
 		},
 

src/mycomponents/location/requiredLocation.vue

@@ -14,7 +14,7 @@
 			<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
 		</view>
 		<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 	</view>
 </template>
 
@@ -43,9 +43,9 @@
 				type: Boolean,
 				default: true
 			},
-			locationTypeList: {
+			locationAreaTypeList: {
 				type: Array,
-				default: []
+				default: null
 			}
 		},
 

src/mycomponents/record/recordDetailCard.vue

@@ -13,7 +13,7 @@
 		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup>
 		<comMessage ref="message"></comMessage>
 	</view>
@@ -53,7 +53,7 @@
 				type: Object,
 				default: null
 			},
-			locationTypeList: {
+			locationAreaTypeList: {
 				type: Object,
 				default: null
 			},

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
 						}

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)

src/pages/container/record/containerUnBindRecord.vue

@@ -61,7 +61,6 @@
 	} from '@/common/directory.js';
 
 	import {
-		getBusinessType,
 		createItemInfo,
 		createDetailInfo,
 		calcHandleQty

src/pages/count/record/countRecord.vue

@@ -6,7 +6,7 @@
 		<view class="page-wraper" v-if="fromLocationCode!=''">
 			<requiredLocation title="盘点库位" :locationCode="fromLocationCode"
 				:isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode'
-				:locationTypeList="locationTypeList"></requiredLocation>
+				:locationAreaTypeList="locationAreaTypeList"></requiredLocation>
 			<u-line></u-line>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
@@ -37,7 +37,7 @@
 
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="盘点库位" @getLocation='getLocation'
-			:locationTypeList="fromLocationTypeArray"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" :isShowStatus="true" :allowEditStatus="true">
 		</count-qty-edit>
 		<comMessage ref="comMessage"></comMessage>
@@ -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)

src/pages/customerReturn/job/returnDetail.vue

@@ -6,7 +6,7 @@
 					<view class="">
 						<com-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
-							:locationTypeList="tolocationTypeList">
+							:locationAreaTypeList="toLocationAreaTypeList">
 						</com-detail-card>
 					</view>
 					<u-line />
@@ -20,7 +20,7 @@
 				<view class="">
 					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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');
 						}

src/pages/customerReturn/record/returnRecord.vue

@@ -21,7 +21,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="tolocationTypeList"></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -35,7 +35,7 @@
 		</win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 
 </template>
@@ -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)

src/pages/customerReturn/request/customerReturnRequestCreate.vue

@@ -34,7 +34,7 @@
 
 					<!-- <view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="tolocationTypeList"></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 					</view> -->
 					<view class="">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -49,7 +49,7 @@
 		</win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 
 </template>
@@ -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)

src/pages/deliver/record/deliverRecord.vue

@@ -35,7 +35,7 @@
 					<view class="">
 						<requiredLocation  ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
 							@getLocation='scanLocationCode' :isShowEdit="true"
-							:locationTypeList="tolocationTypeList"></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -48,7 +48,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HMQ"></win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 
 </template>
@@ -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)

src/pages/inventoryMove/coms/comMove.vue

@@ -24,7 +24,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"></requiredLocation>
+							:locationAreaTypeList="toLocationTypeArray" :isShowEdit="toLocationCode==''"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -36,7 +36,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

src/pages/inventoryMove/coms/comMoveRecord.vue

@@ -23,7 +23,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocation'
-							:locationTypeList="tolocationTypeList" :isShowEdit="isShowEditLocation"></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList" :isShowEdit="isShowEditLocation"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -35,7 +35,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

src/pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -94,7 +94,6 @@
 				detailSource: [], //绑定在页面上的数据源
 				toLocationInfo: {},
 				businessTypeInfo: {},
-				locationTypeList: [],
 				managementList: [],
 				businessTypeCode: '',
 				toLocationCode: '',

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)

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

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

src/pages/package/record/mergePackageRecord.vue

@@ -36,7 +36,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

src/pages/package/record/overPackageRecord.vue

@@ -57,7 +57,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromLocationAreaTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

src/pages/package/record/splitPackageRecord.vue

@@ -34,7 +34,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<win-scan-pack title="拆分标签" ref="scanPopupPack" @getResult='getScanPackResult'></win-scan-pack>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -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)

src/pages/pick/job/pickJobDetail.vue

@@ -15,7 +15,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
 						</comProductDetailCard>
 					</view>
 					<u-line />
@@ -29,7 +29,7 @@
 				<view class="">
 					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						 @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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');

src/pages/productDismantle/job/productDismantleDetail.vue

@@ -30,7 +30,7 @@
 				<view class="">
 					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
 						@getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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 {

src/pages/productDismantle/record/productDismantleRecord.vue

@@ -19,7 +19,7 @@
 			</view>
 
 			<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-				:locationTypeList="tolocationTypeList"></requiredLocation>
+				:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
@@ -36,7 +36,7 @@
 
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -15,7 +15,7 @@
 					<view class="">
 						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
-							:locationTypeList='tolocationTypeList'>
+							:locationAreaTypeList='toLocationAreaTypeList'>
 						</com-detail-card>
 					</view>
 					<u-line />
@@ -28,7 +28,7 @@
 				<view class="">
 					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"  :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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');

src/pages/productPutaway/record/productPutawayRecord.vue

@@ -23,7 +23,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="tolocationTypeList"></requiredLocation>
+							:locationAreaTypeList="tolocationTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -35,7 +35,7 @@
 
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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 {

src/pages/productPutaway/request/putawayRequestCreate.vue

@@ -28,7 +28,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
-							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> -->
+							@getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation> -->
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -41,7 +41,7 @@
 		</win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 </template>
 
@@ -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)

src/pages/productReceipt/coms/comProductDetailCard.vue

@@ -22,7 +22,7 @@
 			 @confirm="confirm">
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<productDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></productDetailInfoPopup>
 		<comMessage ref="message"></comMessage>
 	</view>
@@ -53,15 +53,15 @@
 		props: {
 			dataContent: {
 				type: Object,
-				default: {}
+				default: null
 			},
 			settingParam: {
 				type: Object,
-				default: {}
+				default: null
 			},
-			locationTypeList: {
+			locationAreaTypeList: {
 				type: Array,
-				default: []
+				default: null
 			},
 			
 			

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -15,7 +15,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
 						</comProductDetailCard>
 					</view>
 					<u-line />
@@ -29,7 +29,7 @@
 				<view class="">
 					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						 @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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');

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)

src/pages/productionReceipt/job/productionReceiptDetail.vue

@@ -15,7 +15,7 @@
 					<view class="">
 						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
-							:locationTypeList='tolocationTypeList'>
+							:locationAreaTypeList='toLocationAreaTypeList'>
 						</com-detail-card>
 						<u-line />
 					</view>
@@ -30,7 +30,7 @@
 				<view class="">
 					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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 {

src/pages/productionReceipt/record/productionReceiptRecord.vue

@@ -19,7 +19,7 @@
 			</view>
 
 			<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-				:locationTypeList="tolocationTypeList"></requiredLocation>
+				:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
@@ -36,7 +36,7 @@
 
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

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)

src/pages/productionReturn/coms/comReturnDetailCard.vue

@@ -22,7 +22,7 @@
 			 @confirm="confirm">
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<returnDetailInfoPopup ref="jobDetailPopup" :dataContent="showItem"></returnDetailInfoPopup>
 		<comMessage ref="message"></comMessage>
 	</view>
@@ -53,15 +53,15 @@
 		props: {
 			dataContent: {
 				type: Object,
-				default: {}
+				default: null
 			},
 			settingParam: {
 				type: Object,
-				default: {}
+				default: null
 			},
-			locationTypeList: {
+			locationAreaTypeList: {
 				type: Array,
-				default: []
+				default: null
 			},
 			
 			

src/pages/productionReturn/job/returnDetail.vue

@@ -18,7 +18,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comReturnDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
 						</comReturnDetailCard>
 					</view>
 					<u-line />
@@ -32,7 +32,7 @@
 				<view class="">
 					<locationCompare title="目标库位" :recommendLocationCode="jobToLocationCode"  :locationCode="toLocationCode"
 						 @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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');

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)

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)

src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue

@@ -13,7 +13,7 @@
 		<recommend-qty-edit ref=" receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<receipt-detail-info-popup ref="jobDetailPopup" :dataContent="showItem"></receipt-detail-info-popup>
 		<comMessage ref="message"></comMessage>
 	</view>
@@ -56,7 +56,7 @@
 				type: Object,
 				default: null
 			},
-			locationTypeList: {
+			locationAreaTypeList: {
 				type: Object,
 				default: null
 			},

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -24,7 +24,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
 						</com-receipt-detail-card>
 					</view>
 				</view>
@@ -37,7 +37,7 @@
 				<view class="">
 					<locationCompare ref="locationCompare" title="收货库位" :recommendLocationCode="jobToLocationCode"
 						:locationCode="toLocationCode" @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList">
+						:locationAreaTypeList="toLocationAreaTypeList">
 					</locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
@@ -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');
 						}

src/pages/purchaseReturn/record/returnRecord.vue

@@ -41,7 +41,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'>
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

src/pages/purchaseReturn/request/returnRequestCreate.vue

@@ -33,7 +33,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'>
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getFromLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

src/pages/putaway/job/putawayDetail.vue

@@ -15,7 +15,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
 						</comJobDetailCard>
 					</view>
 				</view>
@@ -28,7 +28,7 @@
 				<view class="">
 					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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');

src/pages/putaway/record/putawayRecord.vue

@@ -30,7 +30,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
-							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> -->
+							@getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation> -->
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -43,7 +43,7 @@
 		</win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 </template>
 
@@ -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)

src/pages/putaway/request/putawayRequestCreate.vue

@@ -32,7 +32,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
-							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> -->
+							@getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation> -->
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -45,7 +45,7 @@
 		</win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 </template>
 
@@ -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)

src/pages/repleinsh/coms/comRepleinshRequestPopup.vue

@@ -68,7 +68,7 @@
 		</win-scan-item>
 
 		<win-scan-location ref="scanLocationPopup" title='目标库位' @getLocation='getLocationCode'
-			:locationTypeList="toLocationTypeList">
+			:locationAreaTypeList="toLocationAreaTypeList">
 		</win-scan-location>
 
 		<comMessage ref="comMessage">
@@ -129,7 +129,7 @@
 				type: String,
 				default: '补料需求信息'
 			},
-			toLocationTypeList: {
+			toLocationAreaTypeList: {
 				type: Array,
 				default: []
 			},

src/pages/repleinsh/job/repleinshDetail.vue

@@ -26,7 +26,7 @@
 				<view class="">
 					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
@@ -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 {

src/pages/repleinsh/record/repleinshRecord.vue

@@ -32,7 +32,7 @@
 			</view>
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
-		<com-repleinsh-request-popup ref="comRepleinshRequestPopup" :toLocationTypeList="tolocationTypeList"
+		<com-repleinsh-request-popup ref="comRepleinshRequestPopup" :toLocationAreaTypeList="toLocationAreaTypeList"
 			@confirm='requestConfirm'
 			:itemCodeTypeList="itemCodeTypeList">
 		</com-repleinsh-request-popup>
@@ -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)

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: "",

src/pages/scrap/record/scrapRecord.vue

@@ -44,7 +44,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 
 </template>
@@ -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)

src/pages/scrap/request/scrapRequestCreate.vue

@@ -44,7 +44,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 
 </template>
@@ -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)

src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue

@@ -79,7 +79,6 @@
 				dataContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
-				locationTypeList: [],
 				toLocationCode: '',
 				toLocationInfo: {},
 				businessTypeInfo: {},

src/pages/transfer/coms/comReceiptDetailCard.vue

@@ -22,7 +22,7 @@
 			 @confirm="confirm">
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 		<comMessage ref="message"></comMessage>
 	</view>
@@ -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: {

src/pages/transfer/coms/comTransferRecord.vue

@@ -22,7 +22,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="tolocationTypeList"></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -35,7 +35,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 
 </template>
@@ -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)

src/pages/transfer/job/issueDetail.vue

@@ -14,7 +14,7 @@
 					<view class="">
 						<com-detail-card :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
-							:locationTypeList='tolocationTypeList'>
+							:locationAreaTypeList='toLocationAreaTypeList'>
 						</com-detail-card>
 					</view>
 				</view>
@@ -28,7 +28,7 @@
 				<view class="">
 					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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');
 						}

src/pages/transfer/job/receiptDetail.vue

@@ -18,7 +18,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
 						</com-receipt-detail-card>
 					</view>
 				</view>
@@ -31,7 +31,7 @@
 				<view class="">
 					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
 						@getLocation='scanLocationCode' 
-						:locationTypeList="toLocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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');
 						}

src/pages/transfer/job/transferDetail.vue

@@ -91,7 +91,6 @@
 				detailSource: [], //绑定在页面上的数据源
 				toLocationInfo: {},
 				businessTypeInfo: {},
-				locationTypeList: [],
 				managementList: [],
 
 			};

src/pages/transfer/record/deliverRecord.vue

@@ -22,7 +22,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="tolocationTypeList"></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -35,7 +35,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
 		<comMessage ref="comMessage"></comMessage>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 	</view>
 
 </template>
@@ -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)

src/pages/transfer/record/receiptRecord.vue

@@ -23,7 +23,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="tolocationTypeList"></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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)

src/pages/unPlanned/coms/comReceiptDetailCard.vue

@@ -22,7 +22,7 @@
 		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
-			:locationTypeList="locationTypeList"></win-scan-location>
+			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 		<comMessage ref="message"></comMessage>
 	</view>
@@ -62,9 +62,9 @@
 				type: Boolean,
 				default: false
 			},
-			locationTypeList: {
+			locationAreaTypeList: {
 				type: Object,
-				default: {}
+				default: null
 			},
 		},
 		watch: {

src/pages/unPlanned/job/receiptJobDetail.vue

@@ -15,7 +15,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" :locationTypeList='toLocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'>
 						</com-receipt-detail-card>
 					</view>
 					<u-line />
@@ -29,7 +29,7 @@
 				<view class="">
 					<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"  :locationCode="toLocationCode"
 						 @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></locationCompare>
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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)

src/pages/unPlanned/record/issueRecord.vue

@@ -36,7 +36,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromLocationTypeArray"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)

src/pages/unPlanned/record/receiptRecord.vue

@@ -28,7 +28,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-							:locationTypeList="tolocationTypeList"></requiredLocation>
+							:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -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)

src/pages/unPlanned/request/issueRequestCreate.vue

@@ -42,7 +42,7 @@
 		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :title="'箱码'">
 		</win-scan-pack-and-location>
 		<win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromLocationTypeArray"></win-scan-location>
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -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)