From 566006e9236f368ba41d101838368082a6ed0445 Mon Sep 17 00:00:00 2001
From: zwq <932307837@qq.com>
Date: Sun, 22 Jun 2025 21:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/server.ts            |  3 +++
 src/pages/base/message/detail.vue | 22 +++++++++++++++++-----
 src/pages/base/message/index.vue  |  6 +++---
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/api/base/server.ts b/src/api/base/server.ts
index ba3e576..dc618aa 100644
--- a/src/api/base/server.ts
+++ b/src/api/base/server.ts
@@ -36,6 +36,9 @@ export const rwflFindRwlxsByRwId = async (params: any) => {
 export const rwzxSaveApi = async (params: any) => {
     return await post("/api/rwzx/save", params);
 };
+export const rwzxExecutedInfoByRwIdAndJsApi = async (params: any) => {
+    return await get("/api/rwzx/executedInfoByRwIdAndJs", params);
+};
 
 
 export const rwFindInfoByRwId = async (params: any) => {
diff --git a/src/pages/base/message/detail.vue b/src/pages/base/message/detail.vue
index fc19d97..20d73b6 100644
--- a/src/pages/base/message/detail.vue
+++ b/src/pages/base/message/detail.vue
@@ -6,7 +6,7 @@
       <view class="detail-header">
         <view class="title-tag-row">
           <text class="detail-title">{{ rw.rwmc }}</text>
-          <view class="tag" :class="messageDetail.tagType">{{ messageDetail.tagText }}</view>
+          <view class="tag" :class="rw.tagType">{{ rw.tagText }}</view>
         </view>
         <view class="detail-meta">
           <text>{{ rw.rwkstime }}</text>
@@ -18,7 +18,7 @@
 
         </BasicForm>
       </view>
-      <view class="detail-footer">
+      <view class="detail-footer" v-if="rwzxqds.length==0">
         <button type="primary" class="action-button" @click="saveRwZx">处理</button>
       </view>
     </view>
@@ -29,7 +29,7 @@
 <script lang="ts" setup>
 import {ref} from 'vue';
 import {onLoad} from '@dcloudio/uni-app';
-import {rwFindInfoByRwId, rwflFindRwlxsByRwId, rwzxSaveApi} from "@/api/base/server";
+import {rwFindInfoByRwId, rwflFindRwlxsByRwId, rwzxExecutedInfoByRwIdAndJsApi, rwzxSaveApi} from "@/api/base/server";
 import {useForm} from "@/components/BasicForm/hooks/useForm";
 import {navigateBack, showToast} from "@/utils/uniapp";
 import {useUserStore} from "@/store/modules/user";
@@ -45,7 +45,7 @@ interface MessageDetail {
   // Add other fields as necessary
 }
 
-const formData = ref({})
+const formData: any = ref({})
 const messageId = ref<string>('');
 const messageDetail = ref<MessageDetail | null>({
   id: 'todo1',
@@ -65,7 +65,6 @@ const schema = reactive<FormsSchema[]>([])
 const {getUser} = useUserStore()
 
 async function saveRwZx() {
-  console.log(222, formData.value)
   const result = [];
   for (let i = 0; i < rwflx.value.length; i++) {
     console.log(44, rwflx.value[i].id, formData.value[rwflx.value[i].id])
@@ -87,6 +86,7 @@ async function saveRwZx() {
   navigateBack()
 }
 
+const rwzxqds = ref([])
 onLoad(async (options) => {
   if (options && options.id) {
     const {result} = await rwFindInfoByRwId({
@@ -140,6 +140,18 @@ onLoad(async (options) => {
         })
       }
     }
+    const res = await rwzxExecutedInfoByRwIdAndJsApi({
+      rwId: options.id,
+      mobile: getUser.mobile
+    });
+    if (res && res.result && res.result.length) {
+      rwzxqds.value = res.result;
+      const showData = {};
+      for (let i = 0; i < rwzxqds.value.length; i++) {
+        showData[rwzxqds.value[i].rwlxId] = rwzxqds.value[i].rwzxqdtx;
+      }
+      formData.value = showData;
+    }
   } else {
     console.error('Message ID/Data is missing!');
     uni.showToast({title: '加载失败，缺少信息', icon: 'none'});
diff --git a/src/pages/base/message/index.vue b/src/pages/base/message/index.vue
index 556030a..f031862 100644
--- a/src/pages/base/message/index.vue
+++ b/src/pages/base/message/index.vue
@@ -113,9 +113,9 @@ onMounted(() => {
 });
 
 const goToDetail = (data: any) => {
-  if (currentTab.value != 1) {
-    return;
-  }
+  // if (currentTab.value != 1) {
+  //   return;
+  // }
   // if(true){
   //   const encodedTitle = encodeURIComponent("教学日志 (待办)");
   //   uni.navigateTo({