Merge remote-tracking branch 'origin/master'

ruoyi-web/src/components/CareHomeSel/index.vue

@@ -1,11 +1,11 @@
-<template>
-  <el-button text @click="dialogVisible = true"
+<template >
+  <el-button  type="danger" @click="dialogVisible = true"
   >{{title}}</el-button
   >
   <el-dialog
       v-model="dialogVisible"
       title="养老机构选择"
-      width="80%"
+      width="90%"
       center
       align-center
       :before-close="handleClose"
@@ -65,13 +65,13 @@
 
         </el-from>
 
-        <el-table stripe :row-height="20" :data="jgList.slice((currentPage-1)*pagesize,currentPage*pagesize)"  @selection-change="handleSelectionChange"   >
-          <el-table-column v-if="seltype === 'select'" :key="indexMethod" label="选择" width="100px" height="50px" type="selection" align="center"/>
-          <el-table-column label="序号" :width="'90px'" height="50px" type="index" :index="indexMethod" align="center"/>
+        <el-table stripe :row-height="15" :data="jgList.slice((currentPage-1)*pagesize,currentPage*pagesize)"  @selection-change="handleSelectionChange"   >
+          <el-table-column v-if="seltype === 'select'" :key="indexMethod" label="选择" width="100px" height="20px" type="selection" align="center"/>
+          <el-table-column label="序号" :width="'90px'" height="20px" type="index" :index="indexMethod" align="center"/>
           <el-table-column label="机构名称" align="center" prop="jgmc">
           <template #default="scope">
             <span v-if="seltype === 'select'">{{scope.row["jgmc"]}}</span>
-            <el-button v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["jgmc"]}}</el-button>
+            <el-button style="height: 20px" v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["jgmc"]}}</el-button>
           </template>
           </el-table-column>
           <!--el-table-column label="建立日期" align="center" prop="jlrq"/>
@@ -79,13 +79,13 @@
           <el-table-column label="通信地址" align="center" prop="txdz">
             <template #default="scope">
               <span v-if="seltype === 'select'">{{scope.row["txdz"]}}</span>
-              <el-button v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["txdz"]}}</el-button>
+              <el-button style="height: 20px" v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["txdz"]}}</el-button>
             </template>
           </el-table-column>
           <el-table-column label="联系方式" align="center" prop="frlxfs">
             <template #default="scope">
               <span v-if="seltype === 'select'">{{scope.row["frlxfs"]}}</span>
-              <el-button v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["frlxfs"]}}</el-button>
+              <el-button style="height: 20px" v-if="seltype === 'index'" type="text"  @click="handlesel(scope.row)">{{scope.row["frlxfs"]}}</el-button>
             </template>
           </el-table-column>
         </el-table>

ruoyi-web/src/views/gljtsq/index.vue

@@ -25,11 +25,11 @@
 				<div class="line"></div>
 			</div>
 			<div>
-        80-89周岁城乡低保（特困）老年人生活补贴每人每月200元。
+        80-89周岁城乡低保（特困）老年人生活补贴每人每月XXX元。
         <br>
-        90-99周岁老年人高龄津贴每人每月400元。
+        90-99周岁老年人高龄津贴每人每月XXX元。
         <br>
-        百岁以上老年人高龄津贴每人每月600元。
+        百岁以上老年人高龄津贴每人每月XXX元。
 			</div>
 			<div class="sqdxTitle">
 				<div>申请流程</div>

ruoyi-web/src/views/rzyljgsq/sqzltx/index.vue

@@ -24,8 +24,8 @@
           <el-input v-model="form.yyLrRzyddh" placeholder="请输入手机号码" clearable></el-input>
         </el-form-item>
         <el-form-item label="养老机构选择" prop="jgmc">
-          <el-input class="yljg-ipt" v-model="form.jgmc" placeholder="请选择养老机构" disabled></el-input>
-          <el-button type="danger" @click="chooseBtn">选 择</el-button>
+          <el-input class="yljg-ipt" slot="prepend" v-model="form.jgmc" placeholder="请选择养老机构" disabled></el-input>
+          <CareHomeSel type="danger" slot="append" ref="dztree" title="选择" :seltype="'index'" @handleNodeClick="NodeClick($event)"></CareHomeSel>
         </el-form-item>
         <el-form-item label="老人居住地址所在行政区划" prop="lrjzdzxzqh">
           <RegionCascaderSelect v-model="form.lrjzdzxzqh"></RegionCascaderSelect>
@@ -186,6 +186,13 @@ const queryParams = reactive({
   status: '',
   szxzqh: '',
 })
+function NodeClick( data) {
+  active.id = data.id
+  active.jgmc = data.jgmc
+  form.jgmc = active.jgmc
+  form.yyLrYljg = active.id
+ // alert(JSON.stringify(data))
+}
 function chooseOrg(rows) {
   active.id = rows.id
   active.jgmc = rows.jgmc