Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/sunVillage_info/list_cbfsq_view.vue

@@ -160,7 +160,7 @@
     </div>
     <img class="bottomImg" v-if="sqbutShow && cbfsqShow" src="../../assets/images/sunVillage_info/cbfwsq.png" alt=""  />
     <img class="bottomImg" v-if="sqbutShow && cbfshShow" src="../../assets/images/sunVillage_info/cbfwsh.png" alt=""  />
-    <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_authorized.png" alt="" v-if="!sqbutShow" />
+<!--    <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_authorized.png" alt="" v-if="!sqbutShow" />-->
   </div>
 </template>
 
@@ -204,7 +204,7 @@
       };
     },
     created() {
-      if(this.$route.query.sqStatus){
+      if(this.$route.query.sqStatus){   // 授权
         getCbfById(this.$route.query.id).then(response => {
           this.form = response.data;
           if(this.form.accountId != null && this.form.accountId !== ""){
@@ -219,7 +219,7 @@
           this.getContractedLandList(this.form.cbfbm);
         });
 
-      }else if(this.$route.query.shStatus){
+      }else if(this.$route.query.shStatus){   // 审核
         getCbfById(this.$route.query.id).then(response => {
           this.form = response.data;
           if(this.form.gsshqz != null && this.form.gsshqz !== ""){
@@ -239,20 +239,20 @@
       }
     },
     methods: {
-      InitOptions() {
+      /* InitOptions() {
         for(let k in this.options)
         {
           this.getDicts(k).then((resp) => this.options[k] = resp.data);
         }
       },
-      /*承包方授权*/
+      // 承包方授权
       cbfsq(){
         eqbEmpower(this.form).then(response => {
           if(response.code === 200 ){
             this.sqbutShow = false;
           }
         });
-      },
+      }, */
       getSysCfb(){
         getCbfList({deptId:this.sysFarmer.deptId,cbfzjhm:this.sysFarmer.idcard}).then(response => {
           this.sqbutShow = true;

src/views/sunVillage_info/list_contractor_single_process.vue

@@ -201,7 +201,7 @@
               this.$notify({type: 'success', message: '签字成功'});
               this.showForm2 = true;
               this.form = r1.data;
-              this.$router.push({name:'sunVillageInfoListContractor'})
+              this.$router.push({path:'/sunVillage_info/list_contractor',query:{sqStatus:true}});
             })
             // let param = new FormData()  // 创建form对象
             // param.append('file', wj)  // 通过append向form对象添加数据