Merge branch '陈航-高级查询问题修改' of sckj/mz-cloud into master

ruoyi-modules/mz-business-lrgl/src/main/resources/mapper/business/ZwywLrJbxxMapper.xml

@@ -221,13 +221,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isChx != null and isChx != ''"> and is_chx = #{isChx}</if>
             <if test="isYyjh != null and isYyjh != ''"> and is_yyjh = #{isYyjh}</if>
             <if test="isSn != null and isSn != ''"> and is_sn = #{isSn}</if>
+            <if test="isCjsb != null and isCjsb != ''"> and is_cjsb = #{isCjsb}</if>
             <if test="lrStpgdj != null  and lrStpgdj != ''">
                 AND lr_stpgdj in
                 <foreach item="lrStpgdj" index="index" collection="lrStpgdj.split(',')" open="(" separator="," close=")">
                     #{lrStpgdj}
                 </foreach>
             </if>
-            <if test="isCjsb != null and isCjsb != ''"> and is_cjsb = #{isCjsb}</if>
             <if test="lrYblb != null  and lrYblb != ''">
                 AND lr_yblb in
                 <foreach item="lrYblb" index="index" collection="lrYblb.split(',')" open="(" separator="," close=")">

ruoyi-ui/src/views/business/lrxx/jbxx/index.vue

@@ -151,14 +151,206 @@
     </el-row>
 
     <!-- Start 高级查询 先做业务 等前端修改这里的样式 -CH 2022-10-19-->
-    <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="sjhm">
-        <el-input v-model="advancedQueryParams.sjhm" placeholder="请输入联系电话" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+    <el-form-item label="老人身份证件号码" prop="lrZjhm">
+      <el-input v-model="advancedQueryParams.lrZjhm" placeholder="请输入老人身份证件号码" clearable @keyup.enter.native="handleQuery" />
+    </el-form-item>
+    <el-form-item label="老人姓名" prop="lrXm" class="formWidth contenrFlex">
+      <el-input v-model="form.lrXm" placeholder="请输入老人姓名" />
+    </el-form-item>
+    <el-form-item label="性别" prop="lrXb">
+      <el-select v-model="queryParams.lrXb" 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="lrXl">
+      <el-select v-model="queryParams.lrXl" 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="lrZzmm">
+      <el-select v-model="queryParams.lrZzmm" placeholder="请选择政治面貌" clearable>
+        <el-option v-for="dict in dict.type.C0013" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="民族" prop="lrMz">
+      <el-select v-model="queryParams.lrMz" 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="lrGj">
+      <el-select v-model="queryParams.lrGj" 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="lrJg">
+      <el-input v-model="advancedQueryParams.lrJg" placeholder="请输入籍贯" clearable @keyup.enter.native="handleQuery" />
+    </el-form-item>
+    <el-form-item label="户籍类别" prop="lrHjlb">
+      <el-select v-model="queryParams.lrHjlb" 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="isYz">
+      <el-radio-group v-model="advancedQueryParams.isYz" 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>
+<!--    上报地址行政区划 lrSbdz-->
+<!--    户籍地址行政区划 lrHjdz-->
+<!--    现居地址行政区划 lrXjdz-->
+    <el-form-item label="常用联系电话" prop="lrCydh" class="formWidth2 contenrFlex2">
+      <el-input v-model="form.lrCydh" placeholder="请输入常用联系电话" />
+    </el-form-item>
+    <el-form-item label="婚姻状况" prop="lrHyzk">
+      <el-select v-model="queryParams.lrHyzk" placeholder="请选择婚姻状况" clearable>
+        <el-option v-for="dict in dict.type.XZ025" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="监护人姓名" prop="jhrXm" class="formWidth contenrFlex">
+      <el-input v-model="form.jhrXm" placeholder="请输入监护人姓名" />
+    </el-form-item>
+    <el-form-item label="监护人手机号码" prop="jhrSjhm">
+      <el-input v-model="advancedQueryParams.jhrSjhm" placeholder="请输入监护人手机号码" clearable @keyup.enter.native="handleQuery" />
+    </el-form-item>
+    <el-form-item label="与监护人关系" prop="jhrGx">
+      <el-select v-model="queryParams.jhrGx" 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="lrJjzk">
+      <el-select v-model="queryParams.lrJjzk" placeholder="请选择生活状况" clearable>
+        <el-option v-for="dict in dict.type.CZ027" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </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="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="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="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="isTk">
+      <el-radio-group v-model="advancedQueryParams.isTk" 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="isDsr">
+      <el-radio-group v-model="advancedQueryParams.isDsr" 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="isYyjh">
+      <el-radio-group v-model="advancedQueryParams.isYyjh" 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="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="lrStpgdj">
+      <el-select v-model="queryParams.lrStpgdj" 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="lrYblb">
+      <el-select v-model="queryParams.lrYblb" 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="lrJkzk">
+      <el-select v-model="queryParams.lrJkzk" placeholder="请选择健康状况" clearable>
+        <el-option v-for="dict in dict.type.XZ015" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="残疾类型" prop="lrCjlx">
+      <el-select v-model="queryParams.lrCjlx" placeholder="请选择残疾类型" clearable>
+        <el-option v-for="dict in dict.type.XZ015" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="能力状况" prop="lrNlzk">
+      <el-select v-model="queryParams.lrNlzk" placeholder="请选择能力状况" clearable>
+        <el-option v-for="dict in dict.type.CH050" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="收入来源" prop="lrSrly">
+      <el-select v-model="queryParams.lrSrly" placeholder="请选择收入来源" clearable>
+        <el-option v-for="dict in dict.type.CH054" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="上年度可支配收入" prop="lrKzpsr">
+      <el-select v-model="queryParams.lrKzpsr" placeholder="请选择上年度可支配收入" clearable>
+        <el-option v-for="dict in dict.type.XZ014" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="个人年收入" prop="lrGrnrs">
+      <el-select v-model="queryParams.lrGrnrs" placeholder="请选择上年度可支配收入" clearable>
+        <el-option v-for="dict in dict.type.XZ014" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="家庭救助帮扶" prop="lrJtjzbfqk">
+      <el-select v-model="queryParams.lrJtjzbfqk" placeholder="请选择家庭救助帮扶" clearable>
+        <el-option v-for="dict in dict.type.CH058" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="陪伴居住情况" prop="lrPbjjqk">
+      <el-select v-model="queryParams.lrPbjjqk" placeholder="请选择陪伴居住情况" clearable>
+        <el-option v-for="dict in dict.type.CH057" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="日常生活照料人" prop="zlrLb">
+      <el-select v-model="queryParams.zlrLb" placeholder="请选择日常生活照料人" clearable>
+        <el-option v-for="dict in dict.type.CH056" :key="dict.value" :label="dict.label" :value="dict.value" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="关爱服务需求" prop="lrGaxq">
+      <el-select v-model="queryParams.lrGaxq" placeholder="请选择关爱服务需求" clearable>
+        <el-option v-for="dict in dict.type.CH055" :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">高级搜索</el-button>