From d7b9b77c7e10dd833dadc3840fc180b7b4215552 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 6 Sep 2024 15:04:33 +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=982024/7/11=2018:25:17src/pages/inventoryMove/record/mov?= =?UTF-8?q?eFreeRecord.vue=E6=B2=A1=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/count/job/countBlindDetail.vue | 3 ++ src/pages/count/job/countJob.vue | 12 ++++--- src/pages/count/job/countLightDetail.vue | 3 ++ src/pages/inventoryMove/coms/comMoveJob.vue | 36 ++++++++++--------- .../inventoryMove/coms/comMoveRecord.vue | 19 ++++++---- .../inventoryMove/job/holdToOkMoveJob.vue | 6 +++- .../inventoryMove/job/holdToScrapMoveJob.vue | 6 +++- .../inventoryMove/job/inventoryMoveDetail.vue | 4 ++- src/pages/inventoryMove/job/moveJob.vue | 6 +++- .../inventoryMove/job/okToHoldMoveJob.vue | 6 +++- .../inventoryMove/job/okToScrapMoveJob.vue | 6 +++- .../inventoryMove/job/scrapToHoldMoveJob.vue | 6 +++- .../inventoryMove/record/holdToOkRecord.vue | 8 ++++- .../record/holdToScrapRecord.vue | 8 ++++- 14 files changed, 93 insertions(+), 36 deletions(-) diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue index 2bcb8a86..34726460 100644 --- a/src/pages/count/job/countBlindDetail.vue +++ b/src/pages/count/job/countBlindDetail.vue @@ -117,6 +117,9 @@ export default { } }, 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 ffed8425..f3c7d40f 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -63,6 +63,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() @@ -73,6 +74,9 @@ onShow(() => { getList('refresh') }) }) +onLoad((option) => { + title.value = option.title +}) onReady(() => { detailOptions.value = getDetailOption() detailGiveupOptions.value = getDetailGiveupOption() @@ -152,7 +156,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' @@ -166,7 +170,7 @@ const getList = (type) => { uni.stopPullDownRefresh() } loadingType.value = '' - updateTitle('盘点') + updateTitle(title.value) uni.hideLoading() showMessage(error) }) @@ -175,12 +179,12 @@ const openJobDetail = (item) => { // 明盘 if (item.isOpenCount == 'TRUE') { uni.navigateTo({ - url: `./countLightDetail?id=${item.id}&status=${item.status}` + url: `./countLightDetail?id=${item.id}&status=${item.status}&title=${title.value}` }) } else { // 盲盘 uni.navigateTo({ - url: `./countBlindDetail?id=${item.id}&status=${item.status}` + url: `./countBlindDetail?id=${item.id}&status=${item.status}&title=${title.value}` }) } } diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue index afe44967..26d623be 100644 --- a/src/pages/count/job/countLightDetail.vue +++ b/src/pages/count/job/countLightDetail.vue @@ -109,6 +109,9 @@ const scanPopup = ref() const countQtyEditRef = ref() onLoad((option) => { + uni.setNavigationBarTitle({ + title: `${option.title}详情` + }) id.value = option.id if (id.value != undefined) { // 新建的任务自动接收 diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue index e786a482..149a6ffc 100644 --- a/src/pages/inventoryMove/coms/comMoveJob.vue +++ b/src/pages/inventoryMove/coms/comMoveJob.vue @@ -37,7 +37,11 @@ const props = defineProps({ businessTypeCode: { type: String, default: 'Move' - } // 业务类型 + }, // 业务类型 + title: { + type: String, + default: '' + } }) const jobList = ref([]) @@ -65,20 +69,20 @@ onMounted(() => { const updateTitle = () => { let title = '' - let name = '' - if (props.businessTypeCode == 'Move') { - name = '库存转移' - } else if (props.businessTypeCode == 'HoldToOk') { - name = '隔离转合格' - } else if (props.businessTypeCode == 'HoldToScrap') { - name = '隔离转报废' - } else if (props.businessTypeCode == 'OkToHold') { - name = '合格转隔离' - } else if (props.businessTypeCode == 'OktoScrap') { - name = '合格转报废' - } else if (props.businessTypeCode == 'ScrapToHold') { - name = '报废转隔离' - } + const name = props.title + // if (props.businessTypeCode == 'Move') { + // name = '库存转移' + // } else if (props.businessTypeCode == 'HoldToOk') { + // name = '隔离转合格' + // } else if (props.businessTypeCode == 'HoldToScrap') { + // name = '隔离转报废' + // } else if (props.businessTypeCode == 'OkToHold') { + // name = '合格转隔离' + // } else if (props.businessTypeCode == 'OktoScrap') { + // name = '合格转报废' + // } else if (props.businessTypeCode == 'ScrapToHold') { + // name = '报废转隔离' + // } // titleName.value = name if (totalCount.value > 0) { title = `${name}(${totalCount.value})` @@ -158,7 +162,7 @@ const getList = (type) => { const openJobDetail = (item) => { uni.navigateTo({ - url: `./inventoryMoveDetail?id=${item.masterId}&status=${item.status}&businessTypeCode=${props.businessTypeCode}` + url: `./inventoryMoveDetail?id=${item.masterId}&status=${item.status}&businessTypeCode=${props.businessTypeCode}&title=${props.title}` }) } diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 4dc84ddc..7de7a771 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -69,7 +69,11 @@ const props = defineProps({ businessTypeCode: { type: String, default: 'Move' - } // 业务类型 + }, // 业务类型 + myTitle: { + type: String, + default: '' + } }) const fromLocationCode = ref('') const fromLocationInfo = ref({}) @@ -107,36 +111,37 @@ onMounted(() => { const initData = () => { if (businessTypeCode.value == 'Move') { - title.value = '库存转移记录' + // title.value = '库存转移记录' toInventoryStatus.value = '' toLocationCode.value = '' isShowEditLocation.value = true } else if (businessTypeCode.value == 'HoldToOk') { - title.value = '隔离转合格记录' + // title.value = '隔离转合格记录' toInventoryStatus.value = 'OK' toLocationCode.value = '' isShowEditLocation.value = true } else if (businessTypeCode.value == 'HoldToScrap') { - title.value = '隔离转报废记录' + // title.value = '隔离转报废记录' toInventoryStatus.value = 'SCRAP' toLocationCode.value = '' // this.toLocationCode = "SCRAP" } else if (businessTypeCode.value == 'OkToHold') { - title.value = '合格转隔离记录' + // title.value = '合格转隔离记录' toInventoryStatus.value = 'HOLD' toLocationCode.value = '' // this.toLocationCode = "HOLD" } else if (businessTypeCode.value == 'OkToScrap') { - title.value = '合格转报废记录' + // title.value = '合格转报废记录' toInventoryStatus.value = 'SCRAP' toLocationCode.value = '' // this.toLocationCode = "SCRAP" } else if (businessTypeCode.value == 'ScrapToHold') { - title.value = '报废转隔离记录' + // title.value = '报废转隔离记录' toInventoryStatus.value = 'HOLD' // this.toLocationCode = "HOLD" toLocationCode.value = '' } + title.value = myTitle.value uni.setNavigationBarTitle({ title: title.value }) diff --git a/src/pages/inventoryMove/job/holdToOkMoveJob.vue b/src/pages/inventoryMove/job/holdToOkMoveJob.vue index 31614e71..f2d07d06 100644 --- a/src/pages/inventoryMove/job/holdToOkMoveJob.vue +++ b/src/pages/inventoryMove/job/holdToOkMoveJob.vue @@ -1,6 +1,6 @@ @@ -10,6 +10,7 @@ import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRef import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue' const receiptjob = ref() +const title = ref('') onShow(() => { nextTick(() => { if (receiptjob.value != undefined) { @@ -17,6 +18,9 @@ onShow(() => { } }) }) +onLoad((option) => { + title.value = option.title +}) onPullDownRefresh(() => { receiptjob.value.refresh() }) diff --git a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue index 293a5f6e..a7b4beb6 100644 --- a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue +++ b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue @@ -1,6 +1,6 @@ @@ -10,6 +10,7 @@ import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRef import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue' const receiptjob = ref() +const title = ref('') onShow(() => { nextTick(() => { if (receiptjob.value != undefined) { @@ -17,6 +18,9 @@ onShow(() => { } }) }) +onLoad((option) => { + title.value = option.title +}) onPullDownRefresh(() => { receiptjob.value.refresh() }) diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index a5f2a78c..8e062fc9 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -67,11 +67,13 @@ const businessTypeCode = ref('') const toLocationCode = ref('') const toInventoryStatus = ref('') const jobStatus = ref('') +const title = ref('') const scanPopup = ref() const detailInfoPopupRef = ref() const comMessageRef = ref() const comScanLocation = ref() onLoad((option) => { + title.value = option.title id.value = option.id businessTypeCode.value = option.businessTypeCode if (id.value != undefined) { @@ -141,7 +143,7 @@ const initData = () => { } uni.setNavigationBarTitle({ - title: `${name}详情` + title: `${title.value}详情` }) } // 接收 diff --git a/src/pages/inventoryMove/job/moveJob.vue b/src/pages/inventoryMove/job/moveJob.vue index 89d2a274..9b7530ac 100644 --- a/src/pages/inventoryMove/job/moveJob.vue +++ b/src/pages/inventoryMove/job/moveJob.vue @@ -1,6 +1,6 @@ @@ -11,6 +11,7 @@ import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue' import { goHome, getCurrDate } from '@/common/basic.js' const receiptjob = ref() +const title = ref('') onShow(() => { nextTick(() => { if (receiptjob.value != undefined) { @@ -18,6 +19,9 @@ onShow(() => { } }) }) +onLoad((option) => { + title.value = option.title +}) onPullDownRefresh(() => { receiptjob.value.refresh() }) diff --git a/src/pages/inventoryMove/job/okToHoldMoveJob.vue b/src/pages/inventoryMove/job/okToHoldMoveJob.vue index 78dd775e..2c535cf3 100644 --- a/src/pages/inventoryMove/job/okToHoldMoveJob.vue +++ b/src/pages/inventoryMove/job/okToHoldMoveJob.vue @@ -1,6 +1,6 @@ @@ -10,6 +10,7 @@ import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRef import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue' const receiptjob = ref() +const title = ref('') onShow(() => { nextTick(() => { if (receiptjob.value != undefined) { @@ -17,6 +18,9 @@ onShow(() => { } }) }) +onLoad((option) => { + title.value = option.title +}) onPullDownRefresh(() => { receiptjob.value.refresh() }) diff --git a/src/pages/inventoryMove/job/okToScrapMoveJob.vue b/src/pages/inventoryMove/job/okToScrapMoveJob.vue index 6535fc6e..fb0f95ce 100644 --- a/src/pages/inventoryMove/job/okToScrapMoveJob.vue +++ b/src/pages/inventoryMove/job/okToScrapMoveJob.vue @@ -1,6 +1,6 @@ @@ -10,6 +10,7 @@ import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRef import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue' const receiptjob = ref() +const title = ref('') onShow(() => { nextTick(() => { if (receiptjob.value != undefined) { @@ -17,6 +18,9 @@ onShow(() => { } }) }) +onLoad((option) => { + title.value = option.title +}) onPullDownRefresh(() => { receiptjob.value.refresh() }) diff --git a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue index f5265e6e..559c968e 100644 --- a/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue +++ b/src/pages/inventoryMove/job/scrapToHoldMoveJob.vue @@ -1,6 +1,6 @@ @@ -10,6 +10,7 @@ import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRef import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue' const receiptjob = ref() +const title = ref('') onShow(() => { nextTick(() => { if (receiptjob.value != undefined) { @@ -17,6 +18,9 @@ onShow(() => { } }) }) +onLoad((option) => { + title.value = option.title +}) onPullDownRefresh(() => { receiptjob.value.refresh() }) diff --git a/src/pages/inventoryMove/record/holdToOkRecord.vue b/src/pages/inventoryMove/record/holdToOkRecord.vue index bfff89ee..28b2d588 100644 --- a/src/pages/inventoryMove/record/holdToOkRecord.vue +++ b/src/pages/inventoryMove/record/holdToOkRecord.vue @@ -1,11 +1,17 @@ diff --git a/src/pages/inventoryMove/record/holdToScrapRecord.vue b/src/pages/inventoryMove/record/holdToScrapRecord.vue index e04e3496..01880089 100644 --- a/src/pages/inventoryMove/record/holdToScrapRecord.vue +++ b/src/pages/inventoryMove/record/holdToScrapRecord.vue @@ -1,11 +1,17 @@