zhaoxiaohai 3 years ago
parent
commit
87fe9d8899
2 changed files with 10 additions and 4 deletions
  1. 9 3
      pages/submission/details.js
  2. 1 1
      pages/submission/index.js

+ 9 - 3
pages/submission/details.js

@@ -26,7 +26,8 @@ Page({
      */
     onLoad(options) {
         this.setData({
-            sat_submiteditmodelid: options.id
+            sat_submiteditmodelid: options.id,
+            ishistory: options.ishistory
         })
 
         //查询详情
@@ -53,11 +54,16 @@ Page({
                 detailsData: res.data[0],
                 oneToOne: options.oneToOne
             });
-            if (options.oneToOne == 'true' && res.data[0].submitedit.length == 1) {
+            if (options.ishistory == 1) {
                 this.setData({
                     done: true
                 })
-            }
+            } else if (options.oneToOne == 'true' && res.data[0].submitedit.length == 1) {
+                this.setData({
+                    done: true
+                })
+            };
+
         });
     },
 

+ 1 - 1
pages/submission/index.js

@@ -173,7 +173,7 @@ Page({
             item
         } = e.currentTarget.dataset;
         wx.navigateTo({
-            url: `./details?type=开始提报&id=${item.sat_submiteditmodelid}&oneToOne=${this.data.activeIndex === 0}`,
+            url: `./details?type=开始提报&id=${item.sat_submiteditmodelid}&oneToOne=${this.data.activeIndex === 0}&ishistory=${item.ishistory}`,
         })
     },
     /**