参数收集自定义表头合并配置列

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

@@ -780,6 +780,7 @@
           flag: '7'
         }
         let paramscm = {
+          paramsManifestid: paramsManifestid,
           moduleFlag:'参数项收集清单'
         }
         var jsonHead = []
@@ -873,7 +874,6 @@
               this.$emit('getcustomizeList',checkedList)
               this.$forceUpdate()
             }else{
-              console.log(1)
               getAction(this.url.tableHeader, params).then((val) => {
                 if (val.success) {
                   jsonHead = val.result

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

@@ -573,8 +573,12 @@
           paramsManifestId: paramsManifestid,
           flag: '8'
         }
+        let paramscm = {
+          paramsManifestid: paramsManifestid,
+          moduleFlag:'上报库管理'
+        }
         var jsonHead = []
-        getAction(url, params).then((res) => {
+        getAction(url, paramscm).then((res) => {
             if (res.success) {
               if(res.result && res.result.length > 0){
                 jsonHead = res.result