diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index e8719ce2..705857c8 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -106,6 +106,9 @@
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ });
this.id = option.id;
this.scanMessage = option.scanMessage || '';
if (this.id != undefined) {
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index f6012426..17053213 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -78,10 +78,12 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
- productionline: []
+ productionline: [],
+ title:''
};
},
- onLoad() {
+ onLoad(option) {
+ this.title = option.title
this.getIssueJobByProductionline()
},
onShow() {
@@ -201,7 +203,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";
@@ -215,7 +217,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle("发料任务");
+ updateTitle(this.title);
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -257,8 +259,7 @@
openJobDetail(item, scanMessage = '') {
uni.navigateTo({
- url: './issueDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' +
- scanMessage
+ url: './issueDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' + scanMessage +'&title='+this.title
});
},
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index a63dc45a..73787a0b 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -134,6 +134,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
this.clearData();
getBusinessType(this.businessTypeCode, res => {
if (res.success) {
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
index d52e0114..50a47626 100644
--- a/src/pages/issue/request/issueScanRequest.vue
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -66,6 +66,9 @@
mounted() {
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
var typeCode = "Issue"
getBusinessType(typeCode, res => {
if (res.success) {
diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue
index ad52c55b..c00439a5 100644
--- a/src/pages/package/job/overPackageJob.vue
+++ b/src/pages/package/job/overPackageJob.vue
@@ -64,8 +64,13 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
+ title:''
};
},
+
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
this.getList('refresh');
@@ -158,13 +163,13 @@
}
this.jobList = type === "refresh" ? list : this.jobList.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)
@@ -199,7 +204,7 @@
openJobDetail(item) {
uni.navigateTo({
- url: './overPackageJobDetail?id=' + item.masterId + '&status=' + item.status
+ url: './overPackageJobDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
});
},
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 68c2ffac..1703b923 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -123,6 +123,9 @@
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
@@ -174,9 +177,12 @@
methods: {
resizeCollapse() {
this.$nextTick(r => {
- this.$refs.comOverPackJobDetailCard.forEach(r => {
- r.resizeCollapse();
- })
+ if(this.$refs.comOverPackJobDetailCard){
+ this.$refs.comOverPackJobDetailCard.forEach(r => {
+ r.resizeCollapse();
+ })
+ }
+
// this.$refs.mainCollapse.forEach(r => {
// r.childrens.forEach(i => {
// i.init();
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 3fdb08d3..44f8c929 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -129,6 +129,11 @@
packUnit,
winComScanBalance
},
+ onLoad(option){
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
+ },
data() {
return {
id: '',
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 24e6a41d..10439f8b 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -113,6 +113,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
this.scanedPackingNumber = option.scaned || '';
if (this.id != undefined) {
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index c87ebf2e..a35a0bfe 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -80,8 +80,12 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
this.getList('refresh');
@@ -170,7 +174,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";
@@ -185,7 +189,7 @@
uni.stopPullDownRefresh();
}
this.loadingType = "";
- updateTitle("生产收料");
+ updateTitle(this.title);
uni.hideLoading();
that.showMessage(error)
})
@@ -193,8 +197,7 @@
openJobDetail(item, packingNumber = '') {
uni.navigateTo({
- url: './productionReceiptDetail?id=' + item.masterId + '&status=' + item.status+'&scaned=' +
- packingNumber
+ url: './productionReceiptDetail?id=' + item.masterId + '&status=' + item.status+'&scaned=' + packingNumber +'&title='+this.title
});
},
diff --git a/src/pages/productionReturn/coms/comReturnCommonRequest.vue b/src/pages/productionReturn/coms/comReturnCommonRequest.vue
index f694372d..96f4f6b1 100644
--- a/src/pages/productionReturn/coms/comReturnCommonRequest.vue
+++ b/src/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -76,7 +76,6 @@
addAgainOption: [],
showOptions: [],
loadingType: "nomore",
- title: "",
fromType: ""
};
@@ -87,6 +86,10 @@
type: String,
default: ''
},
+ title: {
+ type: String,
+ default: ''
+ },
},
@@ -115,10 +118,10 @@
methods: {
updateTitle() {
if (this.businessType == 'ReturnToStore') {
- this.title = "生产合格退料申请"
+ // this.title = "生产合格退料申请"
this.fromType = "ReturnToStore"
} else if (this.businessType == 'ReturnToHold') {
- this.title = "生产隔离退料申请"
+ // this.title = "生产隔离退料申请"
this.fromType = "ReturnToHold"
}
updateTitle(this.title)
diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue
index c3632140..a83fdf47 100644
--- a/src/pages/productionReturn/job/returnDetail.vue
+++ b/src/pages/productionReturn/job/returnDetail.vue
@@ -115,6 +115,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
if (this.id != undefined) {
// //新建的任务自动接收
diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue
index 8b938bc7..5dd8a87b 100644
--- a/src/pages/productionReturn/job/returnJob.vue
+++ b/src/pages/productionReturn/job/returnJob.vue
@@ -69,8 +69,12 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
this.getList('refresh');
@@ -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";
@@ -175,7 +179,7 @@
if (type === "refresh") {
uni.stopPullDownRefresh();
}
- updateTitle("生产退料");
+ updateTitle(this.title);
this.loadingType = "";
uni.hideLoading();
that.showMessage(error)
@@ -184,7 +188,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/productionReturn/record/returnToHold.vue b/src/pages/productionReturn/record/returnToHold.vue
index f31af81d..c18bb6f3 100644
--- a/src/pages/productionReturn/record/returnToHold.vue
+++ b/src/pages/productionReturn/record/returnToHold.vue
@@ -134,7 +134,10 @@
};
},
- onLoad() {
+ onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
getBusinessType(this.businessTypeCode, res => {
if (res.success) {
this.businessType = res.businessType;
diff --git a/src/pages/productionReturn/record/returnToStore.vue b/src/pages/productionReturn/record/returnToStore.vue
index 27983949..ee5bfaab 100644
--- a/src/pages/productionReturn/record/returnToStore.vue
+++ b/src/pages/productionReturn/record/returnToStore.vue
@@ -128,7 +128,10 @@
};
},
- onLoad() {
+ onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
getBusinessType(this.businessTypeCode, res => {
if (res.success) {
this.businessType = res.businessType;
diff --git a/src/pages/productionReturn/request/returnToHoldRequest.vue b/src/pages/productionReturn/request/returnToHoldRequest.vue
index 05d247b9..d68c51bc 100644
--- a/src/pages/productionReturn/request/returnToHoldRequest.vue
+++ b/src/pages/productionReturn/request/returnToHoldRequest.vue
@@ -1,6 +1,6 @@
-
+
@@ -19,9 +19,12 @@
data() {
return {
requestList: [],
-
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
//返回首页
onNavigationBarButtonTap(e) {
diff --git a/src/pages/productionReturn/request/returnToStoreRequest.vue b/src/pages/productionReturn/request/returnToStoreRequest.vue
index 834e6d80..db545290 100644
--- a/src/pages/productionReturn/request/returnToStoreRequest.vue
+++ b/src/pages/productionReturn/request/returnToStoreRequest.vue
@@ -1,6 +1,6 @@
-
+
@@ -19,9 +19,13 @@
data() {
return {
requestList: [],
-
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+
+ },
//返回首页
onNavigationBarButtonTap(e) {
diff --git a/src/pages/query/container.vue b/src/pages/query/container.vue
index 8ce9324a..331da92d 100644
--- a/src/pages/query/container.vue
+++ b/src/pages/query/container.vue
@@ -92,9 +92,9 @@
tabIndex: 0,
};
},
- onLoad(e){
+ onLoad(option){
uni.setNavigationBarTitle({
- title: e.title
+ title: option.title
})
},
onNavigationBarButtonTap(e) {
diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue
index c329a880..37858057 100644
--- a/src/pages/query/item.vue
+++ b/src/pages/query/item.vue
@@ -96,9 +96,9 @@
this.getContentByTab(this.tabIndex, this.pageNo, this.pageSize, "more");
},
- onLoad(e){
+ onLoad(option){
uni.setNavigationBarTitle({
- title: e.title
+ title: option.title
})
},
mounted() {
diff --git a/src/pages/query/location.vue b/src/pages/query/location.vue
index 00bd9106..aea34437 100644
--- a/src/pages/query/location.vue
+++ b/src/pages/query/location.vue
@@ -87,9 +87,9 @@
totalCount:0
};
},
- onLoad(e){
+ onLoad(option){
uni.setNavigationBarTitle({
- title: e.title
+ title: option.title
})
},
onNavigationBarButtonTap(e) {
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index 87d166e8..661772e0 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -107,6 +107,9 @@
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title+'详情'
+ })
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 5570487d..64b0dea8 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -77,8 +77,12 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
+ title:''
};
},
+ onLoad(option){
+ this.title = option.title
+ },
onShow() {
this.getList('refresh');
@@ -177,7 +181,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";
@@ -191,7 +195,7 @@
uni.stopPullDownRefresh();
}
this.loadingType = "";
- updateTitle("补料");
+ updateTitle(this.title);
uni.hideLoading();
that.showMessage(error)
})
@@ -203,8 +207,7 @@
openJobDetail(item,scanMessage = '') {
uni.navigateTo({
- url: './repleinshDetail?id=' + item.masterId + '&status=' + item.status+'&scanMessage=' +
- scanMessage
+ url: './repleinshDetail?id=' + item.masterId + '&status=' + item.status+'&scanMessage=' + scanMessage +'&title='+this.title
});
},
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index 023d70ee..db7adf2c 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -125,6 +125,9 @@
};
},
onLoad(option) {
+ uni.setNavigationBarTitle({
+ title: option.title
+ })
this.clear();
this.getBusinessType()
},