huangxw преди 1 седмица
родител
ревизия
f695129240

+ 27 - 17
src/components/ut-navbar/ut-navbar.vue

@@ -1,22 +1,29 @@
 <template>
-    <up-navbar :fixed="fixed" :border="border">
-        <template #left>
-            <slot name="left">
-                <view class="d-flex a-c">
-                    <up-icon v-if="showBack" name="arrow-left" size="40rpx" color="#333" @click="handleBackClick"></up-icon>
-                    <up-icon v-else name="home" size="40rpx" color="#333" @click="handleHomeClick"></up-icon>
-                    <slot name="leftText">
-                        <text class="f-s-38 c-#333 f-w-500 ml-20">{{ leftText }}</text>
-                    </slot>
-                </view>
+    <view>
+        <up-navbar :fixed="fixed" :border="border">
+            <template #left>
+                <slot name="left">
+                    <view class="d-flex a-c">
+                        <up-icon v-if="showBack" name="arrow-left" size="40rpx" color="#333" @click="handleBackClick"></up-icon>
+                        <up-icon v-else name="home" size="40rpx" color="#333" @click="handleHomeClick"></up-icon>
+                        <slot name="leftText">
+                            <text class="f-s-38 c-#333 f-w-500 ml-20">{{ leftText }}</text>
+                        </slot>
+                    </view>
+                </slot>
+            </template>
+            <template #center>
+                <slot name="center">
+                    <text class="f-s-38 c-#333 f-w-500">{{ title }}</text>
+                </slot>
+            </template>
+        </up-navbar>
+        <view v-if="breadcrumb" class="bg-#EBF6EE pd2-10-24 f-s-24 c-#3FAD5B">
+            <slot name="breadcrumb">
+                {{ breadcrumb }}
             </slot>
-        </template>
-        <template #center>
-            <slot name="center">
-                <text class="f-s-38 c-#333 f-w-500">{{ title }}</text>
-            </slot>
-        </template>
-    </up-navbar>
+        </view>
+    </view>
 </template>
 <script lang="ts" setup>
 import { ref, onMounted } from 'vue';
@@ -27,6 +34,8 @@ const props = withDefaults(
         fixed?: boolean;
         homeUrl?: string;
         leftText?: string;
+        // 是否有面包屑
+        breadcrumb?: string;
     }>(),
     {
         title: '',
@@ -34,6 +43,7 @@ const props = withDefaults(
         fixed: true,
         homeUrl: '/pages/index/index',
         leftText: '',
+        breadcrumb: '',
     }
 );
 

+ 2 - 2
src/components/ut-tabar/ut-tabar.vue

@@ -1,7 +1,7 @@
 <template>
-    <up-popup v-model:show="showStorage" title="请选择操作类型" bgColor="#F7F7F7" round="0" zIndex="1000" closeable>
+    <up-popup v-model:show="showStorage" title="仓储与放行" bgColor="#F7F7F7" round="0" zIndex="1000" closeable>
         <view class="min-h-600">
-            <view class="c-#333 f-s-34 f-w-500 pd-24">请选择操作类型</view>
+            <view class="c-#333 f-s-34 f-w-500 pd-24">仓储与放行</view>
             <view class="pd2-10-24">
                 <up-grid :border="false" :column="3" gap="10rpx">
                     <up-grid-item>

+ 1 - 1
src/plant/base/gap-base-info-edit/index.vue

@@ -119,7 +119,7 @@
             </up-form>
         </view>
         <template #bottom>
-            <view class="pd-20 d-flex base-bottom-wrap">
+            <view class="pd-20 d-flex">
                 <up-button @click="submitForm" type="primary">提交</up-button>
             </view>
         </template>

+ 1 - 1
src/plant/storage/storage-room/detail/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging ref="paging" bgColor="#F7F7F7" safe-area-inset-bottom paging-class="paging-btm-shadow" scroll-with-animation>
         <template #top>
-            <ut-navbar title="库房详情" :fixed="false" border></ut-navbar>
+            <ut-navbar title="库房详情" :fixed="false" border :breadcrumb="`库房管理 > 库房详情`"></ut-navbar>
         </template>
 
         <template>

+ 1 - 1
src/plant/storage/storage-room/edit/index.vue

@@ -1,7 +1,7 @@
 <template>
     <z-paging ref="paging" bgColor="#F7F7F7" safe-area-inset-bottom paging-class="paging-btm-shadow" scroll-with-animation>
         <template #top>
-            <ut-navbar :title="did ? '编辑库房' : '新增库房'" :fixed="false" border></ut-navbar>
+            <ut-navbar :title="did ? '编辑库房' : '新增库房'" :fixed="false" border :breadcrumb="`库房管理 > ${did ? '编辑库房' : '新增库房'}`"></ut-navbar>
         </template>
         <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules" labelWidth="auto" ref="upFormRef">
             <view class="pd-24">