Merge remote-tracking branch 'origin/test' into test

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>
@@ -554,14 +554,29 @@ export default {
         //     this.params.woId = this.$route.query.woId;
         //     this.params.pcId = this.$route.query.pcId;
         // }
-        this.getList(this.params, 1);
+        
         this.getUser();
-
         let jumpParams = JSON.parse(sessionStorage.getItem("jumpParams"))
         this.params.cityWoId = jumpParams.cityWoId;
         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){
+            
+            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.getList(this.params, 1);
+        
     },
     watch: {
         $route() {

src/pages/main/advertising/materialApplication.vue

@@ -4,7 +4,7 @@
 			<toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
             <div class="search">
                 <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
-                <el-button class="btn-check" size="medium" type="primary" @click='jumpadd'>添加
+                <el-button class="btn-check" size="medium" type="primary" @click='jumpadd' v-if="(userInfo.cityName==null&&userInfo.countyName==null)||(userInfo.cityName!=null&&userInfo.countyName==null)">添加
                 </el-button>
             </div>
             <div class="tabbox">
@@ -39,12 +39,17 @@
                            <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 != 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 == 0 || scope.row.countrySts == 2)">验收</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
-                <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
-                    :total="total">
+                <el-pagination
+                    class="pageBox"
+                    @current-change="currchange"
+                    layout="prev, pager, next"
+                    background
+                    :total="total"
+                >
                 </el-pagination>
             </div>
         </div>
@@ -315,7 +320,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 +412,8 @@
                     data: v,
                 }).then((res) => {
                     this.tableData = res.data.body.pageList.data;
-                    // this.total = res.data.totalRecord;
-                    
+                    this.total = res.data.body.pageList.totalRecord;
+                    // console.log(this.tableData);
                     this.loading = false;
 
                 });
@@ -559,6 +564,7 @@
             getUser() {
                 this.userInfo = JSON.parse(window.sessionStorage.userInfo);
                 this.loginNoStr = this.userInfo.loginNoStr;
+
             }
         },
         mounted() {

src/pages/main/advertising/materialApplicationExa.vue

@@ -1011,7 +1011,9 @@ export default {
                 // let list = {};
                 this.cMkAdvMetirialWoInfoSubmit.mkAdvBusiMetirialWoInfoList = this.multipleSelection;
                 this.cMkAdvMetirialWoInfoSubmit.woId = this.params.woId;
+                this.cMkAdvMetirialWoInfoSubmit.cityWoId = this.params.cityWoId;
                 this.cMkAdvMetirialWoInfoSubmit.remark = this.approvalinfolist.opinion;
+                console.log(this.cMkAdvMetirialWoInfoSubmit);
                 if (this.approvalinfolist.opinionradio == 1) {
                     this.cMkAdvMetirialWoInfoSubmit.woSts = "1";
                     if (this.userListOpt == null) {
@@ -1248,13 +1250,21 @@ export default {
         if (JSON.stringify(this.$route.query) != "{}") {
             this.params.woId = this.$route.query.id;
             this.params.btnS = this.$route.query.btnS;
+            
+            // this.params.countryWoId = this.$route.query.countyWoId;
+
             if(this.params.btnS == 1){
                 //确认结果路由
                 this.isBtnShow = true
+                this.params.cityWoId = this.$route.query.cityWoId;
+
+                
             }else if(this.params.btnS == 2){
                 //确认结果路由
-                this.isBtnShow = false
+                this.isBtnShow = false;
+                this.params.cityWoId = this.$route.query.cityWoId;
             }
+            
         }
         this.getList(this.params, 1);
         this.getUser();

src/pages/main/advertising/subtaskList.vue

@@ -209,13 +209,14 @@ export default {
                     //     })
                     this.$router.push({
                                 path: '/materialApplicationExa',
-                                query: {id: this.params.woId, btnS: 2}
+                                query: {id: this.params.woId, btnS: 2, cityWoId: n.id}
                         })
 
                 }else if(v === 2){
                     // 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({