Browse Source

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

NanMing 2 years ago
parent
commit
ed82a0c3b5

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

@@ -370,16 +370,14 @@
     </el-drawer>
     <!-- End 高级查询 -->
 
-    <!-- 添加或修改老人基本信息对话框 -->
+    <!-- 添加或修改老人信息 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="80%" class="scrollbar-box"
       :append-to-body="true">
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-scrollbar wrapClass="scrollbar-wrap">
           <el-tabs v-model="activeName" type="card">
             <el-tab-pane label="基础信息" name="first">
-              <h3>
-                基础信息:
-              </h3>
+              <h3>基础信息:</h3>
               <table class="tableStyle">
                 <tr>
                   <td>
@@ -399,7 +397,6 @@
                     </el-form-item>
                   </td>
                 </tr>
-
                 <tr>
                   <td>
                     <el-form-item label="性别" prop="lrXb">
@@ -409,79 +406,30 @@
                       </el-select>
                     </el-form-item>
                   </td>
-<!--                  <td>-->
-<!--                    <el-form-item label="出生日期" prop="lrCsrq">-->
-<!--                      <el-date-picker clearable v-model="form.lrCsrq" type="date" value-format="yyyyMMdd"-->
-<!--                        placeholder="请选择出生日期">-->
-<!--                      </el-date-picker>-->
-<!--                    </el-form-item>-->
-<!--                  </td>-->
-                </tr>
-                <tr>
-<!--                  <td>-->
-<!--                    <el-form-item label="学历" prop="lrXl">-->
-<!--                      <el-select v-model="form.lrXl" placeholder="请选择学历">-->
-<!--                        <el-option v-for="dict in dict.type.C0008" :key="dict.value" :label="dict.label"-->
-<!--                          :value="dict.value"></el-option>-->
-<!--                      </el-select>-->
-<!--                    </el-form-item>-->
-<!--                  </td>-->
-<!--                  <td>-->
-<!--                    <el-form-item label="政治面貌" prop="lrZzmm">-->
-<!--                      <el-select v-model="form.lrZzmm" placeholder="请选择政治面貌">-->
-<!--                        <el-option v-for="dict in dict.type.C0013" :key="dict.value" :label="dict.label"-->
-<!--                          :value="dict.value"></el-option>-->
-<!--                      </el-select>-->
-<!--                    </el-form-item>-->
-<!--                  </td>-->
+	                <td>
+		                <el-form-item label="民族" prop="lrMz">
+			                <el-select v-model="form.lrMz" placeholder="请选择民族">
+				                <el-option v-for="dict in dict.type.C0009" :key="dict.value" :label="dict.label"
+					                :value="dict.value"></el-option>
+			                </el-select>
+		                </el-form-item>
+	                </td>
                 </tr>
                 <tr>
-                  <td>
-                    <el-form-item label="民族" prop="lrMz">
-                      <el-select v-model="form.lrMz" placeholder="请选择民族">
-                        <el-option v-for="dict in dict.type.C0009" :key="dict.value" :label="dict.label"
-                          :value="dict.value"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="国籍" prop="lrGj">
-                      <!--                    <el-input v-model="form.lrGj" placeholder="请输入国籍"/>-->
-                      <el-select v-model="form.lrGj" placeholder="请选择国籍">
-                        <el-option v-for="dict in dict.type.XZ002" :key="dict.value" :label="dict.label"
-                          :value="dict.value"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <el-form-item label="籍贯" prop="lrJg">
-                      <el-input v-model="form.lrJg" placeholder="请输入籍贯" />
-                    </el-form-item>
-                  </td>
                   <td>
                     <el-form-item label="常用联系电话" prop="lrCydh">
                       <el-input v-model="form.lrCydh" placeholder="请输入常用联系电话" />
                     </el-form-item>
                   </td>
-                  <td>
-                    <el-form-item label="户籍类别" prop="lrHjlb">
-                      <el-select v-model="form.lrHjlb" placeholder="请选择户籍类别">
-                        <el-option v-for="dict in dict.type.C0031" :key="dict.value" :label="dict.label"
-                          :value="dict.value"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
+	                <td>
+		                <el-form-item label="户籍地址" prop="lrHjdz">
+			                <!--<el-input v-model="form.lrHjdz" placeholder="请输入户籍地址"/>-->
+			                <RegionCascaderSelect :isJl="false" :endLevel="5" v-model="form.lrHjdz" @changeValue="changeValue"
+				                style="width: 100%"></RegionCascaderSelect>
+		                </el-form-item>
+	                </td>
                 </tr>
                 <tr>
-                  <td>
-                    <el-form-item label="户籍地址" prop="lrHjdz">
-                      <!--<el-input v-model="form.lrHjdz" placeholder="请输入户籍地址"/>-->
-                      <RegionCascaderSelect :isJl="false" :endLevel="5" v-model="form.lrHjdz" @changeValue="changeValue"
-                        style="width: 100%"></RegionCascaderSelect>
-                    </el-form-item>
-                  </td>
                   <td>
                     <el-form-item label="户籍地址补充信息" prop="lrHjbcxx">
                       <el-input v-model="form.lrHjbcxx" @input="inputLrHjbcxx(form.lrHjbcxx)"
@@ -510,164 +458,32 @@
                       <el-input v-model="form.lrXjdzBcxx" :disabled="form.isYz == '1'" placeholder="请输入户籍地址补充信息" />
                     </el-form-item>
                   </td>
-                  <td>
-                    <el-form-item label="人员状态" prop="ryzt">
-                      <el-select v-model="form.ryzt" placeholder="请选择人员状态">
-                        <el-option v-for="dict in dict.type.C0034" :key="dict.value" :label="dict.label"
-                          :value="dict.value"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <el-form-item label="婚姻状况" prop="lrHyzk">
-                      <el-select v-model="form.lrHyzk" @change="changeLrHyzk(form.lrHyzk)" placeholder="请选择婚姻状况">
-                        <el-option v-for="dict in dict.type.XZ025" :key="dict.value" :label="dict.label"
-                          :value="dict.value"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="残疾证号" prop="cjzh">
-                      <el-input v-model="form.cjzh" placeholder="请输入残疾证号" />
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="是否优抚对象" prop="ryzt">
-                      <el-select v-model="form.isYf" placeholder="请选择是否优抚对象">
-                        <el-option v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.label"
-                          :value="dict.value"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
                 </tr>
-
                 <tr>
-                  <td>
-                    <el-form-item label="文化程度" prop="whcd">
-                      <el-select v-model="form.whcd" placeholder="请选择文化程度">
-                        <el-option v-for="dict in dict.type.C0008" :key="dict.value" :label="dict.label"
-                          :value="dict.value"></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="银行账号" prop="yhzh">
-                      <el-input v-model="form.yhzh" placeholder="请输入银行账号" />
-                    </el-form-item>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <el-form-item label="开户名称" prop="khmc">
-                      <el-input v-model="form.khmc" placeholder="请输入开户名称" />
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="家庭人均收入" prop="jtrjsr">
-                      <Number v-model="form.jtrjsr" placeholder="请输入家庭人均收入" :min="0" :max="10000000000"
-                        :precision="2" />
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="社保卡号" prop="sbkh">
-                      <el-input v-model="form.sbkh" placeholder="请输入社保卡号" />
-                    </el-form-item>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <!--                  <el-form-item label="配偶姓名" prop="lrPoxm" v-if=" form.lrHyzk=='0'">-->
-                    <el-form-item label="配偶姓名" prop="lrPoxm"
-                      v-if="form.lrHyzk == '01' || form.lrHyzk == '03' || form.lrHyzk == '04'">
-                      <el-input v-model="form.lrPoxm" placeholder="请输入配偶姓名" />
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <!--                  <el-form-item label="配偶公民身份号码" prop="lrPoZjmh" v-if="form.lrHyzk=='20'">-->
-                    <el-form-item label="配偶公民身份号码" prop="lrPoZjmh"
-                      v-if="form.lrHyzk == '01' || form.lrHyzk == '03' || form.lrHyzk == '04'">
-                      <el-input v-model="form.lrPoZjmh" placeholder="请输入配偶公民身份号码" />
-                    </el-form-item>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <el-form-item label="是否留守" prop="isLs">
-                      <el-radio-group v-model="form.isLs" @change="changeIsLs(form.isLs)">
-                        <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>
-                  </td>
-                  <td>
-                    <el-form-item label="是否失智" prop="isSz">
-                      <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>
-                      </el-radio-group>
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="是否低保" prop="isDb">
-                      <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>
-                      </el-radio-group>
-                    </el-form-item>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <el-form-item label="是否独居" prop="isDj">
-                      <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>
-                      </el-radio-group>
-                    </el-form-item>
-
-                  </td>
-                  <td>
-                    <el-form-item label="是否孤老" prop="isGl">
-                      <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>
-                      </el-radio-group>
-                    </el-form-item>
-                  </td>
-                  <td>
-                    <el-form-item label="是否失能" prop="isSn">
-                      <el-radio-group v-model="form.isSn" :disabled="true">
-                        <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>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    <el-form-item label="是否特困" prop="isTk">
-                      <el-radio-group v-model="form.isTk">
-                        <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>
-                  </td>
-                  <td>
-                    <el-form-item label="是否低收入" prop="isDsr">
-                      <el-radio-group v-model="form.isDsr">
-                        <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>
-
-                  </td>
+	                <td>
+		                <el-form-item label="婚姻状况" prop="lrHyzk">
+			                <el-select v-model="form.lrHyzk" @change="changeLrHyzk(form.lrHyzk)" placeholder="请选择婚姻状况">
+				                <el-option v-for="dict in dict.type.XZ025" :key="dict.value" :label="dict.label"
+					                :value="dict.value"></el-option>
+			                </el-select>
+		                </el-form-item>
+	                </td>
+	                <td>
+		                <el-form-item label="配偶姓名" prop="lrPoxm"
+			                v-if="form.lrHyzk == '01' || form.lrHyzk == '03' || form.lrHyzk == '04'">
+			                <el-input v-model="form.lrPoxm" placeholder="请输入配偶姓名" />
+		                </el-form-item>
+	                </td>
+	                <td>
+		                <el-form-item label="配偶公民身份号码" prop="lrPoZjmh"
+			                v-if="form.lrHyzk == '01' || form.lrHyzk == '03' || form.lrHyzk == '04'">
+			                <el-input v-model="form.lrPoZjmh" placeholder="请输入配偶公民身份号码" />
+		                </el-form-item>
+	                </td>
                 </tr>
               </table>
-              <h3>
-                健康情况:
-              </h3>
+
+              <h3>健康情况:</h3>
               <el-form-item label="健康状况" prop="lrJkzk">
                 <el-checkbox-group v-model="form.lrJkzk" prop="lrJkzk" @change="changeLrJkzk(form.lrJkzk)">
                   <el-checkbox v-for="dict in dict.type.XZ015" :disabled="disabled(dict.value, 'lrJkzk', '01')"
@@ -676,43 +492,14 @@
                   </el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
-              <el-form-item label="残疾类型" prop="lrCjlx" v-if="ifQT(form.lrJkzk, '02')">
-                <!--<el-select v-model="form.lrCjlx" placeholder="请选择残疾类型">-->
-                <!--<el-option-->
-                <!--v-for="dict in dict.type.C0024"-->
-                <!--:key="dict.value"-->
-                <!--:label="dict.label"-->
-                <!--:value="dict.value"-->
-                <!--&gt;</el-option>-->
-                <!--</el-select>-->
-                <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"
                     :value="dict.value" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="能力评估等级" prop="lrStpgdj">
-                <el-select v-model="form.lrStpgdj" placeholder="请选择能力评估等级" @change="changeNlpg(form.lrStpgdj)"
-                  clearable>
-                  <el-option v-for="dict in dict.type.CZ036" :key="dict.value" :label="dict.label" :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <h3>
-                家庭经济情况:
-              </h3>
+
+              <h3> 家庭经济情况: </h3>
               <el-form-item label="生活状况" prop="lrJjzk">
                 <el-checkbox-group v-model="form.lrJjzk">
                   <el-checkbox v-for="dict in dict.type.CZ027" :disabled="disabledLrJjzk(dict.value, form.lrJjzk)"
@@ -737,12 +524,6 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="个人年收入" prop="lrGrnrs">
-                <el-select v-model="form.lrGrnrs" placeholder="请选择个人年收入" clearable>
-                  <el-option v-for="dict in dict.type.XZ014" :key="dict.value" :label="dict.label" :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
               <el-form-item label="家庭救助帮扶" prop="lrJtjzbfqk">
                 <el-checkbox-group v-model="form.lrJtjzbfqk" @change="changeQT(form.lrJtjzbfqk, '06', 'lrJtjzbfqkQt')">
                   <el-checkbox v-for="dict in dict.type.CH058" :key="dict.value" :label="dict.value">
@@ -753,9 +534,8 @@
               <el-form-item label="其他帮扶情况" prop="lrJtjzbfqkQt" v-if="ifQT(form.lrJtjzbfqk, '06')">
                 <el-input v-model="form.lrJtjzbfqkQt" placeholder="请输入其他帮扶情况" />
               </el-form-item>
-              <h3>
-                陪伴居住情况:
-              </h3>
+
+              <h3> 陪伴居住情况: </h3>
               <el-form-item label="陪伴居住情况" prop="lrPbjjqk">
                 <el-checkbox-group v-model="form.lrPbjjqk" @change="changeQT(form.lrPbjjqk, '06', 'lrPbjjqkQt')">
                   <el-checkbox v-for="dict in dict.type.CH057" :key="dict.value"
@@ -790,9 +570,8 @@
               <el-form-item label="主要照料人电话" prop="zlrDh" v-if="ifNotQT(form.zlrLb, '03')">
                 <el-input v-model="form.zlrDh" placeholder="请输入主要照料人电话" />
               </el-form-item>
-              <h3>
-                关爱服务需求:
-              </h3>
+
+              <h3> 关爱服务需求:</h3>
               <el-form-item label="关爱服务需求" prop="lrGaxq">
                 <el-checkbox-group v-model="form.lrGaxq" @change="changeQT(form.lrGaxq, '05', 'lrGaxqQt')">
                   <el-checkbox v-for="dict in dict.type.CH055" :key="dict.value" :label="dict.value">
@@ -803,46 +582,6 @@
               <el-form-item label="其他关爱服务需求" prop="lrGaxqQt" v-if="ifQT(form.lrGaxq, '05')">
                 <el-input v-model="form.lrGaxqQt" placeholder="请输入其他关爱服务需求" />
               </el-form-item>
-              <h3>
-                拓展信息:
-              </h3>
-              <!--是否留守-->
-              <el-form-item label="是否长护险定点机构" prop="isChx">
-                <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>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item label="是否签约医养结合" prop="isYyjh">
-                <el-radio-group v-model="form.isYyjh">
-                  <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="form.isCjsb">
-                  <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="lrYblb">
-                <el-select v-model="form.lrYblb" placeholder="请选择医保类别" clearable>
-                  <el-option v-for="dict in dict.type.CH045" :key="dict.value" :label="dict.label" :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="监护人姓名" prop="jhrXm">
-                <el-input v-model="form.jhrXm" placeholder="请输入监护人姓名" />
-              </el-form-item>
-              <el-form-item label="监护人手机号码" prop="jhrSjhm">
-                <el-input v-model="form.jhrSjhm" placeholder="请输入监护人手机号码" />
-              </el-form-item>
-              <el-form-item label="与监护人关系" prop="jhrGx">
-                <el-select v-model="form.jhrGx" placeholder="请选择与监护人关系" clearable>
-                  <el-option v-for="dict in dict.type.C0032" :key="dict.value" :label="dict.label" :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
             </el-tab-pane>
             <el-tab-pane label="子女信息" name="first2" :disabled="form.id ? false : true">
               <lrzvxx :oldId="oldId">
@@ -854,16 +593,6 @@
 
               </lrqtsyr>
             </el-tab-pane>
-            <el-tab-pane label="家庭信息" name="four2" :disabled="form.id ? false : true">
-              <lrjtxx :oldId="oldId">
-
-              </lrjtxx>
-            </el-tab-pane>
-            <el-tab-pane label="长护险信息" name="third2" :disabled="form.id ? false : true">
-              <lrchxxx :oldId="oldId">
-
-              </lrchxxx>
-            </el-tab-pane>
             <el-tab-pane label="巡访联系人信息" name="six" :disabled="form.id ? false : true">
               <lrxfrxx :oldId="oldId">
 

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

@@ -193,13 +193,12 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改老人基本信息对话框 -->
-    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1500px" custom-class="custom" :append-to-body="true">
+    <!-- 老人信息详情 -->
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="80%" custom-class="custom" :append-to-body="true">
+	    <el-scrollbar wrapClass="scrollbar-wrap">
         <el-tabs v-model="activeName" type="card" >
           <el-tab-pane label="基础信息" name="first">
-            <h3>
-              基础信息:
-            </h3>
+            <h3 style="margin-top: 0">基础信息:</h3>
             <table class="tableStyle">
               <tr>
                 <td>姓名</td>
@@ -216,154 +215,67 @@
                 <td>身份证号</td>
                 <td>{{form.lrZjhm}}</td>
               </tr>
-              <tr>
-                <td>出生日期</td>
-                <td>{{form.lrCsrq}}</td>
-                <td>学历</td>
-                <td>{{translateDict('C0008',form.lrXl)}}</td>
-              </tr>
-              <tr>
-                <td>政治面貌</td>
-                <td>{{translateDict('C0013',form.lrZzmm)}}</td>
-                <td>国籍</td>
-                <td>{{form.lrGj}}</td>
-              </tr>
               <tr>
                 <td>联系电话</td>
                 <td>{{form.lrCydh}}</td>
                 <td>婚姻及配偶情况</td>
                 <td>{{translateDict('XZ025',form.lrHyzk)}}</td>
-                <td></td>
               </tr>
               <tr>
                 <td>配偶姓名</td>
                 <td>{{form.lrPoxm}}</td>
                 <td>配偶身份证号码</td>
                 <td>{{form.lrPoZjmh}}</td>
-                <td></td>
-              </tr>
-              <tr>
-                <td>籍贯</td>
-                <td>{{form.lrJg}}</td>
-                <td>户籍类别</td>
-                <td colspan="2">{{translateDict('C0031',form.lrHjlb)}}</td>
               </tr>
               <tr>
                 <td>户籍地址</td>
-                <td>{{form.lrHjdzName}}</td>
-                <td>户籍地址补充信息</td>
-                <td colspan="2">
-                  {{form.lrHjbcxx}}
-                </td>
-              </tr>
-              <tr>
-                <td>户籍与现居地址一致</td>
-                <td colspan="4">{{translateDict('CZ035',form.isYz)}}</td>
+                <td colspan="3">{{form.lrHjdzName + form.lrHjbcxx}}</td>
               </tr>
               <tr>
                 <td>现居地址</td>
-                <td>{{form.lrXjdzName}}</td>
-                <td>现居地址补充信息</td>
-                <td colspan="2">{{form.lrXjdzBcxx}}</td>
-              </tr>
-              <tr>
-                <td>婚姻状况</td>
-                <td colspan="4">{{translateDict('C0010',form.lrHyzk)}}</td>
-
-              </tr>
-              <tr>
-                <td>配偶姓名</td>
-                <td>{{form.lrPoxm}}</td>
-                <td>配偶公民身份号码</td>
-                <td colspan="2">{{form.lrPoZjmh}}</td>
-              </tr>
-              <tr>
-                <td>是否留守</td>
-                <td>{{translateDict('CZ035',form.isLs)}}</td>
-                <td>是否失智</td>
-                <td colspan="2">{{translateDict('CZ035',form.isSz)}}</td>
-              </tr>
-              <tr>
-                <td>是否低保</td>
-                <td>{{translateDict('CZ035',form.isDb)}}</td>
-                <td>是否独居</td>
-                <td colspan="2">{{translateDict('CZ035',form.isDj)}}</td>
-              </tr>
-              <tr>
-                <td>是否孤老</td>
-                <td>{{translateDict('CZ035',form.isGl)}}</td>
-                <td>是否失能</td>
-                <td colspan="2">{{translateDict('CZ035',form.isSn)}}</td>
-              </tr>
-              <tr>
-                <td>是否特困</td>
-                <td>{{translateDict('CZ035',form.isTk)}}</td>
-                <td>是否低收入</td>
-                <td colspan="2">{{translateDict('CZ035',form.isDsr)}}</td>
+                <td colspan="3">{{form.lrXjdzName + form.lrXjdzBcxx}}</td>
               </tr>
             </table>
-            <h3>
-              健康情况:
-            </h3>
+
+            <h3>健康情况:</h3>
             <table>
               <tr>
                 <td>健康状况</td>
                 <td>{{translateDict('XZ015',form.lrJkzk,true)}}</td>
-                <td>残疾类型</td>
-                <td colspan="2">{{translateDict('C0024',form.lrCjlx,true)}}</td>
+	              <td>能力情况</td>
+	              <td>{{translateDict('CH050',form.lrNlzk)}}</td>
               </tr>
-              <tr>
-                <td>残疾等级</td>
-                <td>{{translateDict('C0025',form.lrCjdj)}}</td>
-                <td>能力情况</td>
-                <td colspan="2">{{translateDict('CH050',form.lrNlzk)}}</td>
-              </tr>
-              <tr>
-                <td>能力评估等级</td>
-                <td colspan="2">{{translateDict('CZ036',form.lrStpgdj)}}</td>
-              </tr>
-              <!--lrNlzk-->
             </table>
-            <h3>
-              家庭经济情况:
-            </h3>
+
+            <h3>家庭经济情况:</h3>
             <table>
               <tr>
                 <td>生活状况</td>
                 <td>{{translateDict('CZ027',form.lrJjzk,true)}}</td>
                 <td>收入来源</td>
-                <td colspan="2">{{translateDict('CH054',form.lrSrly,true)}}</td>
+                <td>{{translateDict('CH054',form.lrSrly,true)}}</td>
               </tr>
               <tr>
-                <td>其他收入来源</td>
-                <td>{{form.lrSrlyQt}}</td>
                 <td>上年度可支配收入</td>
-                <td colspan="2">{{translateDict('XZ014',form.lrKzpsr)}}</td>
+                <td>{{translateDict('XZ014',form.lrKzpsr)}}</td>
                 <td>个人年收入</td>
-                <td colspan="2">{{translateDict('XZ014',form.lrGrnrs)}}</td>
+                <td>{{translateDict('XZ014',form.lrGrnrs)}}</td>
               </tr>
               <tr>
                 <td>家庭救助帮扶</td>
                 <td>{{translateDict('CH058',form.lrJtjzbfqk,true)}}</td>
                 <td>其他帮扶情况</td>
-                <td colspan="2">{{form.lrJtjzbfqkQt}}</td>
+                <td>{{form.lrJtjzbfqkQt}}</td>
               </tr>
             </table>
-            <h3>
-              陪伴居住情况:
-            </h3>
+
+            <h3>陪伴居住情况:</h3>
             <table>
               <tr>
                 <td>陪伴居住情况</td>
                 <td>{{translateDict('CH057',form.lrPbjjqk,true)}}</td>
-                <td>其他陪伴居住情况</td>
-                <td>{{form.lrPbjjqkQt}}</td>
-              </tr>
-              <tr>
-                <td>日常生活照料人</td>
-                <td>{{translateDict('CH056',form.zlrLb,true)}}</td>
-                <td>与其他人员关系</td>
-                <td>{{form.zlrGx}}</td>
+	              <td>日常生活照料人</td>
+	              <td>{{translateDict('CH056',form.zlrLb,true)}}</td>
               </tr>
               <tr>
                 <td>主要照料人姓名</td>
@@ -373,12 +285,19 @@
               </tr>
               <tr>
                 <td>主要照料人电话</td>
-                <td>{{form.zlrDh}}</td>
-              </tr>
+                <td colspan="3">{{form.zlrDh}}</td>
+              </tr>
+	            <tr>
+		            <td>其他日常生活照料人</td>
+		            <td colspan="3">{{form.zlrGx}}</td>
+	            </tr>
+	            <tr>
+		            <td>其他陪伴居住情况</td>
+		            <td colspan="3">{{form.lrPbjjqkQt}}</td>
+	            </tr>
             </table>
-            <h3>
-              关爱服务需求:
-            </h3>
+
+            <h3>关爱服务需求:</h3>
             <table>
               <tr>
                 <td>关爱服务需求</td>
@@ -387,48 +306,6 @@
                 <td>{{form.lrGaxqQt}}</td>
               </tr>
             </table>
-            <h3>
-              拓展信息:
-            </h3>
-            <table>
-              <tr>
-                <td>是否长护险定点机构</td>
-                <td>{{translateDict('CZ035',form.isChx)}}</td>
-                <td>是否签约医养结合</td>
-                <td>{{translateDict('CZ035',form.isYyjh)}}</td>
-              </tr>
-              <tr>
-                <td>是否参加社保</td>
-                <td>{{translateDict('CZ035',form.isCjsb)}}</td>
-                <td>医保类别</td>
-                <td>{{translateDict('CH045',form.lrYblb)}}</td>
-              </tr>
-              <tr>
-                <td>监护人姓名</td>
-                <td>{{form.jhrXm}}</td>
-                <td>监护人手机号码</td>
-                <td>{{form.jhrSjhm}}</td>
-              </tr>
-              <tr>
-                <td>
-                  与监护人关系
-                </td>
-                <td>
-                  {{translateDict('C0032',form.jhrGx)}}
-                </td>
-              </tr>
-            </table>
-            <h3>
-              审核信息:
-            </h3>
-            <table>
-              <tr>
-                <td>审核状态</td>
-                <td>{{translateDict('CH051',form.lzzt)}}</td>
-                <td>驳回原因</td>
-                <td>{{form.lrBhyy}}</td>
-              </tr>
-            </table>
           </el-tab-pane>
           <el-tab-pane label="子女信息" name="first2">
             <lrzvxx :oldId="oldId" :isDetails="false">
@@ -440,22 +317,13 @@
 
             </lrqtsyr>
           </el-tab-pane>
-          <el-tab-pane label="家庭信息" name="four2">
-            <lrjtxx :oldId="oldId" :isDetails="false">
-
-            </lrjtxx>
-          </el-tab-pane>
-          <el-tab-pane label="长护险信息" name="third2">
-            <lrchxxx :oldId="oldId" :isDetails="false">
-
-            </lrchxxx>
-          </el-tab-pane >
           <el-tab-pane label="巡访联系人信息" name="five2">
             <lrxfrxx :oldId="oldId" :isDetails="false">
 
             </lrxfrxx>
           </el-tab-pane>
         </el-tabs>
+	    </el-scrollbar>
     </el-dialog>
   </div>
 </template>
@@ -625,10 +493,6 @@ export default {
   .el-tabs__header{
     margin: 0;
   }
-  ::v-deep .custom > .el-dialog__body {
-    height: 800px;
-    overflow-y: auto;
-  }
   table td{
     width: 10%;
     height: 2.5rem;

+ 648 - 0
ruoyi-ui/src/views/business/lrxx/jbxxcx/indexOld.vue

@@ -0,0 +1,648 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="老人姓名" prop="lrXm">
+        <el-input
+          v-model="queryParams.lrXm"
+          placeholder="请输入老人姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="老人身份证号码" prop="lrZjhm">
+        <el-input
+          v-model="queryParams.lrZjhm"
+          placeholder="请输入老人身份证件号码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="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="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>
+        <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-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="lrjbxxList">
+      <el-table-column label="序号" align="center">
+        <template slot-scope="scope">
+          {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
+        </template>
+      </el-table-column>
+      <el-table-column label="老人姓名" align="center" prop="lrXm"/>
+      <el-table-column label="老人身份证件号码" align="center" prop="lrZjhm"/>
+      <el-table-column label="性别" align="center" prop="lrXb">
+        <template slot-scope="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="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" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:lrjbxx:edit']"
+          >详情
+          </el-button>
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="handleDelete(scope.row,(queryParams.pageNum-1)*queryParams.pageSize + scope.$index,scope.$index)"-->
+            <!--v-hasPermi="['business:lrjbxx:remove']"-->
+          <!--&gt;删除-->
+          <!--</el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 老人信息详情 -->
+    <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="1500px" custom-class="custom" :append-to-body="true">
+        <el-tabs v-model="activeName" type="card" >
+          <el-tab-pane label="基础信息" name="first">
+            <h3>
+              基础信息:
+            </h3>
+            <table class="tableStyle">
+              <tr>
+                <td>姓名</td>
+                <td> {{form.lrXm}}</td>
+                <td>性别</td>
+                <td>{{translateDict('C0007',form.lrXb)}}</td>
+                <td rowspan="6">
+                  <image-preview :src="form.lrTx" v-if="form.lrTx"></image-preview>
+                </td>
+              </tr>
+              <tr>
+                <td>民族</td>
+                <td>{{translateDict('C0009',form.lrMz)}}</td>
+                <td>身份证号</td>
+                <td>{{form.lrZjhm}}</td>
+              </tr>
+              <tr>
+                <td>出生日期</td>
+                <td>{{form.lrCsrq}}</td>
+                <td>学历</td>
+                <td>{{translateDict('C0008',form.lrXl)}}</td>
+              </tr>
+              <tr>
+                <td>政治面貌</td>
+                <td>{{translateDict('C0013',form.lrZzmm)}}</td>
+                <td>国籍</td>
+                <td>{{form.lrGj}}</td>
+              </tr>
+              <tr>
+                <td>联系电话</td>
+                <td>{{form.lrCydh}}</td>
+                <td>婚姻及配偶情况</td>
+                <td>{{translateDict('XZ025',form.lrHyzk)}}</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>配偶姓名</td>
+                <td>{{form.lrPoxm}}</td>
+                <td>配偶身份证号码</td>
+                <td>{{form.lrPoZjmh}}</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>籍贯</td>
+                <td>{{form.lrJg}}</td>
+                <td>户籍类别</td>
+                <td colspan="2">{{translateDict('C0031',form.lrHjlb)}}</td>
+              </tr>
+              <tr>
+                <td>户籍地址</td>
+                <td>{{form.lrHjdzName}}</td>
+                <td>户籍地址补充信息</td>
+                <td colspan="2">
+                  {{form.lrHjbcxx}}
+                </td>
+              </tr>
+              <tr>
+                <td>户籍与现居地址一致</td>
+                <td colspan="4">{{translateDict('CZ035',form.isYz)}}</td>
+              </tr>
+              <tr>
+                <td>现居地址</td>
+                <td>{{form.lrXjdzName}}</td>
+                <td>现居地址补充信息</td>
+                <td colspan="2">{{form.lrXjdzBcxx}}</td>
+              </tr>
+              <tr>
+                <td>婚姻状况</td>
+                <td colspan="4">{{translateDict('C0010',form.lrHyzk)}}</td>
+
+              </tr>
+              <tr>
+                <td>配偶姓名</td>
+                <td>{{form.lrPoxm}}</td>
+                <td>配偶公民身份号码</td>
+                <td colspan="2">{{form.lrPoZjmh}}</td>
+              </tr>
+              <tr>
+                <td>是否留守</td>
+                <td>{{translateDict('CZ035',form.isLs)}}</td>
+                <td>是否失智</td>
+                <td colspan="2">{{translateDict('CZ035',form.isSz)}}</td>
+              </tr>
+              <tr>
+                <td>是否低保</td>
+                <td>{{translateDict('CZ035',form.isDb)}}</td>
+                <td>是否独居</td>
+                <td colspan="2">{{translateDict('CZ035',form.isDj)}}</td>
+              </tr>
+              <tr>
+                <td>是否孤老</td>
+                <td>{{translateDict('CZ035',form.isGl)}}</td>
+                <td>是否失能</td>
+                <td colspan="2">{{translateDict('CZ035',form.isSn)}}</td>
+              </tr>
+              <tr>
+                <td>是否特困</td>
+                <td>{{translateDict('CZ035',form.isTk)}}</td>
+                <td>是否低收入</td>
+                <td colspan="2">{{translateDict('CZ035',form.isDsr)}}</td>
+              </tr>
+            </table>
+            <h3>
+              健康情况:
+            </h3>
+            <table>
+              <tr>
+                <td>健康状况</td>
+                <td>{{translateDict('XZ015',form.lrJkzk,true)}}</td>
+                <td>残疾类型</td>
+                <td colspan="2">{{translateDict('C0024',form.lrCjlx,true)}}</td>
+              </tr>
+              <tr>
+                <td>残疾等级</td>
+                <td>{{translateDict('C0025',form.lrCjdj)}}</td>
+                <td>能力情况</td>
+                <td colspan="2">{{translateDict('CH050',form.lrNlzk)}}</td>
+              </tr>
+              <tr>
+                <td>能力评估等级</td>
+                <td colspan="2">{{translateDict('CZ036',form.lrStpgdj)}}</td>
+              </tr>
+              <!--lrNlzk-->
+            </table>
+            <h3>
+              家庭经济情况:
+            </h3>
+            <table>
+              <tr>
+                <td>生活状况</td>
+                <td>{{translateDict('CZ027',form.lrJjzk,true)}}</td>
+                <td>收入来源</td>
+                <td colspan="2">{{translateDict('CH054',form.lrSrly,true)}}</td>
+              </tr>
+              <tr>
+                <td>其他收入来源</td>
+                <td>{{form.lrSrlyQt}}</td>
+                <td>上年度可支配收入</td>
+                <td colspan="2">{{translateDict('XZ014',form.lrKzpsr)}}</td>
+                <td>个人年收入</td>
+                <td colspan="2">{{translateDict('XZ014',form.lrGrnrs)}}</td>
+              </tr>
+              <tr>
+                <td>家庭救助帮扶</td>
+                <td>{{translateDict('CH058',form.lrJtjzbfqk,true)}}</td>
+                <td>其他帮扶情况</td>
+                <td colspan="2">{{form.lrJtjzbfqkQt}}</td>
+              </tr>
+            </table>
+            <h3>
+              陪伴居住情况:
+            </h3>
+            <table>
+              <tr>
+                <td>陪伴居住情况</td>
+                <td>{{translateDict('CH057',form.lrPbjjqk,true)}}</td>
+                <td>其他陪伴居住情况</td>
+                <td>{{form.lrPbjjqkQt}}</td>
+              </tr>
+              <tr>
+                <td>日常生活照料人</td>
+                <td>{{translateDict('CH056',form.zlrLb,true)}}</td>
+                <td>与其他人员关系</td>
+                <td>{{form.zlrGx}}</td>
+              </tr>
+              <tr>
+                <td>主要照料人姓名</td>
+                <td>{{form.zlrXm}}</td>
+                <td>主要照料人性别</td>
+                <td>{{translateDict('C0007',form.zlrXb)}}</td>
+              </tr>
+              <tr>
+                <td>主要照料人电话</td>
+                <td>{{form.zlrDh}}</td>
+              </tr>
+            </table>
+            <h3>
+              关爱服务需求:
+            </h3>
+            <table>
+              <tr>
+                <td>关爱服务需求</td>
+                <td>{{translateDict('CH055',form.lrGaxq,true)}}</td>
+                <td>其他关爱服务需求</td>
+                <td>{{form.lrGaxqQt}}</td>
+              </tr>
+            </table>
+            <h3>
+              拓展信息:
+            </h3>
+            <table>
+              <tr>
+                <td>是否长护险定点机构</td>
+                <td>{{translateDict('CZ035',form.isChx)}}</td>
+                <td>是否签约医养结合</td>
+                <td>{{translateDict('CZ035',form.isYyjh)}}</td>
+              </tr>
+              <tr>
+                <td>是否参加社保</td>
+                <td>{{translateDict('CZ035',form.isCjsb)}}</td>
+                <td>医保类别</td>
+                <td>{{translateDict('CH045',form.lrYblb)}}</td>
+              </tr>
+              <tr>
+                <td>监护人姓名</td>
+                <td>{{form.jhrXm}}</td>
+                <td>监护人手机号码</td>
+                <td>{{form.jhrSjhm}}</td>
+              </tr>
+              <tr>
+                <td>
+                  与监护人关系
+                </td>
+                <td>
+                  {{translateDict('C0032',form.jhrGx)}}
+                </td>
+              </tr>
+            </table>
+            <h3>
+              审核信息:
+            </h3>
+            <table>
+              <tr>
+                <td>审核状态</td>
+                <td>{{translateDict('CH051',form.lzzt)}}</td>
+                <td>驳回原因</td>
+                <td>{{form.lrBhyy}}</td>
+              </tr>
+            </table>
+          </el-tab-pane>
+          <el-tab-pane label="子女信息" name="first2">
+            <lrzvxx :oldId="oldId" :isDetails="false">
+
+            </lrzvxx>
+          </el-tab-pane>
+          <el-tab-pane label="其他赡养人" name="second2">
+            <lrqtsyr :oldId="oldId" :isDetails="false">
+
+            </lrqtsyr>
+          </el-tab-pane>
+          <el-tab-pane label="家庭信息" name="four2">
+            <lrjtxx :oldId="oldId" :isDetails="false">
+
+            </lrjtxx>
+          </el-tab-pane>
+          <el-tab-pane label="长护险信息" name="third2">
+            <lrchxxx :oldId="oldId" :isDetails="false">
+
+            </lrchxxx>
+          </el-tab-pane >
+          <el-tab-pane label="巡访联系人信息" name="five2">
+            <lrxfrxx :oldId="oldId" :isDetails="false">
+
+            </lrxfrxx>
+          </el-tab-pane>
+        </el-tabs>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {getLrjbxx, listLrjbxx} from '@/api/business/lrxx/lrjbxx'
+import lrzvxx from "../lrzvxx/index";
+import lrqtsyr from "../lrqtsyr/index";
+import lrchxxx from "../lrchxxx/index";
+import lrjtxx from "../lrjtxx/index";
+import lrxfrxx from "../lrxfrxx/index";
+import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+
+export default {
+    name: 'Jbxxcx',
+    dicts: ['C0009', 'CZ036', 'C0008', 'CZ035', 'CZ027', 'C0015', 'C0007', 'C0013', 'C0024', 'C0025', 'C0010', 'C0032', 'C0031', 'CH054', 'CH051', 'XZ015', 'XZ014', 'CH058', 'CH057', 'CH045', 'CH056', 'CH055', 'CH050', 'XZ025'],
+    components: {
+      lrzvxx:lrzvxx,
+      lrqtsyr:lrqtsyr,
+      lrchxxx:lrchxxx,
+      lrjtxx:lrjtxx,
+      lrxfrxx:lrxfrxx
+    },
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        submitFormLoading: false,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 老人基本信息表格数据
+        lrjbxxList: [],
+        // 弹出层标题
+        title: '',
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          lrXm: null,
+          lrZjhm: null,
+          lrXb: null,
+          isYz: null,
+          isLs: null,
+          lrStpgdj: null,
+          lrJkzk: null,
+          lrHjdz: null
+        },
+        lrHjdz: null,
+        // 表单参数
+        form: {},
+        // 表单校验
+        activeName: 'first',
+        oldId:null
+      }
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      translateDict(type,value,is){
+        if(is&&value&&value.length>0)
+        {
+          // console.log(value,'value');
+          let list="";
+          this.dict.type[type].forEach(item=>{
+            // console.log(item,'item');
+            // console.log(value.indexOf(item.value)!==-1,'indexOf')
+            if(value.indexOf(item.value)!==-1)
+            {
+              list=list+item.label+' '
+            }
+          })
+          // console.log(list,'list')
+          return list
+        }
+        return this.selectDictLabel(this.dict.type[type], value)
+      },
+      /** 查询老人基本信息列表 */
+      getList() {
+        this.loading = true
+        listLrjbxx(this.queryParams).then(response => {
+          this.lrjbxxList = decryptRowData_ECB(response.rows, ["lrZjhm", "lrXm"], [2, 1]);
+          this.total = response.total
+          this.loading = false
+        })
+      },
+
+      /** 搜索按钮操作 */
+      handleQuery() {
+        if (this.lrHjdz) {
+          this.queryParams.lrHjdz = this.lrHjdz[this.lrHjdz.length - 1]
+        } else {
+          this.queryParams.lrHjdz = null
+        }
+        this.queryParams.pageNum = 1
+        this.getList()
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.lrHjdz = null;
+        this.resetForm('queryForm')
+        this.handleQuery()
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        const id = row.id || this.ids
+        this.oldId=id;
+        getLrjbxx(id).then(response => {
+          this.form = decryptData_ECB(response.data, ["lrZjhm", "lrXm", "lrHjbcxx", "lrXjdzBcxx", "lrCydh", "lrPoxm", "lrPoZjmh", "jhrXm", "jhrSjhm", "zlrXm", "zlrDh", "cjzh", "yhzh", "khmc"], [2, 1, 4, 4, 3, 1, 2, 1, 2, 1, 3, 5, 5, 5]);
+          this.form.lrJjzk = this.form.lrJjzk?this.form.lrJjzk.split(','):[];
+          this.form.lrJkzk=this.form.lrJkzk?this.form.lrJkzk.split(','):[];
+          this.form.lrSrly =this.form.lrSrly?this.form.lrSrly.split(','):[];
+          this.form.lrJtjzbfqk =this.form.lrJtjzbfqk?this.form.lrJtjzbfqk.split(','):[];
+          this.form.lrPbjjqk =this.form.lrPbjjqk?this.form.lrPbjjqk.split(','):[];
+          this.form.zlrLb = this.form.zlrLb?this.form.zlrLb.split(','):[];
+          this.form.lrGaxq =this.form.lrGaxq?this.form.lrGaxq.split(','):[];
+          this.open = true
+          this.title = '老人信息'
+        })
+      },
+    }
+  }
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .formFlex {
+    display: flex;
+  }
+
+  .formWidth {
+    width: 33.33%;
+    display: flex !important;
+  }
+
+  h3 {
+    /*margin: 0;*/
+    padding: 0.5rem !important;
+    background-image: -o-linear-gradient(290deg, #ddd 10%, #fff 90%);
+    background-image: linear-gradient(160deg, #ddd 10%, #fff 90%);
+    color: #000;
+    font-weight: 500;
+    font-size: 1.1rem;
+    margin-bottom: 0;
+  }
+
+  .tableStyle {
+    width: 100%;
+    ::v-deep .el-form-item{
+      margin-bottom: 0;
+    }
+  }
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor.el-input{
+    width: 100%;
+  }
+  .el-tabs__header{
+    margin: 0;
+  }
+  ::v-deep .custom > .el-dialog__body {
+    height: 800px;
+    overflow-y: auto;
+  }
+  table td{
+    width: 10%;
+    height: 2.5rem;
+    padding: .5%;
+    font-weight: 500;
+    border: 1px solid #ddd;
+  }
+  table{
+    width: 100%;
+    border-collapse: collapse;
+    border: 1px solid #ddd;
+  }
+  table td:nth-child(odd) {
+    text-align: right;
+    background: #f5f5f5;
+  }
+</style>

+ 5 - 10
ruoyi-ui/src/views/business/lrxx/lrqtsyr/index.vue

@@ -90,11 +90,6 @@
     <!-- 添加或修改其他赡养人对话框 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-
-        <!--<el-form-item label="老人基本信息id" prop="lrId">-->
-        <!--<el-input v-model="form.lrId" placeholder="请输入老人基本信息id" />-->
-        <!--</el-form-item>-->
-
         <el-form-item label="其他赡养人姓名" prop="xm">
           <el-input v-model="form.xm" placeholder="请输入其他赡养人姓名"/>
         </el-form-item>
@@ -129,7 +124,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="其他与被赡养人关系" prop="ybsyrgxQt" v-if="form.ybsyrgx=='9'">
+        <el-form-item label="其他与被赡养人关系" prop="ybsyrgxQt" v-if="form.ybsyrgx=='09'">
           <el-input v-model="form.ybsyrgxQt" placeholder="请输入其他与被赡养人关系"/>
         </el-form-item>
         <el-form-item label="外出地点" prop="wcdd">
@@ -179,16 +174,16 @@
         <tr>
           <td>与被赡养人关系</td>
           <td>{{translateDict('C0032',form.ybsyrgx)}}</td>
-          <td>其他与被赡养人关系</td>
+          <td>与被赡养人其他关系</td>
           <td>{{form.ybsyrgxQt}}</td>
         </tr>
         <tr>
           <td>外出地点</td>
-          <td>{{form.wcddName}}</td>
-          <td>最后一次离家日期</td>
-          <td>{{special(form.lastLjrq)}}</td>
+          <td colspan="3">{{form.wcddName}}</td>
         </tr>
         <tr>
+	        <td>最后一次离家日期</td>
+	        <td>{{special(form.lastLjrq)}}</td>
           <td>平均一年探望次数</td>
           <td>{{translateDict('XZ019',form.twcs)}}</td>
         </tr>

+ 4 - 43
ruoyi-ui/src/views/business/lrxx/lrzvxx/index.vue

@@ -86,15 +86,9 @@
     <!-- 添加或修改子女信息对话框 -->
     <el-dialog v-dialog-drag :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-
-        <!--<el-form-item label="老人信息表id" prop="lrId">-->
-          <!--<el-input v-model="form.lrId" placeholder="请输入老人信息表id" />-->
-        <!--</el-form-item>-->
-
         <el-form-item label="姓名" prop="xm">
           <el-input v-model="form.xm" placeholder="请输入姓名" />
         </el-form-item>
-
         <el-form-item label="子女是否在国内" prop="isGn">
           <el-select v-model="form.isGn" placeholder="请选择子女是否在国内">
             <el-option
@@ -105,33 +99,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="国外地点" prop="wcdz" v-if="form.isGn=='0'">
           <el-input v-model="form.wcdz" placeholder="请输入外出地点" />
         </el-form-item>
         <el-form-item label="外出地点" prop="wcdz" v-else>
           <RegionCascaderSelect v-model="form.wcdz" :isJl="false" endLevel="2" style="width: 100%"></RegionCascaderSelect>
         </el-form-item>
-
         <el-form-item label="联系电话" prop="lxdh">
           <el-input v-model="form.lxdh" placeholder="请输入联系电话" />
         </el-form-item>
-        <el-form-item label="子女身份证件类型" prop="znzjlx">
-          <el-select @change="getValid" v-model="form.znzjlx" placeholder="请选择子女身份证件类型">
-            <el-option
-              v-for="dict in dict.type.C0015"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="子女证件号码" prop="zjhm">
-          <el-input v-model="form.zjhm" placeholder="请输入老年人子女证件号码" />
+        <el-form-item label="子女身份证号" prop="zjhm">
+          <el-input v-model="form.zjhm" placeholder="请输入身份证号码" />
         </el-form-item>
-
         <el-form-item label="是否有配偶" prop="isPo">
           <el-select v-model="form.isPo" placeholder="请选择是否有配偶">
             <el-option
@@ -142,29 +121,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="子女配偶姓名" prop="znPoXm" v-if="form.isPo=='1'">
           <el-input v-model="form.znPoXm" placeholder="请输入子女配偶姓名" />
         </el-form-item>
-
-        <el-form-item label="子女配偶电话号码" prop="znPoDhhm" v-if="form.isPo=='1'">
+        <el-form-item label="子女配偶联系电话" prop="znPoDhhm" v-if="form.isPo=='1'">
           <el-input v-model="form.znPoDhhm" placeholder="请输入子女配偶电话号码" />
         </el-form-item>
-        <el-form-item label="子女配偶身份证件类型" prop="znpozjlx"  v-if="form.isPo=='1'">
-          <el-select @change="getznpoValid" v-model="form.znpozjlx" placeholder="请选择子女配偶身份证件类型">
-            <el-option
-              v-for="dict in dict.type.C0015"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="子女配偶证件号码" prop="pozjhm"  v-if="form.isPo=='1'">
-          <el-input v-model="form.pozjhm" placeholder="请输入老年人子女配偶证件号码" />
-        </el-form-item>
-
         <el-form-item label="最后一次离家时间" prop="lastLjsj">
           <el-date-picker clearable
             v-model="form.lastLjsj"
@@ -173,7 +135,6 @@
             placeholder="请选择最后一次离家时间">
           </el-date-picker>
         </el-form-item>
-
         <el-form-item label="平均一年探望次数" prop="twcs">
           <el-select v-model="form.twcs" placeholder="请选择平均一年探望次数">
             <el-option
@@ -213,7 +174,7 @@
         <tr>
           <td>子女配偶姓名</td>
           <td>{{form.znPoXm}}</td>
-          <td>子女配偶电话号码</td>
+          <td>子女配偶电话</td>
           <td>{{form.znPoDhhm}}</td>
         </tr>
         <tr>

+ 0 - 1
ruoyi-ui/src/views/organization/kugl/hfjl/index.vue

@@ -170,7 +170,6 @@ export default {
     getList() {
       this.loading = true;
       listHfdj(this.queryParams).then(response => {
-        console.log(decrypt_ECB(response.rows[0].blr));
         this.hfdjList = decryptRowData_ECB(response.rows, ["xm", "zjhm", "blr"], [1, 2, 5]);
         this.total = response.total;
         this.loading = false;

+ 1 - 1
ruoyi-ui/src/views/organization/kugl/rzdj/index.vue

@@ -15,7 +15,7 @@
         <el-select v-model="queryParams.rzzt" placeholder="请选择入住状态" clearable>
           <el-option v-for="dict in dict.type.CH063" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
-      </el-form-item>
+      </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>