加参数cityWoId

src/pages/main/advertising/materialApplication.vue

@@ -39,7 +39,7 @@
                            <el-button size="mini" type="primary" @click="jump(1, scope.row)" v-if="(loginNoStr == scope.row.nextOpNo && ((scope.row.provinceCity == 1 && scope.row.nextStep != 12) || (scope.row.provinceCity == 2 && scope.row.nextStep != 10) || (scope.row.provinceCity == 3 && scope.row.nextStep != 11))) && (scope.row.sts != 2 && scope.row.sts != 3)">审批</el-button> 
                             <el-button size="mini" type="primary" @click="jump(3, scope.row)" v-if="(loginNoStr == scope.row.nextOpNo && ((scope.row.provinceCity == 1 && scope.row.nextStep ==7) || (scope.row.provinceCity == 1 && scope.row.nextStep ==11) || (scope.row.provinceCity == 2 && scope.row.nextStep == 9) || (scope.row.provinceCity == 3 && scope.row.nextStep == 10))) && (scope.row.sts != 3)">子任务列表</el-button>
                             <el-button size="mini" type="danger" @click="delLine(scope.row)" v-if="(loginNoStr == scope.row.opNo && ((scope.row.provinceCity == 1 && scope.row.nextStep <= 7) || (scope.row.provinceCity == 2 && scope.row.nextStep <= 10) || (scope.row.provinceCity == 3 && scope.row.nextStep <= 11)) && (scope.row.sts != 3))">删除</el-button>
-                            <el-button size="mini" type="primary" @click="jump(4, scope.row)" v-if="((scope.row.provinceCity == 1 && scope.row.nextStep == 12) || (scope.row.provinceCity == 2 && scope.row.nextStep == 10) || (scope.row.provinceCity == 3 && scope.row.nextStep == 11)) && scope.row.countrySts == 2">验收</el-button>
+                            <el-button size="mini" type="primary" @click="jump(4, scope.row)" v-if="((scope.row.provinceCity == 1 && scope.row.nextStep == 12) || (scope.row.provinceCity == 2 && scope.row.nextStep == 10) || (scope.row.provinceCity == 3 && scope.row.nextStep == 11)) && (scope.row.countrySts == 0 || scope.row.countrySts == 2)">验收</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -315,7 +315,7 @@
                     // this.$router.push("/materialApplicationExa?id=" + n.id + "");
                     this.$router.push({
                                 path: '/materialApplicationExa',
-                                query: {id: n.id, btnS: 1}
+                                query: {cityWoId: n.cityWoId, id: n.id, btnS: 1}
                         })
                     
                 }else if(v === 2){
@@ -407,8 +407,8 @@
                     data: v,
                 }).then((res) => {
                     this.tableData = res.data.body.pageList.data;
-                    // this.total = res.data.totalRecord;
-                    console.log(this.tableData);
+                    // // this.total = res.data.totalRecord;
+                    // console.log(this.tableData);
                     this.loading = false;
 
                 });

src/pages/main/advertising/materialApplicationExa.vue

@@ -1011,6 +1011,7 @@ export default {
                 // let list = {};
                 this.cMkAdvMetirialWoInfoSubmit.mkAdvBusiMetirialWoInfoList = this.multipleSelection;
                 this.cMkAdvMetirialWoInfoSubmit.woId = this.params.woId;
+                this.cMkAdvMetirialWoInfoSubmit.woId = this.params.cityWoId;
                 this.cMkAdvMetirialWoInfoSubmit.remark = this.approvalinfolist.opinion;
                 if (this.approvalinfolist.opinionradio == 1) {
                     this.cMkAdvMetirialWoInfoSubmit.woSts = "1";
@@ -1248,6 +1249,7 @@ export default {
         if (JSON.stringify(this.$route.query) != "{}") {
             this.params.woId = this.$route.query.id;
             this.params.btnS = this.$route.query.btnS;
+            this.params.cityWoId = this.$route.query.cityWoId;
             if(this.params.btnS == 1){
                 //确认结果路由
                 this.isBtnShow = true