Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

src/views/tablePage/index.vue

@@ -340,6 +340,11 @@ export default {
             this.tableForm[k] = this.defaultfilter[k]
           }
         }
+        for(let k in this.formItem){
+          if(this.formItem[k].defaultvalue && this.formItem[k].defaultvalue!=""){
+            this.tableForm[this.formItem[k].pagecode] = this.formItem[k].defaultvalue
+          }
+        }
       }
       // this.formItem = tableColumnArrs.filter(item => item.isdisplay == 1)
     },