From 81f4313ee24ffc6682a65a643c587c5aaece1c2a Mon Sep 17 00:00:00 2001
From: duxp <dxp18195149767@163.com>
Date: Mon, 9 Oct 2023 10:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/pages/taskWarning/taskWarning.js |  2 +-
 miniprogram/pages/workReport/workReport.js   | 26 +++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/miniprogram/pages/taskWarning/taskWarning.js b/miniprogram/pages/taskWarning/taskWarning.js
index dcc2f7c..28818d1 100644
--- a/miniprogram/pages/taskWarning/taskWarning.js
+++ b/miniprogram/pages/taskWarning/taskWarning.js
@@ -44,7 +44,7 @@ Page({
     handleSubmitFile(e){
         let _data = e.currentTarget.dataset.item;
         wx.navigateTo({
-            url:'../workReport/workReport?type='+_data.type+'&isRadio=true'+'&data='+JSON.stringify(_data)
+            url:'../workReport/workReport?type='+_data.type+'&isRadio=true'+'&id='+_data.id
         })
     },
 
diff --git a/miniprogram/pages/workReport/workReport.js b/miniprogram/pages/workReport/workReport.js
index 36888ca..e1320df 100644
--- a/miniprogram/pages/workReport/workReport.js
+++ b/miniprogram/pages/workReport/workReport.js
@@ -34,15 +34,19 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+        console.log(options,'option');
         if(options && JSON.stringify(options) !== '{}'){
             this.setData({
                 "searchForm.type":options.type,
                 isRadio:options.isRadio?options.isRadio:false
             })
             if(this.data.isRadio){
-                this.setData({
-                    detailData:JSON.parse(options.data)
-                })
+                this.loadDetailData({
+                    pageNum:1,
+                    pageSize:10,
+                    type:options.type,
+                    id:options.id
+                });
             }else{
                 this.loadTargetData({type:options.type});
             }
@@ -110,7 +114,12 @@ Page({
             activeId:e.detail.id,
             targetShow:false,
         })
-        this.loadDetailData();
+        this.loadDetailData({
+            pageNum:1,
+            pageSize:10,
+            type:this.data.searchForm.type,
+            id:this.data.searchForm.targetId
+        });
     },
 
     //上传之前
@@ -330,14 +339,9 @@ Page({
     },
 
     //加载详情数据
-    loadDetailData(){
+    loadDetailData(param){
       let _this = this;
-      $api.queryList({
-          pageNum:1,
-          pageSize:10,
-          type:_this.data.searchForm.type,
-          id:_this.data.searchForm.targetId
-      }).then(res => {
+      $api.queryList(param).then(res => {
           if(res.code === 0){
               let _data = null;
               if(res.rows.length>0){