From 973f959f3b652433e3127de6d6e6db393dbfc357 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 6 Sep 2024 11:54:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E7=AE=A1=E7=90=86--=E6=A0=87?=
 =?UTF-8?q?=E9=A2=982024/7/11=2014:46:56?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/purchaseReturn/job/returnDetail.vue |   3 +
 src/pages/purchaseReturn/job/returnJob.vue    |  10 +-
 .../purchaseReturn/record/returnRecord.vue    |  14 +-
 .../purchaseReturn/request/returnRequest.vue  |  10 +-
 .../request/returnRequestDetail.vue           | 192 ++++++++----------
 src/pages/putaway/job/putawayDetail.vue       |   3 +
 src/pages/putaway/job/putawayJob.vue          |  11 +-
 src/pages/putaway/record/putawayRecord.vue    |   3 +
 src/pages/putaway/request/putawayRequest.vue  |   8 +-
 9 files changed, 132 insertions(+), 122 deletions(-)

diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index 64f02883..db6d17f9 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -74,6 +74,9 @@ const comScanLocation = ref()
 const comMessageRef = ref()
 const jobDetailPopup = ref()
 onLoad((option) => {
+  uni.setNavigationBarTitle({
+    title: `${option.title}详情`
+  })
   id.value = option.id
   if (id.value != undefined) {
     // 新建的任务自动接收
diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue
index 43088e78..d4c22c5b 100644
--- a/src/pages/purchaseReturn/job/returnJob.vue
+++ b/src/pages/purchaseReturn/job/returnJob.vue
@@ -45,6 +45,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 jobInfoPopup = ref()
@@ -54,6 +55,9 @@ onShow(() => {
     getList('refresh')
   })
 })
+onLoad((option) => {
+  title.value = option.title
+})
 onReady(() => {
   detailOptions.value = getDetailOption()
   detailGiveupOptions.value = getDetailGiveupOption()
@@ -127,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'
@@ -141,13 +145,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 showItemList = (itemList) => {
   jobListPopup.value.openPopup(itemList)
diff --git a/src/pages/purchaseReturn/record/returnRecord.vue b/src/pages/purchaseReturn/record/returnRecord.vue
index 197e84e6..e5f60264 100644
--- a/src/pages/purchaseReturn/record/returnRecord.vue
+++ b/src/pages/purchaseReturn/record/returnRecord.vue
@@ -74,11 +74,15 @@ const scanFromLocationCode = ref()
 const toLocationInfo = ref({})
 onLoad((option) => {
   fromType.value = option.fromType
-  if (fromType.value == 'requestType') {
-    updateTitle('采购退货申请')
-  } else {
-    updateTitle('采购退货记录')
-  }
+  // if (fromType.value == 'requestType') {
+  //   updateTitle('采购退货申请')
+  // } else {
+  //   updateTitle('采购退货记录')
+  // }
+  uni.setNavigationBarTitle({
+    title: option.title
+  })
+
   const typeCode = 'PurchaseReturn'
   getBusinessType(typeCode, (res) => {
     if (res.success) {
diff --git a/src/pages/purchaseReturn/request/returnRequest.vue b/src/pages/purchaseReturn/request/returnRequest.vue
index 9629e409..afd5f18b 100644
--- a/src/pages/purchaseReturn/request/returnRequest.vue
+++ b/src/pages/purchaseReturn/request/returnRequest.vue
@@ -44,6 +44,7 @@ const addAgainOption = ref([])
 const showOptions = ref([])
 const fromType = ref('requestType')
 const loadingType = ref('nomore')
+const title = ref('')
 
 const requestInfoPopupRef = ref()
 const filter = ref()
@@ -56,6 +57,9 @@ onReady(() => {
   detailAndHandleOption.value = getDetailAndHandleOption()
   detailAndAddAndCloseOption.value = getDetailAndAddAndCloseOption()
 })
+onLoad((option) => {
+  title.value = option.title
+})
 onReachBottom(() => {
   // 避免多次触发
   if (loadingType.value == 'loading' || loadingType.value == 'nomore') {
@@ -81,7 +85,7 @@ onNavigationBarButtonTap((e) => {
 })
 const openRequestDetail = (item) => {
   uni.navigateTo({
-    url: `./returnRequestDetail?id=${item.masterId}&fromType=${fromType.value}`
+    url: `./returnRequestDetail?id=${item.masterId}&fromType=${fromType.value}&title=${title.value}`
   })
 }
 const openRequestInfoPopup = (item) => {
@@ -113,7 +117,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'
@@ -133,7 +137,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/purchaseReturn/request/returnRequestDetail.vue b/src/pages/purchaseReturn/request/returnRequestDetail.vue
index 438cb785..c62d312b 100644
--- a/src/pages/purchaseReturn/request/returnRequestDetail.vue
+++ b/src/pages/purchaseReturn/request/returnRequestDetail.vue
@@ -1,117 +1,99 @@
 <template>
-	<view class="page-wraper">
-		<view class="page-header">
-			<view class='page-header-box'>
-				<view class="header_job_top">
-					<request-top :dataContent="requestContent"></request-top>
-				</view>
-				<view class="header_item">
-					供应商 : {{requestContent.supplierCode}}
-				</view>
-			</view>
-		</view>
-		<view class="page-main">
-			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="">
-						<com-request-detail-card :dataContent="item" @openDetail="openDetail">
-						</com-request-detail-card>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
-		<com-message ref="comMessageRef" />
-	</view>
+  <view class="page-wraper">
+    <view class="page-header">
+      <view class="page-header-box">
+        <view class="header_job_top">
+          <request-top :dataContent="requestContent"></request-top>
+        </view>
+        <view class="header_item"> 供应商 : {{ requestContent.supplierCode }} </view>
+      </view>
+    </view>
+    <view class="page-main">
+      <scroll-view scroll-y="true" class="page-main-scroll">
+        <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+          <view class="">
+            <com-request-detail-card :dataContent="item" @openDetail="openDetail"> </com-request-detail-card>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <request-detail-info-popup ref="jobDetailPopup"></request-detail-info-popup>
+    <com-message ref="comMessageRef" />
+  </view>
 </template>
 
 <script setup lang="ts">
-	import {
-		ref,
-		getCurrentInstance,
-		onMounted
-	} from 'vue'
-	import {
-		onLoad,
-		onNavigationBarButtonTap,
-		onPullDownRefresh
-	} from '@dcloudio/uni-app'
-	import {
-		getPurchaseReturnRequestDetail,
+import { ref, getCurrentInstance, onMounted } from 'vue'
+import { onLoad, onNavigationBarButtonTap, onPullDownRefresh } from '@dcloudio/uni-app'
+import { getPurchaseReturnRequestDetail } from '@/api/request2.js'
 
-	} from '@/api/request2.js';
+import { goHome } from '@/common/basic.js'
 
-	import {
-		goHome,
-	} from '@/common/basic.js';
+import { getDataSource } from '@/common/detail.js'
 
-	import {
-		getDataSource,
-	} from '@/common/detail.js';
+import comRequestDetailCard from '@/mycomponents/detail/comRequestDetailCard.vue'
+import requestDetailInfoPopup from '@/pages/purchaseReturn/coms/requestDetailInfoPopup.vue'
+import requestTop from '@/mycomponents/request/requestTop.vue'
 
+const { proxy } = getCurrentInstance()
 
-	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
-	import requestDetailInfoPopup from '@/pages/purchaseReturn/coms/requestDetailInfoPopup.vue'
-	import requestTop from "@/mycomponents/request/requestTop.vue"
-	const { proxy } = getCurrentInstance()
+const id = ref('')
+const requestContent = ref({})
+const subList = ref([])
+const detailSource = ref([])
+const comMessageRef = ref()
+const jobDetailPopup = ref()
+onLoad((option) => {
+  id.value = option.id
+  uni.setNavigationBarTitle({
+    title: `${option.title}详情`
+  })
+  getDetail()
+})
+// 返回首页
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    goHome()
+  }
+})
+onPullDownRefresh(() => {
+  getDetail()
+  uni.stopPullDownRefresh()
+})
+const getDetail = () => {
+  proxy.$modal.loading('加载中­....')
+  getPurchaseReturnRequestDetail(id.value)
+    .then((res) => {
+      proxy.$modal.closeLoading()
+      if (res.data == null) {
+        showMessage('未获取到详情')
+      } else if (res.data.subList.length > 0) {
+        requestContent.value = res.data
+        subList.value = res.data.subList
+        subList.value.forEach((res) => {
+          // res.fromLocationCode = res.toLocationCode
+          res.locationCode = res.fromLocationCode
+        })
+        detailSource.value = getDataSource(subList.value)
+      } else {
+        showMessage('列表数据为0')
+      }
+    })
+    .catch((error) => {
+      proxy.$modal.closeLoading()
+      showMessage(error)
+    })
+}
+const showMessage = (message) => {
+  comMessageRef.value.showMessage(message, (res) => {
+    if (res) {
+    }
+  })
+}
 
-	const id = ref('') 
-	const requestContent = ref({}) 
-	const subList = ref([]) 
-	const detailSource = ref([]) 
-	const comMessageRef = ref()
-	const jobDetailPopup = ref()
-	onLoad((option)=>{
-		id.value = option.id;
-		getDetail();
-	})
-	//返回首页
-	onNavigationBarButtonTap((e)=> {
-		if (e.index === 0) {
-			goHome();
-		}
-	})
-	onPullDownRefresh(()=> {
-		getDetail();
-		uni.stopPullDownRefresh();
-	})
-	const getDetail = ()=> {
-		proxy.$modal.loading('加载中­....')
-		getPurchaseReturnRequestDetail(id.value).then(res => {
-			proxy.$modal.closeLoading();
-			if (res.data == null) {
-				showMessage('未获取到详情');
-			} else {
-				if (res.data.subList.length > 0) {
-					requestContent.value = res.data;
-					subList.value = res.data.subList;
-					subList.value.forEach(res => {
-						// res.fromLocationCode = res.toLocationCode
-						res.locationCode = res.fromLocationCode
-					})
-					detailSource.value = getDataSource(subList.value);
-				} else {
-					showMessage('列表数据为0');
-				}
-			}
-		}).catch(error => {
-			proxy.$modal.closeLoading();
-			showMessage(error)
-		})
-	}
-	const showMessage=(message) =>{
-		comMessageRef.value.showMessage(message, res => {
-			if (res) {
-			}
-		});
-	}
-	
-	const openDetail=(item)=> {
-		jobDetailPopup.value.openPopup(item)
-	}
-	
+const openDetail = (item) => {
+  jobDetailPopup.value.openPopup(item)
+}
 </script>
 
-<style scoped lang="scss">
-
-</style>
\ No newline at end of file
+<style scoped lang="scss"></style>
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index ece29cbf..31fb69fb 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -77,6 +77,9 @@ const scanPopup = ref()
 const comScanLocation = ref()
 const comMessageRef = 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/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 0fab4fe9..2c2b3220 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -50,6 +50,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 scanPopup = ref()
@@ -60,7 +61,9 @@ onShow(() => {
     getList('refresh')
   })
 })
-
+onLoad((option) => {
+  title.value = option.title
+})
 onReady(() => {
   detailOptions.value = getDetailOption()
   detailGiveupOptions.value = getDetailGiveupOption()
@@ -139,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'
@@ -153,13 +156,13 @@ const getList = (type) => {
         uni.stopPullDownRefresh()
       }
       loadingType.value = ''
-      updateTitle('采购上架')
+      updateTitle(title.value)
       uni.hideLoading()
       showErrorMessage(error)
     })
 }
 const openJobDetail = (item) => {
-  proxy.$tab.navigateTo(`./putawayDetail?id=${item.masterId}&status=${item.status}`)
+  proxy.$tab.navigateTo(`./putawayDetail?id=${item.masterId}&status=${item.status}&title=${title.value}`)
 }
 
 const selectedItem = (item) => {
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 10fa7887..8beb1db2 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -85,6 +85,9 @@ const managementList = ref([])
 const toLocationCode = ref()
 const toWarehouseCode = ref('')
 onLoad((option) => {
+  uni.setNavigationBarTitle({
+    title: option.title
+  })
   clear()
   getBusinessType(businessTypeCode.value, (res) => {
     if (res.success) {
diff --git a/src/pages/putaway/request/putawayRequest.vue b/src/pages/putaway/request/putawayRequest.vue
index 3c480170..7dafe356 100644
--- a/src/pages/putaway/request/putawayRequest.vue
+++ b/src/pages/putaway/request/putawayRequest.vue
@@ -43,9 +43,13 @@ const detailAndAddAndCloseOption = ref([])
 const addAgainOption = ref([])
 const showOptions = ref([])
 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()
@@ -112,7 +116,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'
@@ -133,7 +137,7 @@ const getList = (type) => {
       if (type === 'refresh') {
         uni.stopPullDownRefresh()
       }
-      updateTitle('采购上架申请')
+      updateTitle(title.value)
       loadingType.value = ''
       proxy.$modal.closeLoading()
       showMessage(error)