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

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

@@ -12,73 +12,24 @@
           <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="lrSbdz">
+		    <RegionCascaderSelect v-model="queryParams.lrSbdz" style="width: 100%" :isDataRoot="true" valueProp="code"></RegionCascaderSelect>
+	    </el-form-item>
       <el-form-item label="户籍与现居地址一致" prop="isYz">
         <el-select v-model="queryParams.isYz" 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="isLs">
-        <el-select v-model="queryParams.isLs" 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="isDb">-->
-      <!--<el-select v-model="queryParams.isDb" 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="isChx">-->
-      <!--<el-select v-model="queryParams.isChx" 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="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="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="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="lzzt">
-        <el-select v-model="queryParams.lzzt" placeholder="请选择审核状态" clearable>
-          <el-option v-for="dict in dict.type.CH051" :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="lrCjlx">-->
-      <!--<el-select v-model="queryParams.lrCjlx" 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>
         <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>
@@ -101,45 +52,36 @@
     </el-row>
 
     <el-table v-loading="loading" :data="lrjbxxList">
-      <el-table-column label="序号" align="center">
-        <template slot-scope="scope">
+      <el-table-column label="序号" align="center" width="80">
+        <template v-slot="scope">
           {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
       <el-table-column label="老人姓名" align="center" prop="lrXm" />
       <el-table-column label="老人身份证件号码" align="center" prop="lrZjhm" />
       <el-table-column label="性别" align="center" prop="lrXb">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <dict-tag :options="dict.type.C0007" :value="scope.row.lrXb" />
         </template>
       </el-table-column>
-      <el-table-column label="健康状况" align="center" prop="lrJkzk">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.XZ015" :value="scope.row.lrJkzk" />
-        </template>
-      </el-table-column>
-      <el-table-column label="能力评估等级" align="center" prop="lrStpgdj">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ036" :value="scope.row.lrStpgdj" />
-        </template>
-      </el-table-column>
-      <el-table-column label="是否留守" align="center" prop="isLs">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ035" :value="scope.row.isLs" />
-        </template>
-      </el-table-column>
-      <el-table-column label="户籍与现居地址一致" align="center" prop="isYz">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ035" :value="scope.row.isYz" />
-        </template>
-      </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="lzzt">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CH051" :value="scope.row.lzzt" />
-        </template>
-      </el-table-column>
+	    <el-table-column label="上报地址" align="center" prop="lrSbdzName" />
+<!--	    <el-table-column label="生活状况" align="center" prop="lrJjzk">-->
+<!--		    <template v-slot="scope">-->
+<!--			    <dict-tag :options="dict.type.CZ027" :value="scope.row.lrJjzk ? scope.row.lrJjzk.split(',') : []" />-->
+<!--		    </template>-->
+<!--	    </el-table-column>-->
+<!--      <el-table-column label="健康状况" align="center" prop="lrJkzk">-->
+<!--        <template v-slot="scope">-->
+<!--	        <dict-tag :options="dict.type.XZ015" :value="scope.row.lrJkzk ? scope.row.lrJkzk.split(',') : []" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="户籍与现居地址一致" align="center" prop="isYz">-->
+<!--        <template v-slot="scope">-->
+<!--          <dict-tag :options="dict.type.CZ035" :value="scope.row.isYz" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
-        <template slot-scope="scope">
+        <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdateLzzt(scope.row)"
             v-if="scope.row.lzzt != '2'" v-hasPermi="['business:lrjbxx:checkLzzt']">审批
           </el-button>
@@ -157,7 +99,6 @@
     <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%">
@@ -173,43 +114,23 @@
           <el-form-item label="老人身份证件号码" prop="lrZjhm">
             <el-input v-model="advancedQueryParams.lrZjhm" placeholder="请输入老人身份证件号码" clearable />
           </el-form-item>
-          <el-form-item label="学历" prop="lrXl">
-            <el-select v-model="advancedQueryParams.lrXl" placeholder="请选择学历" multiple collapse-tags 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="advancedQueryParams.lrZzmm" placeholder="请选择政治面貌" multiple collapse-tags 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="advancedQueryParams.lrMz" placeholder="请选择民族" multiple collapse-tags 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="advancedQueryParams.lrGj" placeholder="请选择国籍" multiple collapse-tags 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 />
-          </el-form-item>
-          <el-form-item label="户籍类别" prop="lrHjlb">
-            <el-select v-model="advancedQueryParams.lrHjlb" placeholder="请选择户籍类别" multiple collapse-tags 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="lrHjdz">
+		        <RegionCascaderSelect v-model="advancedQueryParams.lrHjdz" style="width: 100%" :isDataRoot="true" valueProp="code"></RegionCascaderSelect>
+	        </el-form-item>
+	        <el-form-item label="现居地址" prop="lrXjdz">
+		        <RegionCascaderSelect v-model="advancedQueryParams.lrXjdz" style="width: 100%" :isDataRoot="true" valueProp="code"></RegionCascaderSelect>
+	        </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">
             <el-input v-model="advancedQueryParams.lrCydh" placeholder="请输入常用联系电话" />
           </el-form-item>
@@ -218,98 +139,11 @@
               <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">
-            <el-input v-model="advancedQueryParams.jhrXm" placeholder="请输入监护人姓名" />
-          </el-form-item>
-          <el-form-item label="监护人手机号码" prop="jhrSjhm">
-            <el-input v-model="advancedQueryParams.jhrSjhm" placeholder="请输入监护人手机号码" clearable />
-          </el-form-item>
-          <el-form-item label="与监护人关系" prop="jhrGx">
-            <el-select v-model="advancedQueryParams.jhrGx" placeholder="请选择与监护人关系" multiple collapse-tags 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="advancedQueryParams.lrJjzk" placeholder="请选择生活状况" multiple collapse-tags 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="advancedQueryParams.lrStpgdj" placeholder="请选择能力评估等级" multiple collapse-tags 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="advancedQueryParams.lrYblb" placeholder="请选择医保类别" multiple collapse-tags 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="lrJkzk">
             <el-select v-model="advancedQueryParams.lrJkzk" placeholder="请选择健康状况" multiple collapse-tags clearable>
               <el-option v-for="dict in dict.type.XZ015" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -317,7 +151,7 @@
           </el-form-item>
           <el-form-item label="残疾类型" prop="lrCjlx">
             <el-select v-model="advancedQueryParams.lrCjlx" placeholder="请选择残疾类型" multiple collapse-tags clearable>
-              <el-option v-for="dict in dict.type.XZ015" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <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="lrNlzk">
@@ -335,11 +169,6 @@
               <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="advancedQueryParams.lrGrnrs" placeholder="请选择上年度可支配收入" multiple collapse-tags 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="advancedQueryParams.lrJtjzbfqk" placeholder="请选择家庭救助帮扶" multiple collapse-tags
               clearable>
@@ -492,6 +321,19 @@
                   </el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
+	            <el-form-item label="残疾类型" prop="lrCjlx" v-if="ifQT(form.lrJkzk, '02')">
+		            <el-checkbox-group v-model="form.lrCjlx">
+			            <el-checkbox v-for="dict in dict.type.C0024" :key="dict.value" :label="dict.value">
+				            {{ dict.label }}
+			            </el-checkbox>
+		            </el-checkbox-group>
+	            </el-form-item>
+	            <el-form-item label="残疾等级" prop="lrCjdj" v-if="ifQT(form.lrJkzk, '02')">
+		            <el-select v-model="form.lrCjdj" 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 label="能力情况" prop="lrNlzk">
                 <el-select v-model="form.lrNlzk" placeholder="请选择能力状况" clearable>
                   <el-option v-for="dict in dict.type.CH050" :key="dict.value" :label="dict.label"
@@ -892,7 +734,7 @@ export default {
           { required: false, message: '医保类别不能为空', trigger: 'change' }
         ],
         lrJkzk: [
-          { required: false, message: '健康状况不能为空', trigger: 'blur' }
+          { required: true, message: '健康状况不能为空', trigger: 'blur' }
         ],
         lrCjlx: [
           { required: true, message: '残疾类型不能为空', trigger: 'blur' }
@@ -901,43 +743,43 @@ export default {
           { required: true, message: '残疾等级不能为空', trigger: 'blur' }
         ],
         lrNlzk: [
-          { required: false, message: '能力状况不能为空', trigger: 'blur' }
+          { required: true, message: '能力状况不能为空', trigger: 'blur' }
         ],
         lrJjzk: [
-          { required: false, message: '生活状况不能为空', trigger: 'blur' }
+          { required: true, message: '生活状况不能为空', trigger: 'blur' }
         ],
         lrSrly: [
-          { required: false, message: '收入来源不能为空', trigger: 'blur' }
+          { required: true, message: '收入来源不能为空', trigger: 'blur' }
         ],
         lrSrlyQt: [
-          { required: true, message: '其他收入来源不能为空', trigger: 'blur' },
+          { required: false, message: '其他收入来源不能为空', trigger: 'blur' },
           { max: 100, message: '其他收入来源不能超过100个字符', trigger: 'blur' }
         ],
         lrKzpsr: [
-          { required: false, message: '上年度可支配收入不能为空', trigger: 'blur' }
-        ],
-        lrGrnrs: [
-          { required: false, message: '个人年收入不能为空', trigger: 'blur' }
+          { required: true, message: '上年度可支配收入不能为空', trigger: 'blur' }
         ],
+        // lrGrnrs: [
+        //   { required: true, message: '个人年收入不能为空', trigger: 'blur' }
+        // ],
         lrJtjzbfqk: [
-          { required: false, message: '家庭救助帮扶不能为空', trigger: 'blur' }
+          { required: true, message: '家庭救助帮扶不能为空', trigger: 'blur' }
         ],
         lrJtjzbfqkQt: [
-          { required: true, message: '其他帮扶情况不能为空', trigger: 'blur' },
+          { required: false, message: '其他帮扶情况不能为空', trigger: 'blur' },
           { max: 100, message: '其他帮扶情况不能超过100个字符', trigger: 'blur' }
         ],
         lrPbjjqk: [
-          { required: false, message: '陪伴居住情况不能为空', trigger: 'blur' }
+          { required: true, message: '陪伴居住情况不能为空', trigger: 'blur' }
         ],
         lrPbjjqkQt: [
-          { required: true, message: '其他陪伴居住情况不能为空', trigger: 'blur' },
+          { required: false, message: '其他陪伴居住情况不能为空', trigger: 'blur' },
           { max: 100, message: '其他陪伴居住情况不能超过100个字符', trigger: 'blur' }
         ],
         zlrLb: [
-          { required: false, message: '日常生活照料人不能为空', trigger: 'blur' }
+          { required: true, message: '日常生活照料人不能为空', trigger: 'blur' }
         ],
         zlrGx: [
-          { required: true, message: '与其他人员关系不能为空', trigger: 'blur' },
+          { required: false, message: '与其他人员关系不能为空', trigger: 'blur' },
           { max: 72, message: '与其他人员关系不能超过72个字符', trigger: 'blur' }
         ],
         zlrXm: [
@@ -956,10 +798,10 @@ export default {
           { validator: Mobile, trigger: 'blur' }
         ],
         lrGaxq: [
-          { required: false, message: '关爱服务需求不能为空', trigger: 'blur' }
+          { required: true, message: '关爱服务需求不能为空', trigger: 'blur' }
         ],
         lrGaxqQt: [
-          { required: true, message: '其他关爱服务需求不能为空', trigger: 'blur' },
+          { required: false, message: '其他关爱服务需求不能为空', trigger: 'blur' },
           { max: 100, message: '其他关爱服务需求不能超过100个字符', trigger: 'blur' }
         ],
         isSz: [
@@ -1027,7 +869,6 @@ export default {
     }
   },
   created() {
-    console.log(this.dict);
     this.getList()
     const dateMat = new Date()
     const year = dateMat.getFullYear()
@@ -1151,7 +992,6 @@ export default {
         this.form.lrXjdz = null
         this.form.lrXjdzBcxx = null
       }
-      console.log(value, 'value')
     },
     checkJbxxForm() {
       if (this.form.lrCsrq !== this.form.lrZjhm.substr(6, 8)) {
@@ -1176,37 +1016,33 @@ export default {
       this.loading = true
       let copyParams = this.deepCopy(this.advancedQueryParams)
       copyParams.lrXb.length > 0 && (copyParams.lrXb = copyParams.lrXb.join(','))
-      copyParams.lrXl.length > 0 && (copyParams.lrXl = copyParams.lrXl.join(','))
-      copyParams.lrZzmm.length > 0 && (copyParams.lrZzmm = copyParams.lrZzmm.join(','))
       copyParams.lrMz.length > 0 && (copyParams.lrMz = copyParams.lrMz.join(','))
-      copyParams.lrGj.length > 0 && (copyParams.lrGj = copyParams.lrGj.join(','))
-      copyParams.lrHjlb.length > 0 && (copyParams.lrHjlb = copyParams.lrHjlb.join(','))
       copyParams.lrHyzk.length > 0 && (copyParams.lrHyzk = copyParams.lrHyzk.join(','))
-      copyParams.jhrGx.length > 0 && (copyParams.jhrGx = copyParams.jhrGx.join(','))
       copyParams.lrJjzk.length > 0 && (copyParams.lrJjzk = copyParams.lrJjzk.join(','))
-      copyParams.lrStpgdj.length > 0 && (copyParams.lrStpgdj = copyParams.lrStpgdj.join(','))
-      copyParams.lrYblb.length > 0 && (copyParams.lrYblb = copyParams.lrYblb.join(','))
       copyParams.lrJkzk.length > 0 && (copyParams.lrJkzk = copyParams.lrJkzk.join(','))
       copyParams.lrCjlx.length > 0 && (copyParams.lrCjlx = copyParams.lrCjlx.join(','))
-      copyParams.lrNlzk.length > 0 && (copyParams.lrNlzk = copyParams.lrNlzk.join(','))
+	    copyParams.lrNlzk.length > 0 && (copyParams.lrNlzk = copyParams.lrNlzk.join(','))
       copyParams.lrSrly.length > 0 && (copyParams.lrSrly = copyParams.lrSrly.join(','))
       copyParams.lrKzpsr.length > 0 && (copyParams.lrKzpsr = copyParams.lrKzpsr.join(','))
-      copyParams.lrGrnrs.length > 0 && (copyParams.lrGrnrs = copyParams.lrGrnrs.join(','))
       copyParams.lrJtjzbfqk.length > 0 && (copyParams.lrJtjzbfqk = copyParams.lrJtjzbfqk.join(','))
       copyParams.lrPbjjqk.length > 0 && (copyParams.lrPbjjqk = copyParams.lrPbjjqk.join(','))
       copyParams.zlrLb.length > 0 && (copyParams.zlrLb = copyParams.zlrLb.join(','))
       copyParams.lrGaxq.length > 0 && (copyParams.lrGaxq = copyParams.lrGaxq.join(','))
-
+	    copyParams.lrHjdz ? copyParams.lrHjdz = copyParams.lrHjdz[copyParams.lrHjdz.length - 1] : copyParams.lrHjdz = null
+	    copyParams.lrXjdz ? copyParams.lrXjdz = copyParams.lrXjdz[copyParams.lrXjdz.length - 1] : copyParams.lrXjdz = null
       advancedListLrjbxx(copyParams).then(response => {
-        this.lrjbxxList = response.rows
+        this.lrjbxxList = decryptRowData_ECB(response.rows, ["lrZjhm", "lrXm"], [2, 1]);
         this.total = response.total
         this.loading = false
       })
     },
+
     /** 查询老人基本信息列表 */
     getList() {
       this.loading = true
-      listLrjbxx(this.queryParams).then(response => {
+	    let copyForm = this.deepCopy(this.queryParams)
+	    copyForm.lrSbdz ? copyForm.lrSbdz = copyForm.lrSbdz[copyForm.lrSbdz.length - 1] : copyForm.lrSbdz = []
+      listLrjbxx(copyForm).then(response => {
         this.lrjbxxList = decryptRowData_ECB(response.rows, ["lrZjhm", "lrXm"], [2, 1]);
         this.total = response.total
         this.loading = false
@@ -1355,7 +1191,7 @@ export default {
         this.form.zlrLb = this.form.zlrLb ? this.form.zlrLb.split(',') : []
         this.form.lrGaxq = this.form.lrGaxq ? this.form.lrGaxq.split(',') : []
         this.form.lrCjlx = this.form.lrCjlx ? this.form.lrCjlx.split(',') : []
-        this.changeIsLs(this.form.isLs)
+        // this.changeIsLs(this.form.isLs)
         this.open = true
         this.title = '修改老人基本信息'
       })

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

@@ -27,6 +27,9 @@
           />
         </el-select>
       </el-form-item>
+	    <el-form-item label="上报地址" prop="lrSbdz">
+		    <RegionCascaderSelect v-model="queryParams.lrSbdz" style="width: 100%" :isDataRoot="true" valueProp="code"></RegionCascaderSelect>
+	    </el-form-item>
       <el-form-item label="户籍与现居地址一致" prop="isYz" >
         <el-select v-model="queryParams.isYz" placeholder="请选择户籍与现居地址一致"  clearable>
           <el-option
@@ -37,88 +40,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="户籍地址查询" prop="lrHjdz">
-        <RegionCascaderSelect
-          :isJl="false"
-          :endLevel="5"
-          v-model="lrHjdz"
-          style="width: 100%"
-          :isDataRoot="true"
-          valueProp="code"
-        ></RegionCascaderSelect>
-      </el-form-item>
-      <el-form-item label="是否留守" prop="isLs">
-        <el-select v-model="queryParams.isLs" 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="isDb">-->
-        <!--<el-select v-model="queryParams.isDb" 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="isChx">-->
-        <!--<el-select v-model="queryParams.isChx" 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="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="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="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="lrCjlx">-->
-        <!--<el-select v-model="queryParams.lrCjlx" 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="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="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>
         <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>
@@ -130,7 +61,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="lrjbxxList">
-      <el-table-column label="序号" align="center">
+      <el-table-column label="序号" align="center" width="80">
         <template slot-scope="scope">
           {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
         </template>
@@ -142,27 +73,17 @@
           <dict-tag :options="dict.type.C0007" :value="scope.row.lrXb"/>
         </template>
       </el-table-column>
-      <el-table-column label="健康状况" align="center" prop="lrJkzk">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.XZ015" :value="scope.row.lrJkzk"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="能力评估等级" align="center" prop="lrStpgdj">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ036" :value="scope.row.lrStpgdj"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否留守" align="center" prop="isLs">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ035" :value="scope.row.isLs"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="户籍地址" align="center" prop="lrHjdzName" />
-      <el-table-column label="户籍与现居地址一致" align="center" prop="isYz">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ035" :value="scope.row.isYz"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="健康状况" align="center" prop="lrJkzk">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.XZ015" :value="scope.row.lrJkzk"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+	    <el-table-column label="上报地址" align="center" prop="lrSbdzName" />
+<!--      <el-table-column label="户籍与现居地址一致" align="center" prop="isYz">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.CZ035" :value="scope.row.isYz"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -414,7 +335,9 @@ export default {
       /** 查询老人基本信息列表 */
       getList() {
         this.loading = true
-        listLrjbxx(this.queryParams).then(response => {
+	      let copyForm = this.deepCopy(this.queryParams)
+	      copyForm.lrSbdz ? copyForm.lrSbdz = copyForm.lrSbdz[copyForm.lrSbdz.length - 1] : copyForm.lrSbdz = []
+        listLrjbxx(copyForm).then(response => {
           this.lrjbxxList = decryptRowData_ECB(response.rows, ["lrZjhm", "lrXm"], [2, 1]);
           this.total = response.total
           this.loading = false