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

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -711,6 +711,7 @@ export default {
     //点击手动查找按钮
     handleSelect() {
       this.selectModal = true
+      this.handleSelectForm.standType = this.handleSelectForm.dataSource
       this.searchLawBtn()
     },
     saveInfo () {
@@ -719,7 +720,7 @@ export default {
             if (this.addOrEdit === 'add') {
               this.submitLoading = true
               this.$http.putData(
-                  '/sarIssueTrack/issueTrack',
+                  'sarIssueTrack/issueTrack',
                   this.attributeEO,
                   {
                     _this: this,
@@ -882,15 +883,15 @@ export default {
     },
     // 搜索
     searchSarAccessBtn () {
-      this.page = 1
+      this.sarSarAccessEOSearch.page = 1
       this.searchSarAccess()
     },
     //分页查询
     searchSarAccess (advanceSearch) {
       console.log('准备开始分页查询')
-      this.$http.get("/sarIssueTrack/issueTrack", {
+      this.$http.get("sarIssueTrack/issueTrack", {
-        page: 1,
+        current: this.sarSarAccessEOSearch.page,
-        pageSize: this.pageSize,
+        pageSize: this.$store.getters.userInfo.configContent,
         ...this.sarSarAccessEOSearch,
         sortKey: 2
       }, {
@@ -898,9 +899,8 @@ export default {
       }, res => {
         let arr = res.data;
         console.log('分页查询中',arr)
-        this.sarAccessListDatas = arr
+        this.sarAccessListDatas = arr.records
         this.tableLoading = false
-        this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
       });
@@ -911,6 +911,7 @@ export default {
       this.searchSarAccess()
     },
     pageSizeChange (pageSize) {
+      this.sarSarAccessEOSearch.page = 1
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent
       this.searchSarAccess()
     },