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

2022-07-12 18:05:02 +08:00
parent 371d784ae1 ae1412cdd2
commit df0de5320f
1 changed files with 15 additions and 2 deletions
@@ -509,12 +509,25 @@
      getTableListReset() {
        let params = {
          paramsManifestId: this.$route.query.id,
-          userTypes: this.currentPersonRole
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          // userTypes: this.currentPersonRole
        }
+        let url
        this.loading = true
        this.$emit('listReset', '')
        // todo
-        getAction(this.url.tableList, params).then((res) => {
+        if (this.$route.query.it === undefined) {
+          // 页面跳转
+          url = this.url.tableList
+          params.paramsManifestId = this.$route.query.id
+          params.userTypes = this.currentPersonRole
+        } else {
+          // 历史版本
+          url = 'params/collectManifestHistory/list'
+          params.paramsManifestId = this.$route.query.it
+        }
+        getAction(url, params).then((res) => {
          if (res.success) {
            let tt = []
            if (this.currentPersonRole !== 'dre') {