bug

src/pages/main/advertising/acceptanceSituation.vue

@@ -59,7 +59,7 @@
                             <a
                                 style="width: 70px; display: inline-block; color:#169BD5; cursor:pointer"
                                 @click="applicationCli(2, scope.row)"
-                                v-if="companyFlag == 1 && scope.row.sts == 3 && isSubmitBtnShow"
+                                v-if="companyFlag == 1 && scope.row.sts == 3"
                                 >打回</a
                             >
                         </template>
@@ -561,10 +561,17 @@ export default {
         this.params.countyWoId = jumpParams.countyWoId;
         this.params.woId = jumpParams.woId;
         this.params.pcId = jumpParams.pcId;
+        // console.log(this.companyFlag);
+        if(this.userInfo.cityName==null && this.userInfo.countyName == null){
+            console.log(this.$route.query.cityWoId);
+            this.params.woCityId = this.$route.query.cityWoId;
 
+        }else if(this.userInfo.cityName!=null && this.userInfo.countyName == null){
+            this.params.woCityId = jumpParams.cityWoId;
+            this.params.id = jumpParams.countyWoId;
 
-        this.params.woCityId = jumpParams.cityWoId;
-        this.params.id = jumpParams.countyWoId;
+        }
+        
 
         this.getList(this.params, 1);
         this.getUser();

src/pages/main/advertising/subtaskList.vue

@@ -216,6 +216,7 @@ export default {
                     // this.$router.push("/acceptanceSituation?id="+ n.id + "")
                     this.$router.push({
                         path: '/acceptanceSituation',
+                        query: {cityWoId: n.id}
                         // query: { cityWoId: this.params.cityWoId, countyWoId: this.params.countyWoId, woId: this.params.woId }
                     })
                     // this.$router.push({