问题修改

src/pages/repair/equipAssessment/index.vue

@@ -45,6 +45,7 @@
                           <span class="sub-code">{{ `${item.backCode}-${item.level}` }}</span>
                       </div>
                       <div class="title-right">
+                          <uni-tag v-if="item.dataStatus == 3" text="修饰后入库驳回" type="error" style="margin-right: 5px" custom-style="errorStyle"/>
                           <uni-tag v-if="item.status == 0" text="未完成" type="warning" custom-style="warningStyle"/>
                           <uni-tag v-if="item.status == 1" text="已完成" type="success" custom-style="successStyle"/>
                           <uni-tag v-if="item.status == 2" text="已驳回" type="warning" custom-style="warningStyle"/>
@@ -95,6 +96,23 @@
             </view>
         </scroll-view>
     </view>
+
+  <!-- 自定义弹窗 -->
+  <view v-if="showCustomModal" class="custom-modal-mask" @tap="handleCloseModal">
+    <view class="custom-modal-container" @tap.stop>
+      <view class="custom-modal-header">
+        <text class="custom-modal-title">{{ modalTitle }}</text>
+        <text class="custom-modal-close" @tap="handleCloseModal">×</text>
+      </view>
+      <view class="custom-modal-content">
+        {{ modalContent }}
+      </view>
+      <view class="custom-modal-footer">
+        <button class="custom-modal-btn cancel" @tap="handleCancel">转至维修</button>
+        <button class="custom-modal-btn confirm" @tap="handleConfirm">进入定损</button>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup>
@@ -111,6 +129,10 @@ const dateArray = ref([
     new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000).toISOString().split('T')[0],
     new Date().toISOString().split('T')[0]
 ]) //            日期范围
+const showCustomModal = ref(false)
+const currentItem = ref(null)
+const modalTitle = ref('提示')
+const modalContent = ref('是否确认进行定损？')
 // 查询参数
 const queryParams = ref({
     startTime: dateArray.value[0] || '',
@@ -254,21 +276,63 @@ const changeTab = (index) => {
 // 点击跳转详情
 const handleItem = (item) => {
 	console.log(item)
-	if(item.repairStatusCode=="0"){
+  currentItem.value = item
-            // 弹出确认弹窗
+  if(item.repairStatusCode == "0") {
-    uni.showModal({
+    // 使用自定义弹窗
-      title: '提示',
+    showCustomModal.value = true
-      content: '是否确认进行定损？',
+  } else {
-      confirmText: '进入定损', 
+    uni.navigateTo({ url: `/pages/repair/equipAssessment/view?taskId=${item.taskId}` })
-      cancelText: '转至维修',
+  }
-      success: async (res) => {
+
-        if (res.confirm) {
+
-          // 用户点击确认，进行页面跳转
+
-          uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${item.taskId}` })
+	// if(item.repairStatusCode=="0"){
-        } else if (res.cancel) {
+  //           // 弹出确认弹窗
-            //直接进行维修
+  //   uni.showModal({
-             const res = await updateRepairStatusAPI({taskId: item.taskId})
+  //     title: '提示',
-             if(res.code==200){
+  //     content: '是否确认进行定损？',
+  //     confirmText: '进入定损',
+  //     cancelText: '转至维修',
+  //     success: async (res) => {
+  //       if (res.confirm) {
+  //         // 用户点击确认，进行页面跳转
+  //         uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${item.taskId}` })
+  //       } else if (res.cancel) {
+  //           //直接进行维修
+  //            const res = await updateRepairStatusAPI({taskId: item.taskId})
+  //            if(res.code==200){
+  //               uni.showToast({
+  //                   title: '成功转至维修',
+  //                   icon: 'none',
+  //               })
+  //               setTimeout(() => {
+  //                   queryParams.value.pageNum = 1
+  //                   tableList.value = []
+  //                   getTableList(true)
+	// 	        }, 1000)
+  //
+  //            }
+  //       }
+  //     }
+  //   })
+	// 	// uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${item.taskId}` })
+	// }else{
+	// 	uni.navigateTo({ url: `/pages/repair/equipAssessment/view?taskId=${item.taskId}` })
+	// }
+    
+}
+
+// 自定义弹窗确认事件
+const handleConfirm = () => {
+  showCustomModal.value = false
+  uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${currentItem.value.taskId}` })
+}
+
+// 自定义弹窗取消事件
+const handleCancel = async () => {
+  showCustomModal.value = false
+  const res = await updateRepairStatusAPI({taskId: currentItem.value.taskId})
+  if(res.code == 200) {
     uni.showToast({
       title: '成功转至维修',
       icon: 'none',
@@ -278,16 +342,12 @@ const handleItem = (item) => {
       tableList.value = []
       getTableList(true)
     }, 1000)
+  }
+}
 
-             }
+// 关闭弹窗
-        }
+const handleCloseModal = () => {
-      }
+  showCustomModal.value = false
-    })
-		// uni.navigateTo({ url: `/pages/repair/equipAssessment/details?taskId=${item.taskId}` })
-	}else{
-		uni.navigateTo({ url: `/pages/repair/equipAssessment/view?taskId=${item.taskId}` })
-	}
-    
 }
 
 // 判断数据是否加载完毕
@@ -314,6 +374,82 @@ const maskClick = () => {}
 </script>
 
 <style lang="scss" scoped>
+/* 在style部分添加以下样式 */
+.custom-modal-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+
+.custom-modal-container {
+  width: 600rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+}
+
+.custom-modal-header {
+  margin-left: 10px;
+  margin-right: 10px;
+  padding: 10rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1rpx solid #eee;
+}
+
+.custom-modal-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.custom-modal-close {
+  font-size: 40rpx;
+  color: #999;
+  padding: 10rpx;
+}
+
+.custom-modal-content {
+  padding: 40rpx 30rpx;
+  font-size: 28rpx;
+  color: #666;
+  text-align: center;
+}
+
+.custom-modal-footer {
+  display: flex;
+  border-top: 1rpx solid #eee;
+}
+
+.custom-modal-btn {
+  flex: 1;
+  margin: 0;
+  border-radius: 0;
+  border: none;
+  background: none;
+  line-height: 90rpx;
+  font-size: 28rpx;
+}
+
+.custom-modal-btn.cancel {
+  color: #666;
+  border-right: 1rpx solid #eee;
+}
+
+.custom-modal-btn.confirm {
+  color: #3784fb;
+  font-weight: bold;
+}
+
+
 	.title-left {
 	    display: flex;
 	    flex-direction: column;