Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

5 months ago · 00682722b5
40 changed files with 212 additions and 99 deletions
--- a/src/main.js
+++ b/src/main.js
@ -4,6 +4,7 @@ import './router/my_router.js'; //引入拦截
 import VueClipboard from 'vue-clipboard2' //复制粘贴
 import uView from './uni_modules/vk-uview-ui';// 引入 uView UI
 import comMessage from './mycomponents/common/comMessage.vue'
+import comLoading from './mycomponents/common/comLoading.vue'

 // #ifndef VUE3
 import Vue from 'vue'
@ -33,6 +34,8 @@ export function createApp() {
 	app.use(VueClipboard)
 	app.use(uView)
 	app.component('comMessage', comMessage)
+	app.component('comLoading', comLoading)
+	
 	console.log("网络22请求")
 	// startApp(app);
 	return {
--- a/src/pages/container/record/containerBindRecord.vue
+++ b/src/pages/container/record/containerBindRecord.vue
@ -110,6 +110,9 @@
 		},
 		onLoad(option) {

+			uni.setNavigationBarTitle({
+			  title: option.title
+			})
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
--- a/src/pages/container/record/containerUnBindRecord.vue
+++ b/src/pages/container/record/containerUnBindRecord.vue
@ -100,6 +100,9 @@
 		},
 		onLoad(option) {

+			uni.setNavigationBarTitle({
+			  title: option.title
+			})
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
--- a/src/pages/count/job/countBlindDetail.vue
+++ b/src/pages/count/job/countBlindDetail.vue
@ -157,6 +157,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title+'详情'
+			})
 			this.id = option.id;
 			if (this.id != undefined) {
 				//新建的任务自动接收
--- a/src/pages/count/job/countJob.vue
+++ b/src/pages/count/job/countJob.vue
@ -80,8 +80,12 @@
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
 				detailGiveupOptions: [],
+				title:''
 			};
 		},
+		onLoad(option){
+			this.title = option.title
+		},

 		onShow() {
 			this.getList('refresh');
@ -179,7 +183,7 @@

 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("盘点(" + this.totalCount + ")");
+					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@ -192,7 +196,7 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("盘点");
+					updateTitle(this.title);
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
@ -206,12 +210,14 @@
 				//明盘
 				if(item.isOpenCount=="TRUE"){
 					uni.navigateTo({
-						url: './countLightDetail?id=' + item.id + '&status=' + item.status
+						url: './countLightDetail?id=' + item.id + '&status=' + item.status+'&title='+this.title
+
 					});
 				}else {
 					//盲盘
 					uni.navigateTo({
-						url: './countBlindDetail?id=' + item.id + '&status=' + item.status
+						url: './countBlindDetail?id=' + item.id + '&status=' + item.status+'&title='+this.title
+
 					});
 				}
 			},
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@ -158,6 +158,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title+'详情'
+			})
 			this.id = option.id;
 			if (this.id != undefined) {
 				//新建的任务自动接收
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@ -63,7 +63,11 @@
 			businessTypeCode: {
 				type: String,
 				default: "Move"
-			} //业务类型
+			} ,//业务类型
+			title: {
+				type: String,
+				default: ""
+			} 
 		},
 		data() {
 			return {
@ -109,20 +113,20 @@
 		methods: {
 			updateTitle() {
 				var title = ""
-				var name = ""
-				if (this.businessTypeCode == "Move") {
-					name = "库存转移";
-				} else if (this.businessTypeCode == "HoldToOk") {
-					name = "隔离转合格";
-				} else if (this.businessTypeCode == "HoldToScrap") {
-					name = "隔离转报废";
-				} else if (this.businessTypeCode == "OkToHold") {
-					name = "合格转隔离";
-				} else if (this.businessTypeCode == "OktoScrap") {
-					name = "合格转报废";
-				} else if (this.businessTypeCode == "ScrapToHold") {
-					name = "报废转隔离";
-				}
+				var name = this.title
+				// if (this.businessTypeCode == "Move") {
+				// 	name = "库存转移";
+				// } else if (this.businessTypeCode == "HoldToOk") {
+				// 	name = "隔离转合格";
+				// } else if (this.businessTypeCode == "HoldToScrap") {
+				// 	name = "隔离转报废";
+				// } else if (this.businessTypeCode == "OkToHold") {
+				// 	name = "合格转隔离";
+				// } else if (this.businessTypeCode == "OktoScrap") {
+				// 	name = "合格转报废";
+				// } else if (this.businessTypeCode == "ScrapToHold") {
+				// 	name = "报废转隔离";
+				// }
 				this.titleName =name;
 				if (this.totalCount > 0) {
 					title = name + "(" + this.totalCount + ")";
@ -205,7 +209,8 @@
 			
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './inventoryMoveDetail?id=' + item.masterId + '&status=' + item.status+'&businessTypeCode='+this.businessTypeCode
+					url: './inventoryMoveDetail?id=' + item.masterId + '&status=' + item.status+'&businessTypeCode='+this.businessTypeCode+'&title='+this.title
+
 				});
 			},

--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@ -109,6 +109,10 @@
 			// 	type: String,
 			// 	default: ""
 			// },
+			myTitle: {
+				type: String,
+				default: ""
+			},
 		},
 		data() {
 			return {
@ -143,43 +147,41 @@
 			this.getLocationInfo();
 		},

-		onLoad() {
-
-		},

 		methods: {
 			initData() {
 				if (this.businessTypeCode == "Move") {
-					this.title = "库存转移记录";
+					// this.title = "库存转移记录";
 					this.toInventoryStatus = ""
 					this.toLocationCode = ""
 					this.isShowEditLocation = true;
 				} else if (this.businessTypeCode == "HoldToOk") {
-					this.title = "隔离转合格记录";
+					// this.title = "隔离转合格记录";
 					this.toInventoryStatus = "OK"
 					this.toLocationCode = ""
 					this.isShowEditLocation = true;
 				} else if (this.businessTypeCode == "HoldToScrap") {
-					this.title = "隔离转报废记录";
+					// this.title = "隔离转报废记录";
 					this.toInventoryStatus = "SCRAP"
 					this.toLocationCode = ""
 					// this.toLocationCode = "SCRAP"
 				} else if (this.businessTypeCode == "OkToHold") {
-					this.title = "合格转隔离记录";
+					// this.title = "合格转隔离记录";
 					this.toInventoryStatus = "HOLD"
 					this.toLocationCode = ""
 					// this.toLocationCode = "HOLD"
 				} else if (this.businessTypeCode == "OkToScrap") {
-					this.title = "合格转报废记录";
+					// this.title = "合格转报废记录";
 					this.toInventoryStatus = "SCRAP"
 					this.toLocationCode = ""
 					// this.toLocationCode = "SCRAP"
 				} else if (this.businessTypeCode == "ScrapToHold") {
-					this.title = "报废转隔离记录";
+					// this.title = "报废转隔离记录";
 					this.toInventoryStatus = "HOLD"
 					// this.toLocationCode = "HOLD"
 					this.toLocationCode = ""
 				}
+				this.title = this.myTitle
 				uni.setNavigationBarTitle({
 					title: this.title
 				})
--- a/src/pages/inventoryMove/job/holdToOkMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToOk'> </comMoveJob>
+		<comMoveJob :title="title" ref="comMoveJob" businessTypeCode='HoldToOk'> </comMoveJob>
 	</view>
 </template>

@ -12,11 +12,13 @@
 			comMoveJob
 		},
 		data() {
-
 			return {
-
+				title:''
 			}
 		},
+		onLoad(option){
+			this.title = option.title
+		},
 		onPullDownRefresh() {
 			this.$refs.comMoveJob.refresh();
 		},
@ -28,7 +30,7 @@
 			}
 		},

-		onLoad() {},
+		
 		methods: {

 		}
--- a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToScrap'> </comMoveJob>
+		<comMoveJob :title="title" ref="comMoveJob" businessTypeCode='HoldToScrap'> </comMoveJob>
 	</view>
 </template>

@ -12,11 +12,13 @@
 			comMoveJob
 		},
 		data() {
-
 			return {
-
+				title:''
 			}
 		},
+		onLoad(option){
+			this.title = option.title
+		},
 		onPullDownRefresh() {
 			this.$refs.comMoveJob.refresh();
 		},
@ -28,7 +30,6 @@
 			}
 		},

-		onLoad() {},
 		methods: {

 		}
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@ -96,13 +96,16 @@
 				businessTypeCode: '',
 				toLocationCode: '',
 				toInventoryStatus: '',
-				jobStatus:""
+				jobStatus:"",
+				title:''
 			};
 		},
 		props: {

 		},
 		onLoad(option) {
+			this.title = option.title
+			
 			this.id = option.id;
 			this.businessTypeCode = option.businessTypeCode;
 			if (this.id != undefined) {
@ -179,7 +182,7 @@
 				}

 				uni.setNavigationBarTitle({
-					title: name + '详情'
+					title: this.title + '详情'
 				})
 			},

--- a/src/pages/inventoryMove/job/moveJob.vue
+++ b/src/pages/inventoryMove/job/moveJob.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='Move'> </comMoveJob>
+		<comMoveJob :title="title" ref="comMoveJob" businessTypeCode='Move'> </comMoveJob>
 	</view>
 </template>

@ -17,9 +17,13 @@
 		data() {

 			return {
-
+				title:''
 			}
 		},
+		onLoad(option){
+			this.title = option.title
+			
+		},
 		onNavigationBarButtonTap(e) {
 			if (e.index === 0) {
 				this.$refs.comMoveJob.toHome();
@ -28,7 +32,6 @@
 			}
 		},

-		onLoad() {},
 		methods: {

 		}
--- a/src/pages/inventoryMove/job/okToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='OkToHold' > </comMoveJob>
+		<comMoveJob :title="title" ref="comMoveJob" businessTypeCode='OkToHold' > </comMoveJob>
 	</view>
 </template>

@ -12,9 +12,12 @@
 		},
 		data() {
 			return {
-
+				title:''
 			}
 		},
+		onLoad(option){
+			this.title = option.title
+		},
 		onPullDownRefresh() {
 			this.$refs.comMoveJob.refresh();
 		},
@ -27,7 +30,6 @@
 			}
 		},

-		onLoad() {},
 		methods: {

 		}
--- a/src/pages/inventoryMove/job/okToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='OktoScrap'> </comMoveJob>
+		<comMoveJob :title="title" ref="comMoveJob" businessTypeCode='OktoScrap'> </comMoveJob>
 	</view>
 </template>

@ -12,11 +12,13 @@
 			comMoveJob
 		},
 		data() {
-
 			return {
-
+				title:''
 			}
 		},
+		onLoad(option){
+			this.title = option.title
+		},
 		onPullDownRefresh() {
 			this.$refs.comMoveJob.refresh();
 		},
@ -28,7 +30,6 @@
 			}
 		},

-		onLoad() {},
 		methods: {

 		}
--- a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='ScrapToHold'> </comMoveJob>
+		<comMoveJob :title="title" ref="comMoveJob" businessTypeCode='ScrapToHold'> </comMoveJob>
 	</view>
 </template>

@ -12,11 +12,13 @@
 			comMoveJob
 		},
 		data() {
-
 			return {
-
+				title:''
 			}
 		},
+		onLoad(option){
+			this.title = option.title
+		},
 		onPullDownRefresh() {
 			this.$refs.comMoveJob.refresh();
 		},
@ -28,7 +30,6 @@
 			}
 		},

-		onLoad() {},
 		methods: {

 		}
--- a/src/pages/inventoryMove/record/holdToOkRecord.vue
+++ b/src/pages/inventoryMove/record/holdToOkRecord.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveRecord businessTypeCode='HoldToOk' > </comMoveRecord>
+		<comMoveRecord :myTitle="title" businessTypeCode='HoldToOk' > </comMoveRecord>
 	</view>
 </template>

@ -13,10 +13,12 @@
 		},
 		data() {
 			return {
-
+				title:''
 			}
 		},
-		onLoad() {},
+		onLoad(option){
+			this.title = option.title
+		},
 		methods: {}
 	}
 </script>
--- a/src/pages/inventoryMove/record/holdToScrapRecord.vue
+++ b/src/pages/inventoryMove/record/holdToScrapRecord.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveRecord  businessTypeCode='HoldToScrap'> </comMoveRecord>
+		<comMoveRecord :myTitle="title" businessTypeCode='HoldToScrap'> </comMoveRecord>
 	</view>
 </template>

@ -12,13 +12,13 @@
 			comMoveRecord
 		},
 		data() {
-
 			return {
-
+				title:''
 			}
 		},
-
-		onLoad() {},
+		onLoad(option){
+			this.title = option.title
+		},
 		methods: {

 		}
--- a/src/pages/inventoryMove/record/moveFreeRecord.vue
+++ b/src/pages/inventoryMove/record/moveFreeRecord.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveRecord :allowEditStatus="true"  businessTypeCode='Move'> </comMoveRecord>
+		<comMoveRecord :myTitle="title" :allowEditStatus="true"  businessTypeCode='Move'> </comMoveRecord>
 	</view>
 </template>

@ -12,13 +12,13 @@
 			comMoveRecord
 		},
 		data() {
-
 			return {
-
+				title:''
 			}
 		},
-
-		onLoad() {},
+		onLoad(option){
+			this.title = option.title
+		},
 		methods: {

 		}
--- a/src/pages/inventoryMove/record/okToHoldRecord.vue
+++ b/src/pages/inventoryMove/record/okToHoldRecord.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveRecord businessTypeCode='OkToHold' > </comMoveRecord>
+		<comMoveRecord :myTitle="title" businessTypeCode='OkToHold' > </comMoveRecord>
 	</view>
 </template>

@ -13,10 +13,12 @@
 		},
 		data() {
 			return {
-
+				title:''
 			}
 		},
-		onLoad() {},
+		onLoad(option){
+			this.title = option.title
+		},
 		methods: {
 		}
 	}
--- a/src/pages/inventoryMove/record/okToScrapRecord.vue
+++ b/src/pages/inventoryMove/record/okToScrapRecord.vue
@ -1,7 +1,7 @@
 <template>
 	<view class="page-wraper">
 		
-		<comMoveRecord businessTypeCode='OkToScrap' > </comMoveRecord>
+		<comMoveRecord :myTitle="title" businessTypeCode='OkToScrap' > </comMoveRecord>
 	</view>
 </template>

@ -14,10 +14,12 @@
 		},
 		data() {
 			return {
-
+				title:''
 			}
 		},
-		onLoad() {},
+		onLoad(option){
+			this.title = option.title
+		},
 		methods: {
 		}
 	}
--- a/src/pages/inventoryMove/record/scrapToHoldRecord.vue
+++ b/src/pages/inventoryMove/record/scrapToHoldRecord.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveRecord  businessTypeCode='ScrapToHold'> </comMoveRecord>
+		<comMoveRecord :myTitle="title" businessTypeCode='ScrapToHold'> </comMoveRecord>
 	</view>
 </template>

@ -12,13 +12,13 @@
 			comMoveRecord
 		},
 		data() {
-
 			return {
-
+				title:''
 			}
 		},
-
-		onLoad() {},
+		onLoad(option){
+			this.title = option.title
+		},
 		methods: {

 		}
--- a/src/pages/package/record/mergePackageRecord.vue
+++ b/src/pages/package/record/mergePackageRecord.vue
@ -101,6 +101,10 @@
 			};
 		},
 		onLoad(option) {
+			
+			uni.setNavigationBarTitle({
+			  title: option.title
+			})
 			var typeCode = "MergePackage"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
--- a/src/pages/package/record/splitPackageRecord.vue
+++ b/src/pages/package/record/splitPackageRecord.vue
@ -102,6 +102,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title
+			})
 			var typeCode = "SplitPackage"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
--- a/src/pages/scrap/job/scrapJob.vue
+++ b/src/pages/scrap/job/scrapJob.vue
@ -68,12 +68,16 @@
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
 				detailGiveupOptions: [],
+				title:''
 			};
 		},

 		onShow() {
 			this.getList('refresh');
 		},
+		onLoad(option){
+			this.title = option.title
+		},

 		onReady() {
 			this.detailOptions = getDetailOption();
@ -155,7 +159,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("报废出库(" + this.totalCount + ")");
+					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@ -168,7 +172,7 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("报废出库");
+					updateTitle(this.title);
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
@ -178,7 +182,8 @@

 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './scrapJobDetail?id=' + item.masterId + '&status=' + item.status
+					url: './scrapJobDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
+
 				});
 			},

--- a/src/pages/scrap/job/scrapJobDetail.vue
+++ b/src/pages/scrap/job/scrapJobDetail.vue
@ -95,6 +95,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title+'详情'
+			})
 			this.id = option.id;
 			if (this.id != undefined) {
 				//新建的任务自动接收
--- a/src/pages/scrap/record/scrapRecord.vue
+++ b/src/pages/scrap/record/scrapRecord.vue
@ -106,6 +106,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title
+			})
 			this.reasonList = getScarpReasonList();
 			var typeCode = "Scrap"
 			getBusinessType(typeCode, res => {
--- a/src/pages/scrap/request/scrapRequestDetail.vue
+++ b/src/pages/scrap/request/scrapRequestDetail.vue
@ -58,6 +58,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title+'详情'
+			})
 			this.id = option.id;
 			this.getDetail();
 		},
--- a/src/pages/scrap/request/scrapRrequest.vue
+++ b/src/pages/scrap/request/scrapRrequest.vue
@ -77,9 +77,13 @@
 				showOptions: [],
 				fromType: "requestType",
 				loadingType: "nomore",
+				title:''

 			};
 		},
+		onLoad(option){
+			this.title = option.title
+		},
 		onReady() {
 			this.detailOptions = getDetailOption();
 			this.addAgainOption = getAddAgainOption();
@ -123,7 +127,8 @@
 			},
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './scrapRequestDetail?id=' + item.masterId
+					url: './scrapRequestDetail?id=' + item.masterId+'&title='+this.title
+
 				});
 			},
 			getList(type) {
@ -156,7 +161,7 @@

 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("报废出库申请(" + this.totalCount + ")");
+					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@ -174,7 +179,7 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("报废出库申请");
+					updateTitle(this.title);
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
--- a/src/pages/transfer/job/issueDetail.vue
+++ b/src/pages/transfer/job/issueDetail.vue
@ -102,6 +102,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title+'详情'
+			})
 			this.id = option.id;
 			if (this.id != undefined) {
 				// 	//新建的任务自动接收
--- a/src/pages/transfer/job/issueJob.vue
+++ b/src/pages/transfer/job/issueJob.vue
@ -73,12 +73,16 @@
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
 				detailGiveupOptions: [],
+				title:''
 			};
 		},

 		onShow() {
 			this.getList('refresh');
 		},
+		onLoad(option){
+			this.title = option.title
+		},

 		onReady() {
 			this.detailOptions = getDetailOption();
@ -161,7 +165,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("调拨出库任务(" + this.totalCount + ")");
+					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@ -174,7 +178,7 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("调拨出库任务");
+					updateTitle(this.title);
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
@ -183,7 +187,7 @@

 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './issueDetail?id=' + item.masterId + '&status=' + item.status
+					url: './issueDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
 				});
 			},

--- a/src/pages/transfer/job/receiptDetail.vue
+++ b/src/pages/transfer/job/receiptDetail.vue
@ -111,6 +111,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title+'详情'
+			})
 			this.id = option.id;
 			if (this.id != undefined) {
 				// 	//新建的任务自动接收
--- a/src/pages/transfer/job/receiptJob.vue
+++ b/src/pages/transfer/job/receiptJob.vue
@ -72,9 +72,12 @@
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
 				detailGiveupOptions: [],
+				title:''
 			};
 		},
-
+		onLoad(option){
+			this.title = option.title
+		},
 		onShow() {
 			this.getList('refresh');
 		},
@ -160,7 +163,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("调拨入库任务(" + this.totalCount + ")");
+					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@ -175,7 +178,7 @@
 					}
 					
 					this.loadingType = "";
-					updateTitle("调拨入库任务");
+					updateTitle(this.title);
 					uni.hideLoading();
 					that.showMessage(error)
 				})
@ -183,7 +186,7 @@

 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './receiptDetail?id=' + item.masterId + '&status=' + item.status
+					url: './receiptDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
 				});
 			},

--- a/src/pages/transfer/record/deliverRecord.vue
+++ b/src/pages/transfer/record/deliverRecord.vue
@ -103,6 +103,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title
+			})
 			var typeCode = "TransferDeliver"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
--- a/src/pages/transfer/record/receiptRecord.vue
+++ b/src/pages/transfer/record/receiptRecord.vue
@ -95,6 +95,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title
+			})
 			var typeCode = "TransferReceipt"

 			getBusinessType(typeCode, res => {
--- a/src/pages/unPlanned/job/issueJob.vue
+++ b/src/pages/unPlanned/job/issueJob.vue
@ -72,8 +72,12 @@
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
 				detailGiveupOptions: [],
+				title:''
 			};
 		},
+		onLoad(option){
+			this.title = option.title
+		},

 		onShow() {
 			this.getList('refresh');
@ -163,7 +167,7 @@
 					
 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("计划外出库(" + this.totalCount + ")");
+					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@ -176,7 +180,7 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("计划外出库");
+					updateTitle(this.title);
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
@ -185,7 +189,7 @@

 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './issueJobDetail?id=' + item.masterId + '&status=' + item.status
+					url: './issueJobDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
 				});
 			},

--- a/src/pages/unPlanned/job/issueJobDetail.vue
+++ b/src/pages/unPlanned/job/issueJobDetail.vue
@ -94,6 +94,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title+'详情'
+			})
 			this.id = option.id;
 			if (this.id != undefined) {
 				// 	//新建的任务自动接收
--- a/src/pages/unPlanned/job/receiptJob.vue
+++ b/src/pages/unPlanned/job/receiptJob.vue
@ -73,8 +73,12 @@
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
 				detailGiveupOptions: [],
+				title:''
 			};
 		},
+		onLoad(option){
+			this.title = option.title
+		},

 		onShow() {
 			this.getList('refresh');
@ -150,7 +154,7 @@
 					}
 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("计划外入库(" + this.totalCount + ")");
+					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@ -164,7 +168,7 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("计划外入库");
+					updateTitle(this.title);
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
@ -173,7 +177,7 @@

 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './receiptJobDetail?id=' + item.masterId + '&status=' + item.status
+					url: './receiptJobDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
 				});
 			},

--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@ -100,6 +100,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title+'详情'
+			})
 			this.id = option.id;
 			if (this.id != undefined) {
 				// 	//新建的任务自动接收
--- a/src/pages/unPlanned/request/issueRequest.vue
+++ b/src/pages/unPlanned/request/issueRequest.vue
@ -79,6 +79,7 @@
 				showOptions: [],
 				fromType: "requestType",
 				loadingType: "nomore",
+				title:''

 			};
 		},
@ -113,6 +114,9 @@
 				this.$refs.filter.openFilter();
 			}
 		},
+		onLoad(option){
+			this.title = option.title
+		},


 		mounted() {
@ -123,7 +127,7 @@

 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './issueRequestDetail?id=' + item.masterId
+					url: './issueRequestDetail?id=' + item.masterId+'&title='+this.title
 				});
 			},
 			openRequestInfoPopup(item) {
@ -160,7 +164,7 @@

 					var list = res.data.list;
 					this.totalCount = res.data.total
-					updateTitle("计划外出库申请(" + this.totalCount + ")");
+					updateTitle(this.title+"(" + this.totalCount + ")");
 					this.loadingType = "loadmore";
 					if (list == null || list.length == 0) {
 						this.loadingType = "nomore";
@ -179,7 +183,7 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-					updateTitle("计划外出库申请");
+					updateTitle(this.title);
 					this.loadingType = "";
 					uni.hideLoading();
 					that.showMessage(error)
--- a/src/pages/unPlanned/request/issueRequestDetail.vue
+++ b/src/pages/unPlanned/request/issueRequestDetail.vue
@ -58,6 +58,9 @@
 			};
 		},
 		onLoad(option) {
+			uni.setNavigationBarTitle({
+			  title: option.title+'详情'
+			})
 			this.id = option.id;
 			this.getDetail();
 		},