完善入库跳转以及出库创建页面

pages/warehousing/uniqueCode/issueUniqueCode/index.vue

@@ -1,6 +1,8 @@
-<!-- 唯一码发放页面 -->
+<!-- 唯一码发放页面 - 唯一码发放、唯一码编辑、入库单快速生成唯一码 -->
 <template>
     <view class="content">
+        <navigation :title="title" :back-url="backUrl"></navigation>
+
         <view class="remarkLine">
             <span>备注：</span>
             <uni-easyinput type="text" v-model="formData.remark" :inputBorder="false" placeholder="请输入备注" />
@@ -17,9 +19,14 @@ import { ref, onMounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { addUniqueCode, editUniqueCode } from '@/api/uniqueCode';
 import MaterialList from '../../../components/MaterialList.vue';
+import Navigation from '../../../components/Navigation.vue';
+import { objectToQuery } from '../../../until';
 import { computed } from 'vue';
 import _ from 'lodash';
-
+import { includes } from 'lodash';
+// ref：标题
+const title = ref('入库单开单')
+const backUrl = ref('pages/warehousing/index')
 // 数据：路径参数
 const pathParams = ref('')
 // 数据：物料、备注
@@ -33,11 +40,19 @@ onLoad((options) => {
 
 })
 onShow(() => {
+    // 唯一码发放、唯一码编辑、入库单快速生成唯一码 
+    const query = objectToQuery(pathParams.value)
     if (pathParams.value.title) {
-        uni.setNavigationBarTitle({ title: pathParams.value.title })
-    }
-    if (pathParams.value.back == 'inbound') {
-        uni.setNavigationBarTitle({ title: '快速生成唯一码' })
+        // 唯一码编辑 /pages/warehousing/uniqueCode/myUniqueCode/detail?id=64&code=600064
+        title.value = pathParams.value.title
+        backUrl.value = `/pages/warehousing/uniqueCode/myUniqueCode${query}`
+    } else if (includes(pathParams.value.back, 'inbound')) {
+        // 入库单快速生成唯一码 /pages/warehousing/uniqueCode/issueUniqueCode/index?billNo=WR1775527275119&back=inbound
+        title.value = '快速生成唯一码'
+        backUrl.value = `/pages/warehousing/stockIn/components/inbound${query}`
+    } else {
+        title.value = '唯一码发放'
+        backUrl.value = 'pages/warehousing/index'
     }
 })
 

pages/warehousing/uniqueCode/myUniqueCode/detail.vue

@@ -1,7 +1,7 @@
 <!-- 唯一码详情 -->
 <template>
     <!-- 自定义导航栏 -->
-    <navigation :title="pathParams.code ? pathParams.code : '唯一码发放'">
+    <navigation :title="title" :back-url="backUrl">
         <template #right>
             <view class="right-btn flex align-center justify-center ">
                 <uv-image @click="toEdit" src="../../../../static/edit.png" class="ml-24" width="20px" height="20px"
@@ -71,7 +71,8 @@ import { getStatusName, getDetail } from '../until';
 import QrCodeModal from './QrCodeModal.vue';
 import MaterialList from '../../../components/MaterialList.vue'
 import Navigation from '../../../components/Navigation.vue'
-
+const backUrl = ref('')
+const title = ref('')
 const modalRef = ref()
 // 路径参数
 const pathParams = ref('')
@@ -146,12 +147,19 @@ onLoad((options) => {
         uni.showToast({ title: '参数错误,无唯一码ID', icon: 'none' })
         return
     }
+
     pathParams.value = options
     getDetailInfo()
 })
 
 onShow(() => {
-    uni.setNavigationBarTitle({ title: pathParams.value.code })
+    if (pathParams.value.code || pathParams.value.title) {
+        backUrl.value = '/pages/warehousing/uniqueCode/myUniqueCode/index'
+        title.value = pathParams.value.title || pathParams.value.code
+    } else {
+        backUrl.value = '/pages/warehousing/index'
+        title.value = '唯一码发放'
+    }
 })
 
 </script>
@@ -180,5 +188,4 @@ onShow(() => {
 
     }
 }
-
 </style>

pages/warehousing/uniqueCode/myUniqueCode/index.vue

@@ -1,9 +1,11 @@
 <!-- 唯一码 -->
 <template>
     <view class="content">
+        <navigation title="唯一码" back-url="pages/warehousing/index"></navigation>
         <view class="topSearch">
             <uni-easyinput type="text" v-model="queryParams.code" prefixIcon="search" :inputBorder="false"
                 @iconClick="getMaterialList" placeholder="请输入关键词搜索" />
+                
         </view>
 
         <!-- 唯一码列表  -->
@@ -63,6 +65,7 @@ import { getStatusName, getDetail } from '../until';
 import { onShow } from "@dcloudio/uni-app";
 import { getUniqueCodeList, delUniqueCode, detailUniqueCode } from '@/api/uniqueCode'
 import QrCodeModal from './QrCodeModal.vue';
+import Navigation from '../../../components/Navigation.vue';
 
 const queryParams = ref({
     code: ''
@@ -141,11 +144,11 @@ const getDetailInfo = (row) => {
 <style scoped lang="scss">
 .topSearch {
     position: fixed;
-    top: 0;
+    top: var(--nav-height); /* 关键：自动在导航栏下方 */
     left: 0;
     right: 0;
-    z-index: 999;
-    padding: 10px;
+    z-index: 99; /* 比导航栏小 */
+    padding: 8rpx 16rpx;
     background-color: #fff;
     border-bottom: 1px solid #eee;
     box-sizing: border-box;
@@ -153,7 +156,7 @@ const getDetailInfo = (row) => {
 
 .containerBox {
     // padding: 0 12rpx;
-    padding-top: 60px;
+    padding-top: 90px !important; /* 撑开：导航栏+搜索框高度 */
     width: 100%;
     height: 100%;
     box-sizing: border-box;