Merge remote-tracking branch 'origin/master'

src/views/modules/sys/dict-data.vue

@@ -271,7 +271,7 @@ export default {
       <el-row :gutter="20">
         <el-col :span="3">
           <el-form-item label="字典名称">
-            <el-select v-model="searchData.dictType" style="width: 100%" placeholder="请选择">
+            <el-select filterable v-model="searchData.dictType" style="width: 100%" placeholder="请选择">
               <el-option
                 v-for="item in dictTypeList"
                 :key="item.dictType"

src/views/modules/sys/dict.vue

@@ -249,8 +249,8 @@ export default {
     </el-row>
   </el-form>
   <div style="margin-bottom: 8px;margin-top: 8px">
-    <el-button type="primary" icon="el-icon-plus" @click="openDictTypeDialog(0)">新 增</el-button>
-    <el-button type="primary" icon="el-icon-delete" @click="delBatchDictType">删 除</el-button>
+    <el-button type="primary" icon="el-icon-plus" @click="openDictTypeDialog(0)" v-if="false">新 增</el-button>
+    <el-button type="primary" icon="el-icon-delete" @click="delBatchDictType" v-if="false">删 除</el-button>
   </div>
   <el-table
     border height="75vh" row-key="dictId"
@@ -274,7 +274,7 @@ export default {
     <el-table-column prop="remark" header-align="center" align="left" label="备注"/>
     <el-table-column prop="createBy" header-align="center" label="创建者"/>
     <el-table-column prop="createDate" header-align="center" align="center" label="创建时间"/>
-    <el-table-column header-align="center" align="center" label="操作" width="160">
+    <el-table-column header-align="center" align="center" label="操作" width="160" v-if="false">
       <template slot-scope="{row,$index}">
         <el-button type="text" @click="openDictTypeDialog(1,row)" icon="el-icon-edit">修改</el-button>
         <el-button type="text" @click="delDictType(row)" icon="el-icon-delete">删除</el-button>