From 25338b2896641c790ba7945e7dacf250e2636639 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 11 Jul 2024 17:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E6=A0=87?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/customerReturn/job/returnDetail.vue | 3 ++
src/pages/customerReturn/job/returnJob.vue | 10 ++++--
.../customerReturn/record/returnRecord.vue | 3 ++
.../request/customerReturnRequest.vue | 8 +++--
.../request/customerReturnRequestDetail.vue | 3 ++
src/pages/deliver/job/deliverDetail.vue | 3 ++
src/pages/deliver/job/deliverJob.vue | 10 +++---
src/pages/deliver/record/deliverRecord.vue | 3 ++
src/pages/material/materialDowngrade.vue | 3 ++
.../job/fgProductPutawayJob.vue | 7 ++--
.../job/productPutawayDetail.vue | 18 +++++++----
.../productPutaway/job/productPutawayJob.vue | 24 ++++++--------
.../job/semiProductPutawayJob.vue | 7 ++--
.../record/productPutawayRecord.vue | 3 ++
.../productPutaway/request/putawayRequest.vue | 10 ++++--
.../request/putawayRequestDetail.vue | 3 ++
.../job/fgProductReceiptDetail.vue | 5 ++-
.../job/fgProductReceiptJob.vue | 7 ++--
.../job/productReceiptDetail.vue | 6 +++-
.../productReceipt/job/productReceiptJob.vue | 32 +++++++------------
.../productReceipt/job/scrapReceiptDetail.vue | 3 ++
.../productReceipt/job/scrapReceiptJob.vue | 7 ++--
.../job/semiProductReceiptJob.vue | 7 ++--
.../record/productReceiptRecord.vue | 3 ++
.../productRecycle/job/productRecycleJob.vue | 12 ++++---
.../job/productRecycleJobDetail.vue | 3 ++
.../record/productRecycleRecord.vue | 3 ++
src/pages/stockUp/job/stockUpJob.vue | 12 ++++---
src/pages/stockUp/job/stockUpJobDetail.vue | 3 ++
29 files changed, 147 insertions(+), 74 deletions(-)
diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 070a6bee..3b2c9bdf 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -92,6 +92,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue
index 11a76e11..c1ed7c28 100644
--- a/src/pages/customerReturn/job/returnJob.vue
+++ b/src/pages/customerReturn/job/returnJob.vue
@@ -71,8 +71,12 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
this.getList('refresh');
@@ -158,7 +162,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";
@@ -171,7 +175,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle("客户退货任务");
+ updateTitle(this.title);
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -180,7 +184,7 @@
openJobDetail(item) {
uni.navigateTo({
- url: './returnDetail?id=' + item.masterId + '&status=' + item.status
+ url: './returnDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
});
},
diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue
index d8f273b9..9317f930 100644
--- a/src/pages/customerReturn/record/returnRecord.vue
+++ b/src/pages/customerReturn/record/returnRecord.vue
@@ -107,6 +107,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
var typeCode = "CustomerReject"
getBusinessType(typeCode, res => {
if (res.success) {
diff --git a/src/pages/customerReturn/request/customerReturnRequest.vue b/src/pages/customerReturn/request/customerReturnRequest.vue
index 9a80dcc5..8a7639f8 100644
--- a/src/pages/customerReturn/request/customerReturnRequest.vue
+++ b/src/pages/customerReturn/request/customerReturnRequest.vue
@@ -77,6 +77,7 @@
showOptions: [],
fromType: "requestType",
loadingType: "nomore",
+ title:''
};
},
@@ -101,6 +102,7 @@
this.getList('refresh');
},
onLoad(option) {
+ this.title = option.title
this.getList('refresh');
},
//返回首页
@@ -124,7 +126,7 @@
},
openRequestDetail(item) {
uni.navigateTo({
- url: './customerReturnRequestDetail?id=' + item.masterId
+ url: './customerReturnRequestDetail?id=' + item.masterId+'&title='+this.title
});
},
@@ -158,7 +160,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 +178,7 @@
uni.stopPullDownRefresh();
}
this.loadingType = "";
- updateTitle("客户退货申请");
+ updateTitle(this.title);
uni.hideLoading();
that.showMessage(error)
})
diff --git a/src/pages/customerReturn/request/customerReturnRequestDetail.vue b/src/pages/customerReturn/request/customerReturnRequestDetail.vue
index 7cab635f..5d936e4e 100644
--- a/src/pages/customerReturn/request/customerReturnRequestDetail.vue
+++ b/src/pages/customerReturn/request/customerReturnRequestDetail.vue
@@ -59,6 +59,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
this.getDetail();
},
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index 5f084215..d212403b 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -116,6 +116,9 @@
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 861519da..0ab0f649 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -72,10 +72,12 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
- businessType:''
+ businessType:'',
+ title:''
};
},
onLoad(option) {
+ this.title = option.title
this.businessType = option.businessType
},
onShow() {
@@ -169,7 +171,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";
@@ -182,7 +184,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle("制品发货任务");
+ updateTitle(this.title);
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -191,7 +193,7 @@
openJobDetail(item) {
uni.navigateTo({
- url: './deliverDetail?id=' + item.masterId + '&status=' + item.status
+ url: './deliverDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
});
},
diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue
index a17cdd40..743c3303 100644
--- a/src/pages/deliver/record/deliverRecord.vue
+++ b/src/pages/deliver/record/deliverRecord.vue
@@ -119,6 +119,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
this.deliverType = option.deliverType
var typeCode = "Deliver"
diff --git a/src/pages/material/materialDowngrade.vue b/src/pages/material/materialDowngrade.vue
index 167d59d1..c479b151 100644
--- a/src/pages/material/materialDowngrade.vue
+++ b/src/pages/material/materialDowngrade.vue
@@ -119,6 +119,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
this.clear();
getBusinessType(this.businessTypeCode, res => {
if (res.success) {
diff --git a/src/pages/productPutaway/job/fgProductPutawayJob.vue b/src/pages/productPutaway/job/fgProductPutawayJob.vue
index 5c9f5759..5d26aede 100644
--- a/src/pages/productPutaway/job/fgProductPutawayJob.vue
+++ b/src/pages/productPutaway/job/fgProductPutawayJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -13,9 +13,12 @@
},
data() {
return {
-
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onReachBottom() {
this.$refs.productPutawayJob.onReach();
},
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index 99784ba3..4cb645a3 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -118,20 +118,26 @@
status:''
};
},
- onLoad(option) {
+ onLoad(option) {
+
this.id = option.id;
this.type = option.type;
this.scanedPackingNumber = option.scaned || '';
this.status = option.status || ''
if (this.type == 'predict') {
this.switchCode = "SemiPutawayLocationCodeValidate"
- this.hintTitle="预生产上架"
- updateTitle("预生产上架详情");
+ // this.hintTitle="预生产上架"
+ // updateTitle("预生产上架详情");
} else if (this.type == 'assemble') {
this.switchCode = "FgPutawayLocationCodeValidate"
- this.hintTitle="成品入库"
- updateTitle("成品入库详情");
- }
+ // this.hintTitle="成品入库"
+ // updateTitle("成品入库详情");
+ }
+
+ this.hintTitle=option.title
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
},
onShow(){
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index 9f0a3317..fcd9cb9c 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -82,7 +82,11 @@
};
},
props: {
- type: 'assemble',
+ type: 'assemble',
+ title:{
+ required:false,
+ default:''
+ }
},
mounted() {
@@ -194,11 +198,7 @@
var list = res.data.list;
this.totalCount = res.data.total
this.loadingType = "loadmore";
- if (this.type == 'predict') {
- updateTitle("预生产上架任务(" + this.totalCount + ")");
- } else if (this.type == 'assemble') {
- updateTitle("成品入库任务(" + this.totalCount + ")");
- }
+ updateTitle(this.title+"(" + this.totalCount + ")");
if (list == null || list.length == 0) {
this.loadingType = "nomore";
return;
@@ -210,12 +210,8 @@
}).catch(error => {
if (type === "refresh") {
uni.stopPullDownRefresh();
- }
- if (this.type == 'predict') {
- updateTitle("预生产上架任务(" + this.totalCount + ")");
- } else if (this.type == 'assemble') {
- updateTitle("成品入库任务(" + this.totalCount + ")");
- }
+ }
+ updateTitle(this.title+"(" + this.totalCount + ")");
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -224,8 +220,8 @@
openJobDetail(item, packingNumber = '') {
uni.navigateTo({
- url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item
- .type + '&scaned=' + packingNumber
+ url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item.type + '&scaned=' + packingNumber +'&title='+this.title
+
});
},
diff --git a/src/pages/productPutaway/job/semiProductPutawayJob.vue b/src/pages/productPutaway/job/semiProductPutawayJob.vue
index ef249e3e..570fcbcc 100644
--- a/src/pages/productPutaway/job/semiProductPutawayJob.vue
+++ b/src/pages/productPutaway/job/semiProductPutawayJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -13,9 +13,12 @@
},
data() {
return {
-
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
if(this.$refs.productPutawayJob!=undefined){
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index ac453cca..3ba53a5a 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -108,6 +108,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
this.type = option.type
if(this.type=='predict'){
updateTitle('制品上架记录')
diff --git a/src/pages/productPutaway/request/putawayRequest.vue b/src/pages/productPutaway/request/putawayRequest.vue
index 4323d297..054ae8b6 100644
--- a/src/pages/productPutaway/request/putawayRequest.vue
+++ b/src/pages/productPutaway/request/putawayRequest.vue
@@ -78,9 +78,13 @@
addAgainOption: [],
showOptions: [],
loadingType: "nomore",
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onReady() {
this.detailOptions = getDetailOption();
this.addAgainOption = getAddAgainOption();
@@ -125,7 +129,7 @@
},
openRequestDetail(item) {
uni.navigateTo({
- url: './putawayRequestDetail?id=' + item.masterId
+ url: './putawayRequestDetail?id=' + item.masterId+'&title='+this.title
});
},
@@ -175,13 +179,13 @@
this.requestList = type === "refresh" ? list : this.requestList.concat(list);
this.pageNo++;
- updateTitle("制品上架申请(" + this.totalCount + ")");
+ updateTitle(this.title+"(" + this.totalCount + ")");
}).catch(error => {
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle("制品上架申请");
+ updateTitle(this.title);
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
diff --git a/src/pages/productPutaway/request/putawayRequestDetail.vue b/src/pages/productPutaway/request/putawayRequestDetail.vue
index ab816d24..144540bd 100644
--- a/src/pages/productPutaway/request/putawayRequestDetail.vue
+++ b/src/pages/productPutaway/request/putawayRequestDetail.vue
@@ -58,6 +58,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
this.getDetail();
},
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index 57b8da72..5a6dc944 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -146,7 +146,10 @@
scanedPackingNumber: ''
};
},
- onLoad(option) {
+ onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
this.scanedPackingNumber = option.scaned || '';
if (this.id != undefined) {
diff --git a/src/pages/productReceipt/job/fgProductReceiptJob.vue b/src/pages/productReceipt/job/fgProductReceiptJob.vue
index 5858e690..8f0a88c0 100644
--- a/src/pages/productReceipt/job/fgProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -14,9 +14,12 @@
},
data() {
return {
-
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
if(this.$refs.productreceiptjob!=undefined){
this.$refs.productreceiptjob.refresh();
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 78b57831..4245a27c 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -138,7 +138,11 @@
status:''
};
},
- onLoad(option) {
+ onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
+
this.id = option.id;
this.scanedPackingNumber = option.scaned || '';
this.status = option.status || ''
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index db3874ff..f176a7b9 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -84,7 +84,11 @@
// 装配收货：type = 'assemble'
// 预生产收货：type = 'predict'
props: {
- type: 'assemble',
+ type: 'assemble',
+ title: {
+ type: String,
+ default: ''
+ },
},
@@ -182,13 +186,8 @@
var list = res.data.list;
this.totalCount = res.data.total
- if (this.type == 'predict') {
- updateTitle("预生产收货任务(" + this.totalCount + ")");
- } else if (this.type == 'assemble') {
- updateTitle("装配收货任务(" + this.totalCount + ")");
- } else {
- updateTitle("报废收货任务(" + this.totalCount + ")");
- }
+ // 预生产收货任务 装配收货任务 报废收货任务
+ updateTitle(this.title+"(" + this.totalCount + ")");
this.loadingType = "more";
if (list == null || list.length == 0) {
this.loadingType = "noMore";
@@ -202,13 +201,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- if (this.type == 'predict') {
- updateTitle("预生产收货任务(" + this.totalCount + ")");
- } else if (this.type == 'assemble') {
- updateTitle("装配收货任务(" + this.totalCount + ")");
- } else {
- updateTitle("报废收货任务(" + this.totalCount + ")");
- }
+ updateTitle(this.title+"(" + this.totalCount + ")");
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -218,18 +211,15 @@
openJobDetail(item, packingNumber = '') {
if (this.type == 'predict') {
uni.navigateTo({
- url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' +
- packingNumber
+ url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title
});
} else if (this.type == 'assemble') {
uni.navigateTo({
- url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status +
- '&scaned=' + packingNumber
+ url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title
});
} else {
uni.navigateTo({
- url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' +
- packingNumber
+ url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber +'&title='+this.title
});
}
},
diff --git a/src/pages/productReceipt/job/scrapReceiptDetail.vue b/src/pages/productReceipt/job/scrapReceiptDetail.vue
index c0db8193..ebf5495a 100644
--- a/src/pages/productReceipt/job/scrapReceiptDetail.vue
+++ b/src/pages/productReceipt/job/scrapReceiptDetail.vue
@@ -109,6 +109,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
diff --git a/src/pages/productReceipt/job/scrapReceiptJob.vue b/src/pages/productReceipt/job/scrapReceiptJob.vue
index 431547ee..973ed32b 100644
--- a/src/pages/productReceipt/job/scrapReceiptJob.vue
+++ b/src/pages/productReceipt/job/scrapReceiptJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -14,9 +14,12 @@
},
data() {
return {
-
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onReachBottom() {
this.$refs.productreceiptjob.onReach();
},
diff --git a/src/pages/productReceipt/job/semiProductReceiptJob.vue b/src/pages/productReceipt/job/semiProductReceiptJob.vue
index 0a4dc152..dda7bd4f 100644
--- a/src/pages/productReceipt/job/semiProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/semiProductReceiptJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -14,9 +14,12 @@
},
data() {
return {
-
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onReachBottom() {
this.$refs.productreceiptjob.onReach();
},
diff --git a/src/pages/productReceipt/record/productReceiptRecord.vue b/src/pages/productReceipt/record/productReceiptRecord.vue
index 6cec6f09..ff89a133 100644
--- a/src/pages/productReceipt/record/productReceiptRecord.vue
+++ b/src/pages/productReceipt/record/productReceiptRecord.vue
@@ -111,6 +111,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
var typeCode = "ProductReceipt"
getBusinessType(typeCode, res => {
if (res.success) {
diff --git a/src/pages/productRecycle/job/productRecycleJob.vue b/src/pages/productRecycle/job/productRecycleJob.vue
index 2330df4c..3f2e2dcc 100644
--- a/src/pages/productRecycle/job/productRecycleJob.vue
+++ b/src/pages/productRecycle/job/productRecycleJob.vue
@@ -69,9 +69,13 @@
todayTime: "",
status: '1,2', //待处理 、进行中
detailOptions: [],
- detailGiveupOptions: []
+ detailGiveupOptions: [],
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
this.getList('refresh');
@@ -159,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";
@@ -173,7 +177,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle("制品回收任务");
+ updateTitle(this.title);
this.loadingType = "";
uni.hideLoading();
that.showErrorMessage(error)
@@ -183,7 +187,7 @@
openJobDetail(item) {
uni.navigateTo({
- url: './productRecycleJobDetail?id=' + item.masterId + '&status=' + item.status
+ url: './productRecycleJobDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
});
},
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index e86247e8..0b9b7661 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue
@@ -97,6 +97,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
diff --git a/src/pages/productRecycle/record/productRecycleRecord.vue b/src/pages/productRecycle/record/productRecycleRecord.vue
index 6bb35c6a..06a7554d 100644
--- a/src/pages/productRecycle/record/productRecycleRecord.vue
+++ b/src/pages/productRecycle/record/productRecycleRecord.vue
@@ -101,6 +101,9 @@
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.fromType = option.fromType
if (this.fromType == "requestType") {
updateTitle("采购退货申请")
diff --git a/src/pages/stockUp/job/stockUpJob.vue b/src/pages/stockUp/job/stockUpJob.vue
index 2900400e..0c889b7f 100644
--- a/src/pages/stockUp/job/stockUpJob.vue
+++ b/src/pages/stockUp/job/stockUpJob.vue
@@ -72,9 +72,12 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
+ title:''
};
},
-
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
this.getList('refresh');
},
@@ -154,7 +157,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";
@@ -167,7 +170,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle("直接备货任务");
+ updateTitle(this.title);
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -176,7 +179,8 @@
openJobDetail(item) {
uni.navigateTo({
- url: './stockUpJobDetail?id=' + item.masterId + '&status=' + item.status
+ url: './stockUpJobDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
+
});
},
diff --git a/src/pages/stockUp/job/stockUpJobDetail.vue b/src/pages/stockUp/job/stockUpJobDetail.vue
index 5f25e869..64b9cd87 100644
--- a/src/pages/stockUp/job/stockUpJobDetail.vue
+++ b/src/pages/stockUp/job/stockUpJobDetail.vue
@@ -129,6 +129,9 @@
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收