上报库保存修改

jero-web/src/components/tableCollection/index.vue

@@ -335,12 +335,13 @@
       this.getHeader()
       eventBUs.$on('getTableList', search => {
         this.queryParamQuery = search
+        console.log(this.queryParamQuery)
+        this.getTableList()
       })
     },
     watch: {
       currentPersonRole: {
         handler: function() {
-          console.log(123)
           this.getTableList()
         },
         immediate: true
@@ -566,11 +567,12 @@
         }
         getAction('/params/userTypeLog/queryCurrentType', query).then((res) => {
           if (res.success) {
+            this.queryParamQuery = {...this.queryParamQuery}
+
             if (res.result && res.result.userType) {
               if (!(result.some(val => val.value == res.result.userType))) {
                 res.result.userType = result[0] ? result[0].value : ''
               }
-              this.queryParam = {...this.queryParamQuery}
               this.getTableList(res.result.userType)
 
             } else {
@@ -657,7 +659,7 @@
       },
       getTableListReset() {
         this.formInline = {}
-        this.queryParam = {}
+        this.queryParamQuery = {}
         let params = {
           paramsManifestId: this.$route.query.id,
           pageNo: this.pageNo,
@@ -725,6 +727,8 @@
         this.selectedRowKeys = []
       },
       getTableList(currentPersonRole) {
+        console.log(currentPersonRole)
+        console.log(this.queryParamQuery)
         // todo
         let paramsManifestid
         let url
@@ -744,7 +748,7 @@
           paramsManifestId: paramsManifestid,
           ...this.formInline,
           ...currentPersonRole,
-          ...this.queryParam
+          ...this.queryParamQuery
         }
         this.loading = true
         getAction(url, params).then((res) => {

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -671,7 +671,7 @@
         getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
           if (res.success) {
             this.$message.success(this.$t('OperationSuccessful'))
-            this.$refs.CollectionTabel.getTableList()
+            this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
           } else {
             this.$message.warning(this.$t('operationFailed'))
           }
@@ -720,7 +720,7 @@
         this.$refs.CollectionTabel.getLoginUserType()
       },
       GetgetTableList() {
-        this.$refs.CollectionTabel.getTableList()
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
       // 错误数据的弹框
       cancleoperationFailed() {
@@ -854,7 +854,7 @@
           sqp['superQueryMatchType'] = matchType
         }
         this.queryParamQuery = sqp
-        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+        // this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
         eventBUs.$emit('getTableList',this.queryParamQuery)
       },
       // 认证工程师 批量删除 权限
@@ -1103,7 +1103,7 @@
               this.textLoading = false
               _this.$message.success(this.$t('OperationSuccessful'))
               this.areaVisibleFreeze = false
-              this.$refs.CollectionTabel.getTableList()
+              this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
               this.$refs.CollectionTabel.getHeader()
             } else {
               this.textLoading = false
@@ -1501,12 +1501,12 @@
       areaVisibleTaskCutOffTimeflag(val) {
         console.log(val)
         this.areaVisibleTaskCutOffTime = val
-        this.$refs.CollectionTabel.getTableList()
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
       areaVisibleTaskCutOffTimeAll(val){
         console.log(val)
         this.OneclickCollection = val
-        this.$refs.CollectionTabel.getTableList()
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
       //引用参数
       referenceparameter() {
@@ -1579,7 +1579,7 @@
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.selectedRowKeys = []
                     // _this.$refs.CollectionTabel.getData()
-                    _this.$refs.CollectionTabel.getTableList()
+                    _this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
                     _this.textLoading = false
                   } else {
                     _this.textLoading = false