Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -9,7 +9,7 @@
     <!--内框顶部显示-->
     <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
       <div slot="header">
-       <span>
+        <span>
           <i class="icon icon-table2"></i> <!--供方信息查询-->
         </span>
 
@@ -541,7 +541,6 @@
                 style="width:100%"
                 v-model="Grade"
                 placeholder="请选择"
-                :disabled="hidden"
               >
                 <el-option label="全部" value=""></el-option>
                 <el-option label="一级" value="1"></el-option>
@@ -556,7 +555,6 @@
                 style="width:100%"
                 v-model="OperType"
                 placeholder="请选择"
-                :disabled="hidden"
               >
                 <el-option label="全部" value=""></el-option>
                 <el-option label="制造商" value="1"></el-option>