diff --git a/src/main.js b/src/main.js
index 2058bfd2..2e583bc0 100644
--- 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 {
diff --git a/src/pages/container/record/containerBindRecord.vue b/src/pages/container/record/containerBindRecord.vue
index 3aa3175d..0bb57073 100644
--- 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) {
diff --git a/src/pages/container/record/containerUnBindRecord.vue b/src/pages/container/record/containerUnBindRecord.vue
index af7d0981..6c072a1f 100644
--- 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) {
diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue
index d2870e6b..7894f617 100644
--- 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) {
//新建的任务自动接收
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index 54bf700e..fe9457f9 100644
--- 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
+
});
}
},
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index a0edefd5..3bed66ac 100644
--- 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) {
//新建的任务自动接收
diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index affeb0a5..cd4ad7f7 100644
--- 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
+
});
},
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index cb623c69..e75ef9de 100644
--- 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
})
diff --git a/src/pages/inventoryMove/job/holdToOkMoveJob.vue b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
index 149213d6..42525f28 100644
--- a/src/pages/inventoryMove/job/holdToOkMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -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: {
}
diff --git a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
index 410b2abf..4e3ec6e1 100644
--- a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -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: {
}
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index e7c3c78e..5351a481 100644
--- 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 + '详情'
})
},
diff --git a/src/pages/inventoryMove/job/moveJob.vue b/src/pages/inventoryMove/job/moveJob.vue
index e7b7ec56..d63cf62d 100644
--- a/src/pages/inventoryMove/job/moveJob.vue
+++ b/src/pages/inventoryMove/job/moveJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -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: {
}
diff --git a/src/pages/inventoryMove/job/okToHoldMoveJob.vue b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
index 5e2f8ec2..55be8c3a 100644
--- a/src/pages/inventoryMove/job/okToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -12,9 +12,12 @@
},
data() {
return {
-
+ title:''
}
},
+ onLoad(option){
+ this.title = option.title
+ },
onPullDownRefresh() {
this.$refs.comMoveJob.refresh();
},
@@ -27,7 +30,6 @@
}
},
- onLoad() {},
methods: {
}
diff --git a/src/pages/inventoryMove/job/okToScrapMoveJob.vue b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
index c78799e0..4a763659 100644
--- a/src/pages/inventoryMove/job/okToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -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: {
}
diff --git a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
index 985e5a58..4fc28c5e 100644
--- a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue
@@ -1,6 +1,6 @@
-
+
@@ -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: {
}
diff --git a/src/pages/inventoryMove/record/holdToOkRecord.vue b/src/pages/inventoryMove/record/holdToOkRecord.vue
index 72d3dc7b..d708cc99 100644
--- a/src/pages/inventoryMove/record/holdToOkRecord.vue
+++ b/src/pages/inventoryMove/record/holdToOkRecord.vue
@@ -1,6 +1,6 @@
-
+
@@ -13,10 +13,12 @@
},
data() {
return {
-
+ title:''
}
},
- onLoad() {},
+ onLoad(option){
+ this.title = option.title
+ },
methods: {}
}
diff --git a/src/pages/inventoryMove/record/holdToScrapRecord.vue b/src/pages/inventoryMove/record/holdToScrapRecord.vue
index 70175e88..4a4f9e6f 100644
--- a/src/pages/inventoryMove/record/holdToScrapRecord.vue
+++ b/src/pages/inventoryMove/record/holdToScrapRecord.vue
@@ -1,6 +1,6 @@
-
+
@@ -12,13 +12,13 @@
comMoveRecord
},
data() {
-
return {
-
+ title:''
}
},
-
- onLoad() {},
+ onLoad(option){
+ this.title = option.title
+ },
methods: {
}
diff --git a/src/pages/inventoryMove/record/moveFreeRecord.vue b/src/pages/inventoryMove/record/moveFreeRecord.vue
index 001898f1..3d3a6452 100644
--- a/src/pages/inventoryMove/record/moveFreeRecord.vue
+++ b/src/pages/inventoryMove/record/moveFreeRecord.vue
@@ -1,6 +1,6 @@
-
+
@@ -12,13 +12,13 @@
comMoveRecord
},
data() {
-
return {
-
+ title:''
}
},
-
- onLoad() {},
+ onLoad(option){
+ this.title = option.title
+ },
methods: {
}
diff --git a/src/pages/inventoryMove/record/okToHoldRecord.vue b/src/pages/inventoryMove/record/okToHoldRecord.vue
index 2fb80808..e025da9a 100644
--- a/src/pages/inventoryMove/record/okToHoldRecord.vue
+++ b/src/pages/inventoryMove/record/okToHoldRecord.vue
@@ -1,6 +1,6 @@
-
+
@@ -13,10 +13,12 @@
},
data() {
return {
-
+ title:''
}
},
- onLoad() {},
+ onLoad(option){
+ this.title = option.title
+ },
methods: {
}
}
diff --git a/src/pages/inventoryMove/record/okToScrapRecord.vue b/src/pages/inventoryMove/record/okToScrapRecord.vue
index 65eb61ab..30f4f3a2 100644
--- a/src/pages/inventoryMove/record/okToScrapRecord.vue
+++ b/src/pages/inventoryMove/record/okToScrapRecord.vue
@@ -1,7 +1,7 @@
-
+
@@ -14,10 +14,12 @@
},
data() {
return {
-
+ title:''
}
},
- onLoad() {},
+ onLoad(option){
+ this.title = option.title
+ },
methods: {
}
}
diff --git a/src/pages/inventoryMove/record/scrapToHoldRecord.vue b/src/pages/inventoryMove/record/scrapToHoldRecord.vue
index f9b6e8aa..a09ab912 100644
--- a/src/pages/inventoryMove/record/scrapToHoldRecord.vue
+++ b/src/pages/inventoryMove/record/scrapToHoldRecord.vue
@@ -1,6 +1,6 @@
-
+
@@ -12,13 +12,13 @@
comMoveRecord
},
data() {
-
return {
-
+ title:''
}
},
-
- onLoad() {},
+ onLoad(option){
+ this.title = option.title
+ },
methods: {
}
diff --git a/src/pages/package/record/mergePackageRecord.vue b/src/pages/package/record/mergePackageRecord.vue
index 8115c0d1..69fd8752 100644
--- 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) {
diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue
index efa3ecb1..54da6f1d 100644
--- 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) {
diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue
index 06faaf7c..e6951b4d 100644
--- 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
+
});
},
diff --git a/src/pages/scrap/job/scrapJobDetail.vue b/src/pages/scrap/job/scrapJobDetail.vue
index e122f8cc..2a5c5e99 100644
--- 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) {
//新建的任务自动接收
diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue
index d565bd37..2aac2ef0 100644
--- 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 => {
diff --git a/src/pages/scrap/request/scrapRequestDetail.vue b/src/pages/scrap/request/scrapRequestDetail.vue
index fdf08bac..87433f95 100644
--- 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();
},
diff --git a/src/pages/scrap/request/scrapRrequest.vue b/src/pages/scrap/request/scrapRrequest.vue
index fc896d13..4d4ab342 100644
--- 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)
diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue
index 9cdb3a7f..a8ac28e0 100644
--- 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) {
// //新建的任务自动接收
diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue
index 7be40409..f4997341 100644
--- 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
});
},
diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue
index 9fb525bc..90bf09e6 100644
--- 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) {
// //新建的任务自动接收
diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue
index 43f3f1e3..eab54301 100644
--- 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
});
},
diff --git a/src/pages/transfer/record/deliverRecord.vue b/src/pages/transfer/record/deliverRecord.vue
index 1100fe8e..0c753757 100644
--- 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) {
diff --git a/src/pages/transfer/record/receiptRecord.vue b/src/pages/transfer/record/receiptRecord.vue
index 8d3254b5..81a94e90 100644
--- 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 => {
diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue
index 745eae92..324f5a48 100644
--- 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
});
},
diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue
index 97420978..ca2c0c6c 100644
--- 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) {
// //新建的任务自动接收
diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue
index fdc4c594..0fbfeed8 100644
--- 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
});
},
diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index 73d60f6a..7394d301 100644
--- 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) {
// //新建的任务自动接收
diff --git a/src/pages/unPlanned/request/issueRequest.vue b/src/pages/unPlanned/request/issueRequest.vue
index 58d7916b..8bc96f48 100644
--- 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)
diff --git a/src/pages/unPlanned/request/issueRequestDetail.vue b/src/pages/unPlanned/request/issueRequestDetail.vue
index a5b1ed77..daa6f7bd 100644
--- 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();
},