Merge branch 'nanming' of sckj/mz-cloud into master

ruoyi-ui/src/assets/styles/advanced.scss

@@ -0,0 +1,43 @@
+.advanced-drawer {
+  .el-drawer__header {
+    margin: 0;
+    padding: 20px;
+  }
+
+  .el-form {
+    .el-form-item {
+      width: 48%;
+
+      .el-form-item__content {
+        width: 50%;
+
+        .el-date-editor {
+          width: 100%;
+        }
+      }
+    }
+
+    .different-item {
+      width: 100%;
+
+      .el-form-item__content {
+        width: 75%;
+      }
+    }
+
+    .advanced-btns {
+      width: 100%;
+      margin: 0;
+      padding: 20px;
+    }
+  }
+
+  .advanced-scroll {
+    height: 87.5vh;
+    padding: 0 10px;
+  }
+
+  h3 {
+    margin-top: 0;
+  }
+}

ruoyi-ui/src/main.js

@@ -6,18 +6,19 @@ import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
+import '@/assets/styles/advanced.scss' // advanced css
 import App from './App'
 import store from './store'
 import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
-import {download} from '@/utils/request'
-import {dictFilter} from '@/utils/commonMethods'
+import { download } from '@/utils/request'
+import { dictFilter } from '@/utils/commonMethods'
 import './assets/icons' // icon
 import './permission' // permission control
-import {getDicts} from '@/api/system/dict/data'
-import {getConfigKey} from '@/api/system/config'
-import {handleExport} from '@/utils/xxtj'
+import { getDicts } from '@/api/system/dict/data'
+import { getConfigKey } from '@/api/system/config'
+import { handleExport } from '@/utils/xxtj'
 import {
   addDateRange,
   changeDelData,
@@ -90,7 +91,7 @@ import rzlEcharts from '@/components/xxtjEcharts/rzlEcharts'
 import xxtjTree from '@/components/xxtjTree/index.vue'
 import IdType from '@/components/IdType'
 // 仅选择本级组件
-import QueryThisLevel from'@/components/QueryThisLevel'
+import QueryThisLevel from '@/components/QueryThisLevel'
 
 let get_method = Cookies.get
 let set_method = Cookies.set

ruoyi-ui/src/views/organization/rcyy/jzxx/index.vue

@@ -341,7 +341,7 @@ export default {
               if (this.queryParams.pageSize === this.jzxxList.length) {
                 this.jzxxList.pop();
               }
-              this.jzxxList.unshift({ ...this.form, id: response.data });
+              this.jzxxList.unshift({ ...this.form, id: response.data, isCl: '0' });
               this.total++;
             }).finally(() => this.submitFormLoading = false);
           }

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/jbxx/index.vue

@@ -35,14 +35,56 @@
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button type="primary" size="mini" @click="showSearch = !showSearch"
+            <el-button type="primary" size="mini" @click="showDrawer = !showDrawer"
               v-hasPermi="['search:sqJcxx:advancedList']">高级搜索</el-button>
           </el-form-item>
         </el-form>
 
-        <!--    高级查询-Start-->
-        <el-form :model="advancedQueryParams" ref="advancedQueryForm" size="small" :inline="true" v-show="!showSearch"
-          label-width="155px">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['business:ygJbxx:export', 'search:sqJcxx:export']">导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-table v-loading="loading" :data="jcxxList">
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
+          <el-table-column label="单位名称" align="center" prop="jgmc" width="240" />
+          <el-table-column label="所在区划" align="center" prop="szxzqhName" width="240" />
+          <el-table-column label="类别" align="center" prop="lb" width="400">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CZ030" :value="scope.row.lb" />
+            </template>
+          </el-table-column>
+          <el-table-column label="运营状态" align="center" prop="sczt" width="240">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CH026" :value="scope.row.sczt" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleXQ(scope.row)">详情
+              </el-button>
+
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </el-col>
+    </el-row>
+
+    <!-- 高级查询-Start -->
+    <el-drawer custom-class="advanced-drawer" title="高级查询" :visible.sync="showDrawer" size="60%">
+      <el-form :model="advancedQueryParams" ref="advancedQueryForm" size="small" :inline="true" v-show="!showSearch"
+        label-width="155px">
+        <el-scrollbar wrapClass="advanced-scroll">
           <el-form-item label="单位名称" prop="jgmc">
             <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入单位名称" clearable
               @keyup.enter.native="handleQuery" />
@@ -73,13 +115,13 @@
           </el-form-item>
           <el-form-item label="取得食品生产许可证" prop="isJm">
             <el-radio-group v-model="advancedQueryParams.isJm" style="width: 215px" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否开展医疗服务" prop="isKzylfw">
             <el-radio-group v-model="advancedQueryParams.isKzylfw" style="width: 215px" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -95,7 +137,7 @@
           </el-form-item>
           <el-form-item label="是否街道（乡镇）区域性养老中心" prop="isQyxylfwzx">
             <el-radio-group v-model="advancedQueryParams.isQyxylfwzx" style="width: 215px" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -111,13 +153,13 @@
           </el-form-item>
           <el-form-item label="是否投保责任险" prop="isTbzrx">
             <el-radio-group v-model="advancedQueryParams.isTbzrx" style="width: 215px" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否长护险定点机构" prop="isChxddjg">
             <el-radio-group v-model="advancedQueryParams.isChxddjg" style="width: 215px" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -128,7 +170,7 @@
           </el-form-item>
           <el-form-item label="是否提供居家养老上门服务" prop="isTgjjylsmfw">
             <el-radio-group v-model="advancedQueryParams.isTgjjylsmfw" style="width: 215px" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -210,14 +252,14 @@
           <el-form-item label="内设医疗机构" prop="nsyljg">
             <el-checkbox-group v-model="advancedQueryParams.nsyljg">
               <el-checkbox v-for="dict in dict.type.CH013" :key="dict.value" :label="dict.value">
-                {{dict.label}}
+                {{ dict.label }}
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
           <el-form-item label="与医疗机构签约合作" prop="yljgqyhz">
             <el-checkbox-group v-model="advancedQueryParams.yljgqyhz">
               <el-checkbox v-for="dict in dict.type.CH014" :key="dict.value" :label="dict.value">
-                {{dict.label}}
+                {{ dict.label }}
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
@@ -227,37 +269,37 @@
           </el-form-item>
           <el-form-item label="是否取得医疗保险定点医疗机构资格证书" prop="isYlbxddzg">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isYlbxddzg">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否取得医疗机构执业许可证书" prop="isYljgzyxk">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isYljgzyxk">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否为街道（乡镇）区域性养老服务中心" prop="isQyxylfwzx">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isQyxylfwzx">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否提供居家养老上门服务" prop="isTgjjylsmfw">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isTgjjylsmfw">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="土地是否由政府免费提供" prop="isZfmftg">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isZfmftg">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="场所是否由政府免费提供" prop="isCszfmftg">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isCszfmftg">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -267,61 +309,16 @@
           <el-form-item label="入住老年人数最大值" prop="rzlnrsMax">
             <number v-model="advancedQueryParams.rzlnrsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
-
-
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery"
-              v-hasPermi="['search:sqJcxx:advancedList']">高级搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="advancedResetQuery">重置</el-button>
-            <el-button type="primary" size="mini" @click="showSearch = !showSearch">收起</el-button>
-          </el-form-item>
-
-
-        </el-form>
-        <!--    高级查询-End-->
-
-
-
-        <el-row :gutter="10" class="mb8">
-
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-              v-hasPermi="['business:ygJbxx:export','search:sqJcxx:export']">导出</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-        <el-table v-loading="loading" :data="jcxxList">
-          <el-table-column label="序号" align="center">
-            <template slot-scope="scope">
-              {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
-          <el-table-column label="单位名称" align="center" prop="jgmc" width="240" />
-          <el-table-column label="所在区划" align="center" prop="szxzqhName" width="240" />
-          <el-table-column label="类别" align="center" prop="lb" width="400">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ030" :value="scope.row.lb" />
-            </template>
-          </el-table-column>
-          <el-table-column label="运营状态" align="center" prop="sczt" width="240">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.CH026" :value="scope.row.sczt" />
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleXQ(scope.row)">详情
-              </el-button>
-
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize" @pagination="getList" />
-      </el-col>
-    </el-row>
+        </el-scrollbar>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery"
+            v-hasPermi="['search:sqJcxx:advancedList']">高级搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="advancedResetQuery">重置</el-button>
+          <el-button type="primary" size="mini" @click="showSearch = !showSearch">收起</el-button>
+        </el-form-item>
+      </el-form>
+    </el-drawer>
+    <!-- 高级查询-End -->
 
     <!--详情-->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -412,9 +409,9 @@
             <td>{{ translateDict('CZ035', form.isChxddjg) }}</td>
             <td>社区养老服务项目(月均)</td>
             <td>{{ form.isTgjjylsmfw == '1' ? ((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) +
-            Number(form.tgsqylfwWyrc) +
-            Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
-            ) / 6) : '--'
+                Number(form.tgsqylfwWyrc) +
+                Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
+              ) / 6) : '--'
             }}</td>
           </tr>
           <tr>
@@ -422,10 +419,10 @@
             <td>{{ translateDict('CZ035', form.isTgjjylsmfw) }}</td>
             <td>居家上门服务项目(月均)</td>
             <td>{{ form.isTgjjylsmfw == '1' ? ((Number(form.tgjjylsmfwCwrc) + Number(form.tgjjylsmfwZcrc) +
-            Number(form.tgjjylsmfwZjrc) +
-            Number(form.tgjjylsmfwZxrc) + Number(form.tgjjylsmfwXyrc) + Number(form.tgjjylsmfwKfrc) +
-            Number(form.tgjjylsmfwZyrc) + Number(form.tgjjylsmfwGarc) + Number(form.tgjjylsmfwQtrc)
-            ) / 9) : '--'
+                Number(form.tgjjylsmfwZjrc) +
+                Number(form.tgjjylsmfwZxrc) + Number(form.tgjjylsmfwXyrc) + Number(form.tgjjylsmfwKfrc) +
+                Number(form.tgjjylsmfwZyrc) + Number(form.tgjjylsmfwGarc) + Number(form.tgjjylsmfwQtrc)
+              ) / 9) : '--'
             }}</td>
           </tr>
           <tr>
@@ -489,6 +486,8 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 显示高级查询
+      showDrawer: false,
       // 总条数
       total: 0,
       // 机构备案表格数据

ruoyi-ui/src/views/search/xxcx/fwjg/yljg/jbxx/index.vue

@@ -35,21 +35,76 @@
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button type="primary" size="mini" @click="showSearch = !showSearch" v-hasPermi="['search:jcxx:advancedList']">高级搜索</el-button>
+            <el-button type="primary" size="mini" @click="showDrawer = !showDrawer"
+              v-hasPermi="['search:jcxx:advancedList']">高级搜索</el-button>
           </el-form-item>
         </el-form>
+        <el-col :span="1.5">
+          <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+            v-hasPermi="['search:jcxx:export', 'business:jcxx:export']">导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 
-        <!--    高级查询-Start-->
-        <el-form :model="advancedQueryParams" ref="advancedQueryForm" size="small" :inline="true" v-show="!showSearch"
-          label-width="155px">
+        <el-table v-loading="loading" :data="jcxxList">
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
+          <el-table-column label="机构名称" align="center" prop="jgmc" width="240" />
+          <el-table-column label="建立日期" align="center" prop="jlrq" width="150">
+            <template slot-scope="scope">
+              <span>{{ special(scope.row.jlrq) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备案日期" align="center" prop="basj" width="150">
+            <template slot-scope="scope">
+              <span>{{ special(scope.row.basj) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="是否备案" align="center" prop="isBa">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CZ035" :value="scope.row.isBa" />
+            </template>
+          </el-table-column>
+          <el-table-column label="运营状态" align="center" prop="sczt" width="200">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CH026" :value="scope.row.sczt" />
+            </template>
+          </el-table-column>
+          <el-table-column label="所在区划" align="center" prop="szxzqhName" width="240" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleXQ(scope.row)"
+                v-hasPermi="['search:jcxx:query']">详情
+              </el-button>
+              <!--          <el-button-->
+              <!--            size="mini"-->
+              <!--            type="text"-->
+              <!--            icon="el-icon-edit"-->
+              <!--            @click="handleUpdate(scope.row)"-->
+              <!--            v-hasPermi="['business:jcxx:edit']"-->
+              <!--          >修改</el-button>-->
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </el-col>
+    </el-row>
 
+    <!-- 高级查询-Start -->
+    <el-drawer custom-class="advanced-drawer" title="高级查询" :visible.sync="showDrawer" size="60%">
+      <el-form :model="advancedQueryParams" ref="advancedQueryForm" size="small" :inline="true" label-width="50%">
+        <el-scrollbar wrapClass="advanced-scroll">
+          <h3>机构基本信息</h3>
           <el-form-item label="统一社会信用代码" prop="tyshxydm">
-            <el-input v-model="advancedQueryParams.tyshxydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable
-              @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.tyshxydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable />
           </el-form-item>
           <el-form-item label="单位名称" prop="jgmc">
-            <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入单位名称" clearable
-              @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入单位名称" clearable />
           </el-form-item>
           <el-form-item label="是否备案" prop="isBa">
             <el-select v-model="advancedQueryParams.isBa" placeholder="请选择" clearable>
@@ -57,13 +112,13 @@
             </el-select>
           </el-form-item>
           <el-form-item label="备案日期" prop="basj">
-            <el-date-picker clearable v-model="daterangeBasj" style="width: 215px" type="daterange"
-              value-format="yyyyMMdd" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+            <el-date-picker clearable v-model="daterangeBasj" type="daterange" value-format="yyyyMMdd"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="单位建立日期" prop="jlrq">
-            <el-date-picker clearable v-model="daterangeDwjlrq" style="width: 215px" type="daterange"
-              value-format="yyyyMMdd" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+            <el-date-picker clearable v-model="daterangeDwjlrq" type="daterange" value-format="yyyyMMdd"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="机构运营状态" prop="sczt">
@@ -71,23 +126,50 @@
               <el-option v-for="dict in dict.type.CH026" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
+          <el-form-item label="所在行政区划" prop="szxzqh">
+            <RegionCascaderSelect v-model="advancedQueryParams.szxzqh" :isDataRoot="true" endLevel="2" valueProp="code">
+            </RegionCascaderSelect>
+          </el-form-item>
+
+          <h3>法定代表人或负责人信息</h3>
           <el-form-item label="法人类型" prop="frlx">
             <el-select v-model="advancedQueryParams.frlx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH007" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="法定代表人姓名" prop="frxm">
-            <el-input v-model="advancedQueryParams.frxm" placeholder="请输入法定代表人姓名" clearable
-              @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.frxm" placeholder="请输入法定代表人姓名" clearable />
+          </el-form-item>
+          <el-form-item label="机构组织代码" prop="zzjgdm">
+            <el-input v-model="advancedQueryParams.zzjgdm" placeholder="请输入机构组织代码" clearable />
+          </el-form-item>
+          <el-form-item label="通信地址" prop="txdz">
+            <el-input v-model="advancedQueryParams.txdz" placeholder="请输入通信地址" clearable />
+          </el-form-item>
+          <el-form-item label="法人联系电话" prop="frlxfs">
+            <el-input v-model="advancedQueryParams.frlxfs" placeholder="请输入法人联系电话" clearable />
+          </el-form-item>
+          <el-form-item label="法人证件类型" prop="frzjlx">
+            <el-select v-model="advancedQueryParams.frzjlx" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.C0015" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="法人证件号码" prop="frzjhm">
+            <el-input v-model="advancedQueryParams.frzjhm" placeholder="请输入法人证件号码" clearable />
+          </el-form-item>
+          <el-form-item label="法人登记机关" prop="frdjjg">
+            <el-input v-model="advancedQueryParams.frdjjg" placeholder="请输入法人登记机关" clearable />
           </el-form-item>
+
+          <h3>场所信息</h3>
           <el-form-item label="场所性质" prop="csxz">
             <el-select v-model="advancedQueryParams.csxz" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH009" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="取得食品生产许可证" prop="isSpxkZt">
-            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isSpxkZt" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+          <el-form-item label="是否通过消防审验" prop="isXfsyZt">
+            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isXfsyZt">
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -115,11 +197,21 @@
           <el-form-item label="床位总数量最大值" prop="cwzsMax">
             <number v-model="advancedQueryParams.cwzsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
+          <el-form-item v-show="advancedQueryParams.isXfsyZt == 1" label="未通过消防部门审验合格原因" prop="xfsyYy">
+            <el-input v-model="advancedQueryParams.xfsyYy" placeholder="可输入未通过消防部门审验合格原因" clearable />
+          </el-form-item>
+
+          <h3>扩展信息</h3>
           <el-form-item label="单位性质" prop="dwxz">
             <el-select v-model="advancedQueryParams.dwxz" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0038" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
+          <el-form-item label="所处位置" prop="scwz">
+            <el-select v-model="advancedQueryParams.scwz" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CH012" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
           <el-form-item label="兴办主体" prop="xbzt">
             <el-select v-model="advancedQueryParams.xbzt" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH010" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -130,121 +222,92 @@
               <el-option v-for="dict in dict.type.CH052" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
+          <el-form-item v-show="advancedQueryParams.szlrlx.includes('99')" label="收住老人类型(其他说明)" prop="szlrlxQt">
+            <el-input v-model="advancedQueryParams.szlrlxQt" placeholder="可输入收住老人类型(其他说明)" clearable />
+          </el-form-item>
           <el-form-item label="是否开展医疗服务" prop="isKzylfw">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isKzylfw" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="内设医疗机构" prop="nsyljg">
-            <el-checkbox-group v-model="advancedQueryParams.nsyljg">
-              <el-checkbox v-for="dict in dict.type.CH013" :key="dict.value" :label="dict.value">
-                {{dict.label}}
-              </el-checkbox>
-            </el-checkbox-group>
+          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="内设医疗机构" prop="nsyljg">
+            <el-select v-model="advancedQueryParams.nsyljg" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CH013" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-show="advancedQueryParams.isKzylfw == 1" label="与医疗机构签约合作" prop="yljgqyhz">
+            <el-select v-model="advancedQueryParams.yljgqyhz" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CH012" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
           </el-form-item>
-          <br />
           <el-form-item label="是否为特困救助供养机构" prop="isTgjzgyjg">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isTgjzgyjg">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="与医疗机构签约合作" prop="yljgqyhz">
-            <el-checkbox-group v-model="advancedQueryParams.yljgqyhz">
-              <el-checkbox v-for="dict in dict.type.CH014" :key="dict.value" :label="dict.value">
-                {{dict.label}}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
           <el-form-item label="是否为街道（乡镇）区域性养老服务中心" prop="isQyxylfwzx">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isQyxylfwzx">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否投保责任险" prop="isTbzrx">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isTbzrx">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否长护险定点机构" prop="isChxddjg">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isChxddjg">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否提供居家养老上门服务" prop="isTgjjylsmfw">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isTgjjylsmfw">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否提供社区养老服务" prop="isTgsqylfw">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isTgsqylfw">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否为光荣院" prop="isGry">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isGry">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否取得医疗机构执业许可证书" prop="isYljgzyxk">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isYljgzyxk">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否取得医疗保险定点医疗机构资格证书" prop="isYlbxddzg">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isYlbxddzg">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="是否采用会员制方式收费" prop="isSfhyz">
             <el-radio-group style="width: 215px" v-model="advancedQueryParams.isSfhyz">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="享受政府扶持优惠政策内容" prop="fcyhznr">
-            <el-checkbox-group style="width: 500px" v-model="advancedQueryParams.fcyhznr">
-              <el-checkbox v-for="dict in dict.type.CH059" :key="dict.value" :label="dict.value">
-                {{dict.label}}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-
 
-          <el-form-item label="机构组织代码" prop="zzjgdm">
-            <el-input v-model="advancedQueryParams.zzjgdm" placeholder="请输入机构组织代码" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="通信地址" prop="txdz">
-            <el-input v-model="advancedQueryParams.txdz" placeholder="请输入通信地址" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="法人联系电话" prop="frlxfs">
-            <el-input v-model="advancedQueryParams.frlxfs" placeholder="请输入法人联系电话" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="法人证件类型" prop="frzjlx">
-            <el-select v-model="advancedQueryParams.frzjlx" multiple collapse-tags placeholder="请选择" clearable>
-              <el-option v-for="dict in dict.type.C0015" :key="dict.value" :label="dict.label" :value="dict.value" />
+          <el-form-item label="享受政府扶持优惠政策内容" prop="fcyhznr">
+            <el-select v-model="advancedQueryParams.fcyhznr" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CH059" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="法人证件号码" prop="frzjhm">
-            <el-input v-model="advancedQueryParams.frzjhm" placeholder="请输入法人证件号码" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="法人登记机关" prop="frdjjg">
-            <el-input v-model="advancedQueryParams.frdjjg" placeholder="请输入法人登记机关" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
+
           <el-form-item label="建筑面积最小值" prop="jzmjMin">
             <number v-model="advancedQueryParams.jzmjMin" :min="0" :max="999999" :precision="0" />
           </el-form-item>
@@ -257,31 +320,6 @@
           <el-form-item label="占地面积最大值" prop="zdmjMax">
             <number v-model="advancedQueryParams.zdmjMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
-          <el-form-item label="是否通过消防审验" prop="isXfsyZt">
-            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isXfsyZt">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="未通过消防部门审验合格原因" prop="xfsyYy">
-            <el-input v-model="advancedQueryParams.xfsyYy" placeholder="可输入未通过消防部门审验合格原因" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="未取得食品生产许可证原因" prop="spxkYy">
-            <el-input v-model="advancedQueryParams.xfsyYy" placeholder="可输入未取得食品生产许可证原因" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="所处位置" prop="scwz">
-            <el-checkbox-group v-model="advancedQueryParams.scwz">
-              <el-checkbox v-for="dict in dict.type.CH012" :key="dict.value" :label="dict.value">
-                {{dict.label}}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item label="收住老人类型(其他说明)" prop="szlrlxQt">
-            <el-input v-model="advancedQueryParams.szlrlxQt" placeholder="可输入收住老人类型(其他说明)" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
           <el-form-item label="收费方式" prop="sffs">
             <el-select v-model="advancedQueryParams.sffs" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH060" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -311,162 +349,111 @@
           <el-form-item label="押金/备用金最大值" prop="yzZg">
             <number v-model="advancedQueryParams.yzZg" :min="0" :max="999999" :precision="0" />
           </el-form-item>
+          <el-form-item label="月末收住老年人数最小值" prop="ymszlrsMin">
+            <number v-model="advancedQueryParams.ymszlrsMin" :min="0" :max="999999" :precision="0" />
+          </el-form-item>
+          <el-form-item label="月末收住老年人数最大值" prop="ymszlrsMax">
+            <number v-model="advancedQueryParams.ymszlrsMax" :min="0" :max="999999" :precision="0" />
+          </el-form-item>
+          <el-form-item label="是否取得食品生产许可证" prop="isSpxkZt">
+            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isSpxkZt" placeholder="请选择" clearable>
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="advancedQueryParams.isSpxkZt == 1" label="未取得食品生产许可证原因" prop="spxkYy">
+            <el-input v-model="advancedQueryParams.spxkYy" placeholder="可输入未取得食品生产许可证原因" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
           <el-form-item label="是否其他收费" prop="isQtsf">
-            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isQtsf">
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+            <el-radio-group v-model="advancedQueryParams.isQtsf">
+              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="其他收费(项目名称)" prop="qtsfXm">
+          <el-form-item v-show="advancedQueryParams.isQtsf == 1" label="其他收费(项目名称)" prop="qtsfXm">
             <el-input v-model="advancedQueryParams.qtsfXm" placeholder="可输入其他收费(项目名称)" clearable
-                      @keyup.enter.native="handleQuery" />
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item label="其他收费最小值" prop="qtsfZd">
+          <el-form-item v-show="advancedQueryParams.isQtsf == 1" label="其他收费最小值" prop="qtsfZd">
             <number v-model="advancedQueryParams.qtsfZd" :min="0" :max="999999" :precision="0" />
           </el-form-item>
-          <el-form-item label="其他收费最大值" prop="qtsfZg">
+          <el-form-item v-show="advancedQueryParams.isQtsf == 1" label="其他收费最大值" prop="qtsfZg">
             <number v-model="advancedQueryParams.qtsfZg" :min="0" :max="999999" :precision="0" />
           </el-form-item>
-          <el-form-item label="月末收住老年人数最小值" prop="ymszlrsMin">
-            <number v-model="advancedQueryParams.ymszlrsMin" :min="0" :max="999999" :precision="0" />
-          </el-form-item>
-          <el-form-item label="月末收住老年人数最大值" prop="ymszlrsMax">
-            <number v-model="advancedQueryParams.ymszlrsMax" :min="0" :max="999999" :precision="0" />
-          </el-form-item>
-
-
-
-
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini"
-                       @click="advancedHandleQuery"
-                       v-hasPermi="['search:jcxx:advancedList']"
-            >高级搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="advancedResetQuery">重置</el-button>
-            <el-button type="primary" size="mini" @click="showSearch = !showSearch">收起</el-button>
-          </el-form-item>
-        </el-form>
-        <!--    高级查询-End-->
-        <el-col :span="1.5">
-          <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-            v-hasPermi="['search:jcxx:export','business:jcxx:export']">导出</el-button>
-        </el-col>
-
-        <el-table v-loading="loading" :data="jcxxList">
-          <el-table-column label="序号" align="center">
-            <template slot-scope="scope">
-              {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
-            </template>
-          </el-table-column>
-          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
-          <el-table-column label="机构名称" align="center" prop="jgmc" width="240" />
-          <el-table-column label="建立日期" align="center" prop="jlrq" width="150">
-            <template slot-scope="scope">
-              <span>{{ special(scope.row.jlrq) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="备案日期" align="center" prop="basj" width="150">
-            <template slot-scope="scope">
-              <span>{{ special(scope.row.basj) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="是否备案" align="center" prop="isBa">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ035" :value="scope.row.isBa" />
-            </template>
-          </el-table-column>
-          <el-table-column label="运营状态" align="center" prop="sczt" width="200">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.CH026" :value="scope.row.sczt" />
-            </template>
-          </el-table-column>
-          <el-table-column label="所在区划" align="center" prop="szxzqhName" width="240" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleXQ(scope.row)"
-                v-hasPermi="['search:jcxx:query']">详情
-              </el-button>
-              <!--          <el-button-->
-              <!--            size="mini"-->
-              <!--            type="text"-->
-              <!--            icon="el-icon-edit"-->
-              <!--            @click="handleUpdate(scope.row)"-->
-              <!--            v-hasPermi="['business:jcxx:edit']"-->
-              <!--          >修改</el-button>-->
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-      </el-col>
-    </el-row>
-
+        </el-scrollbar>
+        <el-form-item class="advanced-btns">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery"
+            v-hasPermi="['search:jcxx:advancedList']">高级搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="advancedResetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-drawer>
+    <!-- 高级查询-End -->
     <!--详情-->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1400px" append-to-body>
-
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="基本信息" name="first">
           <h3>机构基本信息</h3>
           <table>
             <tr>
               <td>统一社会信用代码</td>
-              <td>{{form.tyshxydm}}</td>
+              <td>{{ form.tyshxydm }}</td>
               <td>单位名称</td>
-              <td>{{form.jgmc}}</td>
+              <td>{{ form.jgmc }}</td>
               <td>单位建立日期</td>
-              <td>{{special(form.jlrq)}}</td>
+              <td>{{ special(form.jlrq) }}</td>
 
             </tr>
             <tr>
               <td>所属行政区划</td>
-              <td>{{form.ssxzqhName}}</td>
+              <td>{{ form.ssxzqhName }}</td>
               <td>单位通信地址</td>
-              <td colspan="5">{{form.szxzqhName}} {{form.txdz}}</td>
+              <td colspan="5">{{ form.szxzqhName }} {{ form.txdz }}</td>
             </tr>
           </table>
           <h3>法定代表人或负责人信息</h3>
           <table>
             <tr>
               <td>法定代表人或负责人姓名</td>
-              <td>{{form.frxm}}</td>
+              <td>{{ form.frxm }}</td>
               <td>法定代表人或负责人证件类型</td>
-              <td>{{translateDict('C0015',form.frzjlx)}}</td>
+              <td>{{ translateDict('C0015', form.frzjlx) }}</td>
               <td>法定代表人或负责人证件号码</td>
-              <td>{{form.frzjhm}}</td>
+              <td>{{ form.frzjhm }}</td>
             </tr>
             <tr>
               <td>法定代表人或负责人联系方式</td>
-              <td>{{form.frlxfs}}</td>
+              <td>{{ form.frlxfs }}</td>
               <td>法人登记机关</td>
-              <td>{{form.frdjjg}}</td>
+              <td>{{ form.frdjjg }}</td>
               <td>法人类型</td>
-              <td>{{translateDict('CH007',form.frlx)}}</td>
+              <td>{{ translateDict('CH007', form.frlx) }}</td>
             </tr>
           </table>
           <h3>场所信息</h3>
           <table>
             <tr>
               <td>全托床位数量(个)</td>
-              <td>{{form.qtcws}}</td>
+              <td>{{ form.qtcws }}</td>
               <td>日托床位数量(个)</td>
-              <td>{{form.qtcws}}</td>
+              <td>{{ form.qtcws }}</td>
               <td>护理型床位数量（个）</td>
-              <td>{{form.hlxcws}}</td>
+              <td>{{ form.hlxcws }}</td>
             </tr>
             <tr>
               <td>床位总数量(个)</td>
-              <td>{{form.cwzs}}</td>
+              <td>{{ form.cwzs }}</td>
               <td>建筑面积(㎡)</td>
-              <td>{{form.jzmj}}</td>
+              <td>{{ form.jzmj }}</td>
               <td>占地面积(㎡)</td>
-              <td>{{form.zdmj}}</td>
+              <td>{{ form.zdmj }}</td>
             </tr>
             <tr>
               <td>场所性质</td>
-              <td>{{translateDict('CH009',form.csxz)}}</td>
+              <td>{{ translateDict('CH009', form.csxz) }}</td>
               <td>是否通过消防部门审验合格</td>
-              <td>{{translateDict('CZ035',form.isXfsyZt)}}</td>
+              <td>{{ translateDict('CZ035', form.isXfsyZt) }}</td>
             </tr>
           </table>
         </el-tab-pane>
@@ -475,74 +462,76 @@
           <table>
             <tr>
               <td>单位性质</td>
-              <td>{{translateDict('C0038',form.dwxz)}}</td>
+              <td>{{ translateDict('C0038', form.dwxz) }}</td>
               <td>所处位置</td>
-              <td>{{translateDict('CH012',form.scwz)}}</td>
+              <td>{{ translateDict('CH012', form.scwz) }}</td>
               <td>兴办主体</td>
-              <td>{{translateDict('CH010',form.xbzt)}}</td>
+              <td>{{ translateDict('CH010', form.xbzt) }}</td>
             </tr>
             <tr>
               <td>收住老年人类型</td>
-              <td colspan="5">{{translateDict('CH052',form.szlrlx,true)}}</td>
+              <td colspan="5">{{ translateDict('CH052', form.szlrlx, true) }}</td>
             </tr>
             <tr>
               <td>是否街道(乡镇)区域性养老中心</td>
-              <td>{{translateDict('CZ035',form.isQyxylfwzx)}}</td>
+              <td>{{ translateDict('CZ035', form.isQyxylfwzx) }}</td>
               <td>是否特困救助供养机构</td>
-              <td>{{translateDict('CZ035',form.isTgjzgyjg)}}</td>
+              <td>{{ translateDict('CZ035', form.isTgjzgyjg) }}</td>
               <td>是否投保责任险</td>
-              <td>{{translateDict('CZ035',form.isTbzrx)}}</td>
+              <td>{{ translateDict('CZ035', form.isTbzrx) }}</td>
             </tr>
             <tr>
               <td>是否长护险定点机构</td>
-              <td>{{translateDict('CZ035',form.isChxddjg)}}</td>
+              <td>{{ translateDict('CZ035', form.isChxddjg) }}</td>
               <td>是否光荣院</td>
-              <td>{{translateDict('CZ035',form.isGry)}}</td>
+              <td>{{ translateDict('CZ035', form.isGry) }}</td>
             </tr>
             <tr>
               <td>是否提供居家上门服务</td>
-              <td>{{translateDict('CZ035',form.isTgjjylsmfw)}}</td>
+              <td>{{ translateDict('CZ035', form.isTgjjylsmfw) }}</td>
               <td>居家上门服务项目(月均)</td>
-              <td>{{ form.isTgjjylsmfw=='1'?((Number(form.tgjjylsmfwCwrc) + Number(form.tgjjylsmfwZcrc) +
-              Number(form.tgjjylsmfwZjrc) +
-              Number(form.tgjjylsmfwZxrc) + Number(form.tgjjylsmfwXyrc) + Number(form.tgjjylsmfwKfrc) +
-              Number(form.tgjjylsmfwZyrc) + Number(form.tgjjylsmfwGarc) + Number(form.tgjjylsmfwQtrc)
-              )/9):'--'}}</td>
+              <td>{{ form.isTgjjylsmfw == '1' ? ((Number(form.tgjjylsmfwCwrc) + Number(form.tgjjylsmfwZcrc) +
+                  Number(form.tgjjylsmfwZjrc) +
+                  Number(form.tgjjylsmfwZxrc) + Number(form.tgjjylsmfwXyrc) + Number(form.tgjjylsmfwKfrc) +
+                  Number(form.tgjjylsmfwZyrc) + Number(form.tgjjylsmfwGarc) + Number(form.tgjjylsmfwQtrc)
+                ) / 9) : '--'
+              }}</td>
             </tr>
             <tr>
               <td>是否提供社区养老服务</td>
-              <td>{{translateDict('CZ035',form.isTgsqylfw)}}</td>
+              <td>{{ translateDict('CZ035', form.isTgsqylfw) }}</td>
               <td>社区养老服务项目(月均)</td>
-              <td>{{form.isTgjjylsmfw=='1'?((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) +
-              Number(form.tgsqylfwWyrc) +
-              Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
-              )/6):'--'}}</td>
+              <td>{{ form.isTgjjylsmfw == '1' ? ((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) +
+                  Number(form.tgsqylfwWyrc) +
+                  Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
+                ) / 6) : '--'
+              }}</td>
             </tr>
             <tr>
               <td>医疗服务形式</td>
-              <td>{{translateDict('CZ035',form.isKzylfw)}}</td>
+              <td>{{ translateDict('CZ035', form.isKzylfw) }}</td>
               <td>内设医疗机构</td>
-              <td>{{translateDict('CH013',form.nsyljg,true)}}</td>
+              <td>{{ translateDict('CH013', form.nsyljg, true) }}</td>
               <td>与医疗机构签约合作</td>
-              <td>{{translateDict('CH014',form.yljgqyhz,true)}}</td>
+              <td>{{ translateDict('CH014', form.yljgqyhz, true) }}</td>
             </tr>
             <tr>
               <td>是否取得医疗机构执业许可证书</td>
-              <td>{{translateDict('CZ035',form.isYljgzyxk)}}</td>
+              <td>{{ translateDict('CZ035', form.isYljgzyxk) }}</td>
               <td>是否取得医疗保险定点医疗机构资格证书</td>
-              <td>{{translateDict('CZ035',form.isYlbxddzg)}}</td>
+              <td>{{ translateDict('CZ035', form.isYlbxddzg) }}</td>
               <td>月末收住老年人数</td>
-              <td>{{form.ymszlrs}}</td>
+              <td>{{ form.ymszlrs }}</td>
             </tr>
             <tr>
               <td>享受政府扶持优惠政策内容</td>
-              <td colspan="5">{{translateDict('CH059',form.fcyhznr,true)}}</td>
+              <td colspan="5">{{ translateDict('CH059', form.fcyhznr, true) }}</td>
             </tr>
             <tr>
               <td>收费方式</td>
-              <td>{{translateDict('CH060',form.sffs)}}</td>
+              <td>{{ translateDict('CH060', form.sffs) }}</td>
               <td>是否采用会员制方式收费</td>
-              <td>{{translateDict('CZ035',form.isSfhyz)}}</td>
+              <td>{{ translateDict('CZ035', form.isSfhyz) }}</td>
               <td>护理费(元/月)</td>
               <td>
                 {{ '最高：' + form.hlfZg }}
@@ -572,9 +561,9 @@
             </tr>
             <tr>
               <td>是否有其他收费项目</td>
-              <td>{{translateDict('CZ035',form.isQtsf)}}</td>
+              <td>{{ translateDict('CZ035', form.isQtsf) }}</td>
               <td>其他收费项目</td>
-              <td>{{form.isQtsf=='1'?form.qtsfXm:'--'}}</td>
+              <td>{{ form.isQtsf == '1' ? form.qtsfXm : '--' }}</td>
               <td>其他收费项目(元/月)</td>
               <td>
                 <!--  CHProblem-这块没改过来，如果上面的isQtsf为'1'是有值，显示最高最低，没有值为'&#45;&#45;',这块需要阔生修改，我没改过来-->
@@ -588,11 +577,11 @@
           <table>
             <tr>
               <td>机构运营状态</td>
-              <td>{{translateDict('CH026',form.sczt)}}</td>
+              <td>{{ translateDict('CH026', form.sczt) }}</td>
               <td>操作原因</td>
-              <td>{{form.czyy}}</td>
+              <td>{{ form.czyy }}</td>
               <td>操作时间</td>
-              <td>{{special(form.czsj)}}</td>
+              <td>{{ special(form.czsj) }}</td>
             </tr>
           </table>
         </el-tab-pane>
@@ -667,6 +656,8 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 显示高级查询
+      showDrawer: false,
       // 总条数
       total: 0,
       // 机构备案表格数据
@@ -732,7 +723,7 @@ export default {
 
         pageNum: 1,
         pageSize: 10,
-        isBj: '0',
+        isBj: null,
       },
       searchXydm: null,
       // 表单参数
@@ -848,7 +839,6 @@ export default {
     };
   },
   created() {
-    console.log('dict',this.dict.type.CZ035)
     this.getList();
   },
   computed: {
@@ -906,6 +896,7 @@ export default {
       }
 
       let copyParams = this.deepCopy(this.advancedQueryParams)
+      copyParams.szxzqh ? copyParams.szxzqh = copyParams.szxzqh[copyParams.szxzqh.length - 1] : copyParams.ssxzqh = null
       copyParams.sczt.length > 0 && (copyParams.sczt = copyParams.sczt.join(','))
       copyParams.frlx.length > 0 && (copyParams.frlx = copyParams.frlx.join(','))
       copyParams.csxz.length > 0 && (copyParams.csxz = copyParams.csxz.join(','))
@@ -915,6 +906,9 @@ export default {
       copyParams.nsyljg.length > 0 && (copyParams.nsyljg = copyParams.nsyljg.join(','))
       copyParams.yljgqyhz.length > 0 && (copyParams.yljgqyhz = copyParams.yljgqyhz.join(','))
       copyParams.fcyhznr.length > 0 && (copyParams.fcyhznr = copyParams.fcyhznr.join(','))
+      copyParams.frzjlx.length > 0 && (copyParams.frzjlx = copyParams.frzjlx.join(','))
+      copyParams.scwz.length > 0 && (copyParams.scwz = copyParams.scwz.join(','))
+      copyParams.sffs.length > 0 && (copyParams.sffs = copyParams.sffs.join(','))
 
       advancedListJcxx(copyParams).then(response => {
         this.jcxxList = response.rows;
@@ -1008,6 +1002,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    /** 高级查询按钮操作 */
     advancedHandleQuery() {
       this.advancedQueryParams.pageNum = 1;
       this.advancedGetList();
@@ -1100,27 +1095,6 @@ table td:nth-child(odd) {
   background: #f5f5f5;
 }
 
-.formFlex {
-  display: flex;
-  width: 100%;
-  flex-wrap: wrap;
-}
-
-.formWidth {
-  width: 33.33%;
-  /*display: flex !important;*/
-}
-
-.formWidth2 {
-  width: 50%;
-  /*display: flex !important;*/
-}
-
-.formWidth3 {
-  width: 100%;
-  /*display: flex !important;*/
-}
-
 .el-select {
   width: 100%;
 }