Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

components/customTable/mutiSearch.vue

@@ -5,11 +5,8 @@
              <Button  @click="open" type="text"><Icon type="md-search" />高级</Button>
                <!-- <Input  v-model="value" placeholder="关键字"  style="width:300px;" :clearable='true'>
                 <Button @click="easySearch" icon="ios-search-outline" slot="append" style="width:40px;background-color:#249E91;color:#FFF;"></Button>
-            </Input> -->
-             
+            </Input> -->             
         </div>
-         
-       
         <!-- 右侧按钮 -->
         <slot name="button"></slot>
         <!-- 弹出高级搜索框 -->

components/page/dataGrid.vue

@@ -133,8 +133,8 @@ export default {
       columnsCur: [],
       configLoad: false,
       userConfig: null, //用户页面配置信息。,
-      userId: 1
-      // userId: this.$store.state.userInfo.userId
+      // userId: 1
+      userId: this.$store.state.userInfo.userId
     }
   },
   props: {