Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb

src/views/caseManagement/caseList.vue

@@ -7,12 +7,12 @@
                         :value="dict.value" @keyup.enter.native="handleQuery"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="申请机构" prop="applicationOrganId">
+            <!-- <el-form-item label="申请机构" prop="applicationOrganId">
                 <el-select v-model="queryParams.applicationOrganId" placeholder="请选择" clearable>
                     <el-option v-for="dict in deptList" :key="dict.deptId" :label="dict.deptName" :value="dict.deptId"
                         @keyup.enter.native="handleQuery"></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="批号" prop="batchNumber">
                 <el-input v-model="queryParams.batchNumber" placeholder="请输入案件批号" clearable style="width: 240px"
                     @keyup.enter.native="handleQuery" />
@@ -319,8 +319,9 @@ export default {
                 pageNum: 1,
                 pageSize: 100000
             }).then(res => {
+                console.log(res)
                 res.rows.forEach(item => {
-                    if(item.id !=11 && item.id !=17){
+                    if(item.id !=17){
                         this.buttonList.push(item)
                     }
                 });