1

src/views/messagePush/messageManagement/informationApproval/index.vue

@@ -141,10 +141,10 @@
   const handleData = (scope, key) => {
     console.log(scope)
     if (key == 'detail') {
-      // 传递数据给detailDialog组件，设置applyId为id值
+      // 传递数据给detailDialog组件，传递applyId和id
       selectedData.value = {
-        ...scope.row,
-        applyId: scope.row.id
+        applyId: scope.row.id,
+        id: scope.row.id
       }
       isDetailShow.value = true
     } else if (key == 'edit') {

src/views/messagePush/pushManagement/components/detailDialog/index.vue

@@ -46,7 +46,7 @@
           </el-descriptions-item>
           <el-descriptions-item label="发送内容">
             <div style="word-break: break-all; white-space: pre-wrap; max-width: 300px;">
-              {{ parseHandlerMessage(sendApplyData.requestDataJson) }}
+              {{ parseHandlerMessage(sendApplyData.requestDataJson, sendApplyData.messageType) }}
             </div>
           </el-descriptions-item>
         </el-descriptions>
@@ -170,7 +170,7 @@
           </el-descriptions-item>
           <el-descriptions-item label="发送handler信息">
             <div style="word-break: break-all; white-space: pre-wrap; max-width: 300px;">
-              {{ parseHandlerMessage(sendDetailsData[0]?.requestDataJson) }}
+              {{ parseHandlerMessage(sendDetailsData[0]?.requestDataJson, sendDetailsData[0]?.messageType) }}
             </div>
           </el-descriptions-item>
         </el-descriptions>
@@ -298,10 +298,19 @@ const getList = (id) => {
   isLoading.value = true
   failReason.value = ''
   
-  // 根据数据是否有applyId来决定传递的参数
-  const requestParams = props.dataList.applyId 
-    ? { applyId: props.dataList.applyId, detailsId: id }
-    : { detailsId: id }
+  // 判断是否是informationApproval页面调用
+  // 如果是informationApproval页面，只传applyId
+  // 如果是其他页面，保持原来的逻辑
+  let requestParams
+  if (props.dataList.applyId && props.dataList.id === props.dataList.applyId) {
+    // informationApproval页面：只传applyId
+    requestParams = { applyId: props.dataList.applyId }
+  } else {
+    // 其他页面：保持原来的逻辑
+    requestParams = props.dataList.applyId 
+      ? { applyId: props.dataList.applyId, detailsId: id }
+      : { detailsId: id }
+  }
   
   BaseService.post('/msgw/message/view', requestParams).then(
     (res: any) => {
@@ -410,16 +419,23 @@ const funRuleTime = (val) => {
   }
 }
 
-// 解析发送handler信息，只显示message字段
-const parseHandlerMessage = (requestDataJson) => {
+// 解析发送handler信息，根据messageType决定是否截取message字段
+const parseHandlerMessage = (requestDataJson, messageType) => {
   if (!requestDataJson) {
     return '--'
   }
-  try {
-    const data = JSON.parse(requestDataJson)
-    return data.message || '--'
-  } catch (error) {
-    return requestDataJson // 如果解析失败，返回原始数据
+  
+  // 只有messageType为SHORT时才截取message字段
+  if (messageType === 'SHORT') {
+    try {
+      const data = JSON.parse(requestDataJson)
+      return data.message || '--'
+    } catch (error) {
+      return requestDataJson // 如果解析失败，返回原始数据
+    }
+  } else {
+    // 其他情况保留完整的requestDataJson
+    return requestDataJson
   }
 }