From aabb5b1df3a476fd878fda4c8c5f5a1b683e6697 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 1 Aug 2024 01:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scan/winComScanBalanceLocation.vue        |   4 +-
 src/mycomponents/scan/winScanItem.vue         |   4 +-
 src/pages/count/job/countBlindDetail.vue      |  74 ++--
 src/pages/count/job/countDetail.vue           |  44 +-
 src/pages/count/job/fuzzyCountDetail.vue      | 417 +++++++++---------
 src/pages/customerReturn/job/returnDetail.vue |  57 ++-
 src/pages/deliver/job/deliverDetail.vue       |  53 ++-
 .../inspect/request/inspectRequestDetail.vue  |  62 ++-
 .../inventoryMove/job/inventoryMoveDetail.vue |  34 +-
 src/pages/issue/coms/comIssueRequestPopup.vue |   1 -
 .../package/job/overPackageJobDetail.vue      |  61 +--
 .../job/productPutawayDetail.vue              | 116 ++---
 .../job/ccProductReceiptDetail.vue            |  64 +--
 .../job/productReceiptDetail.vue              | 123 +++---
 .../productReceipt/job/scrapReceiptDetail.vue |  12 +-
 .../job/productRecycleJobDetail.vue           |  41 +-
 .../coms/comProductionJobCard.vue             |  13 +-
 .../job/productionReceiptDetail.vue           |  23 +-
 .../coms/comReturnRequestPopup.vue            |   1 -
 .../productionReturn/job/returnDetail.vue     |  18 +-
 src/pages/repleinsh/job/repleinshDetail.vue   |  26 +-
 src/pages/stockUp/job/stockUpJobDetail.vue    |  40 +-
 .../record/supplierDeliverRecordDetail.vue    |  23 +-
 src/pages/transfer/job/issueDetail.vue        |  97 ++--
 src/pages/transfer/job/receiptDetail.vue      |  35 +-
 src/pages/transfer/job/transferDetail.vue     |  18 +-
 .../unPlanned/coms/comReceiptRequestPopup.vue |   3 -
 src/pages/unPlanned/job/issueJobDetail.vue    |  18 +-
 src/pages/unPlanned/job/receiptJobDetail.vue  |  39 +-
 .../unPlanned/request/issueRequestDetail.vue  |  23 +-
 .../request/receiptRequestDetail.vue          |  15 +-
 31 files changed, 779 insertions(+), 780 deletions(-)

diff --git a/src/mycomponents/scan/winComScanBalanceLocation.vue b/src/mycomponents/scan/winComScanBalanceLocation.vue
index 807fddf8..8e80ff8f 100644
--- a/src/mycomponents/scan/winComScanBalanceLocation.vue
+++ b/src/mycomponents/scan/winComScanBalanceLocation.vue
@@ -238,9 +238,9 @@
 				getBasicItemByCode(itemCode).then(res => {
 					if (res.data != null && res.data.list.length > 0) {
 						var result = res.data.list[0];
-						var status = result.status;
+						var status = result.available;
 						var type = result.type;
-						if (status == "ENABLE") {
+						if (status == "TRUE") {
 							if (checkDirectoryItemExist(this.itemTypesList, type)) {
 								callBack()
 							} else {
diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
index 39dd7d31..abda6b65 100644
--- a/src/mycomponents/scan/winScanItem.vue
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -110,14 +110,14 @@
 					uni.hideLoading();
 					if (res.data != null && res.data.list.length > 0) {
 						var result =res.data.list[0];
-						var status =result.status;
+						var status =result.available;
 						var type = result.type;
 						var itemCode = result.code
 						var itemName =result.name
 						var uom = result.uom
 						var std = result.uom
 						result.package = scanResult.package
-						if(status=="ENABLE"){
+						if(status=="TRUE"){
 							if(checkDirectoryItemExist(this.itemCodeTypeList,type)){
 								this.result =result;
 								this.callBack()
diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue
index 7894f617..61c1ca16 100644
--- a/src/pages/count/job/countBlindDetail.vue
+++ b/src/pages/count/job/countBlindDetail.vue
@@ -1,26 +1,28 @@
 <template>
 	<view class="page-wraper">
-		<view class="header">
-			<view class="">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
-				<view class="cell_box uni-flex uni-row" style=" font-weight: bold;">
-					<view class="cell_info" style="color: #000">
-						<view class="text_lightblue" style="color: #000">阶段</view>
-						<view style="color: #000">{{getCountStageName(jobContent.stage)}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue" style="color: #000">策略</view>
-						<view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue" style="color: #000">库位</view>
-						<view style="color: #000">{{fromLocationCode}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue" style="color: #000">已扫描</view>
-						<view style="color: #000">{{scanCount}}</view>
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
+					<view class="cell_box uni-flex uni-row" style=" font-weight: bold;">
+						<view class="cell_info" style="color: #000">
+							<view class="text_lightblue" style="color: #000">阶段</view>
+							<view style="color: #000">{{getCountStageName(jobContent.stage)}}</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue" style="color: #000">策略</view>
+							<view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue" style="color: #000">库位</view>
+							<view style="color: #000">{{fromLocationCode}}</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue" style="color: #000">已扫描</view>
+							<view style="color: #000">{{scanCount}}</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -40,8 +42,7 @@
 								</view>
 								<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index"
 									@editItem="editItem" :settingParam="jobContent" @remove="updateData"
-									:isShowRecommendQty ="false"
-									@updateData="updateData">
+									:isShowRecommendQty="false" @updateData="updateData">
 								</comCountDetailcards>
 							</view>
 							<view class='split_line'></view>
@@ -67,9 +68,8 @@
 
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location 
-		 :allowModifyLocation="false"
-		 ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="true"  @getResult='getScanResult'>
+		<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
+			:queryBalance="true" @getResult='getScanResult'>
 		</win-scan-pack-and-location>
 		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
 			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
@@ -158,7 +158,7 @@
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -253,7 +253,7 @@
 							item.recommendQty = item.qty
 							item.handleQty = 0
 							item.countTime = new Date()
-							item.fromLocationCode =that.fromLocationCode;
+							item.fromLocationCode = that.fromLocationCode;
 						})
 						that.allDetails = res.data.subList;
 						that.allCount = res.data.subList.length;
@@ -343,7 +343,7 @@
 				var batch = result.label.batch
 				var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK"
 				var qty = result.balance ? result.balance.qty : 0;
-			
+
 				//按物料、箱码、批次、状态匹配
 				let items = this.allDetails.filter(r =>
 					r.itemCode === itemCode &&
@@ -357,7 +357,7 @@
 						res => {
 							//创建盘点信息，标记为已经扫描
 							if (res) {
-								var detail = this.createAddDetailInfo(pack,qty)
+								var detail = this.createAddDetailInfo(pack, qty)
 								detail.countTime = new Date();
 								this.allDetails.push(detail)
 								this.updateList();
@@ -382,15 +382,15 @@
 									this.scanPopupGetFocus();
 								}
 							})
-			
+
 					} else {
 						//未扫描，赋值
 						selectItem.scaned = true;
-						selectItem.balanceQty= Number(qty)
+						selectItem.balanceQty = Number(qty)
 						selectItem.handleQty = Number(qty)
 						selectItem.packQty = pack.packQty
 						selectItem.packUnit = pack.packUnit
-			
+
 						this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem,
 							null);
 						selectItem.countTime = new Date();
@@ -436,7 +436,7 @@
 
 
 			//创建盘盈的明细
-			createAddDetailInfo(pack,qty) {
+			createAddDetailInfo(pack, qty) {
 				var detail = {
 					masterId: this.jobContent.id, //新增的明细
 					scaned: true,
@@ -453,7 +453,7 @@
 					packQty: pack.packQty,
 					packUnit: pack.packUnit,
 					projectCode: "",
-					recommendQty:Number(qty),
+					recommendQty: Number(qty),
 					qty: Number(qty),
 					handleQty: Number(qty),
 					uom: pack.uom,
@@ -462,7 +462,7 @@
 					countQty: 0,
 					balanceQty: 0,
 					fromLocationCode: this.fromLocationCode,
-					locationCode:this.fromLocationCode,
+					locationCode: this.fromLocationCode,
 					creator: this.$store.state.user.id,
 					countTime: new Date()
 				}
@@ -617,7 +617,7 @@
 		/* #ifdef H5 */
 		top: 88rpx;
 		/* #endif */
-		
+
 		left: 0;
 		width: 100%;
 		background-color: #fff;
diff --git a/src/pages/count/job/countDetail.vue b/src/pages/count/job/countDetail.vue
index 572cde56..7f2bd19d 100644
--- a/src/pages/count/job/countDetail.vue
+++ b/src/pages/count/job/countDetail.vue
@@ -1,22 +1,24 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
-				<view class="cell_box uni-flex uni-row">
-					<view class="cell_info">
-						<view class="text_lightblue">阶段</view>
-						<view>{{getCountStageName(jobContent.stage)}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">策略</view>
-						<view>{{ isOpenCount(jobContent.isOpenCount) }}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">库位</view>
-						<view>{{fromLocationCode}}</view>
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;">
+					<view class="cell_box uni-flex uni-row">
+						<view class="cell_info">
+							<view class="text_lightblue">阶段</view>
+							<view>{{getCountStageName(jobContent.stage)}}</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">策略</view>
+							<view>{{ isOpenCount(jobContent.isOpenCount) }}</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">库位</view>
+							<view>{{fromLocationCode}}</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -48,15 +50,11 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location 
-		ref="scanPopup" :noShowBalanceMessage="true" 
-		:isCount="true"
-		@getCountScanResult='getScanResult'>
+		<win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" :isCount="true"
+			@getCountScanResult='getScanResult'>
 		</win-scan-pack-and-location>
 		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
-			:allowEditStatus="editInventoryStatus" 
-			
-			:isShowBalance="jobContent.isOpenCount=='TRUE'">
+			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
 		</count-qty-edit>
 		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
 		<comMessage ref="comMessage"></comMessage>
diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue
index 3b44b2ca..addbf80e 100644
--- a/src/pages/count/job/fuzzyCountDetail.vue
+++ b/src/pages/count/job/fuzzyCountDetail.vue
@@ -2,22 +2,24 @@
 	<view class="page-wraper">
 		<view class="page-header">
 			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-				<uni-collapse ref="collapse">
-					<uni-collapse-item :open="true">
-						<template v-slot:title>
-							<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
-								盘点范围
+				<view class="header-view">
+					<job-top :dataContent="jobContent"></job-top>
+					<uni-collapse ref="collapse">
+						<uni-collapse-item :open="true">
+							<template v-slot:title>
+								<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
+									盘点范围
+								</view>
+							</template>
+							<view v-for="(range, index) in jobContent.countRange" :key="index">
+								<view class="card_view">
+									<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
+									<text class="card_content ">{{range.value}}</text>
+								</view>
 							</view>
-						</template>
-						<view v-for="(range, index) in jobContent.countRange" :key="index">
-							<view class="card_view">
-								<text class="card_packing_code ">{{getCountScopeName(range.type)}}</text>
-								<text class="card_content ">{{range.value}}</text>
-							</view>
-						</view>
-					</uni-collapse-item>
-				</uni-collapse>
+						</uni-collapse-item>
+					</uni-collapse>
+				</view>
 			</view>
 			<view class="card_view" v-if="fromLocationCode!=''">
 				<text class="card_location">盘点库位</text>
@@ -326,221 +328,220 @@
 				if (this.itemRangeValue != '') {
 					let index = this.itemRangeValue.indexOf(packInfo.itemCode)
 					if (index < 0) {
-						this.showErrorMessage("物料代码【"+ packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内")
-							return;
-						}
-						else {
-							this.onScan(packInfo);
-						}
+						this.showErrorMessage("物料代码【" + packInfo.itemCode + "】,不在盘点范围【" + this.itemRangeValue + "】内")
+						return;
 					} else {
 						this.onScan(packInfo);
 					}
-				},
-
-				onScan(packInfo) {
-						let detail = this.detailSource.find(r => r.itemCode == packInfo.itemCode && r.packingNumber ==
-							packInfo
-							.number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
-						if (detail == undefined) {
-							detail = this.createDetailInfo(packInfo);
-							this.detailSource.unshift(detail)
-							this.scanPopupGetFocus();
-						} else {
-							let index = this.detailSource.findIndex(r => r.itemCode == packInfo.itemCode && r
-								.packingNumber ==
-								packInfo
-								.number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
-							if (index >= 0) {
-								this.detailSource.unshift(this.detailSource.splice(index, 1)[0]); //置顶
-								//提交
-								this.$refs.comMessage.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => {
-									if (res) {
-										this.closeScanPopup();
-										this.edit(detail);
-									} else {
-										this.scanPopupGetFocus();
-									}
-								});
-							}
-						}
-					},
-
-					//创建盘盈的明细
-					createDetailInfo(packInfo) {
-						var detail = {
-							scaned: true,
-							// countDetailNumber: "",
-							number: this.jobContent.number,
-							packingNumber: packInfo.number,
-							batch: packInfo.batch,
-							inventoryStatus: "OK",
-							itemCode: packInfo.itemCode,
-							itemName: packInfo.itemName,
-							itemDesc1: packInfo.itemDesc1,
-							itemDesc2: packInfo.itemDesc2,
-							projectCode: "",
-							qty: packInfo.qty,
-							packUnit: packInfo.packUnit,
-							packQty: packInfo.packQty,
-							packUom: packInfo.packUom,
-							uom: packInfo.uom,
-							remark: "",
-							locationCode: this.fromLocationCode,
-							creator: this.$store.state.user.id,
-							warehouseCode: this.fromLocation.warehouseCode,
-							areaCode: this.fromLocation.areaCode,
-							locationGroupCode: this.fromLocation.locationGroupCode,
-							createTime: new Date().getTime(),
-							countTime: new Date().getTime(),
-							countUser: this.$store.state.user.id,
-							countDescription: '',
-							countQty: packInfo.qty
-						}
-						return detail;
-					},
-
-					editClose() {
-						this.$refs.countQtyEdit.closeEditPopup();
-					},
-
-					swipeClick(e, item, index) {
-						if (e.content.text == "编辑") {
-							this.edit(item)
-						} else if (e.content.text == "移除") {
-							this.remove(item)
-						}
-					},
-
-					//编辑盘点结果
-					edit(item) {
-						let that = this;
-						this.currentEditItem = item;
-						item.handleQty = item.qty;
-						this.$refs.countQtyEdit.openEditPopup(item, null);
-					},
-
-					editConfirm(qty, inventoryStatus, mode) {
-						let that = this;
-						this.currentEditItem.countQty = qty;
-						this.currentEditItem.qty = qty;
-						this.currentEditItem.inventoryStatus = inventoryStatus;
-						this.openScanPopup();
-					},
-
-					editClose() {
-						this.scanPopupGetFocus();
-					},
-
-					remove(item, index) {
-						this.showQuestionMessage("是否要移除扫描信息?", res => {
+				} else {
+					this.onScan(packInfo);
+				}
+			},
+
+			onScan(packInfo) {
+				let detail = this.detailSource.find(r => r.itemCode == packInfo.itemCode && r.packingNumber ==
+					packInfo
+					.number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
+				if (detail == undefined) {
+					detail = this.createDetailInfo(packInfo);
+					this.detailSource.unshift(detail)
+					this.scanPopupGetFocus();
+				} else {
+					let index = this.detailSource.findIndex(r => r.itemCode == packInfo.itemCode && r
+						.packingNumber ==
+						packInfo
+						.number && r.batch == packInfo.batch && r.inventoryStatus == "OK");
+					if (index >= 0) {
+						this.detailSource.unshift(this.detailSource.splice(index, 1)[0]); //置顶
+						//提交
+						this.$refs.comMessage.showQuestionMessage('该箱码已经扫描,是否要编辑盘点明细?', res => {
 							if (res) {
-								this.detailSource.splice(index, 1)
+								this.closeScanPopup();
+								this.edit(detail);
+							} else {
+								this.scanPopupGetFocus();
 							}
 						});
-					},
+					}
+				}
+			},
 
+			//创建盘盈的明细
+			createDetailInfo(packInfo) {
+				var detail = {
+					scaned: true,
+					// countDetailNumber: "",
+					number: this.jobContent.number,
+					packingNumber: packInfo.number,
+					batch: packInfo.batch,
+					inventoryStatus: "OK",
+					itemCode: packInfo.itemCode,
+					itemName: packInfo.itemName,
+					itemDesc1: packInfo.itemDesc1,
+					itemDesc2: packInfo.itemDesc2,
+					projectCode: "",
+					qty: packInfo.qty,
+					packUnit: packInfo.packUnit,
+					packQty: packInfo.packQty,
+					packUom: packInfo.packUom,
+					uom: packInfo.uom,
+					remark: "",
+					locationCode: this.fromLocationCode,
+					creator: this.$store.state.user.id,
+					warehouseCode: this.fromLocation.warehouseCode,
+					areaCode: this.fromLocation.areaCode,
+					locationGroupCode: this.fromLocation.locationGroupCode,
+					createTime: new Date().getTime(),
+					countTime: new Date().getTime(),
+					countUser: this.$store.state.user.id,
+					countDescription: '',
+					countQty: packInfo.qty
+				}
+				return detail;
+			},
 
+			editClose() {
+				this.$refs.countQtyEdit.closeEditPopup();
+			},
 
-					detail(item) {
-						this.showItem = item;
-						this.$refs.detailInfoPopup.openPopup(item);
-					},
+			swipeClick(e, item, index) {
+				if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item)
+				}
+			},
 
-					commit() {
-						if (this.detailSource.length == 0) {
-							this.$refs.comMessage.showMessage('还未扫描,是否要继续提交', res => {
-								if (res) {
-									this.commitJob();
-								}
-							});
-						} else {
+			//编辑盘点结果
+			edit(item) {
+				let that = this;
+				this.currentEditItem = item;
+				item.handleQty = item.qty;
+				this.$refs.countQtyEdit.openEditPopup(item, null);
+			},
+
+			editConfirm(qty, inventoryStatus, mode) {
+				let that = this;
+				this.currentEditItem.countQty = qty;
+				this.currentEditItem.qty = qty;
+				this.currentEditItem.inventoryStatus = inventoryStatus;
+				this.openScanPopup();
+			},
+
+			editClose() {
+				this.scanPopupGetFocus();
+			},
+
+			remove(item, index) {
+				this.showQuestionMessage("是否要移除扫描信息?", res => {
+					if (res) {
+						this.detailSource.splice(index, 1)
+					}
+				});
+			},
+
+
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.detailInfoPopup.openPopup(item);
+			},
+
+			commit() {
+				if (this.detailSource.length == 0) {
+					this.$refs.comMessage.showMessage('还未扫描,是否要继续提交', res => {
+						if (res) {
 							this.commitJob();
 						}
-					},
+					});
+				} else {
+					this.commitJob();
+				}
+			},
 
-					commitJob() {
-						uni.showLoading({
-							title: "提交中....",
-							mask: true
-						});
-						var params = this.setParams()
-						console.log("提交参数", JSON.stringify(params));
-						countJobSubmit(params).then(res => {
-							uni.hideLoading()
-							if (res.data == null) {
-								this.showCommitSuccessMessage("提交成功")
-							} else {
-								this.showErrorMessage("提交失败[" + res.msg + "]")
-							}
-						}).catch(error => {
-							uni.hideLoading()
-							this.showErrorMessage(error)
-						})
-					},
+			commitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				countJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data == null) {
+						this.showCommitSuccessMessage("提交成功")
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
 
 
-					setParams() {
-						var creator = this.$store.state.user.id
-						this.jobContent.subList = this.detailSource
-						// this.jobContent.creator = creator;
-						return this.jobContent;
-					},
+			setParams() {
+				var creator = this.$store.state.user.id
+				this.jobContent.subList = this.detailSource
+				// this.jobContent.creator = creator;
+				return this.jobContent;
+			},
 
 
-					showMessage(message) {
-						this.$refs.comMessage.showMessage(message, res => {
-							if (res) {
-								this.afterCloseMessage()
-							}
-						});
-					},
-					showErrorMessage(message) {
-						this.$refs.comMessage.showErrorMessage(message, res => {
-							if (res) {
-								this.afterCloseMessage()
-							}
-						});
-					},
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
 
-					showScanMessage(message) {
-						this.$refs.comMessage.showScanMessage(message);
-					},
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
 
-					afterCloseMessage() {
-						this.scanPopupGetFocus();
-					},
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
 
-					closeScanMessage() {
-						this.scanPopupGetFocus();
-					},
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
 
-					showCommitSuccessMessage(hint) {
-						this.$refs.comMessage.showSuccessMessage(hint, res => {
-							this.fromLocationCode = '';
-							this.fromLocation = {};
-							this.detailSource = [];
-							this.showFromLocationPopup();
-						})
-					},
-					getCountStageName(value) {
-						return getCountStageName(value)
-					},
-					isOpenCount(value) {
-						return value == "TRUE" ? "明盘" : "盲盘"
-					},
-
-					getCountScopeName(value) {
-						let item = getCountScopeType(value);
-						return item.label;
-					},
-
-					showQuestionMessage(message, callback) {
-						this.$refs.comMessage.showQuestionMessage(message, res => {
-							callback(res);
-						});
-					},
-			}
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.fromLocationCode = '';
+					this.fromLocation = {};
+					this.detailSource = [];
+					this.showFromLocationPopup();
+				})
+			},
+			getCountStageName(value) {
+				return getCountStageName(value)
+			},
+			isOpenCount(value) {
+				return value == "TRUE" ? "明盘" : "盲盘"
+			},
+
+			getCountScopeName(value) {
+				let item = getCountScopeType(value);
+				return item.label;
+			},
+
+			showQuestionMessage(message, callback) {
+				this.$refs.comMessage.showQuestionMessage(message, res => {
+					callback(res);
+				});
+			},
 		}
+	}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 3b2c9bdf..058553d6 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -1,5 +1,17 @@
 <template>
 	<view class="page-wraper">
+
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				 <view class="header_item">
+				 	<view>客户代码:{{jobContent.customerCode}}</view>
+				 </view>
+			</view>
+		</view>
+
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -9,7 +21,6 @@
 							:locationAreaTypeList="toLocationAreaTypeList">
 						</com-detail-card>
 					</view>
-					<view class='split_line'></view>
 				</view>
 			</scroll-view>
 		</view>
@@ -18,9 +29,10 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'" title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' 
-						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
+					<locationCompare ref='comScanLocation' :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
+						title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
+						@getLocation='scanLocationCode' :locationAreaTypeList="toLocationAreaTypeList">
+					</locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -67,9 +79,11 @@
 	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 
 	export default {
 		components: {
+			jobTop,
 			winScanButton,
 			winScanPackAndLocation,
 			locationCompare,
@@ -87,13 +101,13 @@
 				fromLocationCode: "",
 				toLocationCode: "",
 				toLocationAreaTypeList: [],
-				jobStatus:"",
-				jobToLocationCode:""
+				jobStatus: "",
+				jobToLocationCode: ""
 			};
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -117,7 +131,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeCustomerReturnJob(this.id).then(res => {
 						uni.navigateBack();
@@ -167,11 +181,11 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
-							
+
 							that.detailSource = getDataSource(that.subList)
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.jobToLocationCode = that.subList[0].toLocationCode
-							if(that.jobContent.allowModifyLocation=='FALSE'){
+							if (that.jobContent.allowModifyLocation == 'FALSE') {
 								that.toLocationCode = that.subList[0].toLocationCode
 							}
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
@@ -261,10 +275,10 @@
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-								
-								
+
+
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
 										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续退货?', res => {
 												if (res) {
@@ -272,7 +286,7 @@
 													itemDetail.handleQty = Number(result.balance.qty)
 													itemDetail.inventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
-													itemDetail.balance.balanceQty =  Number(result.balance.qty)
+													itemDetail.balance.balanceQty = Number(result.balance.qty)
 													itemDetail.balance.packQty = Number(result.package.packQty)
 													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
@@ -280,19 +294,20 @@
 													this.scanPopupGetFocus();
 												}
 											});
-									}else {
-										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
 											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
 											});
 									}
-									
+
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.balance.qty)
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty =  Number(result.balance.qty)
+									itemDetail.balance.balanceQty = Number(result.balance.qty)
 									itemDetail.balance.packQty = Number(result.package.packQty)
 									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
@@ -456,13 +471,13 @@
 			},
 
 			scanPopupGetFocus() {
-				if(this.$refs.scanPopup!=undefined){
+				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.packGetFocus();
 				}
 			},
 
 			scanPopupLoseFocus() {
-				if(this.$refs.scanPopup!=undefined){
+				if (this.$refs.scanPopup != undefined) {
 					this.$refs.scanPopup.packLoseFocus();
 				}
 			},
@@ -524,4 +539,4 @@
 		background: #e0e0e0;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index d212403b..72f19b7b 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -1,31 +1,28 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<!-- <view class="header_item">
-				申请单号：{{jobContent.requestNumber}}
-			</view>
- -->
-			<view class="cen_card" style="padding: 5rpx;">
-				<view class="cell_box uni-flex uni-row">
-					<view class="cell_info">
-						<view class="text_lightblue">发货类型</view>
-						<view>{{jobContent.deliverType}}</view>
-					</view>
-
-					<view class="cell_info">
-						<view class="text_lightblue">客户代码</view>
-						<view>{{jobContent.customerCode}}</view>
-					</view>
-
-					<view class="cell_info">
-						<view class="text_lightblue">目标库位</view>
-						<view>{{toLocationCode}}</view>
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="cen_card" style="padding: 5rpx;">
+					<view class="cell_box uni-flex uni-row">
+						<view class="cell_info">
+							<view class="text_lightblue">发货类型</view>
+							<view>{{jobContent.deliverType}}</view>
+						</view>
+
+						<view class="cell_info">
+							<view class="text_lightblue">客户代码</view>
+							<view>{{jobContent.customerCode}}</view>
+						</view>
+
+						<view class="cell_info">
+							<view class="text_lightblue">目标库位</view>
+							<view>{{toLocationCode}}</view>
+						</view>
 					</view>
 				</view>
-				<view class='split_line'></view>
 			</view>
 		</view>
 
@@ -59,7 +56,7 @@
 		cancleTakeDeliverJob,
 		deliverJobSubmit
 	} from '@/api/request2.js';
-	
+
 
 	import {
 		calc
@@ -117,7 +114,7 @@
 
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -249,7 +246,7 @@
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
 
-				if(params.subList.length==0){
+				if (params.subList.length == 0) {
 					uni.hideLoading()
 					this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
 					return
@@ -305,7 +302,7 @@
 												.packingNumber;
 											record.toBatch = info.batch;
 										}
-										record.fromPackingNumber =r.packingNumber
+										record.fromPackingNumber = r.packingNumber
 										subItem.recordList.push(record);
 									})
 									subList.push(subItem);
@@ -473,4 +470,4 @@
 	// 	border-bottom-width: 1px;
 	// 	border-bottom-color: #ebeef5;
 	// }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/inspect/request/inspectRequestDetail.vue b/src/pages/inspect/request/inspectRequestDetail.vue
index 199efe98..2c1ec08d 100644
--- a/src/pages/inspect/request/inspectRequestDetail.vue
+++ b/src/pages/inspect/request/inspectRequestDetail.vue
@@ -1,22 +1,22 @@
 <template>
 	<view class="page-wraper">
-
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_item" >
+					单据号 : {{requestContent.number}}
+				</view>
+				<view class="header_item" >
+					<text>供应商代码 : {{requestContent.supplierCode}} </text>
+				</view>
+			</view>
+		</view>
+		<view class='split_line'></view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
-					<view class="" style="font-size: 35rpx;">
-						单据号 : {{requestContent.number}}
-					</view>
-					<view class="" style="font-size: 35rpx;">
-						<text>供应商代码 :  {{requestContent.supplierCode}} </text>
-					</view>
-				</view>
-				<view class='split_line'></view>
+
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comRequestDetailCard :dataContent="item" 
-						:isShowBatch ="false"
-							 @openDetail="openDetail">
+						<comRequestDetailCard :dataContent="item" :isShowBatch="false" @openDetail="openDetail">
 						</comRequestDetailCard>
 					</view>
 				</view>
@@ -29,7 +29,6 @@
 </template>
 
 <script>
-	
 	import {
 		getInspectRequestDetail,
 	} from '@/api/request2.js';
@@ -62,11 +61,11 @@
 		onLoad(option) {
 			this.id = option.id;
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.getDetail();
 		},
-			
+
 		//返回首页
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
@@ -94,29 +93,28 @@
 					if (res.data == null) {
 						that.showMessage('未获取到详情');
 					} else {
-					if (res.data.subList.length > 0) {
-						that.requestContent = res.data;
-						that.subList = res.data.subList;
-						that.detailSource = getDataSource(that.subList)
-						// that.subList = res.data[0];
-						// that.subList.forEach(res=>{
-						// 	res.packingNumber =res.toPackingNumber
-						// 	res.batch =res.fromBatch
-						// })
-					} else {
-						that.showMessage('列表数据为0');
-					}
+						if (res.data.subList.length > 0) {
+							that.requestContent = res.data;
+							that.subList = res.data.subList;
+							that.detailSource = getDataSource(that.subList)
+							// that.subList = res.data[0];
+							// that.subList.forEach(res=>{
+							// 	res.packingNumber =res.toPackingNumber
+							// 	res.batch =res.fromBatch
+							// })
+						} else {
+							that.showMessage('列表数据为0');
+						}
 					}
 				}).catch(error => {
 					uni.hideLoading()
 					this.showMessage(error)
 				})
 			},
-			
+
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {
-					}
+					if (res) {}
 				});
 			},
 
@@ -131,4 +129,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 0afd74c9..7419a85e 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -1,13 +1,11 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
 			</view>
-			<view class='split_line'></view>
 		</view>
 
 		<view class="page-main">
@@ -96,8 +94,8 @@
 				businessTypeCode: '',
 				toLocationCode: '',
 				toInventoryStatus: '',
-				jobStatus:"",
-				title:''
+				jobStatus: "",
+				title: ''
 			};
 		},
 		props: {
@@ -105,7 +103,7 @@
 		},
 		onLoad(option) {
 			this.title = option.title
-			
+
 			this.id = option.id;
 			this.businessTypeCode = option.businessTypeCode;
 			if (this.id != undefined) {
@@ -130,7 +128,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeInventoryMoveJob(this.id).then(res => {
 						uni.navigateBack();
@@ -175,8 +173,7 @@
 					name = "不合格转隔离";
 					this.toLocationCode = 'HOLD';
 					this.toInventoryStatus = 'HOLD';
-				}
-				else if (this.businessTypeCode == "OktoScrap") {
+				} else if (this.businessTypeCode == "OktoScrap") {
 					name = "合格转报废";
 					this.toLocationCode = 'SCRAP';
 					this.toInventoryStatus = 'SCRAP';
@@ -454,13 +451,10 @@
 							detail.toBatch = info.batch;
 							detail.toContainerNumber = '';
 							// detail.toLocationCode = this.toLocationCode;
-							if(this.businessTypeCode == "Move")
-							{
-								detail.toInventoryStatus=detail.inventoryStatus;
-							}
-							else
-							{
-								detail.toInventoryStatus=this.toInventoryStatus;
+							if (this.businessTypeCode == "Move") {
+								detail.toInventoryStatus = detail.inventoryStatus;
+							} else {
+								detail.toInventoryStatus = this.toInventoryStatus;
 							}
 							subList.push(detail)
 						}
@@ -564,4 +558,4 @@
 		background: #e0e0e0;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue
index 3b20dfe4..da1fea6f 100644
--- a/src/pages/issue/coms/comIssueRequestPopup.vue
+++ b/src/pages/issue/coms/comIssueRequestPopup.vue
@@ -99,7 +99,6 @@
 
 <script>
 	import {
-		getBasicItemByCode,
 		getProductionlineItem,
 		getWorkShopLineStation,
 		getWarehouseCodeList
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 285592d8..36a9e041 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -1,44 +1,51 @@
 <template>
 	<view class="page-wraper">
-		<div style="background: white;">
-			<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
-		</div>
+
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<!-- <view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
-			</view> -->
-		</view>
-		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view v-for="(toLocation, index) in detailSource" :key="index">
-					<view class="cen_card" style="padding: 5rpx;" v-if='subList.length>0'>
-						<view class="cell_box uni-flex uni-row">
-							<view class="cell_info">
-								<view class="text_lightblue">翻包前包装规格</view>
-								<view>
-									{{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].fromPackUnit)}}
-								</view>
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="cen_card" style="padding: 5rpx;" v-if='subList.length>0'>
+					<view class="cell_box uni-flex uni-row">
+						<view class="cell_info">
+							<view class="text_lightblue">翻包前包装规格</view>
+							<view>
+								{{getPackUnitName(subList[0].fromPackUnit)}}/{{subList[0].fromPackQty}}({{getUomInfo(subList[0].uom)}})
 							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">翻包后包装规格</view>
-								<view>
-									{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})/{{getPackUnitName(subList[0].toPackUnit)}}
-								</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">翻包后包装规格</view>
+							<view>
+								{{getPackUnitName(subList[0].toPackUnit)}}/{{subList[0].toPackQty}}({{getUomInfo(subList[0].uom)}})
 							</view>
 						</view>
-						<view class="split_line"></view>
 					</view>
+				</view>
+			</view>
 
+		</view>
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view v-for="(toLocation, index) in detailSource" :key="index">
 					<comOverPackJobDetailCard ref='comOverPackJobDetailCard' :dataContent="toLocation"
 						@updateData='updateData'>
 					</comOverPackJobDetailCard>
 				</view>
 			</scroll-view>
 		</view>
-
+		<div style="background: white;">
+			<uni-collapse>
+				<uni-collapse-item>
+					<template v-slot:title>
+						<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
+							打印设置
+						</view>
+					</template>
+					<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
+				</uni-collapse-item>
+			</uni-collapse>
+		</div>
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 09b2be9a..95c8df1a 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -1,20 +1,21 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<!-- <view class="header_item">
 				申请单号 : {{jobContent.requestNumber}}
+			</view> -->
 			</view>
-			<view class='split_line'></view>
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail" 
+						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+							:isShowStatus="false" @remove="updateData" @updateData="updateData" @openDetail="openDetail"
 							:locationAreaTypeList='toLocationAreaTypeList'>
 						</com-detail-card>
 					</view>
@@ -36,7 +37,8 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location :balanceFromInventoryStatuses="false" ref="scanPopup"
+			@getResult='getScanResult'></win-scan-pack-and-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 
 		<comMessage ref="comMessage"></comMessage>
@@ -114,15 +116,15 @@
 				isCheckLocation: false,
 				switchCode: "",
 				scanMessage: '',
-				hintTitle:"",
-				status:''
+				hintTitle: "",
+				status: ''
 			};
 		},
-		onLoad(option) {
-			
+		onLoad(option) {
+
 			this.id = option.id;
 			this.type = option.type;
-			this.scanMessage = option.scanMessage ;
+			this.scanMessage = option.scanMessage;
 			this.status = option.status || ''
 			if (this.type == 'predict') {
 				this.switchCode = "SemiPutawayLocationCodeValidate"
@@ -132,25 +134,25 @@
 				this.switchCode = "FgPutawayLocationCodeValidate"
 				// this.hintTitle="成品入库"
 				// updateTitle("成品入库详情");
-			}
-			
-			this.hintTitle=option.title
-			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+			}
+
+			this.hintTitle = option.title
+			uni.setNavigationBarTitle({
+				title: option.title + '详情'
 			})
-			
-		},
-		onShow(){
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (this.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-			}
+
+		},
+		onShow() {
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (this.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -212,17 +214,17 @@
 							that.jobToLocationCode = that.subList[0].toLocationCode
 							that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.subList)
-							
+
 							that.isCheckLocation = getSwitchInfoByCode(that.switchCode)
 							if (that.isCheckLocation) {
 								that.toLocationCode = ""
 							} else {
 								that.toLocationCode = that.jobToLocationCode;
 							}
-							if(this.scanMessage){
+							if (this.scanMessage) {
 								this.openScanPopupSimulate(this.scanMessage)
 							}
-							
+
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -255,7 +257,7 @@
 
 			openDetail(item) {
 				this.$refs.detailInfoPopup.openPopup(item)
-			},
+			},
 			openScanPopupSimulate(scanMessage) {
 				let fromlocationCode = '';
 				let fromlocationList = [];
@@ -273,7 +275,8 @@
 						}
 					})
 				}
-				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,scanMessage);
+				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
+					scanMessage);
 			},
 
 			openScanPopup() {
@@ -302,8 +305,8 @@
 				this.$refs.scanPopup.closeScanPopup();
 			},
 
-			getScanResult(result) {
-				
+			getScanResult(result) {
+
 				try {
 					var packingNumber = result.balance.packingNumber;
 					var batch = result.balance.batch;
@@ -324,33 +327,33 @@
 						if (itemDetail == undefined) {
 							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 								.fromLocationCode + "】不在列表中")
-						} else {
-							
-							if (!itemDetail.cancleScanedHiht&&itemDetail.scaned) {
+						} else {
+
+							if (!itemDetail.cancleScanedHiht && itemDetail.scaned) {
 								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 									.fromLocationCode + "】已经扫描")
 							} else {
 								// this.addDetail(itemDetail, result);
 								// return;
-								
+
 								//暂时先不判断状态
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
 									// if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
-										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-											']不一致,是否继续上架?', res => {
-												if (res) {
-													itemDetail.cancleScanedHiht=false;
-													this.addDetail(itemDetail, result);
-												} else {
-													this.scanPopupGetFocus();
-												}
-											});
-									}else {
-										itemDetail.cancleScanedHiht=false;
-										this.addDetail(itemDetail, result);
-									}
+									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+										']不一致,是否继续上架?', res => {
+											if (res) {
+												itemDetail.cancleScanedHiht = false;
+												this.addDetail(itemDetail, result);
+											} else {
+												this.scanPopupGetFocus();
+											}
+										});
+								} else {
+									itemDetail.cancleScanedHiht = false;
+									this.addDetail(itemDetail, result);
+								}
 								// } else {
 								// 	this.addDetail(itemDetail, result);
 								// }
@@ -453,7 +456,8 @@
 						productPutawayJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
-								this.showCommitSuccessMessage("提交成功<br>生成"+this.hintTitle+"记录<br>" + res.data)
+								this.showCommitSuccessMessage("提交成功<br>生成" + this.hintTitle + "记录<br>" +
+									res.data)
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}
diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
index 5c4c9040..9975a8d2 100644
--- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
@@ -1,43 +1,45 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-		</view>
-
-		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="cen_card" style="padding: 5rpx;">
-						<view class="cell_box uni-flex uni-row">
-							<view class="cell_info">
-								<view class="text_lightblue">车间</view>
-								<view>
-									{{jobContent.workShopCode}}
-								</view>
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="cen_card" style="padding: 5rpx;">
+					<view class="cell_box uni-flex uni-row">
+						<view class="cell_info">
+							<view class="text_lightblue">车间</view>
+							<view>
+								{{jobContent.workShopCode}}
 							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">生产线</view>
-								<view>
-									{{item.subList[0].productionLineCode}}
-								</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">生产线</view>
+							<view>
+								{{jobContent.subList[0].productionLineCode}}
 							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">班组</view>
-								<view>
-									{{jobContent.team}}
-								</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">班组</view>
+							<view>
+								{{jobContent.team}}
 							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">班次</view>
-								<view>
-									{{jobContent.shift}}
-								</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">班次</view>
+							<view>
+								{{jobContent.shift}}
 							</view>
 						</view>
-						<view class="split_line"></view>
 					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+
 
 					<view class="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 094c25ea..d2287038 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -1,43 +1,45 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-		</view>
-
-		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="cen_card" style="padding: 5rpx;">
-						<view class="cell_box uni-flex uni-row">
-							<view class="cell_info">
-								<view class="text_lightblue">车间</view>
-								<view>
-									{{jobContent.workShopCode}}
-								</view>
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<!-- <view class="header_item">生产计划：{{productionPlanNumber}}</view> -->
+				<view class="cen_card" style="padding: 5rpx;">
+					<view class="cell_box uni-flex uni-row">
+						<view class="cell_info">
+							<view class="text_lightblue">车间</view>
+							<view>
+								{{jobContent.workShopCode}}
 							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">生产线</view>
-								<view>
-									{{item.subList[0].productionLineCode}}
-								</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">生产线</view>
+							<view>
+								{{jobContent.subList[0].productionLineCode}}
 							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">班组</view>
-								<view>
-									{{jobContent.team}}
-								</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">班组</view>
+							<view>
+								{{jobContent.team}}
 							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">班次</view>
-								<view>
-									{{jobContent.shift}}
-								</view>
+						</view>
+						<view class="cell_info">
+							<view class="text_lightblue">班次</view>
+							<view>
+								{{jobContent.shift}}
 							</view>
 						</view>
-						<view class="split_line"></view>
 					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 
 					<view class="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@@ -53,7 +55,8 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare ref="comScanLocation" title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
+					<locationCompare ref="comScanLocation" title="收货库位"
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
 						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
@@ -134,31 +137,31 @@
 				managementList: [],
 				jobStatus: "",
 				jobToLocationCode: "",
-				status:'',
-				scanMessage:""
+				status: '',
+				scanMessage: ""
 			};
 		},
-		onLoad(option) {
-			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
-			})
-			
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title + '详情'
+			})
+
 			this.id = option.id;
-			this.scanMessage =option.scanMessage;
+			this.scanMessage = option.scanMessage;
 			this.status = option.status || ''
-			
-		},
-		onShow(){
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (this.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-			}
+
+		},
+		onShow() {
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (this.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -221,16 +224,16 @@
 							that.jobContent = res.data;
 							that.subList = res.data.subList;
 							that.jobStatus = res.data.status
-							that.jobToLocationCode = that.subList[0].toLocationCode
-							if(that.jobContent.allowModifyLocation=='FALSE'){
-								that.toLocationCode = that.subList[0].toLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode
+							if (that.jobContent.allowModifyLocation == 'FALSE') {
+								that.toLocationCode = that.subList[0].toLocationCode
 							}
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.subList)
-							if(that.scanMessage){
+							if (that.scanMessage) {
 								this.$refs.scanPopup.simulateScan(that.scanMessage);
 							}
-							
+
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -241,8 +244,8 @@
 				})
 			},
 
-			getScanResult(result) {
-				
+			getScanResult(result) {
+
 				let label = result.label;
 				var packingNumber = label.packingNumber;
 				var batch = label.batch;
diff --git a/src/pages/productReceipt/job/scrapReceiptDetail.vue b/src/pages/productReceipt/job/scrapReceiptDetail.vue
index ebf5495a..41a5c40c 100644
--- a/src/pages/productReceipt/job/scrapReceiptDetail.vue
+++ b/src/pages/productReceipt/job/scrapReceiptDetail.vue
@@ -1,13 +1,11 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
 			</view>
-			<view class='split_line'></view>
 		</view>
 
 		<view class="page-main">
@@ -110,7 +108,7 @@
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index f42cacaa..b6a94a57 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue
@@ -1,13 +1,11 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号：{{jobContent.requestNumber}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
 			</view>
-			<view class='split_line'></view>
 		</view>
 
 		<view class="page-main">
@@ -34,7 +32,8 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" title="制品标签" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" title="制品标签"
+			@getResult='getScanResult'></win-scan-pack-and-location>
 		<recycleDetailInfoPopup ref="jobDetailPopup"></recycleDetailInfoPopup>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -98,7 +97,7 @@
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -180,8 +179,8 @@
 							that.jobContent = res.data;
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
-							that.subList.forEach(res=>{
-								res.fromLocationCode =res.toLocationCode
+							that.subList.forEach(res => {
+								res.fromLocationCode = res.toLocationCode
 							})
 							that.toLocationCode = that.jobContent.toLocationCode
 							that.detailSource = getDataSource(that.subList);
@@ -243,11 +242,11 @@
 						itemDetail = detail.subList.find(r => {
 							return r.packingNumber == packingNumber &&
 								r.batch == batch &&
-								r.fromLocationCode == result.fromLocationCode&&
+								r.fromLocationCode == result.fromLocationCode &&
 								r.inventoryStatus == result.balance.inventoryStatus
-								
+
 						})
-						if(itemDetail){
+						if (itemDetail) {
 							// 箱码、批次、库位、状态一致
 							if (itemDetail.scaned) {
 								this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
@@ -257,22 +256,22 @@
 								itemDetail.scaned = true;
 								itemDetail.handleQty = Number(result.balance.qty);
 								itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-								itemDetail.inventoryStatus =result.balance.inventoryStatus;
+								itemDetail.inventoryStatus = result.balance.inventoryStatus;
 								itemDetail.balance = result.balance;
 								itemDetail.balance.balanceQty = Number(result.balance.qty);
 								itemDetail.balance.packQty = Number(result.package.packQty)
 								itemDetail.balance.packUnit = result.package.packUnit
 								this.calcHandleQty();
 							}
-						}else {
+						} else {
 							//箱码、批次、库位相等
 							itemDetail = detail.subList.find(r => {
 								return r.packingNumber == packingNumber &&
 									r.batch == batch &&
 									r.fromLocationCode == result.fromLocationCode
 							})
-							
-							if(itemDetail){
+
+							if (itemDetail) {
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								//箱码、批次、库位相等，状态不相等
 								if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
@@ -282,7 +281,7 @@
 												itemDetail.scaned = true;
 												itemDetail.handleQty = Number(result.balance.qty);
 												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-												itemDetail.inventoryStatus =result.balance.inventoryStatus;
+												itemDetail.inventoryStatus = result.balance.inventoryStatus;
 												itemDetail.balance = result.balance;
 												itemDetail.balance.balanceQty = result.balance.qty;
 												itemDetail.balance.packQty = result.package.packQty
@@ -299,11 +298,11 @@
 											this.scanPopupGetFocus();
 										});
 								}
-							}else {
+							} else {
 								this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
 									.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>不在任务列表中")
 							}
-							
+
 						}
 
 					}
@@ -461,4 +460,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/productionReceipt/coms/comProductionJobCard.vue b/src/pages/productionReceipt/coms/comProductionJobCard.vue
index 00761e5c..3df2b1c2 100644
--- a/src/pages/productionReceipt/coms/comProductionJobCard.vue
+++ b/src/pages/productionReceipt/coms/comProductionJobCard.vue
@@ -1,10 +1,13 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
-		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
-		<view class="" >
-			<text style="font-size: 32rpx; margin-left: 35rpx;">生产线</text>
-			<text style="font-size: 35rpx; margin-left: 10rpx; font-weight: bold;" >{{dataContent.productionLineCode}}</text>
-			
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>		
+		<view class="task_item" style="margin-left: 15px;">
+			<view class="task_text">
+				<view class="card_view">
+					<text class="card_packing_code ">生产线</text>
+					<text class="card_content ">{{dataContent.productionLineCode}}</text>
+				</view>
+			</view>
 		</view>
 	</job-com-main-card>
  </template>
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 273386b5..b36e1f6f 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -2,13 +2,14 @@
 	<view class="page-wraper">
 		<view class="page-main">
 			<view class="page-header">
-				<view class="header_job_top">
-					<job-top :dataContent="jobContent"></job-top>
-				</view>
-				<view class="header_item">
-					发料任务单号 : {{jobContent.issueJobNumber}}
+				<view class="header-view">
+					<view class="header_job_top">
+						<job-top :dataContent="jobContent"></job-top>
+					</view>
+					<view class="header_item">
+						发料任务单号 : {{jobContent.issueJobNumber}}
+					</view>
 				</view>
-				<view class="split_line"></view>
 			</view>
 			<scroll-view scroll-y="true">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -114,7 +115,7 @@
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			this.scanMessage = option.scanMessage;
@@ -195,7 +196,7 @@
 							} else {
 								that.toLocationCode = that.jobToLocationCode;
 							}
-							if(this.scanMessage){
+							if (this.scanMessage) {
 								this.openScanPopupSimulate(this.scanMessage);
 							}
 						} else {
@@ -280,7 +281,7 @@
 					})
 				}
 				this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
-				scanMessage);
+					scanMessage);
 			},
 
 			getScanResult(result) {
@@ -432,8 +433,8 @@
 					uni.hideLoading()
 					this.showErrorMessage(error)
 				})
-				
-				
+
+
 				// var itemCodes = []
 				// this.detailSource.forEach(item => {
 				// 	itemCodes.push(item.itemCode)
diff --git a/src/pages/productionReturn/coms/comReturnRequestPopup.vue b/src/pages/productionReturn/coms/comReturnRequestPopup.vue
index 3c614434..adbdbd79 100644
--- a/src/pages/productionReturn/coms/comReturnRequestPopup.vue
+++ b/src/pages/productionReturn/coms/comReturnRequestPopup.vue
@@ -74,7 +74,6 @@
 
 <script>
 	import {
-		getBasicItemByCode,
 		getProductionlineItem,
 		getWorkShopLineStation
 	} from '@/api/request2.js';
diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue
index a83fdf47..44301682 100644
--- a/src/pages/productionReturn/job/returnDetail.vue
+++ b/src/pages/productionReturn/job/returnDetail.vue
@@ -1,21 +1,19 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<work-station :workshopCode="jobContent.workshopCode" :productionLineCode="titleInfo.productionLineCode"
+					:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
+				</work-station>
 			</view>
-			<!-- <view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
-			</view> -->
-			<work-station :workshopCode="jobContent.workshopCode" :productionLineCode="titleInfo.productionLineCode"
-				:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
-			</work-station>
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<view class="split_line"></view>
 						<com-return-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
 							@remove="updateData" @updateData="updateData"
 							:locationAreaTypeList='toLocationAreaTypeList'>
@@ -116,7 +114,7 @@
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index 7726fa72..133d84b7 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -1,13 +1,14 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
+					申请单号 : {{jobContent.requestNumber}}
+				</view>
 			</view>
-			<view class="split_line"></view>
 		</view>
 
 		<view class="page-main">
@@ -99,7 +100,7 @@
 				toLocationCode: '',
 				toLocationAreaTypeList: [],
 				jobStatus: "",
-				scanMessage:""
+				scanMessage: ""
 			};
 		},
 
@@ -109,10 +110,10 @@
 
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
-			this.scanMessage =option.scanMessage
+			this.scanMessage = option.scanMessage
 			if (this.id != undefined) {
 				//新建的任务自动接收
 				if (option.status == "1") {
@@ -190,10 +191,11 @@
 							that.toLocationCode = that.subList[0].toLocationCode
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
 							that.detailSource = getDataSource(that.detailSource, that.subList)
-							if(that.scanMessage){
-								this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent,that.scanMessage);
+							if (that.scanMessage) {
+								this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this
+									.jobContent, that.scanMessage);
 							}
-							
+
 							setTimeout(r => {
 								that.resizeCollapse();
 							}, 100)
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
index c9a40892..d8271d72 100644
--- a/src/pages/stockUp/job/stockUpJobDetail.vue
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -1,26 +1,11 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号：{{jobContent.requestNumber}}
-			</view>
-			<view class='split_line'></view>
-			<!-- <view class="cen_card" style="padding: 5rpx;">
-				<view class="cell_box uni-flex uni-row">
-					<view class="cell_info">
-						<view class="text_lightblue">客户代码</view>
-						<view>{{jobContent.customerCode}}</view>
-					</view>
-					<view class="cell_info">
-						<view class="text_lightblue">客户寄售库</view>
-						<view>{{toLocationCode}}</view>
-					</view>
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
 				</view>
-				<view class='split_line'></view>
-			</view> -->
+			</view>
 		</view>
 
 		<view class="page-main">
@@ -131,7 +116,7 @@
 
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -317,18 +302,19 @@
 											record.toLocationCode = subItem
 												.toLocationCode;
 											record.supplierCode = r.supplierCode;
-									
+
 											//使用在途库不改变管理模式
 											if (this.toLocationCode == null) {
 												record.toPackingNumber = r
 													.packingNumber;
 												record.toBatch = r.batch;
 											} else {
-												var info = getPackingNumberAndBatch(
-													this.managementList, r
-													.itemCode,
-													r.packingNumber, r
-													.batch);
+												var info =
+													getPackingNumberAndBatch(
+														this.managementList, r
+														.itemCode,
+														r.packingNumber, r
+														.batch);
 												record.toPackingNumber = info
 													.packingNumber;
 												record.toBatch = info.batch;
@@ -338,7 +324,7 @@
 										subList.push(deepCopyData(subItem));
 									}
 								}
-								
+
 							})
 						})
 					})
diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue b/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
index df48aa7f..ee9da4b2 100644
--- a/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
@@ -1,18 +1,17 @@
 <template>
 	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_item">
+					发货单号:{{dataContent.asnNumber}}
+				</view>
+				<view class="header_item">
+					供应商代码:{{dataContent.supplierCode}}
+				</view>
+			</view>
+		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view class=""
-					style="padding:10rpx 30rpx ;font-size: 32rpx; ">
-					<!-- padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx -->
-					<view style="padding: 5rpx;">
-						发货单号:{{dataContent.asnNumber}}
-					</view>
-					<view style="padding: 5rpx;">
-						供应商代码:{{dataContent.supplierCode}}
-					</view>
-				</view>
-				<u-line />
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-record-detail-card :dataContent="item" :index="index" @remove="updateData"
@@ -88,7 +87,7 @@
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			this.getDetail();
diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue
index a8ac28e0..aa501ee2 100644
--- a/src/pages/transfer/job/issueDetail.vue
+++ b/src/pages/transfer/job/issueDetail.vue
@@ -1,11 +1,10 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
 			</view>
 		</view>
 		<view class="page-main">
@@ -20,14 +19,14 @@
 				</view>
 			</scroll-view>
 		</view>
-		
+
 
 		<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' 
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
@@ -67,7 +66,7 @@
 		calcHandleQty,
 		getScanCount
 	} from '@/common/detail.js';
-	
+
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import locationCompare from '@/mycomponents/location/locationCompare.vue'
@@ -75,7 +74,7 @@
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import detailInfoPopup from '@/pages/transfer/coms/detailInfoPopup.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
-	
+
 	export default {
 		name: 'returnDetail',
 		components: {
@@ -96,14 +95,14 @@
 				toLocationCode: "",
 				businessTypeInfo: {},
 				managementList: [],
-				toLocationAreaTypeList:[],
-				jobStatus:"",
-				jobToLocationCode:""
+				toLocationAreaTypeList: [],
+				jobStatus: "",
+				jobToLocationCode: ""
 			};
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -127,7 +126,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeTransferIssueJob(this.id).then(res => {
 						uni.navigateBack();
@@ -183,7 +182,7 @@
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
 							that.jobStatus = res.data.status
-							that.subList =res.data.subList
+							that.subList = res.data.subList
 							that.detailSource = getDataSource(that.subList)
 							that.fromLocationCode = that.subList[0].fromLocationCode
 							that.jobToLocationCode = that.subList[0].toLocationCode
@@ -262,23 +261,26 @@
 								r.batch == batch && r.fromLocationCode == result.fromLocationCode
 						})
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+								.fromLocationCode + "】不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
+									.fromLocationCode + "】已经扫描")
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
-										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
 											']不一致,是否继续出库?', res => {
 												if (res) {
 													itemDetail.scaned = true;
-													itemDetail.handleQty =Number(result.balance.qty) ;
+													itemDetail.handleQty = Number(result.balance.qty);
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus
 													itemDetail.balance = result.balance;
-													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
 													itemDetail.balance.packQty = Number(result.package.packQty)
 													itemDetail.balance.packUnit = result.package.packUnit
 													this.calcHandleQty();
@@ -286,19 +288,20 @@
 													this.scanPopupGetFocus();
 												}
 											});
-									}else {
-										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
 											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
 											});
 									}
-									
+
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty =  Number(result.balance.qty) ;
+									itemDetail.handleQty = Number(result.balance.qty);
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty =  Number(result.balance.qty) ;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
 									itemDetail.balance.packQty = Number(result.package.packQty)
 									itemDetail.balance.packUnit = result.package.packUnit
 									this.calcHandleQty();
@@ -312,17 +315,17 @@
 				}
 			},
 
-			 commit() {
-				 this.scanCount = getScanCount(this.subList);
-				 if (this.scanCount == 0) {
-				 	this.showErrorMessage("扫描数为0,请先扫描")
-				 	return;
-				 }
-				 //校验库位、
-				 if (!this.checkLocation()) {
-				 	return
-				 }
-				 
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
+
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.submitJob();
@@ -344,7 +347,7 @@
 				}
 			},
 
-			 submitJob() {
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -361,7 +364,7 @@
 						this.managementList = res.list;
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
-				
+
 						transferIssueJobSubmit(params).then(res => {
 							if (res.data) {
 								this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录" + res.data)
@@ -379,11 +382,11 @@
 					}
 				});
 			},
-			
+
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
-			
+
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
@@ -401,19 +404,19 @@
 				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
-			
+
 			checkLocation() {
 				var isPass = true;
 				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.showMessageHint('请扫描收货库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
-			
+
 					return isPass = false;
 				}
 				return isPass;
 			},
-			
+
 			showMessageHint(hint, callback) {
 				this.$refs.comMessage.showErrorMessage(hint, res => {
 					if (res) {
@@ -421,7 +424,7 @@
 					}
 				});
 			},
-			
+
 			scanLocationCode(location, code) {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {
@@ -523,4 +526,4 @@
 		background: #e0e0e0;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue
index 90bf09e6..0ef38304 100644
--- a/src/pages/transfer/job/receiptDetail.vue
+++ b/src/pages/transfer/job/receiptDetail.vue
@@ -1,24 +1,23 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
-			</view>
-			<view class="header_item">
-				来源仓库 : {{jobContent.fromWarehouseCode}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="header_item">
+					来源仓库 : {{jobContent.fromWarehouseCode}}
+				</view>
+				<view class='split_line'></view>
 			</view>
-			<view class='split_line'></view>
 		</view>
-
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<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" :locationAreaTypeList='toLocationAreaTypeList'>
+							@remove="updateData" @updateData="updateData"
+							:locationAreaTypeList='toLocationAreaTypeList'>
 						</com-receipt-detail-card>
 					</view>
 				</view>
@@ -29,8 +28,8 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
-						@getLocation='scanLocationCode' 
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
@@ -106,13 +105,13 @@
 				businessTypeInfo: {},
 				managementList: [],
 				toLocationAreaTypeList: [],
-				jobStatus:"",
-				jobToLocationCode:""
+				jobStatus: "",
+				jobToLocationCode: ""
 			};
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -136,7 +135,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeTransferReceiptJob(this.id).then(res => {
 						uni.navigateBack();
@@ -561,4 +560,4 @@
 		background: #e0e0e0;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue
index 2333097b..806d09d2 100644
--- a/src/pages/transfer/job/transferDetail.vue
+++ b/src/pages/transfer/job/transferDetail.vue
@@ -1,13 +1,11 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
 			</view>
-			<view class='split_line'></view>
 		</view>
 
 		<view class="page-main">
@@ -192,7 +190,7 @@
 						item.subList.push(newDetail);
 						items.push(item)
 					} else {
-						item.qty = calc.add(item.qty,detail.qty)
+						item.qty = calc.add(item.qty, detail.qty)
 						let newDetail = this.createDetailInfo(detail); //
 						item.subList.push(newDetail);
 					}
@@ -240,9 +238,9 @@
 					item.handleQty = new Decimal(0).toNumber();
 					for (let detail of item.subList) {
 						if (detail.record != undefined) {
-							item.handleQty = calc.add(item.handleQty,detail.record.qty)
+							item.handleQty = calc.add(item.handleQty, detail.record.qty)
 						}
-						
+
 					}
 				}
 				this.continueScan()
@@ -567,4 +565,4 @@
 </script>
 
 <style scoped lang="scss">
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/unPlanned/coms/comReceiptRequestPopup.vue b/src/pages/unPlanned/coms/comReceiptRequestPopup.vue
index 5889bbe8..4030ac2e 100644
--- a/src/pages/unPlanned/coms/comReceiptRequestPopup.vue
+++ b/src/pages/unPlanned/coms/comReceiptRequestPopup.vue
@@ -76,9 +76,6 @@
 </template>
 
 <script>
-	import {
-		getBasicItemByCode,
-	} from '@/api/request2.js';
 	import {
 		getLocationTypeName,
 		getListLocationTypeDesc,
diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue
index ca2c0c6c..0eb1fd1d 100644
--- a/src/pages/unPlanned/job/issueJobDetail.vue
+++ b/src/pages/unPlanned/job/issueJobDetail.vue
@@ -1,13 +1,11 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
 			</view>
-			<view class='split_line'></view>
 		</view>
 
 		<view class="page-main">
@@ -90,12 +88,12 @@
 				detailSource: [], //绑定在页面上的数据源
 				businessTypeInfo: {},
 				managementList: [],
-				jobStatus:""
+				jobStatus: ""
 			};
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -119,7 +117,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeUnPlannedIssueJob(this.id).then(res => {
 						uni.navigateBack();
@@ -424,4 +422,4 @@
 </script>
 
 <style scoped lang="scss">
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index 071696b0..ed688942 100644
--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@@ -1,13 +1,11 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<job-top :dataContent="jobContent"></job-top>
-			</view>
-			<view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
 			</view>
-			<view class='split_line'></view>
 		</view>
 
 		<view class="page-main">
@@ -15,7 +13,8 @@
 				<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" :locationAreaTypeList='toLocationAreaTypeList'>
+							@remove="updateData" @updateData="updateData"
+							:locationAreaTypeList='toLocationAreaTypeList'>
 						</com-receipt-detail-card>
 					</view>
 					<view class='split_line'></view>
@@ -27,8 +26,8 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"  :locationCode="toLocationCode"
-						 @getLocation='scanLocationCode'
+					<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
 						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
 				</view>
 				<view class=" uni-flex uni-row">
@@ -95,13 +94,13 @@
 				toLocationInfo: {},
 				businessTypeInfo: {},
 				managementList: [],
-				jobStatus:"",
-				jobToLocationCode:""
+				jobStatus: "",
+				jobToLocationCode: ""
 			};
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-				title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			if (this.id != undefined) {
@@ -125,7 +124,7 @@
 		onBackPress(e) {
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
-				if (this.jobStatus=="2") {
+				if (this.jobStatus == "2") {
 					//取消承接任务	
 					cancleTakeUnPlannedReceiptJob(this.id).then(res => {
 						uni.navigateBack();
@@ -221,17 +220,17 @@
 						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
 					} else {
 
-						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch 
-							);
+						var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch);
 						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" +"不在列表中")
+							this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" + "不在列表中")
 						} else {
 							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" +"已经扫描")
+								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】" + "已经扫描")
 							} else {
 								itemDetail.scaned = true;
 								itemDetail.handleQty = Number(result.label.qty);
-								itemDetail.toLocationCode = this.toLocationCode? this.toLocationCode:itemDetail.toLocationCode ;
+								itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail
+									.toLocationCode;
 								itemDetail.packQty = result.package.packQty
 								itemDetail.labelQty = Number(result.label.qty);
 								calcHandleQty(this.detailSource);
@@ -408,5 +407,5 @@
 </script>
 
 <style scoped lang="scss">
-	
-</style>
+
+</style>
\ No newline at end of file
diff --git a/src/pages/unPlanned/request/issueRequestDetail.vue b/src/pages/unPlanned/request/issueRequestDetail.vue
index daa6f7bd..6371662d 100644
--- a/src/pages/unPlanned/request/issueRequestDetail.vue
+++ b/src/pages/unPlanned/request/issueRequestDetail.vue
@@ -1,13 +1,14 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<request-top :dataContent="requestContent"></request-top>
-			</view>
-			<view class="header_item">
-				从仓库代码 : {{requestContent.fromWarehouseCode}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<request-top :dataContent="requestContent"></request-top>
+				</view>
+				<view class="header_item">
+					从仓库代码 : {{requestContent.fromWarehouseCode}}
+				</view>
 			</view>
-			<view class='split_line'></view>
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
@@ -42,7 +43,7 @@
 	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
 	import requestIssDetailInfoPopup from '@/pages/unPlanned/coms/requestIssDetailInfoPopup.vue'
 	import requestTop from "@/mycomponents/request/requestTop.vue"
-	
+
 	export default {
 		components: {
 			comRequestDetailCard,
@@ -59,7 +60,7 @@
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-			  title: option.title+'详情'
+				title: option.title + '详情'
 			})
 			this.id = option.id;
 			this.getDetail();
@@ -92,11 +93,11 @@
 					if (res.data == null) {
 						that.showMessage('未获取到详情');
 					} else {
-						if(res.data.subList.length>0){
+						if (res.data.subList.length > 0) {
 							that.requestContent = res.data;
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList);
-						}else {
+						} else {
 							that.showMessage('列表数据为0');
 						}
 					}
@@ -123,4 +124,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/unPlanned/request/receiptRequestDetail.vue b/src/pages/unPlanned/request/receiptRequestDetail.vue
index 0c9b6b34..6d60031a 100644
--- a/src/pages/unPlanned/request/receiptRequestDetail.vue
+++ b/src/pages/unPlanned/request/receiptRequestDetail.vue
@@ -1,13 +1,14 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<view class="header_job_top">
-				<request-top :dataContent="requestContent"></request-top>
-			</view>
-			<view class="header_item">
-				到仓库代码 : {{requestContent.toWarehouseCode}}
+			<view class="header-view">
+				<view class="header_job_top">
+					<request-top :dataContent="requestContent"></request-top>
+				</view>
+				<view class="header_item">
+					到仓库代码 : {{requestContent.toWarehouseCode}}
+				</view>
 			</view>
-			<view class='split_line'></view>
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
@@ -123,4 +124,4 @@
 
 <style scoped lang="scss">
 
-</style>
+</style>
\ No newline at end of file