1

pages/task/detail.vue

@@ -4,12 +4,7 @@
             <view class="task-name-box">
                 <view class="name-bar">{{taskInfo.taskName}}</view>
                 <view class="arrow-bar">
-                    <zb-tooltip placement="bottom-end" ref="tooltipRef">
-                        <uni-icons type="bottom" size="22"/>
-                        <template #content>
-                            <view class="task-item" v-for="item in taskList" @click="taskClick(item)">{{item.taskName}}</view>
-                        </template>
-                    </zb-tooltip>
+                    <uni-icons type="bottom" size="22" @click="taskPopupClick"/>
                 </view>
             </view>
             <view class="task-report-info">
@@ -17,15 +12,10 @@
                 <view>{{taskInfo.startTime}}</view>
             </view>
             <view class="task-pdf-list-bar">
-                <zb-tooltip placement="bottom-end" ref="tooltipRef1">
-                    <view class="task-pdf-info">
-                        <view class="file-name">{{taskFileInfo.fileName}}</view>
-                        <view class="file-num">共{{taskFileInfo.fileNum}}张表格</view>
-                    </view>
-                    <template #content>
-                        <view class="task-item" v-for="item in taskInfo.approvalFileList" @click="taskFileClick(item)">{{item.fileName}}</view>
-                    </template>
-                </zb-tooltip>
+                <view class="task-pdf-info" @click="tablePopupClick">
+                    <view class="file-name">{{taskFileInfo.fileName}}</view>
+                    <view class="file-num">共{{taskFileInfo.fileNum}}张表格</view>
+                </view>
             </view>
         </view>
         <!--pdf区域-->
@@ -42,7 +32,6 @@
             </hc-tabbars>
         </template>
         <view id="action-bar" v-else></view>
-
         <!-- 普通弹窗 -->
         <uni-popup ref="popupRef" class="hc-popup" type="bottom">
             <view class="task-popup-content">
@@ -95,6 +84,26 @@
                 </template>
             </view>
         </uni-popup>
+
+        <!-- 任务列表 -->
+        <uni-popup ref="popupTaskRef" type="bottom">
+            <view class="relative bg-white h-50vh hc-p br-t">
+                <view class="text-black mb-3 text-center">选择任务数据</view>
+                <template v-for="(item, index) in taskList" :key="index">
+                    <view class="relative mt-3" :class="item.id === taskInfo.id ? 'text-blue' :''" @click="taskClick(item)">{{item.taskName}}</view>
+                </template>
+            </view>
+        </uni-popup>
+
+        <!-- 表格列表 -->
+        <uni-popup ref="popupTableRef" type="bottom">
+            <view class="relative bg-white h-50vh hc-p br-t">
+                <view class="text-black mb-3 text-center">选择表格数据</view>
+                <template v-for="(item, index) in taskInfo.approvalFileList" :key="index">
+                    <view class="relative mt-3" :class="item.id === taskFileInfo.id ? 'text-blue' :''" @click="taskFileClick(item)">{{item.fileName}}</view>
+                </template>
+            </view>
+        </uni-popup>
     </hc-sys>
 </template>
 
@@ -170,19 +179,17 @@ const setWebViewStyle = async () => {
 }
 
 //切换任务
-const tooltipRef = ref(null)
 const taskClick = (item) => {
     taskInfo.value = item
     taskFileInfo.value = item.approvalFileList[0]
-    tooltipRef.value?.close()
+    popupTaskRef.value?.close()
 }
 
 //切换PDF
-const tooltipRef1 = ref(null)
 const taskFileInfo = ref({})
 const taskFileClick = (item) => {
     taskFileInfo.value = item
-    tooltipRef1.value?.close()
+    popupTableRef.value?.close()
 }
 
 //获取任务详情
@@ -223,6 +230,18 @@ const queryPDFnumApi = async (pdfUrl) => {
     return data ? data : 0
 }
 
+//任务列表
+const popupTaskRef = ref(null)
+const taskPopupClick = () => {
+    popupTaskRef.value?.open()
+}
+
+//表格列表
+const popupTableRef = ref(null)
+const tablePopupClick = () => {
+    popupTableRef.value?.open()
+}
+
 //审批弹窗
 const popupRef = ref(null)
 const popupType = ref(1)

style/app.scss

@@ -233,3 +233,7 @@ uni-modal {
     overflow: hidden;
     text-overflow: ellipsis;
 }
+
+.br-t {
+    border-radius: 30rpx 30rpx 0 0;
+}

style/task/detail.scss

@@ -16,12 +16,6 @@ page {
             }
             .arrow-bar {
                 margin-left: 22rpx;
-                .task-item {
-                    font-size: 26rpx;
-                }
-                .task-item + .task-item {
-                    margin-top: 18rpx;
-                }
             }
         }
         .task-report-info {