From 32de632fc4fc922a62942f39d805fcf2908a88d3 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 21 Dec 2023 09:17:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 10 +++++----- pages/inventoryMove/coms/comMove.vue | 10 +++++----- pages/inventoryMove/coms/comMoveJob.vue | 10 +++++----- .../{moveHoldToOkRecord.vue => holdToOkRecord.vue} | 2 +- pages/inventoryMove/record/holdToScrapRecord.vue | 2 +- .../{moveOkToHoldRecord.vue => okToHoldRecord.vue} | 2 +- pages/inventoryMove/record/oktoScrapRecord.vue | 2 +- ...scrapToHoldMoveRecord.vue => scrapToHoldRecord.vue} | 2 +- pages/productionReturn/coms/comReturn.vue | 5 ----- pages/productionReturn/record/returnToHold.vue | 8 +------- pages/productionReturn/record/returnToStore.vue | 8 +------- 11 files changed, 22 insertions(+), 39 deletions(-) rename pages/inventoryMove/record/{moveHoldToOkRecord.vue => holdToOkRecord.vue} (77%) rename pages/inventoryMove/record/{moveOkToHoldRecord.vue => okToHoldRecord.vue} (78%) rename pages/inventoryMove/record/{scrapToHoldMoveRecord.vue => scrapToHoldRecord.vue} (77%) diff --git a/pages.json b/pages.json index f0985149..82f8b5d5 100644 --- a/pages.json +++ b/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 diff --git a/pages/inventoryMove/coms/comMove.vue b/pages/inventoryMove/coms/comMove.vue index 935bd2f3..904fddd0 100644 --- a/pages/inventoryMove/coms/comMove.vue +++ b/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({ diff --git a/pages/inventoryMove/coms/comMoveJob.vue b/pages/inventoryMove/coms/comMoveJob.vue index 17d78497..07ed5031 100644 --- a/pages/inventoryMove/coms/comMoveJob.vue +++ b/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 = "报废转隔离"; } diff --git a/pages/inventoryMove/record/moveHoldToOkRecord.vue b/pages/inventoryMove/record/holdToOkRecord.vue similarity index 77% rename from pages/inventoryMove/record/moveHoldToOkRecord.vue rename to pages/inventoryMove/record/holdToOkRecord.vue index 39cb5413..83724f83 100644 --- a/pages/inventoryMove/record/moveHoldToOkRecord.vue +++ b/pages/inventoryMove/record/holdToOkRecord.vue @@ -1,6 +1,6 @@ diff --git a/pages/inventoryMove/record/holdToScrapRecord.vue b/pages/inventoryMove/record/holdToScrapRecord.vue index 2e3fab46..706ca3c8 100644 --- a/pages/inventoryMove/record/holdToScrapRecord.vue +++ b/pages/inventoryMove/record/holdToScrapRecord.vue @@ -1,6 +1,6 @@ diff --git a/pages/inventoryMove/record/moveOkToHoldRecord.vue b/pages/inventoryMove/record/okToHoldRecord.vue similarity index 78% rename from pages/inventoryMove/record/moveOkToHoldRecord.vue rename to pages/inventoryMove/record/okToHoldRecord.vue index 1aa58c97..422a1694 100644 --- a/pages/inventoryMove/record/moveOkToHoldRecord.vue +++ b/pages/inventoryMove/record/okToHoldRecord.vue @@ -1,6 +1,6 @@ diff --git a/pages/inventoryMove/record/oktoScrapRecord.vue b/pages/inventoryMove/record/oktoScrapRecord.vue index 3df2f7b8..4e67af57 100644 --- a/pages/inventoryMove/record/oktoScrapRecord.vue +++ b/pages/inventoryMove/record/oktoScrapRecord.vue @@ -1,6 +1,6 @@ diff --git a/pages/inventoryMove/record/scrapToHoldMoveRecord.vue b/pages/inventoryMove/record/scrapToHoldRecord.vue similarity index 77% rename from pages/inventoryMove/record/scrapToHoldMoveRecord.vue rename to pages/inventoryMove/record/scrapToHoldRecord.vue index b1bcbe3a..d4efb820 100644 --- a/pages/inventoryMove/record/scrapToHoldMoveRecord.vue +++ b/pages/inventoryMove/record/scrapToHoldRecord.vue @@ -1,6 +1,6 @@ diff --git a/pages/productionReturn/coms/comReturn.vue b/pages/productionReturn/coms/comReturn.vue index d6eb389c..2915c41d 100644 --- a/pages/productionReturn/coms/comReturn.vue +++ b/pages/productionReturn/coms/comReturn.vue @@ -99,11 +99,6 @@ type: String, default: "Move" }, //业务类型 - fromType: { - type: String, - default: "" - }, - }, diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue index 49c87836..a9c53c1a 100644 --- a/pages/productionReturn/record/returnToHold.vue +++ b/pages/productionReturn/record/returnToHold.vue @@ -1,6 +1,6 @@ @@ -14,16 +14,10 @@ data() { return { - settingParam: { - - }, - fromType:"" } }, onLoad(option) { - this.fromType=option.fromType - console.log("申请类型",this.fromType) }, methods: { diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue index d23b8d76..efd1dc4c 100644 --- a/pages/productionReturn/record/returnToStore.vue +++ b/pages/productionReturn/record/returnToStore.vue @@ -1,6 +1,6 @@ @@ -14,16 +14,10 @@ data() { return { - settingParam: { - - }, - fromType:"" } }, onLoad(option) { - this.fromType=option.fromType - console.log("申请类型",this.fromType) }, methods: {