修改任务库位，推荐库位，采购收货整单收货按钮

.hbuilderx/launch.json

@@ -15,6 +15,10 @@
         {
             "openVueDevtools" : true,
             "type" : "uni-app:h5"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
         }
     ]
 }

src/common/style/new_style.css

@@ -2187,6 +2187,7 @@ button::after {
 
 .task_item {
 	margin: 0rpx 10rpx;
+	margin-top: 10rpx;
 	background-color: #fff;
 }
 

src/mycomponents/job/jobComMainCardAsn.vue

@@ -0,0 +1,41 @@
+<template>
+	<view>
+		<view class="task_card">
+			<jobTopAsn :dataContent="dataContent"></jobTopAsn>
+			<slot></slot>
+			<u-line color="#909399" />
+			<job-bottom :dataContent="dataContent"></job-bottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import jobTopAsn from '@/mycomponents/job/jobTopAsn.vue'
+	import jobBottom from '@/mycomponents/job/jobBottom.vue'
+
+	export default {
+		components: {
+			jobTopAsn,
+			jobBottom,
+		},
+		data() {
+			return {
+			};
+		},
+		 
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+		 
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

src/mycomponents/job/jobTopAsn.vue

@@ -0,0 +1,41 @@
+<template>
+	<view class="task_top">
+		<view class="uni-flex space-between u-col-center align-center" >
+			<job-number :number="dataContent.asnNumber"></job-number>
+			<job-status :jobStatus="dataContent.status"></job-status>
+		</view>
+	</view>
+</template>
+
+<script>
+	import jobNumber from '@/mycomponents/job/jobNumber.vue'
+	import jobStatus from '@/mycomponents/job/jobStatus.vue'
+	export default {
+		components: {
+			jobNumber,
+			jobStatus
+		},
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+			openDetail(item) {
+				this.$emit("openDetail", this.dataContent);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>

src/mycomponents/location/locationCompare.vue

@@ -0,0 +1,84 @@
+<template>
+	<view class="uni-flex u-col-center" style="padding-top: 15rpx; 
+	padding-bottom: 15rpx;
+	 padding-left: 10rpx;
+	 padding-right: 10rpx;
+	 font-size:32rpx;">
+		<view class="uni-flex uni-row u-col-center" @click="showLocation">
+			<view>
+				<text style="font-size: 30rpx;">{{title}}</text>
+				
+				<text style="font-size: 25rpx;color:#3FBAFF;">&nbsp {{recommendLocationCode}}</text>
+				<text v-if="locationCode" style="font-size: 25rpx;color:#3FBAFF;">&nbsp/&nbsp{{locationCode}}</text>
+				<!-- <text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text> -->
+			</view>
+			<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>
+	</view>
+</template>
+
+<script>
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+
+	export default {
+		components: {
+			winScanLocation
+		},
+		data() {
+			return {
+				defaultlocationCode: ""
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: "需求库位"
+			},
+			recommendLocationCode: {
+				type: String,
+				default: ""
+			},
+			locationCode: {
+				type: String,
+				default: ""
+			},
+			isShowEdit: {
+				type: Boolean,
+				default: true
+			},
+			locationTypeList: {
+				type: Array,
+				default: []
+			}
+		},
+
+		watch: {
+			// locationCode: {
+			// 	handler(newName, oldName) {
+			// 		if (this.locationCode != "") {
+			// 			this.defaultlocationCode = this.locationCode;
+			// 		}
+			// 	},
+			// 	immediate: true,
+			// 	deep: true
+			// }
+		},
+		methods: {
+			showLocation() {
+				if (this.isShowEdit) {
+					this.$refs.scanLocationCode.openScanPopup();
+				}
+
+			},
+			//扫描源库位
+			getLocation(location, code) {
+				this.$emit("getLocation", location, code)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

src/pages.json

@@ -1173,7 +1173,145 @@
 					]
 				}
 			}
-		},{
+		},
+		{
+			"path": "pages/inventoryMove/job/inventoryMoveDetail",
+			"style": {
+				"navigationBarTitleText": "库存转移详细",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/okToHoldMoveJob",
+			"style": {
+				"navigationBarTitleText": "合格转隔离",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/holdToOkMoveJob",
+			"style": {
+				"navigationBarTitleText": "隔离转合格",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/holdToScrapMoveJob",
+			"style": {
+				"navigationBarTitleText": "隔离转报废",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/okToScrapMoveJob",
+			"style": {
+				"navigationBarTitleText": "合格转报废",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/inventoryMove/job/scrapToHoldMoveJob",
+			"style": {
+				"navigationBarTitleText": "报废转隔离",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+
+						},
+						{
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
 			"path": "pages/inventoryMove/record/moveFreeRecord",
 			"style": {
 				"navigationBarTitleText": "库存转移记录",

src/pages/count/job/countDetail.vue

@@ -69,6 +69,8 @@
 		calc
 	} from '@/common/calc.js';
 	
+	import { Decimal } from 'decimal.js';//引入
+
 	import {
 		goHome,
 		navigateBack,
@@ -81,7 +83,6 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
@@ -94,7 +95,6 @@
 			winScanButton,
 			winScanPack,
 			comCountDetailCard,
-			requiredLocation,
 			winScanPackAndLocation,
 			countQtyEdit,
 			jobTop,
@@ -261,7 +261,7 @@
 					item.handleQty = new Decimal(0).toNumber();
 					item.qty = new Decimal(0).toNumber();
 					for (let detail of item.subList) {
-						if (detail!= undefined) {
+						if (detail != undefined) {
 							if (detail.scaned) {
 								item.handleQty = calc.add(item.handleQty, detail.handleQty);
 							}

src/pages/customerReturn/job/returnDetail.vue

@@ -18,9 +18,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:locationTypeList="tolocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -65,7 +65,7 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue'
 
@@ -73,7 +73,7 @@
 		components: {
 			winScanButton,
 			winScanPackAndLocation,
-			requiredLocation,
+			locationCompare,
 			comDetailCard,
 			detailInfoPopup
 		},
@@ -87,9 +87,9 @@
 				managementList: [],
 				fromLocationCode: "",
 				toLocationCode: "",
-				toLocationInfo: {},
 				tolocationTypeList: [],
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode:""
 			};
 		},
 		onLoad(option) {
@@ -168,10 +168,8 @@
 							
 							that.detailSource = getDataSource(that.subList)
 							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-
-							that.getLocationInfo(that.toLocationCode);
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -182,16 +180,6 @@
 				})
 			},
 
-			getLocationInfo(locationCode) {
-				if (locationCode != '') {
-					getBasicLocationByCode(locationCode).then(res => {
-						if (res.data.list.length > 0) {
-							this.toLocationInfo = res.data.list[0]
-						}
-					})
-				}
-			},
-
 			calcHandleQty() {
 				calcHandleQty(this.detailSource);
 				this.continueScan();

src/pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -69,7 +69,6 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
@@ -82,7 +81,6 @@
 			winScanButton,
 			winScanPack,
 			comInventoryDetailCard,
-			requiredLocation,
 			winScanPackAndLocation,
 			detailInfoPopup,
 			jobTop

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -26,9 +26,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"  :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
+						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:locationTypeList="tolocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -81,7 +81,7 @@
 	} from '@/common/detail.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import detailInfoPopup from '@/pages/productPutaway/coms/detailInfoPopup.vue'
@@ -92,7 +92,7 @@
 		components: {
 			winScanButton,
 			winScanPackAndLocation,
-			requiredLocation,
+			locationCompare,
 			comDetailCard,
 			detailInfoPopup,
 			jobTop
@@ -107,9 +107,9 @@
 				managementList: [],
 				fromLocationCode: "",
 				toLocationCode: "",
-				toLocationInfo: {},
 				tolocationTypeList: [],
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode: "",
 			};
 		},
 		onLoad(option) {
@@ -182,10 +182,9 @@
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
 							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.subList)
-							that.getLocationInfo(that.toLocationCode);
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -196,16 +195,6 @@
 				})
 			},
 
-			getLocationInfo(locationCode) {
-				if (locationCode != '') {
-					getBasicLocationByCode(locationCode).then(res => {
-						if (res.data.list.length > 0) {
-							this.toLocationInfo = res.data.list[0]
-						}
-					})
-				}
-			},
-
 			calcHandleQty() {
 				calcHandleQty(this.detailSource);
 				this.continueScan()

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -27,9 +27,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation title="收货库位" :locationCode="toLocationCode"
+					<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						 @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></requiredLocation>
+						:locationTypeList="toLocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -74,7 +74,7 @@
 
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import jobTop from '@/mycomponents/job/jobTop.vue'
@@ -86,7 +86,7 @@
 		components: {
 			winScanButton,
 			comDetailCard,
-			requiredLocation,
+			locationCompare,
 			winScanPack,
 			jobTop,
 			comProductDetailCard
@@ -103,7 +103,8 @@
 				detailSource: [], //绑定在页面上的数据源
 				toLocationTypeList: [],
 				managementList: [],
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode:""
 
 			};
 		},
@@ -182,7 +183,7 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
-							that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.subList)
 						} else {

src/pages/productReceipt/record/productReceiptRecord.vue

@@ -78,7 +78,6 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comProductRecord from '@/pages/productReceipt/coms/comProductRecord.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 
@@ -87,7 +86,6 @@
 			winScanButton,
 			winScanPack,
 			comProductRecord,
-			requiredLocation,
 			comBlankView,
 		},
 		data() {

src/pages/productionReceipt/job/productionReceiptDetail.vue

@@ -28,9 +28,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 1"
+						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:locationTypeList="tolocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -77,7 +77,7 @@
 	} from '@/common/array.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
@@ -89,7 +89,7 @@
 		components: {
 			winScanButton,
 			winScanPackAndLocation,
-			requiredLocation,
+			locationCompare,
 			comDetailCard,
 			detailInfoPopup,
 			comIssueRequestInfo,
@@ -106,7 +106,8 @@
 				fromLocationCode: "",
 				toLocationCode: "",
 				tolocationTypeList: [],
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode: "",
 			};
 		},
 		onLoad(option) {
@@ -179,7 +180,7 @@
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.subList)
 							// updateTitle(this.jobContent.number);

src/pages/productionReturn/coms/comReturnCommonRequest.vue

@@ -24,7 +24,6 @@
 <script>
 	import requestFilter from '@/mycomponents/request/requestFilter.vue'
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comReturnRequestCard from '@/pages/productionReturn/coms/comReturnRequestCard.vue'
 	import requestInfoPopup from '@/pages/productionReturn/coms/requestInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
@@ -57,7 +56,6 @@
 		components: {
 			comEmptyView,
 			requestFilter,
-			requiredLocation,
 			comReturnRequestCard,
 			requestInfoPopup,
 			requestButton,

src/pages/productionReturn/job/returnDetail.vue

@@ -30,9 +30,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation title="目标库位" :locationCode="toLocationCode"
+					<locationCompare title="目标库位" :recommendLocationCode="jobToLocationCode"  :locationCode="toLocationCode"
-						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						 @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></requiredLocation>
+						:locationTypeList="toLocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -78,7 +78,7 @@
 	} from '@/common/detail.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import comReturnDetailCard from "@/pages/productionReturn/coms/comReturnDetailCard.vue"
 	import detailInfoPopup from '@/pages/productionReturn/coms/detailInfoPopup.vue'
@@ -90,7 +90,7 @@
 		name: 'receipt_detail',
 		components: {
 			winScanButton,
-			requiredLocation,
+			locationCompare,
 			// winScanPackAndLocation,
 			winScanPack,
 			comReturnDetailCard,
@@ -113,7 +113,8 @@
 				toLocationInfo: {},
 				businessTypeInfo: {},
 				titleInfo: "",
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode:""
 			};
 		},
 		onLoad(option) {
@@ -192,7 +193,7 @@
 							that.detailSource = getDataSource(that.subList)
 
 							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 							that.titleInfo = that.subList[0];
 						} else {

src/pages/purchaseReceipt/coms/comReceiptJobCard.vue

@@ -1,5 +1,5 @@
 <template>
-	<job-com-main-card :dataContent="dataContent">
+	<jobComMainCardAsn :dataContent="dataContent">
 		<view class="task_item">
 			<!-- <view class="task_text">
 				<view class="">
@@ -8,7 +8,7 @@
 			</view> -->
 			<view class="task_text">
 				<view class="">
-					发货单号 : {{dataContent.asnNumber}}
+					任务单号 : {{dataContent.number}}
 				</view>
 			</view>
 			<view class="task_text">
@@ -18,14 +18,14 @@
 				</view>
 			</view>
 		</view>
-	</job-com-main-card>
+	</jobComMainCardAsn>
 </template>
 
 <script>
-	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	import jobComMainCardAsn from '@/mycomponents/job/jobComMainCardAsn.vue'
 	export default {
 		components: {
-			jobComMainCard,
+			jobComMainCardAsn,
 		},
 		data() {
 			return {};

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -2,14 +2,21 @@
 	<view class="page-wraper">
 		<view class="page-header">
 			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
+				<jobTopAsn :dataContent="jobContent"></jobTopAsn>
 			</view>
-			<view class="header_item">
+			<view class="uni-flex  u-col-center" style="width: 100%;margin-top: 10rpx; margin-left: 10rpx; align-items: center; ">
-				发货单号 : {{jobContent.asnNumber}}
+				<view class="" style="font-size: 33rpx; font-weight: 600; ">
+					整单收货
 				</view>
-			<required-location ref="requiredLocation" title="默认收货库位 :" :locationCode="jobToLocationCode"
+				<view class="uni-flex" style="margin-left: 50rpx; align-items: center; text-align: center;">
+					<u-switch v-model="isAllReceived" active-color="#4DD865" inactive-color="#eee" size="42" @change="switchChange"></u-switch>	
+				</view>
+				
+			</view>
+			<u-line color="#D8D8D8" style="margin-top: 10rpx; margin-bottom: 10rpx;" />
+			<!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode"
 				:isShowEdit="false"></required-location>
-			<u-line color="#D8D8D8" />
+			<u-line color="#D8D8D8" /> -->
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
@@ -27,9 +34,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<required-location ref="requiredLocation" title="收货库位 :" :locationCode="toLocationCode"
+					<locationCompare ref="locationCompare" title="收货库位:"  :recommendLocationCode="jobToLocationCode"   :locationCode="toLocationCode"
-						:isShowEdit="true" @getLocation='scanLocationCode' :locationTypeList="toLocationTypeList">
+						 @getLocation='scanLocationCode' :locationTypeList="toLocationTypeList">
-					</required-location>
+					</locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -79,9 +86,10 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPackAndCont from '@/mycomponents/scan/winScanPackAndCont.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import comReceiptDetailCard from '@/pages/purchaseReceipt/coms/comReceiptDetailCard.vue'
-	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import jobTopAsn from '@/mycomponents/job/jobTopAsn.vue'
+	
 
 	export default {
 		name: 'receipt_detail',
@@ -89,8 +97,8 @@
 			winScanButton,
 			winScanPackAndCont,
 			comReceiptDetailCard,
-			requiredLocation,
+			locationCompare,
-			jobTop
+			jobTopAsn
 		},
 		data() {
 			return {
@@ -106,7 +114,8 @@
 				toLocationInfo: {},
 				businessTypeInfo: {},
 				managementList: [],
-				jobStatus: ""
+				jobStatus: "",
+				isAllReceived:false
 			};
 		},
 		onLoad(option) {
@@ -189,10 +198,10 @@
 							// that.jobContent.toLocationTypeList = that.toLocationTypeList;
 							that.subList = res.data.subList;
 							that.subList[0].containerNumber = "CN-00000001";
-							that.subList[1].containerNumber = "CN-00000001";
 							that.jobStatus = res.data.status
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.detailSource = getDataSource(that.subList)
+						    console.log(JSON.stringify(this.detailSource))
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -399,7 +408,7 @@
 				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.$refs.comMessage.showMessage('请扫描收货库位', res => {
 						if (res) {
-							this.$refs.requiredLocation.showLocation();
+							this.$refs.locationCompare.showLocation();
 						}
 					});
 					return isPass = false;
@@ -427,6 +436,26 @@
 				return isPass;
 			},
 			
+			switchChange(isOn){
+				this.isAllReceived =isOn
+				if(this.isAllReceived){
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.scaned =true
+							detail.handleQty = detail.qty;
+							detail.toLocationCode = this.toLocationCode;
+							detail.labelQty = detail.qty;
+						
+						})
+					})
+					console.log(JSON.stringify(this.detailSource))
+					calcHandleQty(this.detailSource);
+					this.continueScan()
+				}else {
+					this.getDetail()
+				}
+			},
+
 
 			showMessage(message) {
 				setTimeout(r => {

src/pages/putaway/job/putawayDetail.vue

@@ -27,9 +27,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:locationTypeList="tolocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -76,10 +76,10 @@
 	} from '@/common/detail.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
-	import putawayDetailInfoPopup from '@/pages/putaway/coms/putawayDetailInfoPopup.vue'
+	import locationCompare from '@/pages/putaway/coms/locationCompare.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 
 
@@ -87,9 +87,9 @@
 		components: {
 			winScanButton,
 			winScanPackAndLocation,
-			requiredLocation,
+			locationCompare,
 			comDetailCard,
-			putawayDetailInfoPopup,
+			locationCompare,
 			jobTop
 		},
 		data() {
@@ -103,7 +103,8 @@
 				fromLocationCode: "",
 				toLocationCode: "",
 				tolocationTypeList: [],
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode:""
 			};
 		},
 		onLoad(option) {
@@ -182,7 +183,7 @@
 							that.detailSource = getDataSource(that.subList)
 
 							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode;
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 
 						} else {

src/pages/putaway/request/putawayRequest.vue

@@ -24,7 +24,6 @@
 <script>
 	import requestFilter from '@/mycomponents/request/requestFilter.vue'
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comPutawayRequestCard from '@/pages/putaway/coms/comPutawayRequestCard.vue'
 	import requestInfoPopup from '@/pages/putaway/coms/requestInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
@@ -57,7 +56,6 @@
 		components: {
 			comEmptyView,
 			requestFilter,
-			requiredLocation,
 			comPutawayRequestCard,
 			requestInfoPopup,
 			requestButton,

src/pages/repleinsh/record/repleinshRecord.vue

@@ -86,7 +86,6 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
@@ -99,7 +98,6 @@
 		components: {
 			winScanButton,
 			winScanPack,
-			requiredLocation,
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,

src/pages/repleinsh/request/repleinshRequest.vue

@@ -19,7 +19,6 @@
 </template>
 
 <script>
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comRepleinshRequestCard from '@/pages/repleinsh/coms/comRepleinshRequestCard.vue'
 	import requestInfoPopup from '@/pages/repleinsh/coms/requestInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
@@ -46,7 +45,6 @@
 
 	export default {
 		components: {
-			requiredLocation,
 			comRepleinshRequestCard,
 			requestInfoPopup,
 			requestButton,

src/pages/scrap/record/scrapRecord.vue

@@ -74,7 +74,6 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
@@ -84,7 +83,6 @@
 		components: {
 			winScanButton,
 			winScanPack,
-			requiredLocation,
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,

src/pages/scrap/request/scrapRequestCreate.vue

@@ -76,7 +76,6 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
@@ -87,7 +86,6 @@
 		components: {
 			winScanButton,
 			winScanPack,
-			requiredLocation,
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,

src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue

@@ -60,7 +60,6 @@
 
 
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comRecordDetailCard from '@/pages/supplierDeliver/coms/comRecordDetailCard.vue'
 	import recordDetailInfoPopup from '@/pages/supplierDeliver/coms/recordDetailInfoPopup.vue'
 
@@ -69,7 +68,6 @@
 		components: {
 			winScanPack,
 			comRecordDetailCard,
-			requiredLocation,
 			recordDetailInfoPopup
 		},
 		data() {

src/pages/transfer/job/issueDetail.vue

@@ -26,9 +26,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						@getLocation='scanLocationCode' 
-						:locationTypeList="tolocationTypeList"></requiredLocation>
+						:locationTypeList="tolocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -71,7 +71,7 @@
 	
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import detailInfoPopup from '@/pages/transfer/coms/detailInfoPopup.vue'
@@ -81,7 +81,7 @@
 		name: 'returnDetail',
 		components: {
 			winScanButton,
-			requiredLocation,
+			locationCompare,
 			winScanPackAndLocation,
 			comDetailCard,
 			detailInfoPopup,
@@ -98,7 +98,8 @@
 				businessTypeInfo: {},
 				managementList: [],
 				tolocationTypeList:[],
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode:""
 			};
 		},
 		onLoad(option) {
@@ -183,7 +184,7 @@
 							that.subList =res.data.subList
 							that.detailSource = getDataSource(that.subList)
 							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 						} else {
 							that.showMessage('列表数据为0');

src/pages/transfer/job/receiptDetail.vue

@@ -29,9 +29,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+						@getLocation='scanLocationCode' 
-						:locationTypeList="toLocationTypeList"></requiredLocation>
+						:locationTypeList="toLocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -77,7 +77,7 @@
 	} from '@/common/detail.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import winScanPack from "@/mycomponents/scan/winScanPack.vue"
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
@@ -89,7 +89,7 @@
 		name: 'returnDetail',
 		components: {
 			winScanButton,
-			requiredLocation,
+			locationCompare,
 			winScanPack,
 			comDetailCard,
 			detailInfoPopup,
@@ -107,7 +107,8 @@
 				businessTypeInfo: {},
 				managementList: [],
 				toLocationTypeList: [],
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode:""
 			};
 		},
 		onLoad(option) {
@@ -193,7 +194,7 @@
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)
 							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 						} else {
 							that.showMessage('列表数据为0');

src/pages/transfer/job/transferDetail.vue

@@ -68,7 +68,6 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import jobTop from '@/mycomponents/job/jobTop.vue'
@@ -79,7 +78,6 @@
 			winScanButton,
 			winScanPack,
 			comInventoryDetailCard,
-			requiredLocation,
 			winScanPackAndLocation,
 			jobTop
 		},

src/pages/unPlanned/job/receiptJobDetail.vue

@@ -27,9 +27,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<required-location ref="requiredLocation" title="目标库位" :locationCode="toLocationCode"
+					<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"  :locationCode="toLocationCode"
-						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						 @getLocation='scanLocationCode'
-						:locationTypeList="toLocationTypeList"></required-location>
+						:locationTypeList="toLocationTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -70,7 +70,7 @@
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import comReceiptDetailCard from '@/pages/unPlanned/coms/comReceiptDetailCard.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 
@@ -80,7 +80,7 @@
 			winScanButton,
 			winScanPack,
 			comReceiptDetailCard,
-			requiredLocation,
+			locationCompare,
 			jobTop
 		},
 		data() {
@@ -95,7 +95,8 @@
 				toLocationInfo: {},
 				businessTypeInfo: {},
 				managementList: [],
-				jobStatus:""
+				jobStatus:"",
+				jobToLocationCode:""
 			};
 		},
 		onLoad(option) {
@@ -167,7 +168,7 @@
 							that.jobStatus = res.data.status
 							that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
 							that.subList = res.data.subList;
-							this.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.detailSource = getDataSource(that.subList)
 						} else {
 							that.showErrorMessage('列表数据为0');

src/pages/unPlanned/record/issueRecord.vue

@@ -44,7 +44,6 @@
 <script>
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
@@ -78,7 +77,6 @@
 		components: {
 			comEmptyView,
 			winScanButton,
-			requiredLocation,
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,

src/pages/unPlanned/request/issueRequest.vue

@@ -25,7 +25,6 @@
 <script>
 	import requestFilter from '@/mycomponents/request/requestFilter.vue'
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comIssueRequestCard from '@/pages/unPlanned/coms/comIssueRequestCard.vue'
 	import requestIssInfoPopup from '@/pages/unPlanned/coms/requestIssInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
@@ -58,7 +57,6 @@
 		components: {
 			comEmptyView,
 			requestFilter,
-			requiredLocation,
 			comIssueRequestCard,
 			requestIssInfoPopup,
 			requestButton,

src/pages/unPlanned/request/issueRequestCreate.vue

@@ -50,7 +50,6 @@
 <script>
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
@@ -87,7 +86,6 @@
 		components: {
 			comEmptyView,
 			winScanButton,
-			requiredLocation,
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,

src/pages/unPlanned/request/receiptRequest.vue

@@ -24,7 +24,6 @@
 <script>
 	import requestFilter from '@/mycomponents/request/requestFilter.vue'
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comReceiptRequestCard from '@/pages/unPlanned/coms/comReceiptRequestCard.vue'
 	import requestRecInfoPopup from '@/pages/unPlanned/coms/requestRecInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
@@ -57,7 +56,6 @@
 		components: {
 			comEmptyView,
 			requestFilter,
-			requiredLocation,
 			comReceiptRequestCard,
 			requestRecInfoPopup,
 			requestButton,