Merge branch 'yx-master' into feat/employer

src/views/business/taxUnit/signList.vue

@@ -40,6 +40,10 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-tickets" @click="viewContract(scope.row)"
+                     v-if="scope.row.signStatus && 2 === scope.row.signStatus && scope.row.contractUrl"
+                     v-hasPermi="['business:laborSign:add']">查看合同
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="doAgree(scope.row)"
             v-if="scope.row.signStatus && 1 === scope.row.signStatus" v-hasPermi="['business:laborSign:add']">签约合约
           </el-button>
@@ -204,6 +208,9 @@ export default {
     },
     givePayAcc(row) {
       this.$router.push({ path: '/business/laborAcc', query: { signId: row.id } })
+    },
+    viewContract(row) {
+      window.open(row.contractUrl, '_blank');
     }
   }
 }

src/views/business/unitRechargeBank/index.vue

@@ -181,11 +181,18 @@ export default {
       }
     };
   },
+  watch: {
+    $route(route) {
+      this.queryParams.taxUnitId = this.$route.query.companyId
+      this.queryParams.channelCode = this.$route.query.channelCode
+      this.getList();
+    }
+  },
   created() {
 
   },
   mounted() {
-    // console.log('传入的路由参数', this.$route.query);
+    // // console.log('传入的路由参数', this.$route.query);
     if (this.$route.query.channelCode) {
       this.queryParams.channelCode = this.$route.query.channelCode;
     }