ソースを参照

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

NanMing 2 年 前
コミット
0c10e76caa

+ 28 - 3
ruoyi-ui/src/assets/styles/advanced.scss

@@ -4,6 +4,11 @@
     padding: 20px;
   }
 
+  .advanced-scroll {
+    height: 87.5vh;
+    padding: 0 10px;
+  }
+
   .el-form {
     .el-form-item {
       width: 48%;
@@ -20,6 +25,10 @@
     .different-item {
       width: 100%;
 
+      .el-form-item__label {
+        width: 24% !important;
+      }
+
       .el-form-item__content {
         width: 75%;
       }
@@ -32,12 +41,28 @@
     }
   }
 
-  .advanced-scroll {
-    height: 87.5vh;
-    padding: 0 10px;
+  .el-select {
+    width: 100%;
+  }
+
+  .el-date-editor.el-input {
+    width: 100%;
+  }
+
+  .el-select .el-select__tags>span {
+    >span:nth-child(1) {
+      max-width: 72%;
+    }
   }
 
   h3 {
     margin-top: 0;
+    width: 100%;
+    padding: 0.5rem !important;
+    background-image: linear-gradient(160deg, #ddd 10%, #fff 90%);
+    color: #000;
+    font-weight: 500;
+    font-size: 1.1rem;
+    margin-bottom: 10px;
   }
 }

+ 170 - 158
ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/cyry/commonality/index.vue

@@ -5,134 +5,19 @@
         <QueryThisLevel :initLevel="queryParams.isBj" :active="1" :inactive="0" @changeLevel="changSwitch">
         </QueryThisLevel>
         <span class="sxzd">行政区划</span>
-        <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
-
-        </dept-tree>
+        <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"></dept-tree>
       </el-col>
-
-      <!--    高级查询-Start-->
-      <el-form :model="advancedQueryParams" ref="advancedQueryForm" size="small" :inline="true" v-show="!showSearch"
-        label-width="155px">
-        <el-form-item label="从业人员姓名" prop="xm">
-          <el-input v-model="advancedQueryParams.xm" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="证件号码" prop="sfzhm">
-          <el-input v-model="advancedQueryParams.sfzhm" @keyup.enter.native="handleQuery" placeholder="请输入公民身份证件号码" clearable/>
-        </el-form-item>
-        <el-form-item label="所在单位名称" prop="jgmc">
-          <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入所在单位名称" clearable @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="职业类型" prop="zylx">
-          <el-select v-model="advancedQueryParams.zylx" multiple collapse-tags placeholder="请选择" clearable>
-            <el-option v-for="dict in dict.type.CH061" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="岗位类型" prop="gwlx">
-          <el-select v-model="advancedQueryParams.gwlx" placeholder="请选择" clearable>
-            <el-option v-for="dict in dict.type.CH062" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="文化程度" prop="whcd">
-          <el-select v-model="advancedQueryParams.whcd" placeholder="请选择" clearable>
-            <el-option v-for="dict in dict.type.C0008" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="lxdh">
-          <el-input v-model="advancedQueryParams.lxdh" placeholder="请输入手机号码" clearable @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="离职/退休日期" prop="lzsj">
-          <el-date-picker clearable v-model="daterangeLzsj" style="width: 215px" type="daterange"
-            value-format="yyyyMMdd" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="护理员等级" prop="hlydj">
-          <el-select v-model="advancedQueryParams.hlydj" placeholder="请选择" clearable>
-            <el-option v-for="dict in dict.type.CH020" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否享受过补贴" prop="isBt">
-          <el-radio-group v-model="advancedQueryParams.isBt" style="width: 215px" 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 label="是否得到过奖励" prop="isJl">
-          <el-radio-group v-model="advancedQueryParams.isJl" style="width: 215px" 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 label="是否受到过处罚" prop="isCf">
-          <el-radio-group v-model="advancedQueryParams.isCf" style="width: 215px" 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 label="是否接受过培训" prop="isPx">
-          <el-radio-group v-model="advancedQueryParams.isPx" style="width: 215px" 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 label="是否缴纳社保" prop="isJnsb">
-          <el-radio-group v-model="advancedQueryParams.isJnsb" style="width: 215px" 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 label="性别" prop="xb">
-          <el-select v-model="advancedQueryParams.xb" placeholder="请选择" clearable>
-            <el-option v-for="dict in dict.type.C0007" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="年龄" prop="sfzhm">
-          <number placeholder="请输入年龄最小值" v-model="beginAge" :min="0" style="display: inline-block" />
-          ~
-          <number placeholder="请输入年龄最大值" v-model="endAge" :min="0" style="display: inline-block" />
-        </el-form-item>
-        <el-form-item label="职务" prop="zw">
-          <el-input v-model="advancedQueryParams.zw" placeholder="请输入职务" clearable @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="其它职业类型" prop="zylxQt">
-          <el-input v-model="advancedQueryParams.zylxQt" placeholder="请输入其它职业类型" clearable @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item label="是否有护理人员等级证书" prop="isHlyyzs">
-          <el-radio-group v-model="advancedQueryParams.isHlyyzs" style="width: 215px" 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 label="在职状态" prop="zzzt">
-          <el-select v-model="advancedQueryParams.zzzt" placeholder="请选择" clearable>
-            <el-option v-for="dict in dict.type.CZ001" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-
-
-
-
-        <el-form-item>
-          <el-button v-if="isJg" type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery" v-hasPermi="['search:ygJbxx:advancedList']">高级搜索</el-button>
-          <el-button v-else type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery" v-hasPermi="['search:ygJbxxSq: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="yljgId?24:20" :xs="24">
+      <el-col :span="yljgId ? 24 : 20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
           label-width="100px">
           <el-form-item label="员工姓名" prop="xm">
-            <el-input v-model="queryParams.xm" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.xm" placeholder="请输入姓名" clearable />
           </el-form-item>
           <el-form-item label="证件号码" prop="sfzhm">
-            <el-input v-model="queryParams.sfzhm" placeholder="请输入公民身份证件号码" clearable
-              @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.sfzhm" placeholder="请输入公民身份证件号码" clearable />
           </el-form-item>
           <el-form-item label="所在单位名称" prop="jgmc">
-            <el-input v-model="queryParams.jgmc" placeholder="请输入所在单位名称" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.jgmc" placeholder="请输入所在单位名称" clearable />
           </el-form-item>
           <el-form-item label="在职状态" prop="zzzt" v-show="!isJg">
             <el-select v-model="queryParams.zzzt" placeholder="请选择在职状态">
@@ -154,23 +39,23 @@
           <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 v-if="isJg" type="primary" size="mini" @click="showSearch = !showSearch" v-hasPermi="['search:ygJbxx:advancedList']">高级搜索</el-button>
-            <el-button v-else type="primary" size="mini" @click="showSearch = !showSearch" v-hasPermi="['search:ygJbxxSq:advancedList']">高级搜索</el-button>
+            <el-button v-if="isJg" type="primary" size="mini" @click="showDrawer = !showDrawer"
+              v-hasPermi="['search:ygJbxx:advancedList']">高级查询</el-button>
+            <el-button v-else type="primary" size="mini" @click="showDrawer = !showDrawer"
+              v-hasPermi="['search:ygJbxxSq:advancedList']">高级查询</el-button>
           </el-form-item>
         </el-form>
 
         <el-row :gutter="10" class="mb8" v-if="!yljgId">
           <el-col :span="10" style="color: rgb(247, 132, 119);">
-            从业人员查询数据范围为:正常营业{{isJg?'养老机构':'社区养老服务机构和设施'}}的在职员工
+            从业人员查询数据范围为:正常营业{{ isJg ? '养老机构' : '社区养老服务机构和设施' }}的在职员工
           </el-col>
           <el-col :span="1.5">
             <el-button v-if="isJg" type="warning" plain icon="el-icon-download" size="mini"
-              v-hasPermi="['search:ygJbxx:export']"
-              @click="handleExport">导出
+              v-hasPermi="['search:ygJbxx:export']" @click="handleExport">导出
             </el-button>
             <el-button v-else type="warning" plain icon="el-icon-download" size="mini"
-              v-hasPermi="['search:SqYgJbxx:export']"
-              @click="handleExport">导出
+              v-hasPermi="['search:SqYgJbxx:export']" @click="handleExport">导出
             </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -179,7 +64,7 @@
         <el-table v-loading="loading" :data="ygJbxxList">
           <el-table-column label="序号" align="center">
             <template slot-scope="scope">
-              {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
+              {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
             </template>
           </el-table-column>
           <el-table-column label="从业人员姓名" align="center" prop="xm" />
@@ -220,20 +105,126 @@
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!is_Component">
             <template slot-scope="scope">
-              <slot name='one' :value="scope.row">
-
-              </slot>
+              <slot name='one' :value="scope.row"></slot>
             </template>
           </el-table-column>
-
         </el-table>
-
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <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">
+          <el-form-item label="从业人员姓名" prop="xm">
+            <el-input v-model="advancedQueryParams.xm" placeholder="请输入姓名" clearable />
+          </el-form-item>
+          <el-form-item label="证件号码" prop="sfzhm">
+            <el-input v-model="advancedQueryParams.sfzhm" placeholder="请输入公民身份证件号码" clearable />
+          </el-form-item>
+          <el-form-item label="性别" prop="xb">
+            <el-select v-model="advancedQueryParams.xb" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.C0007" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="lxdh">
+            <el-input v-model="advancedQueryParams.lxdh" placeholder="请输入手机号码" clearable />
+          </el-form-item>
+          <el-form-item class="different-item" label="年龄" prop="sfzhm">
+            <number placeholder="请输入年龄最小值" v-model="beginAge" :min="0" style="display: inline-block" />
+            ~
+            <number placeholder="请输入年龄最大值" v-model="endAge" :min="0" style="display: inline-block" />
+          </el-form-item>
+          <el-form-item label="所在单位名称" prop="jgmc">
+            <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入所在单位名称" clearable />
+          </el-form-item>
+          <el-form-item label="岗位类型" prop="gwlx">
+            <el-select v-model="advancedQueryParams.gwlx" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CH062" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="职务" prop="zw">
+            <el-input v-model="advancedQueryParams.zw" placeholder="请输入职务" clearable />
+          </el-form-item>
+          <el-form-item label="文化程度" prop="whcd">
+            <el-select v-model="advancedQueryParams.whcd" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.C0008" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="职业类型" prop="zylx">
+            <el-select v-model="advancedQueryParams.zylx" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CH061" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-show="advancedQueryParams.zylx == '99'" label="其它职业类型" prop="zylxQt">
+            <el-input v-model="advancedQueryParams.zylxQt" placeholder="请输入其它职业类型" clearable />
+          </el-form-item>
+          <el-form-item label="在职状态" prop="zzzt">
+            <el-select v-model="advancedQueryParams.zzzt" @change="zzztChange" multiple collapse-tags placeholder="请选择"
+              clearable>
+              <el-option v-for="dict in dict.type.CZ001" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-show="showLzsj" label="离职/退休日期" prop="lzsj">
+            <el-date-picker clearable v-model="daterangeLzsj" type="daterange" value-format="yyyyMMdd"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="是否有护理人员等级证书" prop="isHlyyzs">
+            <el-radio-group v-model="advancedQueryParams.isHlyyzs" 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-show="advancedQueryParams.isHlyyzs == '1'" label="护理员等级" prop="hlydj">
+            <el-select v-model="advancedQueryParams.hlydj" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CH020" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否享受过补贴" prop="isBt">
+            <el-radio-group v-model="advancedQueryParams.isBt" 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 label="是否得到过奖励" prop="isJl">
+            <el-radio-group v-model="advancedQueryParams.isJl" 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 label="是否受到过处罚" prop="isCf">
+            <el-radio-group v-model="advancedQueryParams.isCf" 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 label="是否接受过培训" prop="isPx">
+            <el-radio-group v-model="advancedQueryParams.isPx" 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 label="是否缴纳社保" prop="isJnsb">
+            <el-radio-group v-model="advancedQueryParams.isJnsb" 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-scrollbar>
+        <el-form-item class="advanced-btns">
+          <el-button v-if="isJg" type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery"
+            v-hasPermi="['search:ygJbxx:advancedList']">搜索</el-button>
+          <el-button v-else type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery"
+            v-hasPermi="['search:ygJbxxSq: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 v-if="open">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="170px">
@@ -301,12 +292,12 @@
         <div class="formFlex">
           <el-form-item label="是否有护理人员等级证书" class="formWidth">
             <el-radio-group v-model="form.isHlyyzs" :disabled="isYH" @change="changeIsHlyyzs(form.isHlyyzs)">
-              <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="hlydj" class="formWidth">
-            <el-select v-model="form.hlydj" placeholder="请选择护理员等级" :disabled="isYH||isYHZ">
+            <el-select v-model="form.hlydj" placeholder="请选择护理员等级" :disabled="isYH || isYHZ">
               <el-option v-for="dict in dict.type.CH020" :key="dict.value" :label="dict.label" :value="dict.value">
               </el-option>
             </el-select>
@@ -345,49 +336,49 @@
           <table>
             <tr>
               <td>从业人员姓名:</td>
-              <td>{{dataDetails.xm}}</td>
+              <td>{{ dataDetails.xm }}</td>
               <td>性别:</td>
-              <td>{{translateDict('C0007',dataDetails.xb)}}</td>
+              <td>{{ translateDict('C0007', dataDetails.xb) }}</td>
               <td>出生日期:</td>
-              <td>{{dataDetails.csrq?special(dataDetails.csrq):''}}</td>
+              <td>{{ dataDetails.csrq ? special(dataDetails.csrq) : '' }}</td>
             </tr>
             <tr>
               <td>手机号码:</td>
-              <td>{{dataDetails.lxdh}}</td>
+              <td>{{ dataDetails.lxdh }}</td>
               <td>证件类型:</td>
-              <td>{{translateDict('C0015',dataDetails.sfzlx)}}</td>
+              <td>{{ translateDict('C0015', dataDetails.sfzlx) }}</td>
               <td>证件号码:</td>
-              <td>{{dataDetails.sfzhm}}</td>
+              <td>{{ dataDetails.sfzhm }}</td>
             </tr>
             <tr>
               <td>岗位类型:</td>
-              <td>{{translateDict('CH062',dataDetails.gwlx)}}</td>
+              <td>{{ translateDict('CH062', dataDetails.gwlx) }}</td>
               <td>职务:</td>
-              <td>{{dataDetails.zw}}</td>
+              <td>{{ dataDetails.zw }}</td>
               <td>学历:</td>
-              <td>{{translateDict('C0008',dataDetails.whcd)}}</td>
+              <td>{{ translateDict('C0008', dataDetails.whcd) }}</td>
             </tr>
             <tr>
               <td>是否有护理员等级证书:</td>
-              <td>{{translateDict('CZ035',dataDetails.isHlyyzs)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isHlyyzs) }}</td>
               <td>护理员等级:</td>
-              <td>{{translateDict('CH020',dataDetails.hlydj)}}</td>
+              <td>{{ translateDict('CH020', dataDetails.hlydj) }}</td>
               <td>职业类型:</td>
-              <td>{{translateDict('CH061',dataDetails.zylx)}}</td>
+              <td>{{ translateDict('CH061', dataDetails.zylx) }}</td>
             </tr>
             <tr>
               <td>职业类型其他:</td>
-              <td>{{dataDetails.zylxQt}}</td>
+              <td>{{ dataDetails.zylxQt }}</td>
               <td>所属部门:</td>
-              <td>{{dataDetails.zzmc}}</td>
+              <td>{{ dataDetails.zzmc }}</td>
               <td>在职状态:</td>
-              <td>{{translateDict('CZ001',dataDetails.zzzt)}}</td>
+              <td>{{ translateDict('CZ001', dataDetails.zzzt) }}</td>
             </tr>
             <tr>
               <td>离职/退休日期:</td>
-              <td>{{dataDetails.lzsj?special(dataDetails.lzsj):''}}</td>
+              <td>{{ dataDetails.lzsj ? special(dataDetails.lzsj) : '' }}</td>
               <td>是否缴纳社保:</td>
-              <td>{{translateDict('CZ035',dataDetails.isJnsb)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isJnsb) }}</td>
             </tr>
           </table>
         </el-tab-pane>
@@ -457,6 +448,8 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 显示高级查询
+      showDrawer: false,
       // 总条数
       total: 0,
       // 基本信息表格数据
@@ -491,6 +484,10 @@ export default {
         isBj: '0',
       },
       daterangeLzsj: [], // 离职/退休日期
+      beginAge: null,
+      endAge: null,
+      // 是否展示离职日期
+      showLzsj: false,
       advancedQueryParams: {
         xm: null,
         sfzhm: null,
@@ -505,10 +502,11 @@ export default {
         isCf: null, // 员工表没有该字段 该字段是后端子表出来的
         isPx: null, // 员工表没有该字段 该字段是后端子表出来的
         isJnsb: null,
+        zzzt: [],
 
         pageNum: 1,
         pageSize: 10,
-        isBj: '0',
+        isBj: null,
       },
       // 表单参数
       form: {},
@@ -619,9 +617,12 @@ export default {
     ...mapState(['user']),
     is_Component() {
       return this.isComponent
-    }
+    },
   },
   methods: {
+    zzztChange(value) {
+      value.includes('2') || value.includes('3') ? this.showLzsj = true : this.showLzsj = false
+    },
     getValid() {
       this.valid(this.rules, 'sfzhm', this.form.sfzlx)
     },
@@ -750,8 +751,17 @@ export default {
         this.advancedQueryParams.params['beginLzsj'] = this.daterangeLzsj[0]
         this.advancedQueryParams.params['endLzsj'] = this.daterangeLzsj[1]
       }
+      this.beginAge != null ? this.advancedQueryParams.params['beginAge'] = this.beginAge : false
+      this.endAge != null ? this.advancedQueryParams.params['endAge'] = this.endAge : false
+
       let copyParams = this.deepCopy(this.advancedQueryParams)
       copyParams.zylx.length > 0 && (copyParams.zylx = copyParams.zylx.join(','))
+      copyParams.gwlx.length > 0 && (copyParams.gwlx = copyParams.gwlx.join(','))
+      copyParams.whcd.length > 0 && (copyParams.whcd = copyParams.whcd.join(','))
+      copyParams.hlydj.length > 0 && (copyParams.hlydj = copyParams.hlydj.join(','))
+      copyParams.zzzt.length > 0 && (copyParams.zzzt = copyParams.zzzt.join(','))
+      copyParams.xb.length > 0 && (copyParams.xb = copyParams.xb.join(','))
+
       advancedListYgJbxx({ ...copyParams, jgId: this.yljgId }).then(response => {
         this.ygJbxxList = response.rows
         this.total = response.total
@@ -813,6 +823,8 @@ export default {
     /** 高级查询重置按钮操作 */
     advancedResetQuery() {
       this.daterangeLzsj = []
+      this.beginAge = null
+      this.endAge = null
       this.resetForm("advancedQueryForm");
       this.advancedHandleQuery();
     },
@@ -835,7 +847,7 @@ export default {
   }
 }
 </script>
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style lang="scss" scoped>
 table td {
   width: 10%;
   height: 2.5rem;

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

@@ -14,11 +14,10 @@
           label-width="140px">
 
           <el-form-item label="统一社会信用代码" prop="tyshxydm">
-            <el-input v-model="queryParams.tyshxydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable
-              @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.tyshxydm" placeholder="请输入统一社会信用代码" maxlength="18" clearable />
           </el-form-item>
           <el-form-item label="单位名称" prop="jgmc">
-            <el-input v-model="queryParams.jgmc" placeholder="请输入机构名称" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.jgmc" placeholder="请输入机构名称" clearable />
           </el-form-item>
           <el-form-item label="类别" prop="lb">
             <el-select v-model="queryParams.lb" placeholder="请选择" clearable>
@@ -36,7 +35,7 @@
             <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="showDrawer = !showDrawer"
-              v-hasPermi="['search:sqJcxx:advancedList']">高级搜索</el-button>
+              v-hasPermi="['search:sqJcxx:advancedList']">高级查询</el-button>
           </el-form-item>
         </el-form>
 
@@ -82,118 +81,51 @@
 
     <!-- 高级查询-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-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 />
+          </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="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="jgmc">
-            <el-input v-model="advancedQueryParams.ssxzqh" placeholder="请输入所属行政区划" clearable
-              @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <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 label="单位所属行政区划" prop="ssxzqh">
+            <RegionCascaderSelect v-model="advancedQueryParams.ssxzqh" :isDataRoot="true" endLevel="2" valueProp="code">
+            </RegionCascaderSelect>
+          </el-form-item> -->
+          <el-form-item label="单位所在行政区划" prop="szxzqh">
+            <RegionCascaderSelect style="width:100%" v-model="advancedQueryParams.szxzqh" :isDataRoot="true" endLevel="2" valueProp="code">
+            </RegionCascaderSelect>
           </el-form-item>
           <el-form-item label="机构运营状态" prop="sczt">
             <el-select v-model="advancedQueryParams.sczt" multiple collapse-tags placeholder="请选择" clearable>
               <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="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="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>
-            </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>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="类别" prop="lb">
-            <el-select v-model="advancedQueryParams.lb" multiple collapse-tags placeholder="请选择" clearable>
-              <el-option v-for="dict in dict.type.CZ030" :key="dict.value" :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item>
-          <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="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>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="所处位置" prop="scwz">
-            <el-select v-model="advancedQueryParams.scwz" 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" />
-            </el-select>
-          </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>
-            </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>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="收住老人类型" prop="szlrlx">
-            <el-select v-model="advancedQueryParams.szlrlx" multiple collapse-tags placeholder="请选择" clearable>
-              <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 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>
-            </el-radio-group>
+          <el-form-item label="通信地址" prop="txdz">
+            <el-input v-model="advancedQueryParams.txdz" placeholder="请输入通信地址" clearable />
           </el-form-item>
+
+          <h3>法定代表人或负责人信息</h3>
           <el-form-item label="机构组织代码" prop="zzjgdm">
-            <el-input v-model="advancedQueryParams.zzjgdm" placeholder="请输入机构组织代码" clearable
-              @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.zzjgdm" placeholder="请输入机构组织代码" clearable />
           </el-form-item>
-          <el-form-item label="统一社会信用代码" prop="tyshxydm">
-            <el-input v-model="advancedQueryParams.tyshxydm" placeholder="请输入统一社会信用代码" maxlength="18" 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 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="frlxfs">
-            <el-input v-model="advancedQueryParams.frlxfs" placeholder="请输入法人联系电话" clearable
-              @keyup.enter.native="handleQuery" />
+            <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>
@@ -201,12 +133,17 @@
             </el-select>
           </el-form-item>
           <el-form-item label="法人证件号码" prop="frzjhm">
-            <el-input v-model="advancedQueryParams.frzjhm" placeholder="请输入法人证件号码" clearable
-              @keyup.enter.native="handleQuery" />
+            <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
-              @keyup.enter.native="handleQuery" />
+            <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="qtcwsMin">
             <number v-model="advancedQueryParams.qtcwsMin" :min="0" :max="999999" :precision="0" />
@@ -244,61 +181,98 @@
           <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="csxz">
-            <el-select v-model="advancedQueryParams.csxz" multiple collapse-tags placeholder="请选择" clearable>
-              <el-option v-for="dict in dict.type.CH032" :key="dict.value" :label="dict.label" :value="dict.value" />
+
+          <h3>扩展信息</h3>
+          <el-form-item label="类别" prop="lb">
+            <el-select v-model="advancedQueryParams.lb" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.CZ030" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <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="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" />
             </el-select>
           </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 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="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 label="收住老人类型" prop="szlrlx">
+            <el-select v-model="advancedQueryParams.szlrlx" multiple collapse-tags placeholder="请选择" clearable>
+              <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 label="收住老人类型(其他说明)" prop="szlrlxQt">
-            <el-input v-model="advancedQueryParams.szlrlxQt" placeholder="可输入收住老人类型(其他说明)" clearable
-              @keyup.enter.native="handleQuery" />
+          <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="isYlbxddzg">
-            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isYlbxddzg">
+          <el-form-item label="是否开展医疗服务" prop="isKzylfw">
+            <el-radio-group 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>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="是否取得医疗机构执业许可证书" prop="isYljgzyxk">
-            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isYljgzyxk">
+          <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.CH014" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否街道(乡镇)区域性养老中心" prop="isQyxylfwzx">
+            <el-radio-group v-model="advancedQueryParams.isQyxylfwzx" 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 label="是否为街道(乡镇)区域性养老服务中心" prop="isQyxylfwzx">
-            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isQyxylfwzx">
+          <el-form-item label="是否投保责任险" prop="isTbzrx">
+            <el-radio-group v-model="advancedQueryParams.isTbzrx" 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 label="是否长护险定点机构" prop="isChxddjg">
+            <el-radio-group v-model="advancedQueryParams.isChxddjg" 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 label="是否提供居家养老上门服务" prop="isTgjjylsmfw">
-            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isTgjjylsmfw">
+            <el-radio-group v-model="advancedQueryParams.isTgjjylsmfw" 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 label="是否取得医疗保险定点医疗机构资格证书" prop="isYlbxddzg">
+            <el-radio-group v-model="advancedQueryParams.isYlbxddzg">
               <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 v-model="advancedQueryParams.isYljgzyxk">
+              <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>
+
+          <h3>其他信息</h3>
           <el-form-item label="土地是否由政府免费提供" prop="isZfmftg">
-            <el-radio-group style="width: 215px" v-model="advancedQueryParams.isZfmftg">
+            <el-radio-group v-model="advancedQueryParams.isZfmftg">
               <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-group v-model="advancedQueryParams.isCszfmftg">
               <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
               </el-radio>
             </el-radio-group>
@@ -309,12 +283,20 @@
           <el-form-item label="入住老年人数最大值" prop="rzlnrsMax">
             <number v-model="advancedQueryParams.rzlnrsMax" :min="0" :max="999999" :precision="0" />
           </el-form-item>
+          <el-form-item label="是否取得食品生产许可证" prop="isJm">
+            <el-radio-group v-model="advancedQueryParams.isJm" 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.isJm == 1" label="未取得食品生产许可证原因" prop="spxkYy">
+            <el-input v-model="advancedQueryParams.spxkYy" placeholder="可输入未取得食品生产许可证原因" clearable />
+          </el-form-item>
         </el-scrollbar>
-        <el-form-item>
+        <el-form-item class="advanced-btns">
           <el-button type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery"
-            v-hasPermi="['search:sqJcxx:advancedList']">高级搜索</el-button>
+            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>
@@ -528,7 +510,7 @@ export default {
         scwz: null,
         xbzt: null,
         isChxddjg: null,
-        szlrlx: null,
+        szlrlx: [],
         isTgjjylsmfw: null,
 
         pageNum: 1,
@@ -608,6 +590,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(','))
@@ -615,6 +598,12 @@ export default {
       copyParams.xbzt.length > 0 && (copyParams.xbzt = copyParams.xbzt.join(','))
       copyParams.lb.length > 0 && (copyParams.lb = copyParams.lb.join(','))
       copyParams.szlrlx.length > 0 && (copyParams.szlrlx = copyParams.szlrlx.join(','))
+      copyParams.frzjlx.length > 0 && (copyParams.frzjlx = copyParams.frzjlx.join(','))
+      copyParams.nsyljg.length > 0 && (copyParams.nsyljg = copyParams.nsyljg.join(','))
+      copyParams.scwz.length > 0 && (copyParams.scwz = copyParams.scwz.join(','))
+      copyParams.yljgqyhz.length > 0 && (copyParams.yljgqyhz = copyParams.yljgqyhz.join(','))
+      // copyParams.lb.length > 0 && (copyParams.szxzqh = copyParams.szxzqh.join(','))
+
 
       advancedListSqJcxx(copyParams).then(response => {
         this.jcxxList = response.rows;
@@ -707,7 +696,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 高级搜索按钮操作 */
+    /** 高级查询按钮操作 */
     advancedHandleQuery() {
       this.advancedQueryParams.pageNum = 1;
       this.advancedGetList();
@@ -761,40 +750,10 @@ 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%;
-}
-
-.el-date-editor.el-input {
-  width: 100%;
-}
-
 h3 {
   /*margin: 0;*/
   width: 100%;
   padding: 0.5rem !important;
-  background-image: -o-linear-gradient(290deg, #ddd 10%, #fff 90%);
   background-image: linear-gradient(160deg, #ddd 10%, #fff 90%);
   color: #000;
   font-weight: 500;

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

@@ -36,7 +36,7 @@
             <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="showDrawer = !showDrawer"
-              v-hasPermi="['search:jcxx:advancedList']">高级搜索</el-button>
+              v-hasPermi="['search:jcxx:advancedList']">高级查询</el-button>
           </el-form-item>
         </el-form>
         <el-col :span="1.5">
@@ -127,7 +127,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="所在行政区划" prop="szxzqh">
-            <RegionCascaderSelect v-model="advancedQueryParams.szxzqh" :isDataRoot="true" endLevel="2" valueProp="code">
+            <RegionCascaderSelect style="width:100%" v-model="advancedQueryParams.szxzqh" :isDataRoot="true" endLevel="2" valueProp="code">
             </RegionCascaderSelect>
           </el-form-item>
 
@@ -384,7 +384,7 @@
         </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>
+            v-hasPermi="['search:jcxx:advancedList']">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="advancedResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -1095,14 +1095,6 @@ table td:nth-child(odd) {
   background: #f5f5f5;
 }
 
-.el-select {
-  width: 100%;
-}
-
-.el-date-editor.el-input {
-  width: 100%;
-}
-
 h3 {
   /*margin: 0;*/
   width: 100%;

+ 206 - 202
ruoyi-ui/src/views/search/xxcx/lrxx/rzjg/index.vue

@@ -6,298 +6,285 @@
         <QueryThisLevel :initLevel="queryParams.isPresent" :active="1" :inactive="0" @changeLevel="changSwitch">
         </QueryThisLevel>
         <span class="sxzd">行政区划</span>
-        <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
+        <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"></dept-tree>
+      </el-col>
+      <el-col :span="20" :xs="24" style="float:right">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="140px">
+          <el-form-item label="老年人姓名" prop="xm">
+            <el-input v-model="queryParams.xm" placeholder="请输入老年人姓名" clearable />
+          </el-form-item>
+          <el-form-item label="证件号码" prop="zjhm">
+            <el-input v-model="queryParams.zjhm" placeholder="请输入证件号码" clearable />
+          </el-form-item>
+          <el-form-item label="身体能力等级" prop="nlpg">
+            <el-select v-model="queryParams.nlpg" placeholder="请选择身体能力等级" clearable>
+              <el-option v-for="dict in dict.type.CZ036" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否残疾" prop="isCj">
+            <el-select v-model="queryParams.isCj" multiple collapse-tags placeholder="请选择是否残疾" clearable>
+              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="入住机构名称" prop="jgmc">
+            <el-input v-model="queryParams.jgmc" placeholder="请输入入住机构名称" clearable />
+          </el-form-item>
+          <el-form-item label="现居地行政区划" prop="xzqh">
+            <RegionCascaderSelect :isJl="false" v-model="xzqh" style="width: 100%" valueProp="code">
+            </RegionCascaderSelect>
+          </el-form-item>
+          <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="showDrawer = !showDrawer"
+              v-hasPermi="['search:rzjg:advancedList']">高级查询</el-button>
+          </el-form-item>
+        </el-form>
 
-        </dept-tree>
+        <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:rzjg:export']">导出
+            </el-button>
+          </el-col>
+          <div style="color:rgb(247, 132, 119)">
+            老年人查询数据范围为:正常营业养老机构的老年人信息
+          </div>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="khjbxxList">
+          <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="xm" />
+          <el-table-column label="性别" align="center" prop="xb">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.C0007" :value="scope.row.xb" />
+            </template>
+          </el-table-column>
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column label="证件号码" align="center" prop="zjhm" />
+
+          <el-table-column label="身体能力等级" align="center" prop="nlpg">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CZ036" :value="scope.row.nlpg" />
+            </template>
+          </el-table-column>
+          <el-table-column label="是否残疾" align="center" prop="isCj">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CZ035" :value="scope.row.isCj" />
+            </template>
+          </el-table-column>
+          <el-table-column label="现居地行政区划" align="center" prop="xjdxzqyName" />
+          <el-table-column label="入住机构名称" align="center" prop="jgmc" />
+          <el-table-column label="机构所在区划" align="center" prop="xzqhId">
+          </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="particulars(scope.row)"
+                v-hasPermi="['search:rzjg:query']">详情
+              </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 高级查询 先做业务 等前端修改这里的样式 -CH 2022-9-23-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="advancedQueryParams" ref="advancedQueryForm" size="small" :inline="true" v-show="!showSearch"
-          label-width="155px">
+    <!-- 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="xm">
-            <el-input v-model="advancedQueryParams.xm" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.xm" placeholder="请输入姓名" clearable />
           </el-form-item>
           <el-form-item label="证件号码" prop="zjhm">
-            <el-input v-model="advancedQueryParams.zjhm" placeholder="请输入证件号码" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.zjhm" placeholder="请输入证件号码" clearable />
           </el-form-item>
           <el-form-item label="性别" prop="xb">
-            <el-select v-model="advancedQueryParams.xb" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.xb" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0007" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="民族" prop="mz">
-            <el-select v-model="advancedQueryParams.mz" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.mz" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0009" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="现居地行政区划" prop="xjdxzqy">
-            <RegionCascaderSelect :isJl="false" v-model="advancedQueryParams.xjdxzqy" style="width: 100%"
-              valueProp="code"></RegionCascaderSelect>
-          </el-form-item>
           <el-form-item label="户籍类型" prop="hjlb">
-            <el-select v-model="advancedQueryParams.hjlb" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.hjlb" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0031" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="国籍" prop="gj">
-            <el-select v-model="advancedQueryParams.gj" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.gj" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.XZ002" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="婚姻状况" prop="hyzk">
-            <el-select v-model="advancedQueryParams.hyzk" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.hyzk" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0010" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="联系电话" prop="sjhm">
-            <el-input v-model="advancedQueryParams.sjhm" placeholder="请输入手机号码" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.sjhm" placeholder="请输入手机号码" clearable />
+          </el-form-item>
+          <el-form-item label="现居地行政区划" prop="xjdxzqy">
+            <RegionCascaderSelect v-model="advancedQueryParams.xjdxzqy" style="width: 100%"
+              valueProp="code" :endLevel="2"></RegionCascaderSelect>
           </el-form-item>
+          <el-form-item label="居住地址" prop="xjd">
+            <el-input v-model="advancedQueryParams.xjd" placeholder="请输入居住地址" clearable />
+          </el-form-item>
+
+          <h3>扩展信息</h3>
           <el-form-item label="是否参加社保" prop="isCjsb">
             <el-radio-group v-model="advancedQueryParams.isCjsb" 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="isSz">
             <el-radio-group v-model="advancedQueryParams.isSz" 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="isLs">
             <el-radio-group v-model="advancedQueryParams.isLs" 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="isDb">
             <el-radio-group v-model="advancedQueryParams.isDb" 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="isSn">
             <el-radio-group v-model="advancedQueryParams.isSn" 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="isDj">
             <el-radio-group v-model="advancedQueryParams.isDj" 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="isGl">
             <el-radio-group v-model="advancedQueryParams.isGl" 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="isChx">
             <el-radio-group v-model="advancedQueryParams.isChx" 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="isCj">
+            <el-radio-group v-model="advancedQueryParams.isCj" style="width:215px" 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 label="是否计划生育特殊困难家庭" prop="isJhsytskn">
+            <el-radio-group v-model="advancedQueryParams.isJhsytskn" style="width:215px" 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 label="有无子女" prop="isZv">
+            <el-radio-group v-model="advancedQueryParams.isZv" style="width:215px" 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 label="签约状态" prop="isQy">
+            <el-radio-group v-model="advancedQueryParams.isQy" style="width: 215px" 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 label="入住状态" prop="isRz">
+            <el-radio-group v-model="advancedQueryParams.isRz" style="width: 215px" 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 label="服务机构名称" prop="jgmc">
+            <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入机构名称" clearable />
+          </el-form-item>
           <el-form-item label="医保类别" prop="yblb">
-            <el-select v-model="advancedQueryParams.yblb" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.yblb" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH045" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="残疾等级" prop="cjdj">
-            <el-select v-model="advancedQueryParams.cjdj" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.cjdj" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0025" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="身体能力评估等级" prop="nlpg">
-            <el-select v-model="advancedQueryParams.nlpg" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.nlpg" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CZ036" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="残疾类型" prop="cjlx">
-            <el-select v-model="advancedQueryParams.cjlx" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.cjlx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0024" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-
-          <el-form-item label="年龄" prop="zjhm">
-            <number placeholder="请输入年龄最小值" v-model.sync="beginAge" :min="0" style="display: inline-block" />
+          <el-form-item class="different-item" label="年龄" prop="zjhm">
+            <number placeholder="请输入年龄最小值" v-model="beginAge" :min="0" style="display: inline-block" />
             ~
-            <number placeholder="请输入年龄最大值" v-model.sync="endAge" :min="0" style="display: inline-block" />
-          </el-form-item>
-          <el-form-item label="服务机构名称" prop="jgmc">
-            <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入机构名称" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="是否残疾" prop="isCj">
-            <el-radio-group v-model="advancedQueryParams.isCj" style="width:215px" 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 label="是否计划生育特殊困难家庭" prop="isJhsytskn">
-            <el-radio-group v-model="advancedQueryParams.isJhsytskn" style="width:215px" placeholder="请选择" clearable>
-              <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
-              </el-radio>
-            </el-radio-group>
+            <number placeholder="请输入年龄最大值" v-model="endAge" :min="0" style="display: inline-block" />
           </el-form-item>
           <el-form-item label="固定电话" prop="gddh">
-            <el-input v-model="advancedQueryParams.gddh" placeholder="请输入固定电话" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.gddh" placeholder="请输入固定电话" clearable />
           </el-form-item>
-          <el-form-item label="有无子女" prop="isZv">
-            <el-radio-group v-model="advancedQueryParams.isZv" style="width:215px" 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 label="监护人姓名" prop="jhr">
+            <el-input v-model="advancedQueryParams.jhr" placeholder="请输入监护人姓名" clearable />
           </el-form-item>
-
           <el-form-item label="身份证件类型" prop="zjlx">
             <el-select v-model="advancedQueryParams.zjlx" 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="xjd">
-            <el-input v-model="advancedQueryParams.xjd" placeholder="请输入居住地址" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="监护人姓名" prop="jhr">
-            <el-input v-model="advancedQueryParams.jhr" placeholder="请输入监护人姓名" clearable
-                      @keyup.enter.native="handleQuery" />
-          </el-form-item>
           <el-form-item label="监护人手机号码" prop="jhrsjhm">
-            <el-input v-model="advancedQueryParams.jhrsjhm" placeholder="请输入监护人手机号码" clearable
-                      @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.jhrsjhm" placeholder="请输入监护人手机号码" clearable />
           </el-form-item>
           <el-form-item label="与监护人关系" prop="jhrgx">
             <el-select v-model="advancedQueryParams.jhrgx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0032" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="签约状态" prop="isQy">
-            <el-radio-group v-model="advancedQueryParams.isQy" style="width: 215px" 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 label="入住状态" prop="isRz">
-            <el-radio-group v-model="advancedQueryParams.isRz" style="width: 215px" 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 label="人员状态" prop="ryzt">
             <el-select v-model="advancedQueryParams.ryzt" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0034" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-
-
-
-
-
-
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini"
-                       @click="advancedHandleQuery"
-                       v-hasPermi="['search:rzjg: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-col>
-      <!-- End   高级查询 先做业务 等前端修改这里的样式 -CH 2022-9-23-->
-
-      <el-col :span="20" :xs="24" style="float:right">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-          label-width="140px">
-          <el-form-item label="老年人姓名" prop="xm">
-            <el-input v-model="queryParams.xm" placeholder="请输入老年人姓名" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="证件号码" prop="zjhm">
-            <el-input v-model="queryParams.zjhm" placeholder="请输入证件号码" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="身体能力等级" prop="nlpg">
-            <el-select v-model="queryParams.nlpg" placeholder="请选择身体能力等级" clearable>
-              <el-option v-for="dict in dict.type.CZ036" :key="dict.value" :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否残疾" prop="isCj">
-            <el-select v-model="queryParams.isCj" placeholder="请选择是否残疾" clearable>
-              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入住机构名称" prop="jgmc">
-            <el-input v-model="queryParams.jgmc" placeholder="请输入入住机构名称" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="现居地行政区划" prop="xzqh">
-            <RegionCascaderSelect :isJl="false" v-model="xzqh" style="width: 100%" valueProp="code">
-            </RegionCascaderSelect>
-          </el-form-item>
-          <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:rzjg:advancedList']">高级搜索</el-button>
-          </el-form-item>
-        </el-form>
-
-        <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:rzjg:export']">导出
-            </el-button>
-          </el-col>
-          <div style="color:rgb(247, 132, 119)">
-            老年人查询数据范围为:正常营业养老机构的老年人信息
-          </div>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="khjbxxList">
-          <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="xm" />
-          <el-table-column label="性别" align="center" prop="xb">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.C0007" :value="scope.row.xb" />
-            </template>
-          </el-table-column>
-          <el-table-column label="年龄" align="center" prop="age" />
-          <el-table-column label="证件号码" align="center" prop="zjhm" />
-
-          <el-table-column label="身体能力等级" align="center" prop="nlpg">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ036" :value="scope.row.nlpg" />
-            </template>
-          </el-table-column>
-          <el-table-column label="是否残疾" align="center" prop="isCj">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ035" :value="scope.row.isCj" />
-            </template>
-          </el-table-column>
-          <el-table-column label="现居地行政区划" align="center" prop="xjdxzqyName" />
-          <el-table-column label="入住机构名称" align="center" prop="jgmc" />
-          <el-table-column label="机构所在区划" align="center" prop="xzqhId">
-          </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="particulars(scope.row)"
-                v-hasPermi="['search:rzjg:query']">详情
-              </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:rzjg: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="详细信息" :visible.sync="openXQ" width="1200px" custom-class="custom"
       :append-to-body="true">
       <el-tabs v-model="activeNameDetails">
@@ -460,7 +447,7 @@
             <el-table-column label="评估时间" prop="pgrq" width="275">
               <template slot-scope="scope">
                 <span>{{
-                scope.row.pgrq ? special(scope.row.pgrq) : ''
+                    scope.row.pgrq ? special(scope.row.pgrq) : ''
                 }}</span>
               </template>
             </el-table-column>
@@ -477,17 +464,17 @@
               <td>合同开始日期:</td>
               <td>
                 {{
-                dataDetails.htxx && dataDetails.htxx.htksrq
-                ? special(dataDetails.htxx.htksrq)
-                : ''
+                    dataDetails.htxx && dataDetails.htxx.htksrq
+                      ? special(dataDetails.htxx.htksrq)
+                      : ''
                 }}
               </td>
               <td>合同结束日期:</td>
               <td>
                 {{
-                dataDetails.htxx && dataDetails.htxx.htjsrq
-                ? special(dataDetails.htxx.htjsrq)
-                : '无限期'
+                    dataDetails.htxx && dataDetails.htxx.htjsrq
+                      ? special(dataDetails.htxx.htjsrq)
+                      : '无限期'
                 }}
               </td>
             </tr>
@@ -495,17 +482,17 @@
               <td>签订日期:</td>
               <td>
                 {{
-                dataDetails.htxx && dataDetails.htxx.htqdrq
-                ? special(dataDetails.htxx.htqdrq)
-                : ''
+                    dataDetails.htxx && dataDetails.htxx.htqdrq
+                      ? special(dataDetails.htxx.htqdrq)
+                      : ''
                 }}
               </td>
               <td>预计入住日期:</td>
               <td>
                 {{
-                dataDetails.htxx && dataDetails.htxx.yjrzrq
-                ? special(dataDetails.htxx.yjrzrq)
-                : ''
+                    dataDetails.htxx && dataDetails.htxx.yjrzrq
+                      ? special(dataDetails.htxx.yjrzrq)
+                      : ''
                 }}
               </td>
             </tr>
@@ -522,7 +509,7 @@
             <el-table-column label="退住日期" prop="qysj" width="150">
               <template slot-scope="scope">
                 <span>{{
-                scope.row.tzsqrq ? special(scope.row.tzsqrq) : ''
+                    scope.row.tzsqrq ? special(scope.row.tzsqrq) : ''
                 }}</span>
               </template>
             </el-table-column>
@@ -592,6 +579,8 @@ export default {
       expands: [],
       // 显示搜索条件
       showSearch: true,
+      // 显示高级查询
+      showDrawer: false,
       editJtxxAndChxxx: true,
       // 总条数
       total: 0,
@@ -651,7 +640,7 @@ export default {
         zjhm: null,
         xb: null,
         mz: null,
-        xjdxzqy: null,
+        xjdxzqy: [],
         hjlb: null,
         gj: null,
         hyzk: null,
@@ -673,7 +662,7 @@ export default {
 
         pageNum: 1,
         pageSize: 10,
-        isBj: '0',
+        isBj: null,
       },
       // 表单参数
       form: {},
@@ -707,8 +696,21 @@ export default {
       if (this.endAge != null) {
         this.advancedQueryParams.params["endAge"] = this.endAge;
       }
+
       let copyParams = this.deepCopy(this.advancedQueryParams)
-      copyParams.xjdxzqy.length > 0 && (copyParams.xjdxzqy = copyParams.xjdxzqy.join(','))
+      copyParams.xjdxzqy ? copyParams.xjdxzqy = copyParams.xjdxzqy[copyParams.xjdxzqy.length - 1] : copyParams.xjdxzqy = null
+      copyParams.xb.length > 0 && (copyParams.xb = copyParams.xb.join(','))
+      copyParams.mz.length > 0 && (copyParams.mz = copyParams.mz.join(','))
+      copyParams.hjlb.length > 0 && (copyParams.hjlb = copyParams.hjlb.join(','))
+      copyParams.gj.length > 0 && (copyParams.gj = copyParams.gj.join(','))
+      copyParams.hyzk.length > 0 && (copyParams.hyzk = copyParams.hyzk.join(','))
+      copyParams.yblb.length > 0 && (copyParams.yblb = copyParams.yblb.join(','))
+      copyParams.cjdj.length > 0 && (copyParams.cjdj = copyParams.cjdj.join(','))
+      copyParams.nlpg.length > 0 && (copyParams.nlpg = copyParams.nlpg.join(','))
+      copyParams.cjlx.length > 0 && (copyParams.cjlx = copyParams.cjlx.join(','))
+      copyParams.zjlx.length > 0 && (copyParams.zjlx = copyParams.zjlx.join(','))
+      copyParams.jhrgx.length > 0 && (copyParams.jhrgx = copyParams.jhrgx.join(','))
+
       advancedListKhxxBySqJg(copyParams).then((response) => {
         this.khjbxxList = this.$hideRowData(response.rows, ['xm', 'zjhm'], [1, 3])
         this.total = response.total
@@ -721,6 +723,8 @@ export default {
     },
     /** 高级查询重置按钮操作 */
     advancedResetQuery() {
+      this.beginAge = null
+      this.endAge = null
       this.resetForm("advancedQueryForm");
       this.advancedHandleQuery();
     },

+ 212 - 208
ruoyi-ui/src/views/search/xxcx/lrxx/sqfw/index.vue

@@ -6,295 +6,289 @@
         <QueryThisLevel :initLevel="queryParams.isPresent" :active="1" :inactive="0" @changeLevel="changSwitch">
         </QueryThisLevel>
         <span class="sxzd">行政区划</span>
-        <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick">
+        <dept-tree :userId="user.userData.dept.parentId" @handleNodeClick="handleNodeClick"></dept-tree>
+      </el-col>
+      <el-col :span="20" :xs="24" style="float:right">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="140px">
+          <el-form-item label="老年人姓名" prop="xm">
+            <el-input v-model="queryParams.xm" placeholder="请输入老年人姓名" clearable />
+          </el-form-item>
+          <el-form-item label="证件号码" prop="zjhm">
+            <el-input v-model="queryParams.zjhm" placeholder="请输入证件号码" clearable />
+          </el-form-item>
+          <el-form-item label="身体能力等级" prop="nlpg">
+            <el-select v-model="queryParams.nlpg" placeholder="请选择身体能力等级" clearable>
+              <el-option v-for="dict in dict.type.CZ036" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="是否残疾" prop="isCj">
+            <el-select v-model="queryParams.isCj" placeholder="请选择是否残疾" clearable>
+              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="机构名称" prop="jgmc">
+            <el-input v-model="queryParams.jgmc" placeholder="请输入机构名称" clearable />
+          </el-form-item>
+          <el-form-item label="现居地行政区划" prop="xzqh">
+            <RegionCascaderSelect :isJl="false" v-model="xzqh" style="width: 100%" valueProp="code">
+            </RegionCascaderSelect>
+          </el-form-item>
+          <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="showDrawer = !showDrawer"
+              v-hasPermi="['search:sqfw:advancedList']">高级搜索</el-button>
+          </el-form-item>
+        </el-form>
 
-        </dept-tree>
+        <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:rzjg:export']">导出
+            </el-button>
+          </el-col>
+          <div style="color:rgb(247, 132, 119)">
+            老年人查询数据范围为:正常营业社区养老服务机构和设施的老年人信息
+          </div>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="khjbxxList">
+          <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="xm" />
+          <el-table-column label="性别" align="center" prop="xb">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.C0007" :value="scope.row.xb" />
+            </template>
+          </el-table-column>
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column label="证件号码" align="center" prop="zjhm" />
+
+          <el-table-column label="身体能力等级" align="center" prop="nlpg">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CZ036" :value="scope.row.nlpg" />
+            </template>
+          </el-table-column>
+          <el-table-column label="是否残疾" align="center" prop="isCj">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.CZ035" :value="scope.row.isCj" />
+            </template>
+          </el-table-column>
+          <el-table-column label="现居地行政区划" align="center" prop="xjdxzqyName" />
+          <el-table-column label="机构名称" align="center" prop="jgmc" />
+          <el-table-column label="机构所在区划" align="center" prop="xzqhId">
+          </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="particulars(scope.row)"
+                v-hasPermi="['search:rzjg:query']">详情
+              </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 高级查询 先做业务 等前端修改这里的样式 -CH 2022-9-23-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="advancedQueryParams" ref="advancedQueryForm" size="small" :inline="true" v-show="!showSearch"
-          label-width="155px">
+    <!-- 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="xm">
-            <el-input v-model="advancedQueryParams.xm" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.xm" placeholder="请输入姓名" clearable />
           </el-form-item>
           <el-form-item label="性别" prop="xb">
-            <el-select v-model="advancedQueryParams.xb" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.xb" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0007" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="证件号码" prop="zjhm">
-            <el-input v-model="advancedQueryParams.zjhm" placeholder="请输入证件号码" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="婚姻状况" prop="hyzk">
-            <el-select v-model="advancedQueryParams.hyzk" placeholder="请选择" clearable>
-              <el-option v-for="dict in dict.type.C0010" :key="dict.value" :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="服务机构名称" prop="jgmc">
-            <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入机构名称" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="现居地行政区域" prop="xjdxzqy">
-            <RegionCascaderSelect :isJl="false" v-model="advancedQueryParams.xjdxzqy" style="width: 100%"
-              valueProp="code"></RegionCascaderSelect>
-          </el-form-item>
-          <el-form-item label="是否残疾" prop="isCj">
-            <el-radio-group v-model="advancedQueryParams.isCj" style="width:215px" 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-input v-model="advancedQueryParams.zjhm" placeholder="请输入证件号码" clearable />
           </el-form-item>
           <el-form-item label="国籍" prop="gj">
-            <el-select v-model="advancedQueryParams.gj" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.gj" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.XZ002" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="户籍类别" prop="hjlb">
-            <el-select v-model="advancedQueryParams.hjlb" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.hjlb" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0031" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="民族" prop="mz">
-            <el-select v-model="advancedQueryParams.mz" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.mz" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0009" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="年龄" prop="zjhm">
-            <number placeholder="请输入年龄最小值" v-model.sync="beginAge" :min="0" style="display: inline-block" />
+          <el-form-item label="联系电话" prop="sjhm">
+            <el-input v-model="advancedQueryParams.sjhm" placeholder="请输入联系电话" clearable />
+          </el-form-item>
+          <el-form-item label="婚姻状况" prop="hyzk">
+            <el-select v-model="advancedQueryParams.hyzk" multiple collapse-tags placeholder="请选择" clearable>
+              <el-option v-for="dict in dict.type.C0010" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="服务机构名称" prop="jgmc">
+            <el-input v-model="advancedQueryParams.jgmc" placeholder="请输入机构名称" clearable />
+          </el-form-item>
+          <el-form-item label="现居地行政区域" prop="xjdxzqy">
+            <RegionCascaderSelect :endLevel="2" v-model="advancedQueryParams.xjdxzqy" style="width: 100%"
+              valueProp="code"></RegionCascaderSelect>
+          </el-form-item>
+          <el-form-item class="different-item" label="年龄" prop="zjhm">
+            <number placeholder="请输入年龄最小值" v-model="beginAge" :min="0" style="display: inline-block" />
             ~
-            <number placeholder="请输入年龄最大值" v-model.sync="endAge" :min="0" style="display: inline-block" />
+            <number placeholder="请输入年龄最大值" v-model="endAge" :min="0" style="display: inline-block" />
           </el-form-item>
+
+          <h3>扩展信息</h3>
           <el-form-item label="是否参加社保" prop="isCjsb">
             <el-radio-group v-model="advancedQueryParams.isCjsb" 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="isCj">
+            <el-radio-group v-model="advancedQueryParams.isCj" style="width:215px" 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 label="是否失智" prop="isSz">
             <el-radio-group v-model="advancedQueryParams.isSz" 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="isSn">
             <el-radio-group v-model="advancedQueryParams.isSn" 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="isDj">
             <el-radio-group v-model="advancedQueryParams.isDj" 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="isGl">
             <el-radio-group v-model="advancedQueryParams.isGl" 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="isChx">
             <el-radio-group v-model="advancedQueryParams.isChx" 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="isJhsytskn">
             <el-radio-group v-model="advancedQueryParams.isJhsytskn" 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="isDb">
             <el-radio-group v-model="advancedQueryParams.isDb" 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="isLs">
             <el-radio-group v-model="advancedQueryParams.isLs" 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="isZv">
+            <el-radio-group v-model="advancedQueryParams.isZv" style="width:215px" 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 label="签约状态" prop="isQy">
+            <el-radio-group v-model="advancedQueryParams.isQy" style="width: 215px" 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 label="入住状态" prop="isRz">
+            <el-radio-group v-model="advancedQueryParams.isRz" style="width: 215px" 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 label="医保类别" prop="yblb">
-            <el-select v-model="advancedQueryParams.yblb" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.yblb" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CH045" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="身体能力评估等级" prop="nlpg">
-            <el-select v-model="advancedQueryParams.nlpg" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.nlpg" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.CZ036" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="残疾类型" prop="cjlx">
-            <el-select v-model="advancedQueryParams.cjlx" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.cjlx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0024" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="残疾等级" prop="cjdj">
-            <el-select v-model="advancedQueryParams.cjdj" placeholder="请选择" clearable>
+            <el-select v-model="advancedQueryParams.cjdj" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0025" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="联系电话" prop="sjhm">
-            <el-input v-model="advancedQueryParams.sjhm" placeholder="请输入联系电话" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
           <el-form-item label="固定电话" prop="gddh">
-            <el-input v-model="advancedQueryParams.gddh" placeholder="请输入固定电话" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-
-          <el-form-item label="有无子女" prop="isZv">
-            <el-radio-group v-model="advancedQueryParams.isZv" style="width:215px" 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-input v-model="advancedQueryParams.gddh" placeholder="请输入固定电话" clearable />
           </el-form-item>
-
           <el-form-item label="身份证件类型" prop="zjlx">
             <el-select v-model="advancedQueryParams.zjlx" 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="xjd">
-            <el-input v-model="advancedQueryParams.xjd" placeholder="请输入居住地址" clearable
-                      @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.xjd" placeholder="请输入居住地址" clearable />
           </el-form-item>
           <el-form-item label="监护人姓名" prop="jhr">
-            <el-input v-model="advancedQueryParams.jhr" placeholder="请输入监护人姓名" clearable
-                      @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.jhr" placeholder="请输入监护人姓名" clearable />
           </el-form-item>
           <el-form-item label="监护人手机号码" prop="jhrsjhm">
-            <el-input v-model="advancedQueryParams.jhrsjhm" placeholder="请输入监护人手机号码" clearable
-                      @keyup.enter.native="handleQuery" />
+            <el-input v-model="advancedQueryParams.jhrsjhm" placeholder="请输入监护人手机号码" clearable />
           </el-form-item>
           <el-form-item label="与监护人关系" prop="jhrgx">
             <el-select v-model="advancedQueryParams.jhrgx" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0032" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="签约状态" prop="isQy">
-            <el-radio-group v-model="advancedQueryParams.isQy" style="width: 215px" 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 label="入住状态" prop="isRz">
-            <el-radio-group v-model="advancedQueryParams.isRz" style="width: 215px" 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 label="人员状态" prop="ryzt">
             <el-select v-model="advancedQueryParams.ryzt" multiple collapse-tags placeholder="请选择" clearable>
               <el-option v-for="dict in dict.type.C0034" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-
-
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini"
-                       @click="advancedHandleQuery"
-                       v-hasPermi="['search:sqfw: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-col>
-      <!-- End   高级查询 先做业务 等前端修改这里的样式 -CH 2022-9-23-->
-
-
-      <el-col :span="20" :xs="24" style="float:right">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-          label-width="140px">
-          <el-form-item label="老年人姓名" prop="xm">
-            <el-input v-model="queryParams.xm" placeholder="请输入老年人姓名" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="证件号码" prop="zjhm">
-            <el-input v-model="queryParams.zjhm" placeholder="请输入证件号码" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="身体能力等级" prop="nlpg">
-            <el-select v-model="queryParams.nlpg" placeholder="请选择身体能力等级" clearable>
-              <el-option v-for="dict in dict.type.CZ036" :key="dict.value" :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="是否残疾" prop="isCj">
-            <el-select v-model="queryParams.isCj" placeholder="请选择是否残疾" clearable>
-              <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="机构名称" prop="jgmc">
-            <el-input v-model="queryParams.jgmc" placeholder="请输入机构名称" clearable @keyup.enter.native="handleQuery" />
-          </el-form-item>
-          <el-form-item label="现居地行政区划" prop="xzqh">
-            <RegionCascaderSelect :isJl="false" v-model="xzqh" style="width: 100%" valueProp="code">
-            </RegionCascaderSelect>
-          </el-form-item>
-          <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:sqfw:advancedList']">高级搜索</el-button>
-          </el-form-item>
-        </el-form>
-
-        <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:rzjg:export']">导出
-            </el-button>
-          </el-col>
-          <div style="color:rgb(247, 132, 119)">
-            老年人查询数据范围为:正常营业社区养老服务机构和设施的老年人信息
-          </div>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="khjbxxList">
-          <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="xm" />
-          <el-table-column label="性别" align="center" prop="xb">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.C0007" :value="scope.row.xb" />
-            </template>
-          </el-table-column>
-          <el-table-column label="年龄" align="center" prop="age" />
-          <el-table-column label="证件号码" align="center" prop="zjhm" />
-
-          <el-table-column label="身体能力等级" align="center" prop="nlpg">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ036" :value="scope.row.nlpg" />
-            </template>
-          </el-table-column>
-          <el-table-column label="是否残疾" align="center" prop="isCj">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.CZ035" :value="scope.row.isCj" />
-            </template>
-          </el-table-column>
-          <el-table-column label="现居地行政区划" align="center" prop="xjdxzqyName" />
-          <el-table-column label="机构名称" align="center" prop="jgmc" />
-          <el-table-column label="机构所在区划" align="center" prop="xzqhId">
-          </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="particulars(scope.row)"
-                v-hasPermi="['search:rzjg:query']">详情
-              </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:sqfw: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="详细信息" :visible.sync="openXQ" width="1200px" custom-class="custom"
       :append-to-body="true">
       <el-tabs v-model="activeNameDetails">
@@ -456,7 +450,7 @@
             <el-table-column label="评估时间" prop="pgrq" width="275">
               <template slot-scope="scope">
                 <span>{{
-                scope.row.pgrq ? special(scope.row.pgrq) : ""
+                    scope.row.pgrq ? special(scope.row.pgrq) : ""
                 }}</span>
               </template>
             </el-table-column>
@@ -473,17 +467,17 @@
               <td>合同开始日期:</td>
               <td>
                 {{
-                dataDetails.htxx && dataDetails.htxx.htksrq
-                ? special(dataDetails.htxx.htksrq)
-                : ""
+                    dataDetails.htxx && dataDetails.htxx.htksrq
+                      ? special(dataDetails.htxx.htksrq)
+                      : ""
                 }}
               </td>
               <td>合同结束日期:</td>
               <td>
                 {{
-                dataDetails.htxx && dataDetails.htxx.htjsrq
-                ? special(dataDetails.htxx.htjsrq)
-                : "无限期"
+                    dataDetails.htxx && dataDetails.htxx.htjsrq
+                      ? special(dataDetails.htxx.htjsrq)
+                      : "无限期"
                 }}
               </td>
             </tr>
@@ -491,17 +485,17 @@
               <td>签订日期:</td>
               <td>
                 {{
-                dataDetails.htxx && dataDetails.htxx.htqdrq
-                ? special(dataDetails.htxx.htqdrq)
-                : ""
+                    dataDetails.htxx && dataDetails.htxx.htqdrq
+                      ? special(dataDetails.htxx.htqdrq)
+                      : ""
                 }}
               </td>
               <td>预计入住日期:</td>
               <td>
                 {{
-                dataDetails.htxx && dataDetails.htxx.yjrzrq
-                ? special(dataDetails.htxx.yjrzrq)
-                : ""
+                    dataDetails.htxx && dataDetails.htxx.yjrzrq
+                      ? special(dataDetails.htxx.yjrzrq)
+                      : ""
                 }}
               </td>
             </tr>
@@ -518,7 +512,7 @@
             <el-table-column label="退住日期" prop="qysj" width="150">
               <template slot-scope="scope">
                 <span>{{
-                scope.row.tzsqrq ? special(scope.row.tzsqrq) : ""
+                    scope.row.tzsqrq ? special(scope.row.tzsqrq) : ""
                 }}</span>
               </template>
             </el-table-column>
@@ -588,6 +582,8 @@ export default {
       expands: [],
       // 显示搜索条件
       showSearch: true,
+      // 显示高级查询
+      showDrawer: false,
       editJtxxAndChxxx: true,
       // 总条数
       total: 0,
@@ -640,12 +636,12 @@ export default {
         xm: null,
         jgmc: null,
         zjhm: null,
-        xb: null,
-        mz: null,
-        xjdxzqy: null,
-        hjlb: null,
-        gj: null,
-        hyzk: null,
+        xb: [],
+        mz: [],
+        xjdxzqy: [],
+        hjlb: [],
+        gj: [],
+        hyzk: [],
 
         isCj: null,
         isCjsb: null,
@@ -658,8 +654,8 @@ export default {
         isChx: null,
         isJhsytskn: null,
 
-        yblb: null,
-        cjdj: null,
+        yblb: [],
+        cjdj: [],
         nlpg: null,
         cjlx: null,
         sjhm: null, // 联系电话
@@ -778,7 +774,18 @@ export default {
         this.advancedQueryParams.params["endAge"] = this.endAge;
       }
       let copyParams = this.deepCopy(this.advancedQueryParams)
-      copyParams.xjdxzqy.length > 0 && (copyParams.xjdxzqy = copyParams.xjdxzqy.join(','))
+      copyParams.xjdxzqy ? copyParams.xjdxzqy = copyParams.xjdxzqy[copyParams.xjdxzqy.length - 1] : copyParams.xjdxzqy = null
+      copyParams.xb.length > 0 && (copyParams.xb = copyParams.xb.join(','))
+      copyParams.mz.length > 0 && (copyParams.mz = copyParams.mz.join(','))
+      copyParams.hjlb.length > 0 && (copyParams.hjlb = copyParams.hjlb.join(','))
+      copyParams.gj.length > 0 && (copyParams.gj = copyParams.gj.join(','))
+      copyParams.hyzk.length > 0 && (copyParams.hyzk = copyParams.hyzk.join(','))
+      copyParams.yblb.length > 0 && (copyParams.yblb = copyParams.yblb.join(','))
+      copyParams.cjdj.length > 0 && (copyParams.cjdj = copyParams.cjdj.join(','))
+      copyParams.nlpg.length > 0 && (copyParams.nlpg = copyParams.nlpg.join(','))
+      copyParams.cjlx.length > 0 && (copyParams.cjlx = copyParams.cjlx.join(','))
+      copyParams.zjlx.length > 0 && (copyParams.zjlx = copyParams.zjlx.join(','))
+      copyParams.jhrgx.length > 0 && (copyParams.jhrgx = copyParams.jhrgx.join(','))
 
       advancedListKhxxBySqJg(copyParams).then((response) => {
         this.khjbxxList = response.rows;
@@ -865,15 +872,12 @@ export default {
     },
     advancedHandleQuery() {
       this.advancedQueryParams.pageNum = 1;
-      // if (this.xzqh) {
-      //   this.advancedQueryParams.xjdxzqy = this.xzqh[this.xzqh.length - 1];
-      // } else {
-      //   this.advancedQueryParams.xjdxzqy = null;
-      // }
       this.advancedGetList();
     },
     /** 高级查询重置按钮操作 */
     advancedResetQuery() {
+      this.beginAge = null
+      this.endAge = null
       this.resetForm("advancedQueryForm");
       this.advancedHandleQuery();
     },