mod: 任务详情

src/api/schedule/task.ts

@@ -3,18 +3,16 @@ import { http } from '@/http/http'
 enum Api {
   base = '/scheduleTasks/tasks',
   confirmBase = '/scheduleTasks/tasks/confirm',
+  uploadBase = '/taskAttachment/attachment',
+  photoBase = '/taskPhoto/photo',
 }
 
 export function transferTask(data: any) {
-  return http.put(`${Api.base}/forward`, data, {
-    successMessageMode: 'message',
-  })
+  return http.put(`${Api.base}/forward`, data)
 }
 // 关闭任务
 export function closeTask(data: any) {
-  return http.put(`${Api.base}/cancel`, data, {
-    successMessageMode: 'message',
-  })
+  return http.put(`${Api.base}/cancel`, data)
 }
 
 export function getTaskDetail(id: number) {
@@ -29,3 +27,16 @@ export function getTaskDetail(id: number) {
 export function confirmDoneTask(id: number) {
   return http.put(`${Api.confirmBase}/${id}`)
 }
+
+/**
+ * 处理任务附件
+ * @param params
+ * @returns
+ */
+export function dealUploadTask(params: any) {
+  return http.put(`${Api.uploadBase}/handle`, params)
+}
+
+export function dealPhotoTask(params: any) {
+  return http.put(`${Api.photoBase}/handle`, params)
+}

src/components/AttachmentList.vue

@@ -0,0 +1,212 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+
+// 组件属性定义
+interface Props {
+  files: string[] // 文件URL数组
+  fileNames?: string[] // 文件名数组，可选
+  size?: number // 卡片大小（默认50）
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  fileNames: () => [],
+  size: 50,
+})
+
+// 图片文件扩展名
+const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp']
+
+/**
+ * 获取文件名
+ * @param url 文件URL
+ * @param index 文件索引
+ * @returns 文件名
+ */
+function getFileName(url: string, index: number): string {
+  if (props.fileNames && props.fileNames[index]) {
+    return props.fileNames[index]
+  }
+  // 从URL中提取文件名
+  const parts = url.split('/')
+  return parts[parts.length - 1] || `file${index + 1}`
+}
+
+/**
+ * 判断是否为图片文件
+ * @param fileName 文件名
+ * @returns 是否为图片
+ */
+function isImage(fileName: string): boolean {
+  const extension = fileName.split('.').pop()?.toLowerCase()
+  return extension ? imageExtensions.includes(extension) : false
+}
+
+/**
+ * 获取文件扩展名
+ * @param fileName 文件名
+ * @returns 文件扩展名（大写）
+ */
+function getFileExtension(fileName: string): string {
+  const extension = fileName.split('.').pop()?.toUpperCase()
+  return extension || 'FILE'
+}
+
+/**
+ * 处理文件下载
+ * @param url 文件URL
+ * @param fileName 文件名
+ */
+function handleFileDownload(url: string, fileName: string) {
+  // #ifdef H5
+  // H5平台使用a标签下载
+  const link = document.createElement('a')
+  link.href = url
+  link.download = fileName
+  link.target = '_blank'
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+  // #endif
+
+  // #ifndef H5
+  // 非H5平台使用uni.downloadFile
+  uni.downloadFile({
+    url,
+    success: (res) => {
+      if (res.statusCode === 200) {
+        uni.saveFile({
+          tempFilePath: res.tempFilePath,
+          success: (saveRes) => {
+            uni.showToast({
+              title: '下载成功',
+              icon: 'success',
+            })
+          },
+          fail: (err) => {
+            console.error('保存文件失败:', err)
+            uni.showToast({
+              title: '保存文件失败',
+              icon: 'error',
+            })
+          },
+        })
+      }
+    },
+    fail: (err) => {
+      console.error('下载文件失败:', err)
+      uni.showToast({
+        title: '下载文件失败',
+        icon: 'error',
+      })
+    },
+  })
+  // #endif
+}
+</script>
+
+<template>
+  <view class="attachment-list">
+    <view
+      v-for="(file, index) in files"
+      :key="index"
+      class="attachment-item"
+      :style="{ width: `${size * 4}rpx`, height: `${size * 4}rpx` }"
+    >
+      <!-- 图片文件 -->
+      <view v-if="isImage(getFileName(file, index))" class="image-container">
+        <wd-img
+          :width="size * 4"
+          :height="size * 4"
+          :src="file"
+          :enable-preview="true"
+        />
+      </view>
+
+      <!-- 其他文件 -->
+      <view
+        v-else
+        class="file-container"
+        @tap="handleFileDownload(file, getFileName(file, index))"
+      >
+        <view class="file-icon">
+          <wd-icon name="document" size="64rpx" />
+        </view>
+        <view class="file-extension">
+          {{ getFileExtension(getFileName(file, index)) }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.attachment-list {
+  width: 100%;
+  display: flex;
+  overflow-x: auto;
+  padding: 10rpx 0;
+  scrollbar-width: thin;
+  scrollbar-color: #c1c1c1 #f5f5f5;
+
+  &::-webkit-scrollbar {
+    height: 6rpx;
+  }
+
+  &::-webkit-scrollbar-track {
+    background: #f5f5f5;
+    border-radius: 3rpx;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #c1c1c1;
+    border-radius: 3rpx;
+  }
+
+  &::-webkit-scrollbar-thumb:hover {
+    background: #a8a8a8;
+  }
+}
+
+.attachment-item {
+  margin-right: 20rpx;
+  border-radius: 12rpx;
+  overflow: hidden;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+  transition: transform 0.3s, box-shadow 0.3s;
+  flex-shrink: 0;
+  
+  &:hover {
+    transform: translateY(-4rpx);
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);
+  }
+}
+
+.image-container {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.file-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f7fa;
+  cursor: pointer;
+}
+
+.file-icon {
+  margin-bottom: 16rpx;
+  color: #215acd;
+}
+
+.file-extension {
+  font-size: 24rpx;
+  font-weight: 500;
+  color: #31373d;
+  text-transform: uppercase;
+}
+</style>

src/pages/schedule/details/deal/index2.vue

@@ -9,7 +9,7 @@
             style="margin-left: 10rpx; transform: translateY(6rpx)"
             name="arrow-down"
             size="20px"
-          ></wd-icon>
+          />
         </text>
       </view>
       <view>
@@ -22,32 +22,33 @@
     </view>
     <scroll-view class="task-container" scroll-y>
       <view class="content-main">
-        <view style="font-size: 36rpx; font-weight: 500; margin-bottom: 50rpx"
-          >油品：0#</view
-        >
+        <view style="font-size: 36rpx; font-weight: 500; margin-bottom: 50rpx">
+          油品：0#
+        </view>
         <wd-form ref="form" :model="model">
           <view style="display: flex; flex-direction: column; gap: 90rpx">
             <view>
               <view
                 style="font-size: 32rpx; font-weight: 500; margin-bottom: 30rpx"
-                >液位仪数据</view
               >
+                液位仪数据
+              </view>
               <wd-input
+                v-model="model.value1"
                 label="油高 h1(mm)"
                 label-width="100%"
                 prop="value1"
                 clearable
-                v-model="model.value1"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写发现问题' }]"
                 custom-class="custom-vertical-input"
               />
               <wd-input
+                v-model="model.value2"
                 label="水高(mm)"
                 label-width="100%"
                 prop="value2"
                 clearable
-                v-model="model.value2"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写处理措施' }]"
                 custom-class="custom-vertical-input"
@@ -56,34 +57,35 @@
             <view>
               <view
                 style="font-size: 32rpx; font-weight: 500; margin-bottom: 30rpx"
-                >手工量缸数据</view
               >
+                手工量缸数据
+              </view>
               <wd-input
+                v-model="model.value1"
                 label="油高 h1(mm)"
                 label-width="100%"
                 prop="value1"
                 clearable
-                v-model="model.value1"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写发现问题' }]"
                 custom-class="custom-vertical-input"
               />
               <wd-input
+                v-model="model.value2"
                 label="水高(mm)"
                 label-width="100%"
                 prop="value2"
                 clearable
-                v-model="model.value2"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写处理措施' }]"
                 custom-class="custom-vertical-input"
               />
               <wd-input
+                v-model="model.value2"
                 label="水高高度差(mm)(h1-h2)"
                 label-width="100%"
                 prop="value2"
                 clearable
-                v-model="model.value2"
                 placeholder="请输入"
                 :rules="[{ required: true, message: '请填写处理措施' }]"
                 custom-class="custom-vertical-input"
@@ -92,11 +94,12 @@
             <view>
               <view
                 style="font-size: 32rpx; font-weight: 500; margin-bottom: 30rpx"
-                >异常记录</view
               >
+                异常记录
+              </view>
               <wd-textarea
-                prop="value1"
                 v-model="model.value1"
+                prop="value1"
                 placeholder="请填写异常记录"
                 :rules="[{ required: true, message: '请填写异常记录' }]"
                 :auto-height="false"
@@ -110,19 +113,23 @@
     </scroll-view>
     <!-- 确定按钮 -->
     <view class="confirm-btn">
-      <button class="btn" @click="submitTasks">确 定</button>
+      <button class="btn" @click="submitTasks">
+        确 定
+      </button>
     </view>
     <calendar
-      v-model:datePickerVisible="datePickerVisible"
-      @confirmDate="onconfirmDate"
+      v-model:date-picker-visible="datePickerVisible"
       :detailedtime="true"
+      @confirm-date="onconfirmDate"
     />
   </view>
 </template>
+
 <script lang="ts" setup>
-import { ref, reactive, onMounted } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
 import calendar from '@/utils/calendar.vue'
+
 const tab = ref('1缸')
 const tabs = ['1缸', '2缸', '3缸', '4缸']
 const { success: showSuccess } = useToast()
@@ -140,10 +147,10 @@ function formatDateTime() {
 
   currentDateTime.value = `${year}-${month}-${day} ${hours}:${minutes}`
 }
-const handleClickCalendar = () => {
+function handleClickCalendar() {
   datePickerVisible.value = true
 }
-const onconfirmDate = (date: string) => {
+function onconfirmDate(date: string) {
   currentDateTime.value = date
 }
 onMounted(() => {
@@ -172,6 +179,7 @@ function submitTasks() {
     })
 }
 </script>
+
 <style lang="scss" scoped>
 .task-management {
   display: flex;

src/pages/schedule/details/deal/inspection.vue

@@ -1,23 +1,21 @@
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { cloneDeep, isArray } from 'lodash-es'
+import { onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
 import { getCheckSubItemsByTaskId, getChecktItemsByTaskId, handleCheckTask, submitCheckLogs } from '@/api/schedule/check'
 import { getTaskDetail } from '@/api/schedule/task'
 import useUpload from '@/hooks/useUpload'
 import anomalyPop from '../popup/anomaly.vue'
-import centerpopup from '../popup/centerpopup.vue'
 
 const route = useRoute()
 const taskId = ref(Number(route.query.id))
 const checkId = ref(Number(route.query.checkId))
-
+const anomalyPopRef = ref<any>(null)
 const popShow = ref({
   centerShow: false,
   anomalyShow: false,
 })
 // const popShow = ref({})
-const tab = ref('前庭')
-
 const taskInfo: any = ref({})
 const checkSubItems: any = ref([])
 
@@ -41,50 +39,6 @@ interface Task {
   }[]
 }
 
-// 任务数据
-// const tasks = ref<Task[]>([
-//   {
-//     id: '1',
-//     type: '前庭',
-//     description:
-//       '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-//     instructions: '拍照：按照示例图拍摄前庭内海报宣传物，可上传多张照片',
-//     examples: [
-//       'https://picsum.photos/id/1018/200/150',
-//       'https://picsum.photos/id/1019/200/150',
-//     ],
-//     images: [],
-//     isimages: true,
-//     status: 'normal',
-//   },
-//   {
-//     id: '2',
-//     type: '前庭',
-//     description: '[卫生] 抽油枪栓是否出现空转或存在明显渗油。',
-//     icon: 'help-circle',
-//     instructions: '',
-//     examples: [],
-//     images: [],
-//     isimages: false,
-//     status: 'normal',
-//     details: [{ name: '12号枪', status: 'normal' }],
-//   },
-//   {
-//     id: '3',
-//     type: '前庭',
-//     description:
-//       '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-//     instructions: '拍照：按照示例图拍摄前庭内海报宣传物，可上传多张照片',
-//     examples: [
-//       'https://picsum.photos/id/1018/200/150',
-//       'https://picsum.photos/id/1019/200/150',
-//     ],
-//     images: ['https://picsum.photos/id/1025/200/150'],
-//     isimages: true,
-//     status: 'normal',
-//   },
-// ])
-
 // 选择图片
 function chooseImage(index: number) {
   // 为每个上传请求创建独立的upload实例，确保能正确处理对应的任务索引
@@ -95,11 +49,11 @@ function chooseImage(index: number) {
       const imageUrl = res.url || ''
       if (imageUrl) {
         console.log('currentCheckList.value[index]', currentCheckList.value[index], imageUrl)
-        if (!currentCheckList.value[index]?.dealPhoto) {
-          currentCheckList.value[index].dealPhoto = []
+        if (!currentCheckList.value[index]?.photoUrl) {
+          currentCheckList.value[index].photoUrl = []
         }
         nextTick(() => {
-          currentCheckList.value[index].dealPhoto.push({
+          currentCheckList.value[index].photoUrl.push({
             url: imageUrl,
             name: res.fileName,
           })
@@ -113,28 +67,50 @@ function chooseImage(index: number) {
   uploadImage()
 }
 const selectTask = ref<any>({})
+const anomalyData = ref<any>({})
 // 切换任务状态
-function toggleTaskStatus(task: any) {
+async function toggleTaskStatus(task: any) {
   selectTask.value = task
+  // 初始化异常数据
+  console.log('task.formOperationIssue', task.formOperationIssue)
+  anomalyData.value = task.formOperationIssue || {}
   popShow.value.anomalyShow = true
+  await nextTick()
+  let problemPhoto = cloneDeep(anomalyData.value.problemPhoto)
+  if (problemPhoto && !isArray(problemPhoto)) {
+    problemPhoto = problemPhoto.split(',').map((url: string, index: number) => ({
+      name: url.trim(),
+      url: anomalyData.value.problemPhotoUrl[index],
+    }))
+  }
+  const data = {
+    ...anomalyData.value,
+    problemPhoto,
+  }
+  console.log('data123', data)
+  anomalyPopRef.value?.updateModelData(data)
 }
 
 // 处理异常信息提交
 function handleAnomalySubmitted({ checkItemId, data }: { checkItemId: number, data: any }) {
   // 在 currentCheckList 中找到对应的任务
   const taskIndex = currentCheckList.value.findIndex((item: any) => item.id === checkItemId)
+  console.log('taskIndex', taskIndex)
   if (taskIndex !== -1) {
     // 在任务对象中添加标记，表明异常信息已填写
-    currentCheckList.value[taskIndex].hasAnomalyInfo = true
+    // currentCheckList.value[taskIndex].hasAnomalyInfo = true
     // 保存提交的异常数据
-    currentCheckList.value[taskIndex].anomalyData = data
+    currentCheckList.value[taskIndex].formOperationIssue = data
   }
+
+  popShow.value.anomalyShow = false
 }
 
 // 处理 dealResult 变化
 function handleDealResultChange(task: any) {
   // 当用户选择异常时，自动弹出异常信息填写抽屉
-  if (task.dealResult === '2') {
+  if (task.result === 2) {
+    anomalyData.value = task.formOperationIssue || {}
     toggleTaskStatus(task)
   }
 }
@@ -160,24 +136,31 @@ async function saveCheckLog({ index }: { index: number }) {
     const logs = []
     const items = checkSubItems.value[index]?.items || []
     currentCheckList.value.forEach((item: any, index: number) => {
+      let result = 1
+      if (item.dealHasScore) {
+        result = (item.dealScore || 0) === item.limitScore ? 1 : 2
+      }
+      else {
+        result = item.result || 1
+      }
       const logInfo = {
-        inputItem: item.dealInputItem || '', // 输入内容
+        inputItem: item.inputItem || '', // 输入内容
         itemId: item.id || '', // 检查项ID
-        photo: item.dealPhoto?.map((photo: any) => photo.name).join(',') || '', // 照片
-        result: item.dealHasScore ? (item.dealScore || 0) === item.limitScore ? '1' : '2' : '3', // 检查结果1正常2异常3不适用
+        photo: item.photoUrl?.map((photo: any) => photo.name).join(',') || '', // 照片
+        result, // 检查结果1正常2异常3不适用
         score: item.dealHasScore ? item.dealScore || 0 : 0, // 分数
       }
 
       // 做一些判断，比如必填项
-      if (item.hasPhoto === 2 && !item.dealPhoto?.length) {
+      if (item.hasPhoto === 2 && !item.photoUrl?.length) {
         throw new Error('请上传照片')
       }
 
-      if (item.hasInput === 1 && !item.dealInputItem) {
+      if (item.hasInput === 1 && !item.inputItem) {
         throw new Error('请输入内容')
       }
 
-      if (logInfo.result === '2') {
+      if (logInfo.result === 2) {
       // 判断是否输入异常项
       // if (!item.dealScore) {
       //   uni.showToast({
@@ -264,6 +247,10 @@ function init() {
       // 为每个任务添加 score 字段
       item.items.forEach((task: any) => {
         task.score = task.score || null
+        task.photoUrl = (task.photoUrl || []).map((url: string, index: number) => ({
+          url,
+          name: task.photo.split(',')[index],
+        }))
       })
     })
     // 更新检查项数据
@@ -273,23 +260,6 @@ function init() {
   })
 }
 
-function getPhotos(item: any): Array<{ isExample: boolean, url: string }> {
-  const list: Array<{ isExample: boolean, url: string }> = (
-    item.exampleImageUrl || []
-  ).map((url: string) => ({
-    url,
-    isExample: true,
-  }));
-  (item.photoUrl || []).forEach((url: string) => {
-    list.push({
-      url,
-      isExample: false,
-    })
-  })
-
-  return list
-}
-
 onMounted(async () => {
   await init()
 })
@@ -334,7 +304,7 @@ onMounted(async () => {
           </view>
 
           <view v-if="task.hasInput > 0" class="input-container" style="margin-right: 1rem;">
-            <wd-textarea v-model="task.dealInputItem" :placeholder="task.inputContent || '请输入内容'" :maxlength="100" show-word-limit />
+            <wd-textarea v-model="task.inputItem" :placeholder="task.inputContent || '请输入内容'" :maxlength="100" show-word-limit />
           </view>
 
           <!-- 操作说明 -->
@@ -374,9 +344,9 @@ onMounted(async () => {
             </view>
 
             <!-- 已上传图片 -->
-            <view v-if="task?.dealPhoto?.length > 0" class="uploaded-images">
+            <view v-if="task?.photoUrl?.length > 0" class="uploaded-images">
               <view
-                v-for="(image, idx) in task.dealPhoto"
+                v-for="(image, idx) in task.photoUrl"
                 :key="idx"
                 class="uploaded-image"
               >
@@ -385,19 +355,19 @@ onMounted(async () => {
             </view>
           </view>
           <view v-if="task.checkResult === 1" style="margin-left: 1rem;">
-            <wd-radio-group v-model="task.dealResult" shape="dot" inline @change="handleDealResultChange(task)">
-              <wd-radio value="1">
+            <wd-radio-group v-model="task.result" shape="dot" inline @change="handleDealResultChange(task)">
+              <wd-radio :value="1">
                 正常
               </wd-radio>
-              <wd-radio value="2">
+              <wd-radio :value="2">
                 异常
               </wd-radio>
-              <wd-radio value="3">
+              <wd-radio :value="3">
                 不适用
               </wd-radio>
             </wd-radio-group>
-            <view v-if="task.dealResult === '2'" style="margin-top: 8rpx;">
-              <text class="link-text" @tap="toggleTaskStatus(task)">{{ task.hasAnomalyInfo ? '点击查看异常' : '点击填写异常' }}</text>
+            <view v-if="task.result === 2" style="margin-top: 8rpx;">
+              <text class="link-text" @tap="toggleTaskStatus(task)">{{ task.formOperationIssue ? '点击查看异常' : '点击填写异常' }}</text>
             </view>
           </view>
 
@@ -416,15 +386,21 @@ onMounted(async () => {
               </view>
             </view>
             <view v-if="task.dealScore !== null && task.dealScore < task.limitScore && !task.dealHasScore" class="abnormal-link">
-              <text class="link-text" @tap="toggleTaskStatus(task)">{{ task.hasAnomalyInfo ? '点击查看异常' : '点击填写异常（未满分必填）' }}</text>
+              <text class="link-text" @tap="toggleTaskStatus(task)">{{ task.formOperationIssue ? '点击查看异常' : '点击填写异常（未满分必填）' }}</text>
             </view>
           </view>
         </view>
       </view>
     </scroll-view>
-    <centerpopup v-model:center-show="popShow.centerShow" />
-
-    <anomalyPop v-model:anomaly-show="popShow.anomalyShow" :task-id="taskId" :station-id="taskInfo.stationId" :check-item-id="selectTask.id" @anomaly-submitted="handleAnomalySubmitted" />
+    <wd-popup
+      v-model="popShow.anomalyShow"
+      custom-style="border-radius: 32rpx 32rpx 0 0; height: 80%;z-index: 100;"
+      position="bottom"
+      :safe-area-inset-bottom="true"
+      closable
+    >
+      <anomalyPop v-if="popShow.anomalyShow" ref="anomalyPopRef" :task-id="taskId" :station-id="taskInfo.stationId" :check-item-id="selectTask.id" :anomaly-data="anomalyData.value" @anomaly-submitted="handleAnomalySubmitted" />
+    </wd-popup>
     <!-- 确定按钮 -->
     <view class="confirm-btn">
       <button class="btn" @click="submitTasks">

src/pages/schedule/details/deal/photo.vue

@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import { useToast } from 'wot-design-uni'
+import { dealPhotoTask } from '@/api/schedule/task'
+import useUpload from '@/hooks/useUpload'
+
+const toast = useToast()
+
+definePage({
+  style: {
+    navigationBarTitleText: '拍照任务',
+  },
+})
+
+// 任务和检查项ID
+const taskId = ref('')
+const checkId = ref('')
+
+// 表单数据
+const formData = ref({
+  attachments: '',
+  remark: '',
+})
+
+// 上传图片列表
+const fileList = ref<any[]>([])
+
+// 上传状态
+const loading = ref(false)
+
+// 上传问题照片
+const uploadProblemPhoto: any = (file, formData, options) => {
+  const { customUpload } = useUpload({
+    fileType: 'image',
+  })
+  return customUpload(file, formData, options)
+}
+
+// 删除问题照片
+function deleteProblemPhoto(index: number) {
+  fileList.value.splice(index, 1)
+
+  // 更新附件字段
+  const fileNames = fileList.value.map((item: any) => item.name).filter(Boolean)
+  formData.value.attachments = fileNames.join(',')
+}
+
+// 提交表单
+async function submitForm() {
+  // 检查是否有图片上传
+  if (fileList.value.length === 0) {
+    toast.info('请上传图片')
+    return
+  }
+
+  // 构建请求参数
+  const params = {
+    id: taskId.value,
+    attachment: fileList.value.map((item: any) => item.name).join(','),
+    result: formData.value.remark,
+  }
+
+  // 开始提交，显示 loading
+  loading.value = true
+
+  // 调用处理任务附件接口
+  try {
+    const res: any = await dealPhotoTask(params)
+    if (res.code === 200) {
+      toast.success('提交成功')
+      // 跳转回上一页
+      setTimeout(() => {
+        uni.navigateBack()
+      }, 1500)
+    }
+    else {
+      toast.error(res.msg || '提交失败，请重试')
+      return
+    }
+  }
+  catch (error) {
+    toast.error('提交失败，请重试')
+    return
+  }
+  finally {
+    // 提交完成，隐藏 loading
+    loading.value = false
+  }
+}
+
+// 页面加载时获取参数
+onMounted(() => {
+  // 获取页面参数
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  // 使用类型断言获取options
+  const options = (currentPage as any).options || {}
+  taskId.value = options.id || ''
+  checkId.value = options.checkId || ''
+})
+</script>
+
+<template>
+  <view class="page min-h-screen bg-gray-100 p-4">
+    <view class="rounded-lg bg-white p-4 shadow-sm">
+      <!-- 上传图片 -->
+      <view class="mb-6">
+        <view class="mb-4 flex items-center justify-between">
+          <text class="font-medium">上传图片</text>
+        </view>
+        <view>
+          <wd-upload
+            v-model:file-list="fileList"
+            image-mode="aspectFill"
+            :upload-method="uploadProblemPhoto"
+            @delete="deleteProblemPhoto"
+          />
+        </view>
+      </view>
+
+      <!-- 备注 -->
+      <view class="mb-6">
+        <text class="mb-2 block font-medium">处理结果</text>
+        <wd-textarea v-model="formData.remark" placeholder="请填写处理结果" auto-height :maxlength="120" clearable show-word-limit />
+      </view>
+
+      <!-- 提交按钮 -->
+      <view class="mt-8 flex justify-center">
+        <wd-button
+          type="primary"
+          size="large"
+          :loading="loading"
+          @click="submitForm"
+        >
+          提交
+        </wd-button>
+      </view>
+    </view>
+    <wd-toast />
+  </view>
+</template>
+
+<style lang="scss" scoped>
+// 保持与upload.vue一致的样式
+</style>

src/pages/schedule/details/deal/upload.vue

@@ -1,23 +1,170 @@
-<template>
-  <view class="page-container">
-    <view class="page-header">
-      <view class="page-header-left">
-        <view class="page-header-left-title">
-          上传文件
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
+import { useToast } from 'wot-design-uni'
+import { dealUploadTask } from '@/api/schedule/task'
+import useUpload from '@/hooks/useUpload'
+
+const toast = useToast()
 
 const taskId = ref('')
 const checkId = ref('')
 
+// 表单数据
+const formData = ref({
+  attachments: '',
+  remark: '',
+})
+
+// 上传文件列表
+const uploadFiles = ref<any[]>([])
+
+// 初始化useUpload
+const { run: uploadRun, loading: uploadLoading } = useUpload({
+  fileType: 'file',
+  success: (data) => {
+    console.log('上传成功:', data)
+
+    // 构建文件对象
+    const fileObj = {
+      url: data.url || '',
+      originalFilename: data.originalFilename || data.name || '',
+      name: data.fileName || data.name || '',
+    }
+
+    // 添加到上传文件列表
+    uploadFiles.value.push(fileObj)
+
+    // 更新附件字段
+    const fileNames = uploadFiles.value.map((f) => {
+      try {
+        const response = JSON.parse(f.response)
+        return response.data.fileName
+      }
+      catch (error) {
+        console.error('解析文件响应失败:', error)
+        return ''
+      }
+    }).filter(Boolean)
+
+    formData.value.attachments = fileNames.join(',')
+    console.log('文件名称:', formData.value.attachments)
+  },
+  error: (err) => {
+    console.error('上传失败:', err)
+    toast.error('上传失败，请重试')
+  },
+})
+
+// 处理删除文件
+function handleRemoveFile(file: any) {
+  const index = uploadFiles.value.findIndex(f => f.url === file.url)
+  if (index !== -1) {
+    uploadFiles.value.splice(index, 1)
+
+    // 更新附件字段
+    const fileNames = uploadFiles.value.map((f) => {
+      try {
+        const response = JSON.parse(f.response)
+        return response.data.fileName
+      }
+      catch (error) {
+        console.error('解析文件响应失败:', error)
+        return ''
+      }
+    }).filter(Boolean)
+
+    formData.value.attachments = fileNames.join(',')
+  }
+}
+
+// 提交表单
+async function submitForm() {
+  // 这里可以添加表单验证逻辑
+
+  // 检查是否有文件上传
+  if (uploadFiles.value.length === 0) {
+    toast.info('请上传附件')
+    return
+  }
+
+  // 构建请求参数
+  const params = {
+    taskId: Number(taskId.value),
+    checkId: Number(checkId.value),
+    ...formData.value,
+    id: taskId.value,
+    attachment: uploadFiles.value.map(f => f.name).join(','),
+    attachmentName: uploadFiles.value.map(f => f.originalFilename).join(','),
+    remark: formData.value.remark,
+  }
+
+  // 调用处理任务附件接口
+  try {
+    const res: any = await dealUploadTask(params)
+    if (res.code === 200) {
+      toast.success('提交成功')
+      // 跳转回上一页
+      setTimeout(() => {
+        uni.navigateBack()
+      }, 1500)
+    }
+    else {
+      toast.error(res.msg || '提交失败，请重试')
+      return
+    }
+  }
+  catch (error) {
+    toast.error('提交失败，请重试')
+    return
+  }
+}
+
+// 页面加载时获取参数
 onMounted(() => {
-//   taskId.value = getQueryParam('id') || ''
-//   checkId.value = getQueryParam('checkId') || ''
+  // 获取页面参数
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  // 使用类型断言获取options
+  const options = (currentPage as any).options || {}
+  taskId.value = options.id || ''
+  checkId.value = options.checkId || ''
 })
 </script>
+
+<template>
+  <view class="page min-h-screen bg-gray-100 p-4">
+    <view class="rounded-lg bg-white p-4 shadow-sm">
+      <!-- 上传附件 -->
+      <view class="mb-6">
+        <view class="flex items-center justify-between">
+          <text class="font-medium">上传附件</text>
+          <wd-button type="text" @click="uploadRun">
+            点击上传附件
+          </wd-button>
+        </view>
+        <view v-for="(file, index) in uploadFiles" :key="index" class="mt-2 flex items-center justify-between">
+          <wd-icon name="close-circle" class="mr-2 text-red-500" @click="handleRemoveFile(file)" />
+          <wd-text :text="file.originalFilename" class="flex-1" />
+        </view>
+      </view>
+
+      <!-- 备注 -->
+      <view class="mb-6">
+        <text class="mb-2 block font-medium">备注</text>
+        <wd-textarea v-model="formData.remark" placeholder="请填写备注" auto-height :maxlength="120" clearable show-word-limit />
+      </view>
+
+      <!-- 提交按钮 -->
+      <view class="mt-8 flex justify-center">
+        <wd-button
+          type="primary"
+          size="large"
+          @click="submitForm"
+        >
+          提交
+        </wd-button>
+      </view>
+      <wd-toast />
+    </view>
+  </view>
+</template>

src/pages/schedule/details/taskdetails/index.vue

@@ -1,14 +1,119 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+
+import { useRoute } from 'vue-router'
+import { getCheckSubItemsByTaskId, getChecktItemsByTaskId } from '@/api/schedule/check'
+import { getTaskDetail } from '@/api/schedule/task'
+
+const route = useRoute()
+const taskId = ref(Number(route.query.id))
+const checkId = ref(Number(route.query.checkId))
+const taskInfo = ref<any>({})
+const checkSubItems = ref<any[]>([])
+const activeArea = ref(0)
+const popupShow = ref({
+  centerShow: false,
+  bottomShow: false,
+})
+
+const currentCheckItem = ref<any>({})
+
+const statics = ref({
+  score: 0,
+  totalScore: 0,
+  totalItems: 0,
+  photoCount: 0,
+})
+
+function init() {
+  // 并发获取数据
+  Promise.all([
+    getTaskDetail(taskId.value),
+    getChecktItemsByTaskId({
+      checkId: checkId.value,
+      pageSize: 100,
+    }),
+    getCheckSubItemsByTaskId({
+      checkId: checkId.value,
+      pageSize: 100,
+    }),
+  ]).then(([taskDetailRes, checkItemsRes, checkSubItemsRes]: any) => {
+    if (taskDetailRes.data) {
+      taskInfo.value = taskDetailRes.data
+    }
+    // 处理检查项数据
+    checkSubItems.value = checkSubItemsRes?.rows || []
+    checkSubItems.value.forEach((item: any) => {
+      item.statics = {
+        score: 0,
+        totalScore: 0,
+        totalItems: 0,
+        photoCount: 0,
+      }
+      item.items
+        = checkItemsRes?.rows?.filter(
+          (subItem: any) => subItem.subItemId === item.id,
+        ) || []
+      // 为每个任务添加 score 字段
+      item.items.forEach((task: any) => {
+        if (task.checkResult === 2) {
+          item.statics.score += task.score || 0
+          item.statics.totalScore += (task.limitScore || 0).length
+        }
+        if (task?.result === 2) {
+          item.statics.totalItems += 1
+        }
+        if (task?.hasPhoto > 0 && (!task?.photoUrl || task?.photoUrl?.length === 0)) {
+          item.statics.photoCount += 1
+        }
+        task.score = task.score || null
+        task.photoUrl = (task.photoUrl || []).map((url: string, index: number) => ({
+          url,
+          name: task.photo.split(',')[index],
+        }))
+      })
+      // 计算总得分
+      statics.value.score += item.statics.score
+      statics.value.totalScore += item.statics.totalScore
+      statics.value.totalItems += item.statics.totalItems
+      statics.value.photoCount += item.statics.photoCount
+    })
+    // 更新检查项数据
+    activeArea.value = 0
+    currentCheckItem.value = checkSubItems.value[0] || {}
+  })
+}
+const toastHtml = ref('')
+function helpClick(task: any) {
+  toastHtml.value = task.checkDescription
+  popupShow.value.centerShow = true
+}
+
+function helpClose() {
+  toastHtml.value = ''
+  popupShow.value.centerShow = false
+}
+
+async function changeTab({ index }: { index: number }) {
+  currentCheckItem.value = checkSubItems.value[index] || {}
+}
+
+onMounted(async () => {
+  await init()
+})
+</script>
+
 <template>
   <view class="task-management">
     <view class="fixed-area">
       <view class="head-Card">
         <view class="head-Card-title">
-          未来路加油站
+          {{ taskInfo.stationName || '' }}
         </view>
         <view class="head-Card-tab">
           <view class="head-Card-tab-item">
             <view class="tab-item-num">
-              0
+              {{ statics.photoCount || 0 }}
             </view>
             <view class="tab-item-text">
               无拍照
@@ -17,7 +122,7 @@
           <view class="head-Card-tab-item">
             <view class="tab-item-Middle">
               <view class="tab-item-num">
-                0
+                {{ statics.totalItems || 0 }}
               </view>
               <view class="tab-item-text">
                 异常总数
@@ -26,8 +131,7 @@
           </view>
           <view class="head-Card-tab-item">
             <view class="tab-item-num">
-              0 /
-              <text style="font-size: 24rpx; font-weight: 500">10</text>
+              {{ statics.score || 0 }} / {{ statics.totalScore || 0 }}
             </view>
             <view class="tab-item-text">
               总得分
@@ -36,9 +140,9 @@
         </view>
       </view>
       <view>
-        <wd-tabs v-model="tab">
-          <block v-for="item in tabs" :key="item">
-            <wd-tab :title="`${item}`" :name="item" />
+        <wd-tabs v-model="activeArea" @click="changeTab">
+          <block v-for="(item, index) in checkSubItems" :key="index">
+            <wd-tab :title="`${item.name}`" :name="index" />
           </block>
         </wd-tabs>
       </view>
@@ -47,43 +151,43 @@
     <scroll-view class="task-container" scroll-y>
       <view class="task-top-left">
         <text>
-          异常数<text style="color: #31373d; font-weight: 600"> 0</text>
+          异常数 <text style="color: #31373d; font-weight: 600">
+            {{ currentCheckItem?.statics?.totalItems || 0 }}
+          </text>
         </text>
-        <text style="color: #31373d; font-weight: 600">|</text>
+        <text style="color: #31373d; font-weight: 600"> | </text>
         <text>
-          得分<text style="color: #31373d; font-weight: 600"> 0/0</text>
+          得分 <text style="color: #31373d; font-weight: 600">
+            {{ currentCheckItem?.statics?.score || 0 }} / {{ currentCheckItem?.statics?.totalScore || 0 }}
+          </text>
         </text>
       </view>
       <view class="tasks">
         <view
-          v-for="(task, index) in currentTasks"
+          v-for="(task, index) in currentCheckItem?.items || []"
           :key="index"
           class="task-item"
         >
           <!-- 任务描述 -->
           <view class="task-description">
-            <text class="task-number">{{ index + 1 }}.</text>
+            <text class="task-number">{{ +index + 1 }}.</text>
             <text class="task-text">
-              {{ task.description }}
-              <wd-icon
-                v-if="task?.questionicon"
-                :name="task?.questionicon"
-                size="32rpx"
-                @click="() => (popupshow.centershow = true)"
-              />
+              {{ task.tagName ? `【${task.tagName.replace(/,/g, '|')}】` : '' }}
+              {{ task.itemName }}
+              <wd-icon v-if="task?.checkDescription" name="help-circle" size="16px" @click="helpClick(task)" />
             </text>
           </view>
           <!-- 操作说明-图片示例 -->
           <view
-            v-if="task.instructions && task.examples.length > 0"
+            v-if="task.exampleImageUrl.length > 0"
             class="task-instructions-example"
           >
-            <view class="task-instructions">
-              <text class="instructions-text">{{ task.instructions }}</text>
+            <view v-if="task.photoPrompt" class="task-instructions">
+              <text class="instructions-text">{{ `拍照：${task.photoPrompt}` }}</text>
             </view>
             <view class="example-images">
               <view
-                v-for="(example, idx) in task.examples"
+                v-for="(example, idx) in task.exampleImageUrl"
                 :key="idx"
                 class="example-image"
               >
@@ -93,41 +197,57 @@
             </view>
           </view>
           <!-- 已上传图片 -->
-          <view v-if="task.images.length > 0" class="uploaded-images">
+          <view v-if="task?.photoUrl?.length > 0" class="uploaded-images">
             <view
-              v-for="(image, idx) in task.images"
+              v-for="(image, idx) in task.photoUrl"
               :key="idx"
               class="uploaded-image"
             >
-              <image :src="image" mode="aspectFill" />
+              <!-- <image :src="image" mode="aspectFill" /> -->
+              <wd-img style="width: 100%; height: 100%" :src="image.url" :enable-preview="true" />
             </view>
           </view>
           <!-- 几号枪 -->
-          <view v-if="task.jihaoqiang" class="jihaoqiang">
-            <text class="jihaoqiang-text">{{ task.jihaoqiang }}</text>
+          <view v-if="task?.inputItem" class="whichGun">
+            <text class="whichGun-text">{{ task.inputItem }}</text>
           </view>
           <!-- 状态 -->
           <view class="task-status">
             <view>
               <text class="status-text">
-                整体：{{ task.status === 'normal' ? '正常' : '异常' }}
+                整体：{{ task.result === 1 ? '正常' : task.result === 2 ? '异常' : '不适用' }}
               </text>
             </view>
           </view>
-          <view v-if="task.exceptiondescription" class="exceptiondescription">
-            <view class="exceptiondescription-title">
+          <view v-if="task?.formOperationIssue?.id" class="anomalyDescription">
+            <view class="anomalyDescription-title">
               异常描述：
             </view>
-            <view class="exceptiondescription-content">
-              {{ task.exceptiondescription }}
+            <view class="anomalyDescription-content">
+              {{ task.formOperationIssue?.problemDescription || '' }}
             </view>
           </view>
         </view>
       </view>
     </scroll-view>
-    <centerpopup v-model:centershow="popupshow.centershow" />
-    <bottompopup v-model:bottomshow="popupshow.bottomshow" />
-    <!-- 确定按钮 -->
+
+    <wd-popup
+      v-model="popupShow.centerShow"
+      custom-style="border-radius:32rpx;"
+      @close="helpClose"
+    >
+      <view class="popup-content">
+        <view style="font-size: 36rpx; font-weight: 500; color: #020917">
+          说明
+        </view>
+        <view style="font-size: 32rpx; font-weight: 400; color: #343a45" v-html="toastHtml" />
+        <view style="width: 100%">
+          <button class="btn" @click="helpClose">
+            我 知 道 了
+          </button>
+        </view>
+      </view>
+    </wd-popup>
     <view class="confirm-btn">
       <button class="btn" @click="submitTasks">
         评 论
@@ -136,124 +256,11 @@
   </view>
 </template>
 
-<script lang="ts" setup>
-import { computed, ref } from 'vue'
-import useUpload from '@/hooks/useUpload'
-import bottompopup from '../popup/bottompopup.vue'
-import centerpopup from '../popup/centerpopup.vue'
-
-const popupshow = ref({
-  centershow: false,
-  bottomshow: false,
-})
-// const popupshow = ref({})
-const tab = ref('前庭')
-const tabs = ['前庭', '自助服务区', '罐区', '便利店']
-
-// 定义任务类型
-interface Task {
-  id: string
-  type: string
-  description: string
-  icon?: string
-  instructions: string
-  examples: string[]
-  images: string[]
-  jihaoqiang: string
-  status: 'normal' | 'abnormal'
-  questionicon: string
-  exceptiondescription: string
-}
-
-// 任务数据
-const tasks = ref<Task[]>([
-  {
-    id: '1',
-    type: '前庭',
-    description:
-      '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-    instructions: '拍照：按照示例图拍摄前庭内海报宣传物，可上传多张照片',
-    examples: [
-      'https://picsum.photos/id/1018/200/150',
-      'https://picsum.photos/id/1019/200/150',
-    ],
-    images: [
-      'https://picsum.photos/id/1028/200/150',
-      'https://picsum.photos/id/1022/200/150',
-      'https://picsum.photos/id/1023/200/150',
-      'https://picsum.photos/id/1026/200/150',
-      'https://picsum.photos/id/1025/200/150',
-      'https://picsum.photos/id/1029/200/150',
-      'https://picsum.photos/id/1025/200/150',
-    ],
-    questionicon: 'help-circle',
-    jihaoqiang: '',
-    status: 'normal',
-    exceptiondescription: '',
-  },
-  {
-    id: '2',
-    type: '前庭',
-    description: '[卫生] 抽油枪栓是否出现空转或存在明显渗油。',
-    icon: 'help-circle',
-    instructions: '',
-    examples: [],
-    images: [],
-    questionicon: 'help-circle',
-    jihaoqiang: '12号枪',
-
-    status: 'normal',
-    exceptiondescription: '',
-  },
-  {
-    id: '3',
-    type: '前庭',
-    description:
-      '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-    instructions: '',
-    examples: [],
-    images: [],
-    questionicon: 'help-circle',
-    jihaoqiang: '13号枪',
-    status: 'abnormal',
-    exceptiondescription:
-      '异常描述异常描述异常描述异常描述异常描述异常描述异常描述异常描述异常描述异常描述异常描述',
-  },
-  {
-    id: '4',
-    type: '前庭',
-    description:
-      '[AI] [卫生] 前庭海报整齐不歪斜，干净无灰尘污渍（立柱、灯箱、展架等）。',
-    instructions: '',
-    examples: [],
-    images: [],
-    questionicon: 'help-circle',
-    jihaoqiang: '',
-    status: 'normal',
-    exceptiondescription: '',
-  },
-])
-
-// 根据当前标签筛选任务
-const currentTasks = computed(() => {
-  return tasks.value.filter(task => task.type === tab.value)
-})
-// 提交任务
-function submitTasks() {
-  console.log('提交任务', tasks.value)
-  // 这里可以添加提交逻辑
-  uni.showToast({
-    title: '提交成功',
-    icon: 'success',
-  })
-}
-</script>
-
 <style lang="scss" scoped>
 .task-management {
   display: flex;
   flex-direction: column;
-  height: 1500rpx;
+  min-height: 100vh;
   overflow: hidden;
   .fixed-area {
     flex-shrink: 0;
@@ -326,7 +333,7 @@ function submitTasks() {
     // padding: 0 30rpx;
     .task-top-left {
       margin-left: 30rpx;
-      width: 230rpx;
+      width: 250rpx;
       height: 52rpx;
       background-color: #e8f3ff;
       border-radius: 12rpx;
@@ -416,7 +423,7 @@ function submitTasks() {
           }
         }
       }
-      .jihaoqiang {
+      .whichGun {
         width: 100%;
         height: 96rpx;
         background-color: #f5f5f5;
@@ -428,7 +435,7 @@ function submitTasks() {
         box-sizing: border-box;
         margin-bottom: 10rpx;
         border-radius: 20rpx;
-        .jihaoqiang-text {
+        .whichGun-text {
           font-size: 28rpx;
           color: #4e5969;
           font-weight: 500;
@@ -446,16 +453,16 @@ function submitTasks() {
           color: #31373d;
         }
       }
-      .exceptiondescription {
+      .anomalyDescription {
         width: 100%;
         border-bottom: 1px solid #eeeeee;
         font-size: 28rpx;
         padding-bottom: 40rpx;
-        .exceptiondescription-title {
+        .anomalyDescription-title {
           font-weight: 500;
           color: #31373d;
         }
-        .exceptiondescription-content {
+        .anomalyDescription-content {
           font-weight: 400;
           color: #4e5969;
         }
@@ -483,9 +490,14 @@ function submitTasks() {
 
   // 确定按钮
   .confirm-btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
     padding: 20rpx 30rpx;
     background-color: white;
     border-top: 1rpx solid #eee;
+    z-index: 100;
 
     .btn {
       width: 100%;
@@ -500,4 +512,34 @@ function submitTasks() {
     }
   }
 }
+
+.custom-txt {
+  width: 400rpx;
+  height: 400rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 32rpx;
+}
+.popup-content {
+  width: 600rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  padding: 40rpx;
+  box-sizing: border-box;
+  gap: 40rpx;
+  .btn {
+    width: 100%;
+    height: 80rpx;
+    background-color: #215acd;
+    color: white;
+    font-size: 32rpx;
+    border-radius: 12rpx;
+    font-weight: 400;
+    border: none;
+    outline: none;
+  }
+}
 </style>

src/pages/schedule/details/index.vue

@@ -1,14 +1,22 @@
 <script setup lang="ts">
 import dayjs from 'dayjs'
 import { keyBy } from 'lodash-es'
-import { ref } from 'vue'
+import { storeToRefs } from 'pinia'
+import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useMessage, useToast } from 'wot-design-uni'
-import { confirmDoneTask, getTaskDetail } from '@/api/schedule/task'
+import { closeTask, confirmDoneTask, getTaskDetail, transferTask } from '@/api/schedule/task'
+import { getAllUsers } from '@/api/system/users'
 
+import AttachmentList from '@/components/AttachmentList.vue'
+import { useUserStore } from '@/store'
 import { authStatusOptions, taskLevelOptions, taskStatusOptions } from '@/utils/dicts'
 
-const message = useMessage()
+const userStore = useUserStore()
+
+const { userInfo } = storeToRefs(userStore)
+
+const wotMessage = useMessage()
 const toast = useToast()
 
 // 定义页面配置，注册路由
@@ -27,6 +35,11 @@ const taskInfo: any = ref({})
 const taskOther: any = ref({})
 const taskResult: any = ref({})
 
+// 转交功能相关
+const users = ref<any[]>([])
+const value = ref<string[]>([])
+const customShow = ref<string>('')
+
 // 切换更多内容显示/隐藏
 function toggleMore() {
   isExpanded.value = !isExpanded.value
@@ -34,7 +47,7 @@ function toggleMore() {
 
 async function dealConfirmTaskEvent() {
 // 二次弹框确认
-  message.confirm({
+  wotMessage.confirm({
     msg: `确认完成任务 ${taskInfo.value.taskName} 吗？`,
     title: '确认完成',
   }).then(async () => {
@@ -64,6 +77,12 @@ async function dealTaskEvent() {
       })
       return
     }
+    case 'photo': {
+      uni.navigateTo({
+        url: `/pages/schedule/details/deal/photo?id=${taskInfo.value.taskList?.[0]?.id}`,
+      })
+      return
+    }
     case 'confirm': {
       await dealConfirmTaskEvent()
 
@@ -109,7 +128,7 @@ async function dealTaskEvent() {
     }
     case 'upload': {
       uni.navigateTo({
-        url: `/pages/schedule/details/deal/upload?id=${taskId.value}`,
+        url: `/pages/schedule/details/deal/upload?id=${taskInfo.value.taskList?.[0]?.id}`,
       })
       return
     }
@@ -136,6 +155,61 @@ function viewDetails3() {
   })
 }
 
+// 获取用户列表
+async function getUserList() {
+  console.log('调用getAllUsers时的stationId:', taskInfo.value.stationId)
+  const res: any = await getAllUsers({
+    pageNum: 10000,
+    stationId: taskInfo.value.stationId,
+  })
+  if (res.code === 200) {
+    users.value = res.data.map((item: any) => ({
+      label: item.nickName,
+      value: item.userId,
+    }))
+  }
+}
+
+// 选择器确认事件
+function handleTransferTask({ value, selectedItems }: any) {
+  console.log('value:', value[0], taskInfo.value.executorId)
+  if (value.length === 0) {
+    toast.error('请选择执行人')
+    return
+  }
+
+  if (value[0] === taskInfo.value.executorId) {
+    toast.error('不能将任务转交给当前执行人')
+    console.log('不能将任务转交给当前执行人', toast)
+
+    return
+  }
+
+  wotMessage.confirm({
+    msg: `确认将任务 ${taskInfo.value.taskName} 转交给 ${selectedItems.map((item: any) => item.label).join(', ')} 吗？`,
+    title: '确认转交',
+  }).then(async () => {
+    try {
+      const res: any = await transferTask({
+        id: taskInfo.value.id || 0,
+        executorId: value[0],
+      })
+      if (res.code !== 200) {
+        toast.error(res.msg || '操作失败')
+        return
+      }
+
+      toast.success('转交任务成功')
+      await init()
+    }
+    catch {
+      toast.error('操作失败')
+    }
+  }).catch(() => {
+    return
+  })
+}
+
 /**
  * 获取任务时间
  * @returns 任务时间字符串
@@ -154,12 +228,33 @@ function downloadFile(file: any, fileName: string) {
   console.log('downloadFile:', file, fileName)
 }
 
+const buttons = ref({
+  deal: false,
+  transfer: false,
+  close: false,
+})
+
 async function init() {
   const res: any = await getTaskDetail(taskId.value)
   taskInfo.value = res.data || {}
   if (!taskInfo.value.status) {
     taskInfo.value.status = 0
   }
+  console.log(userInfo.value)
+
+  if (taskInfo.value.status === 1) {
+    if (taskInfo.value.executorId === userInfo.value.user?.userId) {
+      buttons.value.deal = true
+    }
+    if (userInfo.value.user?.createBy === taskInfo.value.createBy || userInfo.value.user?.post?.type === '"headquarters"' || (taskInfo.value?.taskTemplate?.isMust === 0 && taskInfo.value.executorId === userInfo.value.user?.userId)) {
+      buttons.value.close = true
+
+      if (taskInfo.value.authStatus === 0) {
+        buttons.value.transfer = true
+      }
+    }
+  }
+
   // 假设从接口返回数据中获取taskOther和taskResult
   taskOther.value.taskTypeName = taskInfo.value?.formTypeName || '-'
 
@@ -195,6 +290,11 @@ async function init() {
     taskOther.value.taskFrequencyName
       = taskInfo.value?.taskTemplate?.taskFrequencyName || '-'
   }
+
+  // 获取用户列表
+  if (taskInfo.value.stationId) {
+    await getUserList()
+  }
 }
 
 // 状态标签配置
@@ -206,9 +306,44 @@ const priorityConfig: any = keyBy(taskLevelOptions, 'value')
 // 授权状态标签配置
 const authStatusConfig: any = keyBy(authStatusOptions, 'value')
 
-onMounted(async () => {
+function goDetail() {
+  uni.navigateTo({
+    url: `/pages/schedule/details/detail/inspection?id=${taskId.value}&checkId=${taskInfo.value.taskList[0].id}`,
+  })
+}
+
+/**
+ * 关闭任务按钮点击事件
+ */
+async function closeTaskEvent() {
+  // 二次弹框确认
+  wotMessage.confirm({
+    msg: `确认关闭任务 ${taskInfo.value.taskName} 吗？`,
+    title: '确认关闭',
+  }).then(async () => {
+    try {
+      await closeTask({
+        id: taskInfo.value.id || 0,
+      })
+
+      toast.success('关闭任务成功')
+      await init()
+    }
+    catch {
+      toast.error('操作失败')
+    }
+  }).catch(() => {
+    return
+  })
+}
+
+onShow(async () => {
   await init()
 })
+
+onMounted(async () => {
+  // await init()
+})
 </script>
 
 <template>
@@ -245,7 +380,7 @@ onMounted(async () => {
     <!-- 标准指引 -->
     <view class="section">
       <view class="section-title">
-        任务信息
+        基础信息
       </view>
       <view class="standard-guide">
         <view class="guide-item">
@@ -268,8 +403,17 @@ onMounted(async () => {
           <view class="guide-label">
             执行人
           </view>
-          <view class="guide-value">
+          <view class="guide-value flex items-center justify-between">
             {{ taskInfo.executorName || '-' }}
+            <wd-select-picker
+              v-model="value"
+              title="选择转交人"
+              filterable :max="1" use-default-slot :columns="users" style="z-index:101" @confirm="handleTransferTask"
+            >
+              <wd-button v-if="buttons.transfer" type="text">
+                转交
+              </wd-button>
+            </wd-select-picker>
           </view>
         </view>
         <view class="guide-item">
@@ -320,33 +464,27 @@ onMounted(async () => {
             {{ getTaskTime() || '-' }}
           </view>
         </view>
-        <!-- <view class="guide-item">
-          <view class="guide-label">
-            任务描述
-          </view>
-          <view class="guide-value">
-            {{ taskInfo.description || '-' }}
-          </view>
-        </view> -->
-        <view v-if="taskInfo.descriptionFilesUrl && taskInfo.descriptionFilesUrl.length > 0" class="guide-item">
+
+        <view v-if="taskInfo.descriptionFilesUrl && taskInfo.descriptionFilesUrl.length > 0" class="guide-item attachment-guide-item">
           <view class="guide-label">
             详情附件
           </view>
           <view class="guide-value">
-            <!-- 使用wot-ui样式显示附件 -->
-            <view class="attachment-list">
-              <wd-tag
-                v-for="(file, index) in taskInfo.descriptionFilesUrl"
-                :key="index"
-                custom-class="attachment-tag"
-                type="primary"
-                plain
-              >
-                附件{{ index + 1 }}
-              </wd-tag>
-            </view>
+            <!-- 使用附件列表组件显示附件 -->
+            <AttachmentList
+              :files="taskInfo.descriptionFilesUrl"
+              :size="30"
+            />
           </view>
         </view>
+      </view>
+    </view>
+
+    <view v-if="taskInfo.status === 3" class="section">
+      <view class="section-title">
+        处理结果
+      </view>
+      <view class="standard-guide">
         <view v-if="taskResult.handleContent || taskInfo.cancelReason" class="guide-item">
           <view class="guide-label">
             处理情况
@@ -363,24 +501,17 @@ onMounted(async () => {
             {{ taskInfo.completeTime || taskInfo.cancelTime || '-' }}
           </view>
         </view>
-        <view v-if="taskResult.files && taskResult.files.length > 0" class="guide-item">
+        <view v-if="taskResult.files && taskResult.files.length > 0" class="guide-item attachment-guide-item">
           <view class="guide-label">
             处理附件
           </view>
           <view class="guide-value">
-            <!-- 使用wot-ui样式显示附件列表 -->
-            <view class="attachment-list">
-              <wd-tag
-                v-for="(file, index) in taskResult.files"
-                :key="index"
-                custom-class="attachment-tag"
-                type="success"
-                plain
-                @click="downloadFile(file, taskResult.fileNames[index] || `附件${index + 1}`)"
-              >
-                {{ taskResult.fileNames[index] || `附件${index + 1}` }}
-              </wd-tag>
-            </view>
+            <!-- 使用附件列表组件显示附件 -->
+            <AttachmentList
+              :files="taskResult.files"
+              :file-names="taskResult.fileNames"
+              :size="30"
+            />
           </view>
         </view>
       </view>
@@ -416,8 +547,38 @@ onMounted(async () => {
       </view>
     </view>
 
-    <view class="detail-btn" @tap="dealTaskEvent">
-      <text>处理任务</text>
+    <!-- 按钮容器 -->
+    <view class="btn-container">
+      <!-- 关闭任务按钮 -->
+      <wd-button
+        v-if="buttons.close"
+        type="error"
+        class="close-btn"
+        @click="closeTaskEvent"
+      >
+        关闭任务
+      </wd-button>
+      <!-- 处理任务按钮 -->
+      <wd-button
+        v-if="buttons.deal"
+        type="primary"
+        class="deal-btn"
+        @click="dealTaskEvent"
+      >
+        处理任务
+      </wd-button>
+    </view>
+
+    <!-- 查看详情按钮 -->
+    <view class="view-detail-container">
+      <wd-button
+        v-if="[3].includes(taskInfo.status)"
+        type="primary"
+        class="view-detail-btn"
+        @click="goDetail"
+      >
+        查看详情
+      </wd-button>
     </view>
     <!-- <view class="detail-btn" @tap="viewDetails2">
       <text>查 看 详 情2</text>
@@ -425,6 +586,8 @@ onMounted(async () => {
     <view class="detail-btn" @tap="viewDetails3">
       <text>查 看 详 情3</text>
     </view> -->
+    <wd-message-box />
+    <wd-toast />
   </view>
 </template>
 
@@ -432,7 +595,7 @@ onMounted(async () => {
 .details-box {
   display: flex;
   flex-direction: column;
-  padding: 30rpx 24rpx;
+  padding: 30rpx 24rpx 160rpx;
   background-color: #ffffff;
 
   .details-box-title {
@@ -506,6 +669,7 @@ onMounted(async () => {
   .standard-guide {
     .guide-item {
       display: flex;
+      align-items: center;
       margin-bottom: 24rpx;
 
       &:last-child {
@@ -517,6 +681,7 @@ onMounted(async () => {
         font-size: 28rpx;
         color: #6c757d;
         font-weight: 400;
+        line-height: 52rpx;
       }
 
       .guide-value {
@@ -524,6 +689,35 @@ onMounted(async () => {
         font-size: 28rpx;
         font-weight: 400;
         color: #31373d;
+        line-height: 52rpx;
+      }
+
+      // 调整转交按钮样式，确保不改变行高
+      .guide-value :deep(.wd-button) {
+        margin: 0;
+        padding: 0;
+        height: auto;
+        line-height: 52rpx;
+      }
+
+      .guide-value :deep(.wd-button__text) {
+        margin: 0;
+        padding: 0;
+        line-height: 52rpx;
+      }
+    }
+
+    // 附件列表特殊样式
+    .attachment-guide-item {
+      flex-direction: column;
+      align-items: flex-start;
+
+      .guide-label {
+        margin-bottom: 12rpx;
+      }
+
+      .guide-value {
+        width: 100%;
       }
     }
   }
@@ -547,25 +741,38 @@ onMounted(async () => {
     }
   }
 
-  // 查看详情按钮
-  .detail-btn {
+  // 按钮容器
+  .btn-container {
     display: flex;
-    align-items: center;
-    justify-content: center;
+    gap: 16rpx;
+    position: fixed;
+    bottom: 32rpx;
+    left: 24rpx;
+    right: 24rpx;
+    z-index: 100;
+  }
+
+  // 并排放置的按钮样式
+  .btn-container .wd-button {
+    flex: 1;
     height: 96rpx;
-    background-color: #215acd;
-    border-radius: 14rpx;
-    margin-bottom: 32rpx;
+    font-size: 32rpx;
+  }
+
+  // 查看详情按钮容器
+  .view-detail-container {
     position: fixed;
     bottom: 32rpx;
     left: 24rpx;
     right: 24rpx;
-    z-index: 999;
-    text {
-      font-size: 32rpx;
-      color: #ffffff;
-      font-weight: 500;
-    }
+    z-index: 100;
+  }
+
+  // 查看详情按钮样式
+  .view-detail-btn {
+    width: 100%;
+    height: 96rpx;
+    font-size: 32rpx;
   }
 
   // 更多内容样式

src/pages/schedule/details/popup/anomaly.vue

@@ -8,13 +8,9 @@ import { getTags } from '@/api/system/tags'
 import { getAllUsers } from '@/api/system/users'
 import useUpload from '@/hooks/useUpload'
 // import { useUserStore } from '@/store'
-import calendar from '@/utils/calendar.vue'
+// import calendar from '@/utils/calendar.vue'
 
 const props = defineProps({
-  anomalyShow: {
-    type: Boolean,
-    default: false,
-  },
   taskId: {
     type: Number,
     default: 0,
@@ -27,6 +23,10 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
+  anomalyData: {
+    type: Object,
+    default: () => ({}),
+  },
 })
 const emit = defineEmits(['update:anomalyShow', 'anomaly-submitted'])
 console.log(props.stationId)
@@ -34,9 +34,6 @@ const tags = ref<any[]>([])
 const users = ref<any[]>([])
 // const userStore = useUserStore()
 // const { userInfo } = storeToRefs(userStore)
-function handleClose() {
-  emit('update:anomalyShow', false)
-}
 
 async function getUserList() {
   console.log('调用getAllUsers时的stationId:', props.stationId)
@@ -96,20 +93,25 @@ const model = reactive<{
   correlationTaskId: '',
 })
 
-const form = ref()
-const loading = ref(false)
-const action: string
-  = ''
-
-const datePickerVisible = ref(false)
+// 更新 model 数据
+function updateModelData(data: any) {
+  if (!data)
+    return
 
-function handleClickCalendar() {
-  datePickerVisible.value = true
-}
-function onconfirmDate(date: string) {
-  model.deadline = date
+  model.isTransferTask = data.isTransferTask?.toString() || '1'
+  model.problemDescription = data.problemDescription || ''
+  model.handlingSuggestion = data.handlingSuggestion || ''
+  model.deadline = data.deadline || ''
+  model.executorId = data.executorId ? [Number(data.executorId)] : []
+  model.ccTo = data.ccTo ? data.ccTo.split(',').map((item: string) => Number(item.trim())) : []
+  model.problemPhoto = data.problemPhoto || []
+  model.tags = data.tags ? data.tags.split(',').map((item: string) => Number(item.trim())) : []
+  model.correlationTaskId = data.correlationTaskId?.toString() || ''
 }
 
+const form = ref()
+const loading = ref(false)
+
 // 上传问题照片
 const uploadProblemPhoto: any = (file, formData, options) => {
   const { customUpload } = useUpload({
@@ -123,24 +125,6 @@ function deleteProblemPhoto(index: number) {
   model.problemPhoto.splice(index, 1)
 }
 
-// 删除处理照片
-function deleteHandlingPhoto(index: number) {
-  model.handlingPhoto.splice(index, 1)
-}
-
-// 验证截止时间是否大于当前时间
-function validateDeadline(value: number | string, resolve: (valid: boolean) => void) {
-  const now = Date.now()
-  // 检查value类型，如果是字符串则转换为时间戳
-  const deadline = typeof value === 'string' ? new Date(value).getTime() : value
-  if (deadline < now) {
-    showSuccess({ msg: '截止时间不能小于当前时间' })
-    resolve(false)
-  }
-  else {
-    resolve(true)
-  }
-}
 function handleSubmit() {
   form.value
     .validate()
@@ -168,12 +152,25 @@ function handleSubmit() {
 
         submitIssue(submitData)
           .then((res) => {
-            console.log(res, 'res')
             // 提交成功后向父组件传递数据
-            emit('anomaly-submitted', { checkItemId: props.checkItemId, data: submitData })
-            // showSuccess({
-            //   msg: '校验通过，数据已提交',
-            // })
+            emit('anomaly-submitted', { checkItemId: props.checkItemId, data: {
+              ...submitData,
+              problemPhoto: model.problemPhoto,
+            } })
+
+            console.log(res, 'res')
+            // 重置表单数据
+            model.isTransferTask = '1'
+            model.problemDescription = ''
+            model.handlingSuggestion = ''
+            model.deadline = ''
+            model.executorId = ''
+            model.ccTo = []
+            model.handlingMeasure = ''
+            model.handlingPhoto = []
+            model.problemPhoto = []
+            model.tags = []
+            model.correlationTaskId = ''
           })
           .catch((error) => {
             console.log(error, 'error')
@@ -202,180 +199,170 @@ watch(() => props.stationId, (newStationId) => {
     getUserList()
   }
 }, { immediate: false })
+
+defineExpose({
+  updateModelData,
+})
 </script>
 
 <template>
   <view>
-    <wd-popup
-      v-model="props.anomalyShow"
-      custom-style="border-radius: 32rpx 32rpx 0 0; height: 80%;z-index: 100;"
-      position="bottom"
-      :safe-area-inset-bottom="true"
-      closable
-      @close="handleClose"
-    >
-      <view class="popup-content">
-        <view class="content-header">
-          <text style="font-size: 34rpx; font-weight: 500; color: #464c51">
-            异常情况
-          </text>
-        </view>
-        <view class="content-main">
-          <wd-form ref="form" :model="model">
-            <view style="display: flex; flex-direction: column; gap: 40rpx; padding-bottom: 100rpx;">
-              <view>
-                <view style="font-size: 32rpx; font-weight: 500; color: #31373d">
-                  是否转任务
-                </view>
-                <view
-                  style="
+    <view class="popup-content">
+      <view class="content-header">
+        <text style="font-size: 34rpx; font-weight: 500; color: #464c51">
+          异常情况
+        </text>
+      </view>
+      <view class="content-main">
+        <wd-form ref="form" :model="model">
+          <view style="display: flex; flex-direction: column; gap: 40rpx; padding-bottom: 100rpx;">
+            <view>
+              <view style="font-size: 32rpx; font-weight: 500; color: #31373d">
+                是否转任务
+              </view>
+              <view
+                style="
                     font-size: 28rpx;
                     font-weight: 400;
                     color: #4e5969;
                     margin-bottom: 20rpx;
                   "
-                >
-                  转任务后会出现在执行人的任务日程视图中
-                </view>
-                <wd-radio-group v-model="model.isTransferTask" shape="dot" inline>
-                  <view style="display: flex; gap: 260rpx">
-                    <wd-radio value="1">
-                      是
-                    </wd-radio>
-                    <wd-radio value="0">
-                      否
-                    </wd-radio>
-                  </view>
-                </wd-radio-group>
+              >
+                转任务后会出现在执行人的任务日程视图中
               </view>
-              <wd-input
-                v-model="model.problemDescription"
-                label="问题描述"
-                label-width="100%"
-                prop="problemDescription"
-                clearable
-                placeholder="请输入"
-                :rules="[{ required: true, message: '请填写问题描述' }]"
-                custom-class="custom-vertical-input"
-              />
-              <view class="custom-vertical-select">
-                <view
-                  style="
+              <wd-radio-group v-model="model.isTransferTask" shape="dot" inline>
+                <view style="display: flex; gap: 260rpx">
+                  <wd-radio value="1">
+                    是
+                  </wd-radio>
+                  <wd-radio value="0">
+                    否
+                  </wd-radio>
+                </view>
+              </wd-radio-group>
+            </view>
+            <wd-input
+              v-model="model.problemDescription"
+              label="问题描述"
+              label-width="100%"
+              prop="problemDescription"
+              clearable
+              placeholder="请输入"
+              :rules="[{ required: true, message: '请填写问题描述' }]"
+              custom-class="custom-vertical-input"
+            />
+            <view class="custom-vertical-select">
+              <view
+                style="
                     margin-bottom: 10rpx;
                     font-size: 28rpx;
                     font-weight: 500;
                     color: #333;
                   "
-                >
-                  标签
-                </view>
-                <wd-select-picker
-                  v-model="model.tags" :columns="tags" filterable
-                  :max="1"
-                  placeholder="请选择"
-                />
+              >
+                标签
               </view>
-              <wd-input
-                v-model="model.handlingSuggestion"
-                label="处理建议"
-                label-width="100%"
-                prop="handlingSuggestion"
-                clearable
-                placeholder="请输入"
-                custom-class="custom-vertical-input"
+              <wd-select-picker
+                v-model="model.tags" :columns="tags" filterable
+                :max="1"
+                placeholder="请选择"
               />
-              <view class="custom-vertical-select">
-                <view
-                  style="
+            </view>
+            <wd-input
+              v-model="model.handlingSuggestion"
+              label="处理建议"
+              label-width="100%"
+              prop="handlingSuggestion"
+              clearable
+              placeholder="请输入"
+              custom-class="custom-vertical-input"
+            />
+            <view class="custom-vertical-select">
+              <view
+                style="
                     margin-bottom: 10rpx;
                     font-size: 28rpx;
                     font-weight: 500;
                     color: #333;
                   "
-                >
-                  <text style="color: red; margin-right: 4rpx; font-size: 28rpx;">* </text>截止时间
-                </view>
-                <wd-datetime-picker
-                  v-model="model.deadline"
-                  type="date"
-                  use-second
-                  :min-date="new Date().getTime()"
-                  :max-date="new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).getTime()"
-                  prop="deadline"
-                  :rules="[{ required: true, message: '请选择截止时间' }]"
-                />
+              >
+                <text style="color: red; margin-right: 4rpx; font-size: 28rpx;">* </text>截止时间
               </view>
-              <view>
-                <view
-                  style="
+              <wd-datetime-picker
+                v-model="model.deadline"
+                type="date"
+                use-second
+                :min-date="new Date().getTime()"
+                :max-date="new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).getTime()"
+                prop="deadline"
+                :rules="[{ required: true, message: '请选择截止时间' }]"
+              />
+            </view>
+            <view>
+              <view
+                style="
                     margin-bottom: 10rpx;
                     font-size: 28rpx;
                     font-weight: 500;
                     color: #333;
                   "
-                >
-                  问题照片
-                </view>
-                <view>
-                  <wd-upload
-                    v-model:file-list="model.problemPhoto"
-                    image-mode="aspectFill"
-                    :upload-method="uploadProblemPhoto"
-                    @delete="deleteProblemPhoto"
-                  />
-                </view>
+              >
+                问题照片
               </view>
-              <view class="custom-vertical-select">
-                <view
-                  style="
+              <view>
+                <wd-upload
+                  v-model:file-list="model.problemPhoto"
+                  image-mode="aspectFill"
+                  :upload-method="uploadProblemPhoto"
+                  @delete="deleteProblemPhoto"
+                />
+              </view>
+            </view>
+            <view class="custom-vertical-select">
+              <view
+                style="
                     margin-bottom: 10rpx;
                     font-size: 28rpx;
                     font-weight: 500;
                     color: #333;
                   "
-                >
-                  <text style="color: red; margin-right: 4rpx; font-size: 28rpx;">* </text>执行人
-                </view>
-                <wd-select-picker
-                  v-model="model.executorId" :columns="users" filterable
-                  placeholder="请选择"
-                  prop="executorId"
-                  :max="1"
-                  :rules="[{ required: true, message: '请选择执行人' }]"
-                />
+              >
+                <text style="color: red; margin-right: 4rpx; font-size: 28rpx;">* </text>执行人
               </view>
-              <view class="custom-vertical-select">
-                <view
-                  style="
+              <wd-select-picker
+                v-model="model.executorId" :columns="users" filterable
+                placeholder="请选择"
+                prop="executorId"
+                :max="1"
+                :rules="[{ required: true, message: '请选择执行人' }]"
+              />
+            </view>
+            <view class="custom-vertical-select">
+              <view
+                style="
                     margin-bottom: 10rpx;
                     font-size: 28rpx;
                     font-weight: 500;
                     color: #333;
                   "
-                >
-                  抄送人
-                </view>
-                <wd-select-picker
-                  v-model="model.ccTo" :columns="users" filterable
-                  placeholder="请选择"
-                />
+              >
+                抄送人
               </view>
+              <wd-select-picker
+                v-model="model.ccTo" :columns="users" filterable
+                placeholder="请选择"
+              />
             </view>
-          </wd-form>
-        </view>
-        <view class="footer">
-          <button class="btn" :disabled="loading" @click="handleSubmit">
-            <wd-loading v-if="loading" size="20px" color="#ffffff" />
-            <text v-else>提 交</text>
-          </button>
-        </view>
+          </view>
+        </wd-form>
+      </view>
+      <view class="footer">
+        <button class="btn" :disabled="loading" @click="handleSubmit">
+          <wd-loading v-if="loading" size="20px" color="#ffffff" />
+          <text v-else>提 交</text>
+        </button>
       </view>
-    </wd-popup>
-    <calendar
-      v-model:date-picker-visible="datePickerVisible"
-      :detailedtime="false"
-      @confirm-date="onconfirmDate"
-    />
+    </view>
   </view>
 </template>
 

src/pages/schedule/details/popup/centerpopup.vue

@@ -1,72 +0,0 @@
-<template>
-  <view>
-    <wd-popup
-      v-model="props.centershow"
-      custom-style="border-radius:32rpx;"
-      @close="handleClose"
-    >
-      <view class="popup-content">
-        <view style="font-size: 36rpx; font-weight: 500; color: #020917"
-          >说明</view
-        >
-        <view style="font-size: 32rpx; font-weight: 400; color: #343a45">
-          出入口清洁:【运营手册-第九章-第 2节】<br />
-          1、清洁要求:绿化带修葺良好，草地清洁;<br />
-          2、清洁频率:绿化带每非天繁忙时间至少检查清洁一次。
-        </view>
-        <view style="width: 100%">
-          <button class="btn" @click="handleClose">我 知 道 了</button>
-        </view>
-      </view>
-    </wd-popup>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { defineProps, defineEmits } from 'vue'
-const props = defineProps({
-  centershow: {
-    type: Boolean,
-    default: false,
-  },
-  bottomshow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['update:centershow', 'update:bottomshow'])
-const handleClose = () => {
-  emit('update:centershow', false)
-}
-</script>
-<style lang="scss" scoped>
-.custom-txt {
-  width: 400rpx;
-  height: 400rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: 32rpx;
-}
-.popup-content {
-  width: 600rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-  padding: 40rpx;
-  box-sizing: border-box;
-  gap: 40rpx;
-  .btn {
-    width: 100%;
-    height: 80rpx;
-    background-color: #215acd;
-    color: white;
-    font-size: 32rpx;
-    border-radius: 12rpx;
-    font-weight: 400;
-    border: none;
-    outline: none;
-  }
-}
-</style>