Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

mes/qd/src/components/Crud/RR.operation.vue

@@ -1,8 +1,16 @@
 <!--搜索与重置-->
 <template>
   <span>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
+    <!-- <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
     <el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
+    -->
+    <el-dropdown split-button type="primary" class="filter-item" @click="crud.toQuery">
+      <i class="el-icon-search el-icon--left" />查询
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">重置</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+
   </span>
 </template>
 <script>

mes/qd/src/main.js

@@ -49,7 +49,7 @@ Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
 Vue.use(Element, {
-  size: Cookies.get('size') || 'small' // set element-ui default size
+  size: Cookies.get('size') || 'mini' // set element-ui default size
 })
 
 Vue.config.productionTip = false