From 7fe7b6182c2d407d28c2c9da1c070c3ce964e3e7 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 20 五月 2025 10:49:14 +0800
Subject: [PATCH] 1.移动端添加自定义navbar导航栏

---
 eims-ui-mobile/src/pages/repair/res-list.vue |   94 ++++++++++++++++++++++++++++++----------------
 1 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/eims-ui-mobile/src/pages/repair/res-list.vue b/eims-ui-mobile/src/pages/repair/res-list.vue
index 02b2570..087fb22 100644
--- a/eims-ui-mobile/src/pages/repair/res-list.vue
+++ b/eims-ui-mobile/src/pages/repair/res-list.vue
@@ -2,30 +2,25 @@
 {
   layout: 'default',
   needLogin: true,
-  style: {
-    navigationBarTitleText: '璁惧缁翠慨',
-    'app-plus': {
-      titleNView: {
-        buttons: [
-          {
-            text: '鎺ュ崟',
-            fontSize: '14px',
-            color: '#FFFFFF',
-          },
-          {
-            text: '',
-            fontSize: '24px',
-            color: '#FFFFFF',
-          },
-        ],
-      },
-    },
-  },
+  style: { navigationBarTitleText: '璁惧缁翠慨', navigationStyle: 'custom' },
 }
 </route>
 <template>
   <z-paging ref="paging" v-model="dataList" @query="queryList" show-refresher-update-time>
     <template #top>
+      <wd-navbar
+        title="璁惧缁翠慨"
+        left-arrow
+        @click-left="goBack"
+        right-text="鎻愪氦"
+        @click-right="handleClickRight"
+        custom-style="background: #4D80F0;"
+        safeAreaInsetTop
+      >
+        <template #right>
+          <text v-if="isOperatorOrRepair()" class="text-white">鎺ュ崟</text>
+        </template>
+      </wd-navbar>
       <wd-drop-menu>
         <wd-drop-menu-item
           v-model="resTypeId"
@@ -33,6 +28,11 @@
           value-key="dictValue"
           :options="resTypeList"
           @change="handleResType"
+        />
+        <wd-drop-menu-item
+          v-model="filterDate"
+          :options="filterDateList"
+          @change="handleFilterDate"
         />
         <wd-drop-menu-item
           v-model="status"
@@ -195,6 +195,7 @@
 import { isLeader, isOperatorOrRepair } from '@/utils/RoleUtils'
 import { useUserStore } from '@/store'
 import { formatDate } from '@/utils/DateUtils'
+import dayjs from "dayjs";
 const userStore = useUserStore()
 
 const message = useMessage()
@@ -222,7 +223,13 @@
 const status = ref<number>(-1)
 
 const isSelectRes = ref(false)
+const filterDate = ref<string>('2')
 
+const filterDateList = ref<Record<string, any>[]>([
+  { label: '鎵�鏈夋暟鎹�', value: '0' },
+  { label: '褰撳ぉ鏁版嵁', value: '1' },
+  { label: '褰撴湀鏁版嵁', value: '2' },
+])
 const resTypeList = ref<any>([{ dictLabel: '鎵�鏈夌被鍨�', dictValue: -1 }])
 const statusList = ref<any>([{ dictLabel: '鎵�鏈夌姸鎬�', dictValue: -1 }])
 function handleResType({ value }) {
@@ -231,28 +238,48 @@
 function handleResStatu({ value }) {
   reloadData()
 }
+function handleFilterDate({ value }) {
+  reloadData()
+}
 
 const paging = ref(null)
 const dataList = ref([])
 
 const queryList = (pageNum?: number, pageSize?: number) => {
-  const params: any = {
+  const queryParams: any = {
     pageNum,
     pageSize,
     reqType: resTypeId.value,
     status: status.value,
   }
   if (resTypeId.value === -1) {
-    delete params.reqType
+    delete queryParams.reqType
   }
   if (status.value === -1) {
-    delete params.status
+    delete queryParams.status
+  }
+
+  if (filterDate.value === '1') {
+    // 鑾峰彇褰撳墠鏃ユ湡
+    const now = dayjs()
+    queryParams.params = {
+      beginReqTime: now.startOf('day').format('YYYY-MM-DD 00:00:00'),
+      endReqTime: now.endOf('day').format('YYYY-MM-DD 23:59:59'),
+    }
+  } else if (filterDate.value === '2') {
+    const now = dayjs()
+    queryParams.params = {
+      beginReqTime: now.startOf('month').format('YYYY-MM-DD 00:00:00'),
+      endReqTime: now.endOf('month').format('YYYY-MM-DD 23:59:59'),
+    }
+  } else {
+    delete queryParams.params
   }
   // 濡傛灉鏄粠鎵爜椤甸潰杩囨潵锛屽彧鑳芥煡璇㈠浐瀹氳澶囩殑鏁版嵁
   if (option?.from === 'scan') {
-    params.assetNo = option.assetNo
+    queryParams.assetNo = option.assetNo
   }
-  getRepairResList(params)
+  getRepairResList(queryParams)
     .then((res: any) => {
       paging.value.completeByTotal(res.rows, res.total)
     })
@@ -330,16 +357,17 @@
     url: `/pages/repair/repair-fb?id=${item.id}`,
   })
 }
-
-onNavigationBarButtonTap((e) => {
-  if (e.index === 0) {
-    if (isLeader()) {
-      toast.info('璇风櫥褰曠淮淇伐璐﹀彿鎺ュ崟')
-    } else if (isOperatorOrRepair()) {
-      handleSelectReq()
-    }
+const goBack = () => {
+  uni.navigateBack()
+}
+function handleClickRight() {
+  if (isLeader()) {
+    toast.info('璇风櫥褰曠淮淇伐璐﹀彿鎺ュ崟')
+  } else if (isOperatorOrRepair()) {
+    handleSelectReq()
   }
-})
+}
+
 
 /**
  * 閫夋嫨鎶ヤ慨鍗�

--
Gitblit v1.9.3