修改路径

pages.json

@@ -861,7 +861,7 @@
 			}
 		},
 		{
-			"path": "pages/inventoryMove/job/HoldToScrapMoveJob",
+			"path": "pages/inventoryMove/job/holdToScrapMoveJob",
 			"style": {
 				"navigationBarTitleText": "隔离转报废",
 				"enablePullDownRefresh": true,
@@ -913,7 +913,7 @@
 			}
 		},
 		{
-			"path": "pages/inventoryMove/record/scrapToHoldMoveRecord",
+			"path": "pages/inventoryMove/record/scrapToHoldRecord",
 			"style": {
 				"navigationBarTitleText": "报废转隔离记录",
 				"enablePullDownRefresh": true
@@ -929,14 +929,14 @@
 			}
 		},
 		{
-			"path": "pages/inventoryMove/record/moveOkToHoldRecord",
+			"path": "pages/inventoryMove/record/okToHoldRecord",
 			"style": {
 				"navigationBarTitleText": "合格转隔离记录",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/inventoryMove/record/moveHoldToOkRecord",
+			"path": "pages/inventoryMove/record/holdToOkRecord",
 			"style": {
 				"navigationBarTitleText": "隔离转合格记录",
 				"enablePullDownRefresh": true
@@ -950,7 +950,7 @@
 			}
 		},
 		{
-			"path": "pages/inventoryMove/record/oktoScrapRecord",
+			"path": "pages/inventoryMove/record/okToScrapRecord",
 			"style": {
 				"navigationBarTitleText": "合格转报废记录",
 				"enablePullDownRefresh": true

pages/inventoryMove/coms/comMove.vue

@@ -126,15 +126,15 @@
 				var name =""
 				if(this.businessTypeCode=="Move"){
 					name = "库存转移记录";
-				}else if(this.businessTypeCode=="HoldToOk"){
+				}else if(this.businessTypeCode=="HoldToOkRecord"){
 					name = "隔离转合格记录";
-				}else if(this.businessTypeCode=="HoldToScrap"){
+				}else if(this.businessTypeCode=="HoldToScrapRecord"){
 					name = "隔离转报废记录";
-				}else if(this.businessTypeCode=="OkToHold"){
+				}else if(this.businessTypeCode=="OkToHoldRecord"){
 					name = "合格转隔离记录";
-				}else if(this.businessTypeCode=="OktoScrap"){
+				}else if(this.businessTypeCode=="OktoScrapRecord"){
 					name = "合格转报废记录";
-				}else if(this.businessTypeCode=="ScrapToHold"){
+				}else if(this.businessTypeCode=="ScrapToHoldRecord"){
 					name = "报废转隔离记录";
 				}
 				uni.setNavigationBarTitle({

pages/inventoryMove/coms/comMoveJob.vue

@@ -114,15 +114,15 @@
 				var name = ""
 				if (this.businessTypeCode == "Move") {
 					name = "库存转移";
-				} else if (this.businessTypeCode == "HoldToOk") {
+				} else if (this.businessTypeCode == "HoldToOkJob") {
 					name = "隔离转合格";
-				} else if (this.businessTypeCode == "HoldToScrap") {
+				} else if (this.businessTypeCode == "HoldToScrapJob") {
 					name = "隔离转报废";
-				} else if (this.businessTypeCode == "OkToHold") {
+				} else if (this.businessTypeCode == "OkToHoldJob") {
 					name = "合格转隔离";
-				} else if (this.businessTypeCode == "OktoScrap") {
+				} else if (this.businessTypeCode == "OktoScrapJob") {
 					name = "合格转报废";
-				} else if (this.businessTypeCode == "ScrapToHold") {
+				} else if (this.businessTypeCode == "ScrapToHoldJob") {
 					name = "报废转隔离";
 				}
 

pages/inventoryMove/record/moveHoldToOkRecord.vue → pages/inventoryMove/record/holdToOkRecord.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMove businessTypeCode='HoldToOk' :isShowStatus="false"> </comMove>
+		<comMove businessTypeCode='HoldToOkRecord' :isShowStatus="false"> </comMove>
 	</view>
 </template>
 

pages/inventoryMove/record/holdToScrapRecord.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMove :isShowStatus="true" businessTypeCode='HoldToScrap'> </comMove>
+		<comMove :isShowStatus="true" businessTypeCode='HoldToScrapRecord'> </comMove>
 	</view>
 </template>
 

pages/inventoryMove/record/moveOkToHoldRecord.vue → pages/inventoryMove/record/okToHoldRecord.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMove businessTypeCode='OkToHold' :isShowStatus="true"> </comMove>
+		<comMove businessTypeCode='OkToHoldRecord' :isShowStatus="true"> </comMove>
 	</view>
 </template>
 

pages/inventoryMove/record/oktoScrapRecord.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMove businessTypeCode='OktoScrap' :isShowStatus="true"> </comMove>
+		<comMove businessTypeCode='OktoScrapRecord' :isShowStatus="true"> </comMove>
 	</view>
 </template>
 

pages/inventoryMove/record/scrapToHoldMoveRecord.vue → pages/inventoryMove/record/scrapToHoldRecord.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMove :isShowStatus="true" businessTypeCode='ScrapToHold'> </comMove>
+		<comMove :isShowStatus="true" businessTypeCode='ScrapToHoldRecord'> </comMove>
 	</view>
 </template>
 

pages/productionReturn/coms/comReturn.vue

@@ -99,11 +99,6 @@
 				type: String,
 				default: "Move"
 			}, //业务类型
-			fromType: {
-				type: String,
-				default: ""
-			},
-
 
 		},
 

pages/productionReturn/record/returnToHold.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comReturn businessTypeCode="ReturnToHold" :fromType ="fromType"> </comReturn>
+		<comReturn businessTypeCode="ReturnToHold" > </comReturn>
 	</view>
 </template>
 
@@ -14,16 +14,10 @@
 		data() {
 
 			return {
-				settingParam: {
-
-				},
-				fromType:""
 			}
 		},
 
 		onLoad(option) {
-			this.fromType=option.fromType
-			console.log("申请类型",this.fromType)
 		},
 		methods: {
 

pages/productionReturn/record/returnToStore.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comReturn businessTypeCode="ReturnToStore" :fromType ="fromType"> </comReturn>
+		<comReturn businessTypeCode="ReturnToStore" > </comReturn>
 	</view>
 </template>
 
@@ -14,16 +14,10 @@
 		data() {
 
 			return {
-				settingParam: {
-
-				},
-				fromType:""
 			}
 		},
 
 		onLoad(option) {
-			this.fromType=option.fromType
-			console.log("申请类型",this.fromType)
 		},
 		methods: {