diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index c777289a..85b69315 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -72,6 +72,9 @@ const managementList = ref([]) const comIssueDetailCardRef = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id scanMessage.value = option.scanMessage if (id.value != undefined) { diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 18fefa7c..b6d5f5d7 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -54,6 +54,7 @@ const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) const productionline = ref([]) +const title = ref('') const filter = ref() const scanMessage = ref('') const comMessageRef = ref() @@ -66,7 +67,8 @@ onShow(() => { getList('refresh') }) }) -onLoad(() => { +onLoad((option) => { + title.value = option.title getIssueJobByProductionline1() }) onReady(() => { @@ -172,7 +174,7 @@ const getList = (type, fromLocationCode = '', productionLineCode = '') => { 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' @@ -186,7 +188,7 @@ const getList = (type, fromLocationCode = '', productionLineCode = '') => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('发料任务') + updateTitle(title.value) uni.hideLoading() showErrorMessage(error) }) diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index 48d06fe0..e202aa64 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -106,6 +106,9 @@ const resultData = ref({}) const balanceSelectRef = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: option.title + }) clearData() getBusinessType(businessTypeCode.value, (res) => { if (res.success) { diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue index e369f51a..a1f847a3 100644 --- a/src/pages/issue/request/issueScanRequest.vue +++ b/src/pages/issue/request/issueScanRequest.vue @@ -44,6 +44,9 @@ const fromInventoryStatuses = ref('') const toInventoryStatuses = ref('') const scanPopup = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: option.title + }) const typeCode = 'Issue' getBusinessType(typeCode, (res) => { nextTick(() => { diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index ed1eb607..a1c1154d 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -39,6 +39,7 @@ const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) const filter = ref() +const title = ref('') const comMessageRef = ref() const jobInfoPopupRef = ref() onShow(() => { @@ -46,6 +47,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -118,7 +122,8 @@ 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' @@ -132,7 +137,7 @@ const getList = (type) => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('翻包任务') + updateTitle(title.value) uni.hideLoading() showErrorMessage(error) }) diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index e31716e2..afde3c52 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -83,6 +83,9 @@ const comMessageRef = ref() const comOverPackJobDetailCardRef = ref() const managementList = ref([]) onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id if (id.value != undefined) { // 新建的任务自动接收 @@ -122,9 +125,11 @@ onBackPress((e) => { }) const resizeCollapse = () => { nextTick((r) => { - comOverPackJobDetailCardRef.value.forEach((r) => { - r.resizeCollapse() - }) + if (comOverPackJobDetailCardRef.value) { + comOverPackJobDetailCardRef.value.forEach((r) => { + r.resizeCollapse() + }) + } }) } const receive = (callback) => { diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index b58df4aa..1caf5bbd 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -110,6 +110,11 @@ const comMessageRef = ref() onShow(() => { getBusinessType() }) +onLoad((option) => { + uni.setNavigationBarTitle({ + title: option.title + }) +}) onNavigationBarButtonTap((e) => { if (e.index === 0) { goHome() diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index 7f836e9f..2261c59d 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -82,6 +82,9 @@ const detailInfoPopupRef = ref() const comMessageRef = ref() const comScanLocation = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id scanedPackingNumber.value = option.scaned if (id.value != undefined) { diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index 7c598da1..691119a1 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -55,6 +55,7 @@ const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) const filter = ref() +const title = ref('') const comMessageRef = ref() const jobInfoPopupRef = ref() const jobListPopupRef = ref() @@ -64,6 +65,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -136,7 +140,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' @@ -150,7 +154,7 @@ const getList = (type) => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('生产收料') + updateTitle(title.value) uni.hideLoading() showErrorMessage(error) }) diff --git a/src/pages/productionReturn/coms/comReturnCommonRequest.vue b/src/pages/productionReturn/coms/comReturnCommonRequest.vue index e09dd146..ee21bad3 100644 --- a/src/pages/productionReturn/coms/comReturnCommonRequest.vue +++ b/src/pages/productionReturn/coms/comReturnCommonRequest.vue @@ -43,7 +43,6 @@ const addAgainOption = ref([]) const showOptions = ref([]) const fromType = ref('requestType') const loadingType = ref('nomore') -const title = ref('') const requestInfoPopupRef = ref() const filter = ref() @@ -51,6 +50,10 @@ const props = defineProps({ businessType: { type: String, default: '' + }, + title: { + type: String, + default: '' } }) // 返回首页 @@ -74,13 +77,13 @@ onMounted(() => { }) const updateTitle1 = () => { if (props.businessType == 'ReturnToStore') { - title.value = '生产合格退料申请' + // title.value = '生产合格退料申请' fromType.value = 'ReturnToStore' } else if (props.businessType == 'ReturnToHold') { - title.value = '生产隔离退料申请' + // title.value = '生产隔离退料申请' fromType.value = 'ReturnToHold' } - updateTitle(title) + updateTitle(props.title) } // onShow(() => { // nextTick(() => { diff --git a/src/pages/productionReturn/job/returnDetail.vue b/src/pages/productionReturn/job/returnDetail.vue index 09d80fde..aaf3e51d 100644 --- a/src/pages/productionReturn/job/returnDetail.vue +++ b/src/pages/productionReturn/job/returnDetail.vue @@ -84,6 +84,9 @@ const detailInfoPopupRef = ref() const comMessageRef = ref() const comScanLocation = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id if (id.value != undefined) { // 新建的任务自动接收 diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue index 5cfe8015..cbe8aa7e 100644 --- a/src/pages/productionReturn/job/returnJob.vue +++ b/src/pages/productionReturn/job/returnJob.vue @@ -54,6 +54,7 @@ const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const detailGiveupOptions = ref([]) const filter = ref() +const title = ref('') const comMessageRef = ref() const jobInfoPopupRef = ref() const jobListPopupRef = ref() @@ -62,6 +63,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -134,7 +138,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' @@ -148,13 +152,13 @@ const getList = (type) => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('生产退料') + updateTitle(title.value) uni.hideLoading() showErrorMessage(error) }) } const openJobDetail = (item) => { - proxy.$tab.navigateTo(`./returnDetail?id=${item.masterId}&status=${item.status}`) + proxy.$tab.navigateTo(`./returnDetail?id=${item.masterId}&status=${item.status}&title=${title.value}`) } const selectedItem = (item) => { openJobDetail(item) diff --git a/src/pages/productionReturn/record/returnToHold.vue b/src/pages/productionReturn/record/returnToHold.vue index 4aeda381..00f3f422 100644 --- a/src/pages/productionReturn/record/returnToHold.vue +++ b/src/pages/productionReturn/record/returnToHold.vue @@ -111,7 +111,10 @@ const toLocationAreaTypeList = ref([]) const scanPopup = ref() const comMessageRef = ref() const toWarehouseCode = ref() -onLoad(() => { + onLoad(option) { + uni.setNavigationBarTitle({ + title: option.title + }) getBusinessType(businessTypeCode.value, (res) => { if (res.success) { businessType.value = res.businessType diff --git a/src/pages/productionReturn/record/returnToStore.vue b/src/pages/productionReturn/record/returnToStore.vue index 58ccfce1..6fdbe7ad 100644 --- a/src/pages/productionReturn/record/returnToStore.vue +++ b/src/pages/productionReturn/record/returnToStore.vue @@ -88,7 +88,10 @@ const toManagementList = ref([]) const scanPopup = ref() const comMessageRef = ref() const toWarehouseCode = ref() -onLoad(() => { +onLoad(option) { + uni.setNavigationBarTitle({ + title: option.title + }) getBusinessType(businessTypeCode.value, (res) => { if (res.success) { businessType.value = res.businessType diff --git a/src/pages/productionReturn/request/returnToHoldRequest.vue b/src/pages/productionReturn/request/returnToHoldRequest.vue index 5e38f28e..9a929621 100644 --- a/src/pages/productionReturn/request/returnToHoldRequest.vue +++ b/src/pages/productionReturn/request/returnToHoldRequest.vue @@ -1,6 +1,6 @@ @@ -13,6 +13,7 @@ import { goHome } from '@/common/basic.js' const requestList = ref([]) const request = ref() +const title = ref('') onNavigationBarButtonTap((e) => { if (e.index === 0) { goHome() @@ -20,6 +21,9 @@ onNavigationBarButtonTap((e) => { request.value.openFilter() } }) +onLoad((option) => { + title.value = option.title +}) onShow(() => { nextTick(() => { request.value.getList('refresh') diff --git a/src/pages/productionReturn/request/returnToStoreRequest.vue b/src/pages/productionReturn/request/returnToStoreRequest.vue index 1cc2f8c1..645bb189 100644 --- a/src/pages/productionReturn/request/returnToStoreRequest.vue +++ b/src/pages/productionReturn/request/returnToStoreRequest.vue @@ -1,6 +1,6 @@ @@ -12,6 +12,7 @@ import { goHome } from '@/common/basic.js' const requestList = ref([]) const request = ref() +const title = ref('') onNavigationBarButtonTap((e) => { if (e.index === 0) { goHome() @@ -19,6 +20,9 @@ onNavigationBarButtonTap((e) => { request.value.openFilter() } }) +onLoad((option) => { + title.value = option.title +}) onShow(() => { nextTick(() => { request.value.getList('refresh') diff --git a/src/pages/query/container.vue b/src/pages/query/container.vue index 04af3b64..3fb287a3 100644 --- a/src/pages/query/container.vue +++ b/src/pages/query/container.vue @@ -77,9 +77,9 @@ export default { 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 d41195d0..73ea8f99 100644 --- a/src/pages/query/item.vue +++ b/src/pages/query/item.vue @@ -64,10 +64,10 @@ filter.value.openFilter() } }) - onLoad((e)=>{ - uni.setNavigationBarTitle({ - title: e.title - }) + onLoad((option)=>{ + uni.setNavigationBarTitle({ + title: option.title + }) }) onMounted(() => { openScanPopup() diff --git a/src/pages/query/location.vue b/src/pages/query/location.vue index a5fad520..07e8e1f5 100644 --- a/src/pages/query/location.vue +++ b/src/pages/query/location.vue @@ -73,9 +73,9 @@ onNavigationBarButtonTap((e) => { onMounted(() => { openScanPopup() }) -onLoad((e) => { +onLoad((option) => { uni.setNavigationBarTitle({ - title: e.title + title: option.title }) }) onPullDownRefresh(() => { diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index c7281181..651b6496 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -85,6 +85,9 @@ const comScanIssuePackRef = ref() const locationTypes = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id operation.value = option.operation if (id.value != undefined) { diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index d4848fd2..b585a8aa 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -52,6 +52,7 @@ const status = ref('1,2') // 待处理 、进行中 const detailOptions = ref([]) const scanMessage = ref('') const detailGiveupOptions = ref([]) +const title = ref('') const filter = ref() const comMessageRef = ref() const jobInfoPopupRef = ref() @@ -62,6 +63,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -144,7 +148,7 @@ const getList = (type, fromLocationCode = '') => { 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' @@ -158,7 +162,7 @@ const getList = (type, fromLocationCode = '') => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('补料') + updateTitle(title.value) uni.hideLoading() showErrorMessage(error) }) @@ -168,7 +172,7 @@ const fromLocationCode = (fromLocationCode) => { getList('refresh', fromLocationCode, '') } const openJobDetail = (item, scanMessageParams = '') => { - proxy.$tab.navigateTo(`./repleinshDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessageParams}`) + proxy.$tab.navigateTo(`./repleinshDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage.value}&title=${title.value}`) } const selectedItem = (item) => { openJobDetail(item) diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue index ef96ffdd..e2fc4b77 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord.vue @@ -92,6 +92,9 @@ const show = ref(false) const scanPopup = ref() const scanLocationCode = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: option.title + }) clear() getBusinessType() })