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

ruoyi-ui/src/views/organization/kugl/khjbxx/index.vue

@@ -39,162 +39,10 @@
       <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="['organization:khJbxx:advancedList']">高级搜索</el-button>
+        <el-button type="primary" size="mini" @click="showDrawer = !showDrawer"
+          v-hasPermi="['organization:khJbxx:advancedList']">高级查询</el-button>
       </el-form-item>
     </el-form>
-
-    <!-- Start 高级查询 先做业务 等前端修改这里的样式 -CH 2022-9-23-->
-    <el-form :model="advancedQueryParams" ref="advancedQueryForm" size="small" :inline="true" v-show="!showSearch"
-      label-width="140px">
-      <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="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="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="gj">
-        <el-select v-model="advancedQueryParams.gj" 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-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-option v-for="dict in dict.type.C0009" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item>
-      <!--  CH-Prlblem-2022-9-23 这个《文化程度》 全国高级查询有 但是在机构里的 客户基本信息没有该字段。字典值为XZ048-->
-      <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>
-        </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="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>
-        </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>
-        </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>
-        </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>
-        </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>
-        </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>
-        </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>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="医保类别" prop="yblb">
-        <el-select v-model="advancedQueryParams.yblb" 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-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-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-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="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-form-item>
-      <el-form-item label="年龄" prop="zjhm">
-        <number placeholder="请输入年龄最小值" v-model.sync="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="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="gddh">
-        <el-input v-model="advancedQueryParams.gddh" placeholder="请输入固定电话" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-
-
-
-
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini"
-                   @click="advancedHandleQuery"
-                   v-hasPermi="['organization:khJbxx: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   高级查询 先做业务 等前端修改这里的样式 -CH 2022-9-23-->
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
@@ -212,11 +60,10 @@
       </el-col>
       <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}}
+          {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
       <el-table-column label="客户姓名" align="center" prop="xm" />
@@ -258,16 +105,167 @@
             v-hasPermi="['organization:khjbxx:edit']">修改
           </el-button>
           <el-button size="mini" type="text" icon="el-icon-delete"
-            @click="handleDelete(scope.row,(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1,scope.$index,scope.$index)"
+            @click="handleDelete(scope.row, (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1, scope.$index, scope.$index)"
             v-hasPermi="['organization:khjbxx:remove']">删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
+    <!-- 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
+              @keyup.enter.native="handleQuery" />
+          </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="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" 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="gj">
+            <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" 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" 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="yblb">
+            <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" 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" 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" 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="xjdxzqy">
+            <RegionCascaderSelect :isJl="false" 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="endAge" :min="0" style="display: inline-block" />
+          </el-form-item>
+          <!--  CH-Prlblem-2022-9-23 这个《文化程度》 全国高级查询有 但是在机构里的 客户基本信息没有该字段。字典值为XZ048-->
+          <el-form-item label="是否参加社保" prop="isCjsb">
+            <el-radio-group v-model="advancedQueryParams.isCjsb" 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" 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" 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="isSn">
+            <el-radio-group v-model="advancedQueryParams.isSn" 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="isDj">
+            <el-radio-group v-model="advancedQueryParams.isDj" 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="isGl">
+            <el-radio-group v-model="advancedQueryParams.isGl" 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="isChx">
+            <el-radio-group v-model="advancedQueryParams.isChx" 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="isDb">
+            <el-radio-group v-model="advancedQueryParams.isDb" 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="isLs">
+            <el-radio-group v-model="advancedQueryParams.isLs" 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="isCj">
+            <el-radio-group v-model="advancedQueryParams.isCj" 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" 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 type="primary" icon="el-icon-search" size="mini" @click="advancedHandleQuery"
+            v-hasPermi="['organization:khJbxx: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="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
@@ -368,13 +366,13 @@
             <div class="formFlex">
               <el-form-item label="是否失智" prop="isSz" class="formWidth2">
                 <el-radio-group v-model="form.isSz">
-                  <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" class="formWidth2">
                 <el-radio-group v-model="form.isDj">
-                  <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>
@@ -382,13 +380,13 @@
             <div class="formFlex">
               <el-form-item label="是否留守" prop="isLs" class="formWidth2">
                 <el-radio-group v-model="form.isLs">
-                  <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" class="formWidth2">
                 <el-radio-group v-model="form.isDb">
-                  <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>
@@ -396,13 +394,13 @@
             <div class="formFlex">
               <el-form-item label="是否孤老" prop="isGl" class="formWidth2">
                 <el-radio-group v-model="form.isGl">
-                  <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="isCjsb" class="formWidth2">
                 <el-radio-group v-model="form.isCjsb">
-                  <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>
@@ -410,13 +408,13 @@
             <div class="formFlex">
               <el-form-item label="是否享受长护险" prop="isChx" class="formWidth2">
                 <el-radio-group v-model="form.isChx">
-                  <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" class="formWidth2">
                 <el-radio-group v-model="form.isJhsytskn">
-                  <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>
@@ -462,7 +460,7 @@
               <el-form-item label="是否失能" class="formWidth2">
                 <el-radio-group v-model="form.isSn">
                   <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value"
-                    :disabled="beforeSubmit">{{dict.label}}
+                    :disabled="beforeSubmit">{{ dict.label }}
                   </el-radio>
                 </el-radio-group>
               </el-form-item>
@@ -470,11 +468,11 @@
             <div class="formFlex">
               <el-form-item label="是否残疾" prop="isCj" class="formWidth2">
                 <el-radio-group v-model="form.isCj">
-                  <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 v-if="form.isCj==1" label="残疾类型" prop="cjlx" class="formWidth2">
+              <el-form-item v-if="form.isCj == 1" label="残疾类型" prop="cjlx" class="formWidth2">
                 <el-select v-model="form.cjlx" placeholder="请选择残疾类型">
                   <el-option v-for="dict in dict.type.C0024" :key="dict.value" :label="dict.label" :value="dict.value">
                   </el-option>
@@ -482,13 +480,13 @@
               </el-form-item>
             </div>
             <div class="formFlex">
-              <el-form-item v-if="form.isCj==1" label="残疾等级" prop="cjdj" class="formWidth2">
+              <el-form-item v-if="form.isCj == 1" label="残疾等级" prop="cjdj" class="formWidth2">
                 <el-select v-model="form.cjdj" placeholder="请选择残疾等级">
                   <el-option v-for="dict in dict.type.C0025" :key="dict.value" :label="dict.label" :value="dict.value">
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="form.isCj==1" label="残疾证号" prop="cjzh" class="formWidth2 contenrFlex2">
+              <el-form-item v-if="form.isCj == 1" label="残疾证号" prop="cjzh" class="formWidth2 contenrFlex2">
                 <el-input v-model="form.cjzh" placeholder="请输入残疾证号" />
               </el-form-item>
             </div>
@@ -506,19 +504,19 @@
               <el-table-column label="家庭成员姓名" prop="jtcyxm" width="150" />
               <el-table-column label="家庭成员证件类型代码" prop="jtcyzjlx" width="150">
                 <template slot-scope="scope">
-                  {{ translateDict('C0015',scope.row.jtcyzjlx)}}
+                  {{ translateDict('C0015', scope.row.jtcyzjlx) }}
                 </template>
               </el-table-column>
               <el-table-column label="家庭成员证件号码" prop="jtcyzjhm" width="150">
               </el-table-column>
               <el-table-column label="家庭成员性别" prop="jtcyxb" width="150">
                 <template slot-scope="scope">
-                  {{ translateDict('C0007',scope.row.jtcyxb)}}
+                  {{ translateDict('C0007', scope.row.jtcyxb) }}
                 </template>
               </el-table-column>
               <el-table-column label="家庭成员与老年人关系" prop="jtcygx" width="150">
                 <template slot-scope="scope">
-                  {{ translateDict('C0032',scope.row.jtcygx)}}
+                  {{ translateDict('C0032', scope.row.jtcygx) }}
                 </template>
               </el-table-column>
               <el-table-column label="家庭成员联系电话" prop="jtcylxdh" width="150" />
@@ -527,16 +525,16 @@
                 fixed="right">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" icon="el-icon-edit"
-                    @click="handleUpdateFamily(scope.row,scope.$index)" v-hasPermi="['organization:jtxx:edit']">修改
+                    @click="handleUpdateFamily(scope.row, scope.$index)" v-hasPermi="['organization:jtxx:edit']">修改
                   </el-button>
                   <el-button size="mini" type="text" icon="el-icon-delete"
-                    @click="handleDeleteFamily(scope.row,(jtxxQueryParams.pageNum-1)*jtxxQueryParams.pageSize + scope.$index + 1,scope.$index)"
+                    @click="handleDeleteFamily(scope.row, (jtxxQueryParams.pageNum - 1) * jtxxQueryParams.pageSize + scope.$index + 1, scope.$index)"
                     v-hasPermi="['organization:jtxx:remove']">删除
                   </el-button>
                 </template>
               </el-table-column>
             </el-table>
-            <pagination v-show="jtxxTotal>0" :total="jtxxTotal" :page.sync="jtxxQueryParams.pageNum"
+            <pagination v-show="jtxxTotal > 0" :total="jtxxTotal" :page.sync="jtxxQueryParams.pageNum"
               :limit.sync="jtxxQueryParams.pageSize" @pagination="getJtxxList" />
           </el-tab-pane>
           <el-tab-pane label="长护险信息" :disabled="!editJtxxAndChxxx" name="fourth"
@@ -551,7 +549,7 @@
               <el-table-column label="序号" align="center" prop="index" width="50" />
               <el-table-column label="长护险服务签约日期" prop="qysj">
                 <template slot-scope="scope">
-                  {{special(scope.row.qysj)}}
+                  {{ special(scope.row.qysj) }}
                 </template>
               </el-table-column>
               <el-table-column label="长护险月报销资金" prop="bxzj" />
@@ -564,24 +562,24 @@
                 fixed="right">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" icon="el-icon-edit"
-                    @click="handleUpdateLong(scope.row,scope.$index)" v-hasPermi="['organization:chxxx:edit']">修改
+                    @click="handleUpdateLong(scope.row, scope.$index)" v-hasPermi="['organization:chxxx:edit']">修改
                   </el-button>
                   <el-button size="mini" type="text" icon="el-icon-delete"
-                    @click="handleDeleteLong(scope.row,(chxxxQueryParams.pageNum-1)*chxxxQueryParams.pageSize + scope.$index + 1,scope.$index)"
+                    @click="handleDeleteLong(scope.row, (chxxxQueryParams.pageNum - 1) * chxxxQueryParams.pageSize + scope.$index + 1, scope.$index)"
                     v-hasPermi="['organization:chxxx:remove']">删除
                   </el-button>
                 </template>
               </el-table-column>
             </el-table>
-            <pagination v-show="chxxxTotal>0" :total="chxxxTotal" :page.sync="chxxxQueryParams.pageNum"
+            <pagination v-show="chxxxTotal > 0" :total="chxxxTotal" :page.sync="chxxxQueryParams.pageNum"
               :limit.sync="chxxxQueryParams.pageSize" @pagination="getChxxxList" />
           </el-tab-pane>
         </el-tabs>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="upForm" v-if="activeName== 'second'">上一步</el-button>
-        <el-button type="primary" @click="downForm" v-if="activeName== 'first'">下一步</el-button>
-        <el-button type="primary" @click="submitForm" v-if="activeName== 'second'">提 交</el-button>
+        <el-button type="primary" @click="upForm" v-if="activeName == 'second'">上一步</el-button>
+        <el-button type="primary" @click="downForm" v-if="activeName == 'first'">下一步</el-button>
+        <el-button type="primary" @click="submitForm" v-if="activeName == 'second'">提 交</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -638,7 +636,7 @@
             placeholder="请选择长护险服务签约日期" />
         </el-form-item>
         <el-form-item label="长护险月报销资金" prop="bxzj">
-          <number v-model.sync="longForm.bxzj" placeholder="长护险月报销资金" controls-position="right" :min="0"
+          <number v-model="longForm.bxzj" placeholder="长护险月报销资金" controls-position="right" :min="0"
             :max="999999.99" :precision="2">
           </number>
         </el-form-item>
@@ -662,36 +660,36 @@
           <table>
             <tr>
               <td>姓名：</td>
-              <td>{{dataDetails.xm}}</td>
+              <td>{{ dataDetails.xm }}</td>
               <td>国籍：</td>
-              <td>{{ translateDict('XZ002',dataDetails.gj)}}</td>
+              <td>{{ translateDict('XZ002', dataDetails.gj) }}</td>
               <td>民族：</td>
-              <td>{{ translateDict('C0009',dataDetails.mz)}}</td>
+              <td>{{ translateDict('C0009', dataDetails.mz) }}</td>
               <td rowspan="3">
                 <image-preview :src="dataDetails.tx" v-if="dataDetails.tx"></image-preview>
               </td>
             </tr>
             <tr>
               <td>性别：</td>
-              <td>{{translateDict('C0007',dataDetails.xb)}}</td>
+              <td>{{ translateDict('C0007', dataDetails.xb) }}</td>
               <td>证件类型：</td>
-              <td>{{translateDict('C0015',dataDetails.zjlx)}}</td>
+              <td>{{ translateDict('C0015', dataDetails.zjlx) }}</td>
               <td>证件号码：</td>
-              <td>{{dataDetails.zjhm}}</td>
+              <td>{{ dataDetails.zjhm }}</td>
             </tr>
             <tr>
               <td>婚姻状况：</td>
-              <td>{{translateDict('C0010',dataDetails.hyzk)}}</td>
+              <td>{{ translateDict('C0010', dataDetails.hyzk) }}</td>
               <td>户籍类型：</td>
-              <td>{{translateDict('C0031',dataDetails.hjlb)}}</td>
+              <td>{{ translateDict('C0031', dataDetails.hjlb) }}</td>
               <td>出生日期：</td>
-              <td>{{dataDetails.csrq}}</td>
+              <td>{{ dataDetails.csrq }}</td>
             </tr>
             <tr>
               <td>现居地区划：</td>
-              <td colspan="2">{{dataDetails.xjdxzqy}}</td>
+              <td colspan="2">{{ dataDetails.xjdxzqy }}</td>
               <td>现居地址：</td>
-              <td>{{dataDetails.xjd}}</td>
+              <td>{{ dataDetails.xjd }}</td>
               <!--<td>运营状态：</td>-->
               <!--<td></td>-->
             </tr>
@@ -702,59 +700,59 @@
           <table>
             <tr>
               <td>是否失智：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isSz)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isSz) }}</td>
               <td>是否留守：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isLs)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isLs) }}</td>
               <td></td>
               <td></td>
             </tr>
             <tr>
               <td>是否低保：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isDb)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isDb) }}</td>
               <td>是否独居：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isDj)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isDj) }}</td>
               <td>是否孤老：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isGl)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isGl) }}</td>
             </tr>
             <tr>
               <td>是否享受长护险：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isChx)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isChx) }}</td>
               <td>是否失能：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isSn)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isSn) }}</td>
               <td>是否计划生育特殊困难家庭：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isJhsytskn)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isJhsytskn) }}</td>
             </tr>
             <tr>
               <td>身体能力评估等级：</td>
-              <td>{{ translateDict('CZ036',dataDetails.nlpg)}}</td>
+              <td>{{ translateDict('CZ036', dataDetails.nlpg) }}</td>
               <td>是否参加社保：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isCjsb)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isCjsb) }}</td>
               <td>医保类别：</td>
-              <td>{{ translateDict('CH045',dataDetails.yblb)}}</td>
+              <td>{{ translateDict('CH045', dataDetails.yblb) }}</td>
             </tr>
             <tr>
               <td>固定电话：</td>
-              <td>{{dataDetails.gddh}}</td>
+              <td>{{ dataDetails.gddh }}</td>
               <td>移动电话：</td>
-              <td>{{dataDetails.sjhm}}</td>
+              <td>{{ dataDetails.sjhm }}</td>
               <td>监护人/联系人：</td>
-              <td>{{dataDetails.jhr}}</td>
+              <td>{{ dataDetails.jhr }}</td>
             </tr>
             <tr>
               <td>监护人/联系人联系电话：</td>
-              <td>{{dataDetails.jhrsjhm}}</td>
+              <td>{{ dataDetails.jhrsjhm }}</td>
               <td>与监护人/联系人关系：</td>
-              <td>{{dataDetails.jhrgx}}</td>
+              <td>{{ dataDetails.jhrgx }}</td>
               <td>是否残疾：</td>
-              <td>{{ translateDict('CZ035',dataDetails.isCj)}}</td>
+              <td>{{ translateDict('CZ035', dataDetails.isCj) }}</td>
             </tr>
             <tr>
               <td>残疾类型：</td>
-              <td>{{ translateDict('C0024',dataDetails.cjlx)}}</td>
+              <td>{{ translateDict('C0024', dataDetails.cjlx) }}</td>
               <td>残疾等级：</td>
-              <td>{{ translateDict('C0025',dataDetails.cjdj)}}</td>
+              <td>{{ translateDict('C0025', dataDetails.cjdj) }}</td>
               <td>残疾证号：</td>
-              <td>{{ translateDict('C0025',dataDetails.cjzh)}}</td>
+              <td>{{ translateDict('C0025', dataDetails.cjzh) }}</td>
             </tr>
             <!--<tr>-->
             <!--<td>开户名称：</td>-->
@@ -772,25 +770,25 @@
             <el-table-column label="家庭成员姓名" prop="jtcyxm" width="150" />
             <el-table-column label="家庭成员证件类型代码" prop="jtcyzjlx" width="150">
               <template slot-scope="scope">
-                {{ translateDict('C0015',scope.row.jtcyzjlx)}}
+                {{ translateDict('C0015', scope.row.jtcyzjlx) }}
               </template>
             </el-table-column>
             <el-table-column label="家庭成员证件号码" prop="jtcyzjhm" width="150">
             </el-table-column>
             <el-table-column label="家庭成员性别" prop="jtcyxb" width="150">
               <template slot-scope="scope">
-                {{ translateDict('C0007',scope.row.jtcyxb)}}
+                {{ translateDict('C0007', scope.row.jtcyxb) }}
               </template>
             </el-table-column>
             <el-table-column label="家庭成员与老年人关系" prop="jtcygx" width="150">
               <template slot-scope="scope">
-                {{ translateDict('C0032',scope.row.jtcygx)}}
+                {{ translateDict('C0032', scope.row.jtcygx) }}
               </template>
             </el-table-column>
             <el-table-column label="家庭成员联系电话" prop="jtcylxdh" width="150" />
             <el-table-column label="家庭成员居住地址" prop="jtcyjzd" width="150" />
           </el-table>
-          <pagination v-show="jtxxTotal>0" :total="jtxxTotal" :page.sync="jtxxQueryParams.pageNum"
+          <pagination v-show="jtxxTotal > 0" :total="jtxxTotal" :page.sync="jtxxQueryParams.pageNum"
             :limit.sync="jtxxQueryParams.pageSize" @pagination="getJtxxList" />
         </el-tab-pane>
         <el-tab-pane label="长护险信息" name="fourthDetails" v-if="checkPermi(['organization:chxxx:list'])">
@@ -805,26 +803,26 @@
             </el-table-column>
             <el-table-column label="是否有效" prop="isYx">
               <template slot-scope="scope">
-                {{ translateDict('CZ035',scope.row.isYx)}}
+                {{ translateDict('CZ035', scope.row.isYx) }}
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="chxxxTotal>0" :total="chxxxTotal" :page.sync="chxxxQueryParams.pageNum"
+          <pagination v-show="chxxxTotal > 0" :total="chxxxTotal" :page.sync="chxxxQueryParams.pageNum"
             :limit.sync="chxxxQueryParams.pageSize" @pagination="getChxxxList" />
         </el-tab-pane>
         <el-tab-pane label="合同信息" name="fiveDetails" v-if="checkPermi(['organization:htxx:listbyjbxx'])">
           <table>
             <tr>
               <td>合同开始日期:</td>
-              <td>{{dataDetails.htxx&&dataDetails.htxx.htksrq?special(dataDetails.htxx.htksrq):''}}</td>
+              <td>{{ dataDetails.htxx && dataDetails.htxx.htksrq ? special(dataDetails.htxx.htksrq) : '' }}</td>
               <td>合同结束日期:</td>
-              <td>{{dataDetails.htxx&&dataDetails.htxx.htjsrq?special(dataDetails.htxx.htjsrq):''}}</td>
+              <td>{{ dataDetails.htxx && dataDetails.htxx.htjsrq ? special(dataDetails.htxx.htjsrq) : '' }}</td>
             </tr>
             <tr>
               <td>签订日期:</td>
-              <td>{{dataDetails.htxx&&dataDetails.htxx.htqdrq?special(dataDetails.htxx.htqdrq):''}}</td>
+              <td>{{ dataDetails.htxx && dataDetails.htxx.htqdrq ? special(dataDetails.htxx.htqdrq) : '' }}</td>
               <td>预计入住日期:</td>
-              <td> {{dataDetails.htxx&&dataDetails.htxx.yjrzrq?special(dataDetails.htxx.yjrzrq):''}}</td>
+              <td> {{ dataDetails.htxx && dataDetails.htxx.yjrzrq ? special(dataDetails.htxx.yjrzrq) : '' }}</td>
             </tr>
           </table>
         </el-tab-pane>
@@ -838,7 +836,7 @@
             </el-table-column>
             <el-table-column label="退住日期" prop="qysj" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.tzsqrq?special(scope.row.tzsqrq):''}}</span>
+                <span>{{ scope.row.tzsqrq ? special(scope.row.tzsqrq) : '' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="房间号" prop="rzfj" width="150">
@@ -847,14 +845,14 @@
             </el-table-column>
             <el-table-column label="状态" prop="rzzt" width="150">
               <template slot-scope="scope">
-                {{ translateDict('CH029',scope.row.rzzt)}}
+                {{ translateDict('CH029', scope.row.rzzt) }}
               </template>
             </el-table-column>
             <el-table-column label="创建人" prop="blr">
             </el-table-column>
             <el-table-column label="创建时间" prop="blsj" width="150">
               <template slot-scope="scope">
-                <span>{{ special(scope.row.blsj,'time') }}</span>
+                <span>{{ special(scope.row.blsj, 'time') }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -874,7 +872,7 @@ import { chineseOne, idCard, Regular } from '@/utils/regular'
 import { checkPermi, checkRole } from "@/utils/permission";
 import { Constant } from '@/utils/constant'
 import { getToken } from "@/utils/auth";
-import {decryptData_ECB,decryptRowData_ECB} from "@/api/tool/sm4";
+import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
 
 export default {
   name: 'Khjbxx',
@@ -893,6 +891,8 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 显示高级查询
+      showDrawer: false,
       editJtxxAndChxxx: true,
       // 总条数
       total: 0,
@@ -953,6 +953,8 @@ export default {
         cjlx: null,
         isRz: null,
       },
+      beginAge: null,
+      endAge: null,
       advancedQueryParams: {
         beginAge: null,
         endAge: null,
@@ -961,7 +963,7 @@ export default {
         zjhm: null,
         xb: null,
         mz: null,
-        // xjdxzqy: null,
+        xjdxzqy: [],
         hjlb: null,
         gj: null,
         hyzk: null,
@@ -1253,15 +1255,22 @@ export default {
     /** 查询养老机构_客户_基本信息列表 */
     advancedGetList() {
       this.loading = true
-      // this.advancedQueryParams.params = {};
-      // if (this.beginAge || this.beginAge == '0') {
-      //   this.advancedQueryParams.params["beginAge"] = this.beginAge;
-      // }
-      // if (this.endAge || this.endAge == '0') {
-      //   this.advancedQueryParams.params["endAge"] = this.endAge;
-      // }
+      this.advancedQueryParams.params = {};
+      
+      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.sczt.length > 0 && (copyParams.sczt = copyParams.sczt.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(','))
 
       advancedListKhxxBySqJg(copyParams).then(response => {
         this.khjbxxList = this.$decryptRowData(response.rows, ["xm", "zjhm"], [1, 3]);
@@ -1385,15 +1394,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();
     },

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

@@ -590,7 +590,7 @@ export default {
       }
 
       let copyParams = this.deepCopy(this.advancedQueryParams)
-      copyParams.szxzqh ? copyParams.szxzqh = copyParams.szxzqh[copyParams.szxzqh.length - 1] : copyParams.ssxzqh = null
+      copyParams.szxzqh ? copyParams.szxzqh = copyParams.szxzqh[copyParams.szxzqh.length - 1] : copyParams.szxzqh = 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(','))

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

@@ -896,7 +896,7 @@ export default {
       }
 
       let copyParams = this.deepCopy(this.advancedQueryParams)
-      copyParams.szxzqh ? copyParams.szxzqh = copyParams.szxzqh[copyParams.szxzqh.length - 1] : copyParams.ssxzqh = null
+      copyParams.szxzqh ? copyParams.szxzqh = copyParams.szxzqh[copyParams.szxzqh.length - 1] : copyParams.szxzqh = 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(','))

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

@@ -136,8 +136,8 @@
             <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>
+            <RegionCascaderSelect :isJl="false" v-model="advancedQueryParams.xjdxzqy" style="width: 100%"
+              valueProp="code"></RegionCascaderSelect>
           </el-form-item>
           <el-form-item label="居住地址" prop="xjd">
             <el-input v-model="advancedQueryParams.xjd" placeholder="请输入居住地址" clearable />

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

@@ -143,7 +143,7 @@
             <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%"
+            <RegionCascaderSelect :isJl="false" v-model="advancedQueryParams.xjdxzqy" style="width: 100%"
               valueProp="code"></RegionCascaderSelect>
           </el-form-item>
           <el-form-item class="different-item" label="年龄" prop="zjhm">