跳转

components/IncidentListFilter.vue

@@ -226,7 +226,8 @@
   }
   
   onLoad((option) => {
-    searchData.hospital = evt.hospital;
+    // searchData.hospital = evt.hospital;
+    setHospital();
     searchData.selected = evt.selected;
     searchData.area = evt.area;
     searchData.category = evt.category;

pages/categoryThree/categoryThree.vue

@@ -65,7 +65,7 @@
     }
     dataInfo.paramData.category = dataInfo.categoryThreeObj;
     handlerStore.setHandlerData(dataInfo.paramData);
-    uni.redirectTo({
+    uni.navigateTo({
       url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
     })
   }

pages/consumableList/consumableList.vue

@@ -94,7 +94,7 @@
           mask: true,
         });
         setTimeout(() => {
-          uni.redirectTo({
+          uni.navigateTo({
             url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
           })
         }, 1500)

pages/handler/handler.vue

@@ -193,6 +193,7 @@
     handlerImgList: [],//处理图片列表
     category: {},//故障现象
     synergetic: [],//协同人员
+    isSummaryNext: false,//汇总单-下一步
   })
   
   // 是否提交
@@ -447,7 +448,7 @@
   }
   
   // 获取事件详情
-  function getIncidentDetail(isSummaryNext = false){
+  function getIncidentDetail(){
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -458,7 +459,7 @@
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
         
-        if(isSummaryNext){
+        if(dataInfo.isSummaryNext){
           // 汇总单-下一步
           dataInfo.incidentData.duty.addSummary = 0;
         }
@@ -622,8 +623,11 @@
   function submit(){
     isSubmit.value = true;
     if(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder.value){
-      isSubmit.value = false;
-      getIncidentDetail(true);
+      // isSubmit.value = false;
+      // getIncidentDetail(true);
+      uni.navigateTo({
+        url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}&isSummaryNext=1`,
+      });
     }else if(dataInfo.tabActiveValue === 'doing' && !isInSummaryOrder.value){
       submitHandler();
     }else if(dataInfo.tabActiveValue === 'overtime'){
@@ -787,6 +791,7 @@
   
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
+    dataInfo.isSummaryNext = option.isSummaryNext == 1;
     getIncidentDetail();
   })
 </script>

pages/synergeticAdd/synergeticAdd.vue

@@ -60,7 +60,7 @@
     }
     dataInfo.paramData.synergetic = dataInfo.userSelectedList;
     handlerStore.setHandlerData(dataInfo.paramData);
-    uni.redirectTo({
+    uni.navigateTo({
       url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
     })
   }

pages/workHourManagementTwo/workHourManagementTwo.vue

@@ -103,7 +103,7 @@
           mask: true,
         });
         setTimeout(() => {
-          uni.redirectTo({
+          uni.navigateTo({
             url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
           })
         }, 1500)