修试审核弹框优化

src/pages/repair/testExamine/index.vue

@@ -183,15 +183,18 @@
             </view>
         </scroll-view>
     </view>
+    <PopupConfirm ref="popupConfirm" :content="content" />
 </template>
 
 <script setup>
 import { ref, computed } from 'vue' 
 import { getListTestExamineApply,outerAudit } from '@/services/repair/testExamine.js'
-
+import PopupConfirm from '@/components/PopupConfirm'
 import { onShow } from '@dcloudio/uni-app'
 import { debounce } from 'lodash-es'
 
+const popupConfirm = ref(null)
+const content = ref('')
 const loading = ref(false)
 const total = ref(0) //                 数据总量
 const active = ref(1) //                tap索引
@@ -206,7 +209,7 @@ const queryParams = ref({
     endTime: dateArray.value[1] || '', //                     结束时间
     keyWord: '', //                     关键字 
     pageNum: 1,
-    pageSize: 5,
+    pageSize: 20,
     taskType:5,
     appTaskStatus:10,
 })
@@ -270,11 +273,9 @@ const submitAll = () => {
         return
     }
     // 弹框确认
-    uni.showModal({
+    content.value = '确定提交审核吗？'
-        title: '提示',
+    popupConfirm.value.openPopup().then(async confirm => {
-        content: '确定提交审核吗？',
+        if (!confirm.data) return
-        success: async (res) => {
-            if (res.confirm) {
         const params = tableList.value.filter(item => item.checked).map(item => {
             return {
                 status: '1',
@@ -284,9 +285,7 @@ const submitAll = () => {
         console.log('🚀 ~ params ~ params:', params)
         if (loading.value) return
         loading.value = true
-                uni.showLoading({
+        uni.showLoading({ title: '操作中...', mask: true})
-                    mask: true
-                })
         try {
             const res = await outerAudit(params)
             if (res.code === 200) {
@@ -296,21 +295,24 @@ const submitAll = () => {
                 })
                 onSearchBtn()
             }
-                    loading.value = false
-                    uni.hideLoading()
         } catch (error) {
             console.log('🚀 ~ submitAll ~ error:', error)
+        } finally {
             loading.value = false
             uni.hideLoading()
         }
-            }
-        }
     })
 }
 // 右滑按钮点击事件
 const onClick = async (e, item) => {
     console.log(item) 
     if (e.index === 0) {
+        content.value = '确定通过该数据吗？'
+        popupConfirm.value.openPopup().then(async (confirm) => {
+            console.log('🚀 ~ onClick ~ confirm:', confirm)
+            if (!confirm.data) return
+            try {
+                uni.showLoading({ title: '操作中...', mask: true })
                 // 通过逻辑
                 const res = await outerAudit([{ status: "1",taskId:item.taskId}])
                 if (res.code === 200) {
@@ -320,7 +322,19 @@ const onClick = async (e, item) => {
                     })
                     onSearchBtn()
                 }
+            } catch (error) {
+                console.log('🚀 ~ onClick ~ error:', error)
+            } finally {
+                uni.hideLoading()
+            }
+        })
     } else {
+        content.value = '确定驳回该数据吗？'
+        popupConfirm.value.openPopup().then(async (confirm) => {
+            console.log('🚀 ~ onClick ~ confirm:', confirm)
+            if (!confirm.data) return
+            try {
+                uni.showLoading({ title: '操作中...', mask: true })
                 // 驳回逻辑
                 const res = await outerAudit([{ status: "2",taskId:item.taskId}])
                 if (res.code === 200) {
@@ -330,6 +344,12 @@ const onClick = async (e, item) => {
                     })
                     onSearchBtn()
                 }
+            } catch (error) {
+                console.log('🚀 ~ onClick ~ error:', error)
+            } finally {
+                uni.hideLoading()
+            }
+        })
     }
 }
 
@@ -391,7 +411,7 @@ onShow(() => {
 const onScrollTolower = debounce(() => {
     console.log('触底事件')
     if (total.value > tableList.value.length) {
-        queryParams.value.pageSize += 5
+        queryParams.value.pageSize += 10
         getTableList()
     }
 }, 500)