Merge branch 'web-v2-temp' into 3.3.7-scxjy

src/views/comprehensive/personnel/managePermissionTemplates/index.vue

@@ -33,7 +33,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        @pagination="getPermitList"
       />
     </div>
     <add-page v-if="pageType == 2" :propsData="propsData"></add-page>
@@ -98,6 +98,7 @@
         this.loading = true;
         getPermitList(this.queryParams).then(response => {
           this.$set(this,'dataList',response.rows);
+          this.$set(this,'total',response.total);
           this.loading = false;
         });
       },