From 1335f3861c81c65f0f5b8db2d18112609884621a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 6 Sep 2024 15:49:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86--=E6=A0=87?= =?UTF-8?q?=E9=A2=98=202024/7/11=2018:25:17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/record/moveFreeRecord.vue | 8 +++++++- src/pages/inventoryMove/record/okToHoldRecord.vue | 8 +++++++- src/pages/inventoryMove/record/okToScrapRecord.vue | 8 +++++++- src/pages/inventoryMove/record/scrapToHoldRecord.vue | 8 +++++++- src/pages/scrap/job/scrapJob.vue | 9 ++++++--- src/pages/scrap/job/scrapJobDetail.vue | 3 +++ src/pages/scrap/record/scrapRecord.vue | 4 +++- src/pages/scrap/request/scrapRequestDetail.vue | 3 +++ src/pages/scrap/request/scrapRrequest.vue | 10 +++++++--- src/pages/transfer/job/issueDetail.vue | 3 +++ src/pages/transfer/job/issueJob.vue | 10 +++++++--- src/pages/transfer/job/receiptDetail.vue | 3 +++ src/pages/transfer/job/receiptJob.vue | 10 +++++++--- src/pages/transfer/record/deliverRecord.vue | 3 +++ src/pages/transfer/record/receiptRecord.vue | 3 +++ src/pages/unPlanned/job/issueJob.vue | 10 +++++++--- src/pages/unPlanned/job/issueJobDetail.vue | 3 +++ src/pages/unPlanned/job/receiptJob.vue | 11 +++++++---- src/pages/unPlanned/job/receiptJobDetail.vue | 3 +++ src/pages/unPlanned/request/issueRequest.vue | 10 +++++++--- src/pages/unPlanned/request/issueRequestDetail.vue | 3 +++ 21 files changed, 106 insertions(+), 27 deletions(-) diff --git a/src/pages/inventoryMove/record/moveFreeRecord.vue b/src/pages/inventoryMove/record/moveFreeRecord.vue index 0c4f99b9..f402b1b6 100644 --- a/src/pages/inventoryMove/record/moveFreeRecord.vue +++ b/src/pages/inventoryMove/record/moveFreeRecord.vue @@ -1,11 +1,17 @@ diff --git a/src/pages/inventoryMove/record/okToHoldRecord.vue b/src/pages/inventoryMove/record/okToHoldRecord.vue index 5e9263c8..cac5c28a 100644 --- a/src/pages/inventoryMove/record/okToHoldRecord.vue +++ b/src/pages/inventoryMove/record/okToHoldRecord.vue @@ -1,11 +1,17 @@ diff --git a/src/pages/inventoryMove/record/okToScrapRecord.vue b/src/pages/inventoryMove/record/okToScrapRecord.vue index 90a9fe3c..0acee43a 100644 --- a/src/pages/inventoryMove/record/okToScrapRecord.vue +++ b/src/pages/inventoryMove/record/okToScrapRecord.vue @@ -1,11 +1,17 @@ diff --git a/src/pages/inventoryMove/record/scrapToHoldRecord.vue b/src/pages/inventoryMove/record/scrapToHoldRecord.vue index 3277b166..c6900ffb 100644 --- a/src/pages/inventoryMove/record/scrapToHoldRecord.vue +++ b/src/pages/inventoryMove/record/scrapToHoldRecord.vue @@ -1,10 +1,16 @@ diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue index 5628c65b..2bc25a59 100644 --- a/src/pages/scrap/job/scrapJob.vue +++ b/src/pages/scrap/job/scrapJob.vue @@ -43,6 +43,7 @@ const todayTime = ref('') const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) +const title = ref('') const filter = ref() const comMessageRef = ref() @@ -53,7 +54,9 @@ onShow(() => { getList('refresh') }) }) - +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -128,7 +131,7 @@ const getList = (type) => { const { list } = res.data totalCount.value = res.data.total - updateTitle(`报废出库(${totalCount.value})`) + updateTitle(`${title.value}(${totalCount.value})`) loadingType.value = 'loadmore' if (list == null || list.length == 0) { loadingType.value = 'nomore' @@ -142,7 +145,7 @@ const getList = (type) => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('报废出库') + updateTitle(totalCount.value) uni.hideLoading() showMessage(error) }) diff --git a/src/pages/scrap/job/scrapJobDetail.vue b/src/pages/scrap/job/scrapJobDetail.vue index ea527888..96cca7ed 100644 --- a/src/pages/scrap/job/scrapJobDetail.vue +++ b/src/pages/scrap/job/scrapJobDetail.vue @@ -68,6 +68,9 @@ const jobStatus = ref('') const comMessageRef = ref() const scanPopup = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id if (id.value != undefined) { // 新建的任务自动接收 diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue index 69a62a90..3323d750 100644 --- a/src/pages/scrap/record/scrapRecord.vue +++ b/src/pages/scrap/record/scrapRecord.vue @@ -83,8 +83,10 @@ const scanLocationCode = ref() const managementList = ref([]) const show = ref(false) onLoad((option) => { + uni.setNavigationBarTitle({ + title: option.title + }) reasonList.value = getScarpReasonList() - console.log(123, reasonList.value) const typeCode = 'Scrap' getBusinessType(typeCode, (res) => { if (res.success) { diff --git a/src/pages/scrap/request/scrapRequestDetail.vue b/src/pages/scrap/request/scrapRequestDetail.vue index 6b80ee2b..a7067cc6 100644 --- a/src/pages/scrap/request/scrapRequestDetail.vue +++ b/src/pages/scrap/request/scrapRequestDetail.vue @@ -43,6 +43,9 @@ const detailSource = ref([]) const comMessageRef = ref() const jobDetailPopup = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id getDetail() }) diff --git a/src/pages/scrap/request/scrapRrequest.vue b/src/pages/scrap/request/scrapRrequest.vue index a6b4804f..1562be69 100644 --- a/src/pages/scrap/request/scrapRrequest.vue +++ b/src/pages/scrap/request/scrapRrequest.vue @@ -52,9 +52,13 @@ const addAgainOption = ref([]) const showOptions = ref([]) const fromType = ref('requestType') const loadingType = ref('nomore') +const title = ref('') const requestInfoPopupRef = ref() const filter = ref() const comMessageRef = ref() +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() addAgainOption.value = getAddAgainOption() @@ -88,7 +92,7 @@ onNavigationBarButtonTap((e) => { }) const openRequestDetail = (item) => { uni.navigateTo({ - url: `./scrapRequestDetail?id=${item.masterId}` + url: `./scrapRequestDetail?id=${item.masterId}&title=${title.value}` }) } const openRequestInfoPopup = (item) => { @@ -120,7 +124,7 @@ const getList = (type) => { } const { list } = res.data totalCount.value = res.data.total - updateTitle(`报废出库申请(${totalCount.value})`) + updateTitle(`${title.value}(${totalCount.value})`) loadingType.value = 'loadmore' if (list == null || list.length == 0) { loadingType.value = 'nomore' @@ -141,7 +145,7 @@ const getList = (type) => { if (type === 'refresh') { uni.stopPullDownRefresh() } - updateTitle('报废出库申请') + updateTitle(title.value) loadingType.value = '' proxy.$modal.closeLoading() showMessage(error) diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue index 2e41cad2..d67a92d5 100644 --- a/src/pages/transfer/job/issueDetail.vue +++ b/src/pages/transfer/job/issueDetail.vue @@ -72,6 +72,9 @@ const comMessageRef = ref() const detailInfoPopupRef = ref() const fromLocationCode = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id if (id.value != undefined) { // 新建的任务自动接收 diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue index e65d02d3..59ac19dd 100644 --- a/src/pages/transfer/job/issueJob.vue +++ b/src/pages/transfer/job/issueJob.vue @@ -56,6 +56,7 @@ const todayTime = ref('') const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) +const title = ref('') const filter = ref() const comMessageRef = ref() const jobInfoPopupRef = ref() @@ -65,6 +66,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -138,7 +142,7 @@ const getList = (type) => { const { list } = res.data totalCount.value = res.data.total - updateTitle(`调拨出库任务(${totalCount.value})`) + updateTitle(`${title.value}(${totalCount.value})`) loadingType.value = 'loadmore' if (list == null || list.length == 0) { loadingType.value = 'nomore' @@ -152,13 +156,13 @@ const getList = (type) => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('调拨出库任务') + updateTitle(title.value) uni.hideLoading() showMessage(error) }) } const openJobDetail = (item) => { - proxy.$tab.navigateTo(`./issueDetail?id=${item.masterId}&status=${item.status}`) + proxy.$tab.navigateTo(`./issueDetail?id=${item.masterId}&status=${item.status}&title=${title.value}`) } const showItemList = (itemList) => { jobListPopupRef.value.openPopup(itemList) diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue index 0f2c93eb..dd7f49af 100644 --- a/src/pages/transfer/job/receiptDetail.vue +++ b/src/pages/transfer/job/receiptDetail.vue @@ -79,6 +79,9 @@ const comMessageRef = ref() const detailInfoPopupRef = ref() const fromLocationCode = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id if (id.value != undefined) { // 新建的任务自动接收 diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue index d01dfa46..0207e3e8 100644 --- a/src/pages/transfer/job/receiptJob.vue +++ b/src/pages/transfer/job/receiptJob.vue @@ -46,6 +46,7 @@ const todayTime = ref('') const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) +const title = ref('') const filter = ref() const comMessageRef = ref() const jobInfoPopupRef = ref() @@ -55,6 +56,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -128,7 +132,7 @@ const getList = (type) => { const { list } = res.data totalCount.value = res.data.total - updateTitle(`调拨入库任务(${totalCount.value})`) + updateTitle(`${title.value}(${totalCount.value})`) loadingType.value = 'loadmore' if (list == null || list.length == 0) { loadingType.value = 'nomore' @@ -142,13 +146,13 @@ const getList = (type) => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('调拨入库任务') + updateTitle(title.value) uni.hideLoading() showMessage(error) }) } const openJobDetail = (item) => { - proxy.$tab.navigateTo(`./receiptDetail?id=${item.masterId}&status=${item.status}`) + proxy.$tab.navigateTo(`./receiptDetail?id=${item.masterId}&status=${item.status}&title=${title.value}`) } const showItemList = (itemList) => { jobListPopupRef.value.openPopup(itemList) diff --git a/src/pages/transfer/record/deliverRecord.vue b/src/pages/transfer/record/deliverRecord.vue index bdea47f4..ae1932b1 100644 --- a/src/pages/transfer/record/deliverRecord.vue +++ b/src/pages/transfer/record/deliverRecord.vue @@ -73,6 +73,9 @@ const scanPopup = ref() const fromLocationCode = ref() const scanLocationCode = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: option.title + }) const 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 baa84a21..62067412 100644 --- a/src/pages/transfer/record/receiptRecord.vue +++ b/src/pages/transfer/record/receiptRecord.vue @@ -68,6 +68,9 @@ const comMessageRef = ref() const scanPopup = ref() const fromLocationCode = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: option.title + }) const typeCode = 'TransferReceipt' getBusinessType(typeCode, (res) => { if (res.success) { diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue index 5141edd6..2cf53a72 100644 --- a/src/pages/unPlanned/job/issueJob.vue +++ b/src/pages/unPlanned/job/issueJob.vue @@ -49,6 +49,7 @@ const todayTime = ref('') const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) +const title = ref('') const filter = ref() const comMessageRef = ref() const jobInfoPopupRef = ref() @@ -59,6 +60,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onMounted(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -132,7 +136,7 @@ const getList = (type) => { const { list } = res.data totalCount.value = res.data.total - updateTitle(`计划外出库(${totalCount.value})`) + updateTitle(`${title.value}(${totalCount.value})`) loadingType.value = 'loadmore' if (list == null || list.length == 0) { loadingType.value = 'nomore' @@ -146,7 +150,7 @@ const getList = (type) => { uni.stopPullDownRefresh() } - updateTitle('计划外出库') + updateTitle(title.value) loadingType.value = '' uni.hideLoading() showMessage(error) @@ -154,7 +158,7 @@ const getList = (type) => { } const openJobDetail = (item, packingNumber = '') => { uni.navigateTo({ - url: `./issueJobDetail?id=${item.masterId}&status=${item.status}` + url: `./issueJobDetail?id=${item.masterId}&status=${item.status}&title=${title.value}` }) } const showItemList = (itemList) => { diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue index c9a77716..f60f47a4 100644 --- a/src/pages/unPlanned/job/issueJobDetail.vue +++ b/src/pages/unPlanned/job/issueJobDetail.vue @@ -67,6 +67,9 @@ const comScanLocation = ref() const detailInfoPopupRef = ref() const comMessageRef = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id if (id.value != undefined) { // 新建的任务自动接收 diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue index 794afbb7..c6811219 100644 --- a/src/pages/unPlanned/job/receiptJob.vue +++ b/src/pages/unPlanned/job/receiptJob.vue @@ -56,6 +56,7 @@ const todayTime = ref('') const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) +const title = ref('') const filter = ref() const comMessageRef = ref() const jobInfoPopupRef = ref() @@ -66,6 +67,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onMounted(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -138,8 +142,7 @@ const getList = (type) => { const { list } = res.data totalCount.value = res.data.total - - updateTitle(`计划外入库(${totalCount.value})`) + updateTitle(`${title.value}(${totalCount.value})`) loadingType.value = 'loadmore' if (list == null || list.length == 0) { loadingType.value = 'nomore' @@ -153,7 +156,7 @@ const getList = (type) => { uni.stopPullDownRefresh() } - updateTitle('计划外入库') + updateTitle(title.value) loadingType.value = '' uni.hideLoading() showMessage(error) @@ -161,7 +164,7 @@ const getList = (type) => { } const openJobDetail = (item, packingNumber = '') => { uni.navigateTo({ - url: `./receiptJobDetail?id=${item.masterId}&status=${item.status}` + url: `./receiptJobDetail?id=${item.masterId}&status=${item.status}&title=${title.value}` }) } const showItemList = (itemList) => { diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index 910d2236..8a176d31 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -73,6 +73,9 @@ const scanPopup = ref() const comScanLocation = ref() const comMessageRef = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id if (id.value != undefined) { // 新建的任务自动接收 diff --git a/src/pages/unPlanned/request/issueRequest.vue b/src/pages/unPlanned/request/issueRequest.vue index 06fee928..40a282bf 100644 --- a/src/pages/unPlanned/request/issueRequest.vue +++ b/src/pages/unPlanned/request/issueRequest.vue @@ -45,6 +45,7 @@ const addAgainOption = ref([]) const showOptions = ref([]) const fromType = ref('requestType') const loadingType = ref('nomore') +const title = ref('') const requestInfoPopupRef = ref() const filter = ref() const comMessageRef = ref() @@ -63,6 +64,9 @@ onReachBottom(() => { } getList('more') }) +onLoad((option) => { + title.value = option.title +}) onPullDownRefresh(() => { getList('refresh') }) @@ -81,7 +85,7 @@ onNavigationBarButtonTap((e) => { }) const openRequestDetail = (item) => { uni.navigateTo({ - url: `./issueRequestDetail?id=${item.masterId}` + url: `./issueRequestDetail?id=${item.masterId}&title=${title.value}` }) } const openRequestInfoPopup = (item) => { @@ -114,7 +118,7 @@ const getList = (type) => { const { list } = res.data totalCount.value = res.data.total - updateTitle(`计划外出库申请(${totalCount.value})`) + updateTitle(`${title.value}(${totalCount.value})`) loadingType.value = 'loadmore' if (list == null || list.length == 0) { loadingType.value = 'nomore' @@ -134,7 +138,7 @@ const getList = (type) => { if (type === 'refresh') { uni.stopPullDownRefresh() } - updateTitle('计划外出库申请') + updateTitle(title.value) loadingType.value = '' proxy.$modal.closeLoading() showMessage(error) diff --git a/src/pages/unPlanned/request/issueRequestDetail.vue b/src/pages/unPlanned/request/issueRequestDetail.vue index 95ee3a00..dce63469 100644 --- a/src/pages/unPlanned/request/issueRequestDetail.vue +++ b/src/pages/unPlanned/request/issueRequestDetail.vue @@ -46,6 +46,9 @@ const detailSource = ref([]) const comMessageRef = ref() const requestDetailPopup = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id getDetail() })