wangguangping 3 lat temu
rodzic
commit
c4eecc95a1

+ 2 - 0
src/pages/main/advertising/acceptance.vue

@@ -382,6 +382,8 @@ export default {
                         downloadElement.click();
                         document.body.removeChild(downloadElement);
                         window.URL.revokeObjectURL(href);
+
+                        this.ysListDialogStatus = false
                     }
                 });
         },

+ 5 - 4
src/pages/main/advertising/materialApplication.vue

@@ -321,10 +321,11 @@
                 }else if(v === 2){
                     this.$router.push("/materialApplicationDetail?id="+ n.id + "")
                 }else if(v === 3){
-                    if(n.provinceCity == 1 && n.nextStep ==7){
-                        let jumpParams = {cityWoId: n.cityWoId, countyWoId: n.countryWoId, woId: n.id, pcId: n.provinceCity};
+                    let jumpParams = {cityWoId: n.cityWoId, countyWoId: n.countryWoId, woId: n.id, pcId: n.provinceCity};
 
-                        sessionStorage.setItem("jumpParams", JSON.stringify(jumpParams))
+                    sessionStorage.setItem("jumpParams", JSON.stringify(jumpParams))
+                    if(n.provinceCity == 1 && n.nextStep ==7){
+                        
                         this.$router.push({
                                 path: '/subtaskList',
                                 // query: { cityWoId: n.cityWoId, countyWoId: n.countryWoId, woId: n.id, }
@@ -336,7 +337,7 @@
                     } else if((n.provinceCity == 1 && n.nextStep ==11) || (n.provinceCity == 2 && n.nextStep == 9) || (n.provinceCity == 3 && n.nextStep == 10)){
                         this.$router.push({
                                 path: '/acceptanceSituation',
-                                query: { cityWoId: n.cityWoId, countyWoId: n.countryWoId, woId: n.id, pcId: n.provinceCity}
+                                // query: { cityWoId: n.cityWoId, countyWoId: n.countryWoId, woId: n.id, pcId: n.provinceCity}
 
                                 // path: '/acceptanceSituation/:name',
                                 // name: 'acceptanceSituation',