陈航-按照Coding进度-开发与修复

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgJcxx.java

@@ -833,6 +833,12 @@ public class YljgJcxx extends BaseEntity
     @NumberV(message = "{配备人员数}")
     private String pbrys;
 
+    /** 失智照护专区入住老年人数 */
+    @ApiModelProperty(value = "失智照护专区入住老年人数")
+//    @NotBlank(message = "{失智照护专区入住老年人数}",groups = AddGroup.class)
+    @NumberV(message = "{失智照护专区入住老年人数}")
+    private String szzhzqRzlnrs;
+
 
 
 }

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/domain/YljgsqJcxx.java

@@ -238,7 +238,7 @@ public class YljgsqJcxx extends BaseEntity
 
     /** 分项类别（CZ030） */
     @ApiModelProperty(value = "分项类别代码（CZ030）")
-    @DictV(type = "CZ030",message = "{分项类别代码}")
+    @DictV(type = "CZ030", isMuti = true, message = "{分项类别代码}")
     private String fxlb;
 
     /** 是否开展医疗服务（CZ035） */
@@ -620,4 +620,40 @@ public class YljgsqJcxx extends BaseEntity
 
     @TableField(exist = false)
     private List<String> yljgqyhzCx;
+
+
+    /**  部长要新增业务的字段 - CH - 2023-2-10 17:54:20*/
+    /** 是否设置失智照护专区（CZ035） */
+//    @Excel(name = "是否设置失智照护专区", dictType = "CZ035")
+    @ApiModelProperty(value = "是否设置失智照护专区（CZ035）")
+    @NotBlank(message = "{是否设置失智照护专区}",groups = AddGroup.class)
+    @DictV(type = "CZ035",message = "{是否设置失智照护专区}")
+    private String isSzzhzq;
+
+    /** 专区面积 */
+//    @Excel(name = "专区面积")
+    @ApiModelProperty(value = "专区面积")
+    @Range(min=0,max=10000000000L,message = "{专区面积}")
+    @Digits(integer = 10,fraction = 2,message = "{专区面积}")
+    private String zqmj;
+
+    /** 专区床位数 */
+//    @Excel(name = "专区床位数")
+    @ApiModelProperty(value = "专区床位数")
+//    @NotBlank(message = "{专区床位数}",groups = AddGroup.class)
+    @NumberV(message = "{专区床位数}")
+    private String zqcw;
+
+    /** 配备人员数 */
+//    @Excel(name = "配备人员数")
+    @ApiModelProperty(value = "配备人员数")
+//    @NotBlank(message = "{配备人员数}",groups = AddGroup.class)
+    @NumberV(message = "{配备人员数}")
+    private String pbrys;
+
+    /** 失智照护专区入住老年人数 */
+    @ApiModelProperty(value = "失智照护专区入住老年人数")
+//    @NotBlank(message = "{失智照护专区入住老年人数}",groups = AddGroup.class)
+    @NumberV(message = "{失智照护专区入住老年人数}")
+    private String szzhzqRzlnrs;
 }

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgJcxxMapper.xml

@@ -103,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="zqmj"    column="zqmj"    />
         <result property="zqcw"    column="zqcw"    />
         <result property="pbrys"    column="pbrys"    />
+        <result property="szzhzqRzlnrs"    column="szzhzq_rzlnrs"    />
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createUserType"    column="create_user_type"    />
@@ -137,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.is_qtsf, a.qtsf_xm, a.qtsf_zg, a.qtsf_zd, a.ymszlrs, a.sczt, a.sczt_xgsj, is_ba, a.basj, a.xgrq,
             a.create_time_str, a.create_user_id, a.create_by, a.create_unit,a.create_tounit, a.create_unit_name,
             a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name,
-            a.jglb, a.zyrq, a.yljgzyxkzh, a.chxpfrq, a.ffssmj, a.frdjhm, a.is_szzhzq, a.zqmj, a.zqcw, a.pbrys,
+            a.jglb, a.zyrq, a.yljgzyxkzh, a.chxpfrq, a.ffssmj, a.frdjhm, a.is_szzhzq, a.zqmj, a.zqcw, a.pbrys, a.szzhzq_rzlnrs,
             b.`name` as ssxzqh_name, c.`name` as szxzqh_name
             from yljg_jcxx a
             LEFT JOIN sys_dept_jl b ON a.ssxzqh = b.code
@@ -160,7 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.is_kzylfw, a.nsyljg, a.yljgqyhz, a.is_yljgzyxk, a.is_ylbxddzg,
         a.fcyhznr, a.sffs, a.is_sfhyz, a.hlf_zg, a.hlf_zd, a.cwf_zg, a.cwf_zd, a.ssf_zg, a.ssf_zd, a.yz_zg, a.yz_zd,
         a.is_qtsf, a.qtsf_xm, a.qtsf_zg, a.qtsf_zd, a.ymszlrs, a.sczt, a.sczt_xgsj, is_ba, a.basj, a.xgrq,
-        a.is_szzhzq, a.zqmj, a.zqcw, a.pbrys,
+        a.is_szzhzq, a.zqmj, a.zqcw, a.pbrys, a.szzhzq_rzlnrs,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit, a.create_tounit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name
         from yljg_jcxx a
@@ -716,6 +717,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zqmj != null">zqmj = #{zqmj},</if>
             <if test="zqcw != null">zqcw = #{zqcw},</if>
             <if test="pbrys != null">pbrys = #{pbrys},</if>
+            <if test="pbryszzhzqRzlnrss != null">szzhzq_rzlnrs = #{szzhzqRzlnrs},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-jg/src/main/resources/mapper/organization/YljgsqJcxxMapper.xml

@@ -77,6 +77,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isQyylzx"    column="is_qyylzx"    />
         <result property="fwrc"    column="fwrc"    />
         <result property="tgfwlx"    column="tgfwlx"    />
+        <result property="isSzzhzq"    column="is_szzhzq"    />
+        <result property="zqmj"    column="zqmj"    />
+        <result property="zqcw"    column="zqcw"    />
+        <result property="pbrys"    column="pbrys"    />
+        <result property="szzhzqRzlnrs"    column="szzhzq_rzlnrs"    />
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createUserType"    column="create_user_type"    />
@@ -115,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tgjjylsmfw_qtrc, tgjjylsmfw_qtsm,
         tgsqylfw_qtrc, tgsqylfw_rtrc, tgsqylfw_czrc, tgsqylfw_wyrc,
         tgsqylfw_zfrc, tgsqylfw_kfrc, tgsqylfw_qtfwrc,
+        is_szzhzq, zqmj, zqcw, pbrys, szzhzq_rzlnrs,
         create_time_str, create_user_id, create_by, create_unit,create_tounit, create_unit_name,
         update_time_str, update_user_id, update_by, update_unit, update_unit_name
         from yljgsq_jcxx
@@ -193,6 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tgjjylsmfw_qtrc, tgjjylsmfw_qtsm,
         tgsqylfw_qtrc, tgsqylfw_rtrc, tgsqylfw_czrc, tgsqylfw_wyrc,
         tgsqylfw_zfrc, tgsqylfw_kfrc, tgsqylfw_qtfwrc,
+        is_szzhzq, zqmj, zqcw, pbrys, szzhzq_rzlnrs,
         create_time_str, create_user_id, create_by, create_unit,create_tounit, create_unit_name,
         update_time_str, update_user_id, update_by, update_unit, update_unit_name
         from yljgsq_jcxx
@@ -205,9 +212,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tyshxydm != null  and tyshxydm != ''"> and tyshxydm like concat('%', #{tyshxydm}, '%')</if>
             <if test="jgmc != null  and jgmc != ''"> and jgmc like concat('%', #{jgmc}, '%')</if>
             <if test="lb != null  and lb != ''"> and lb = #{lb}</if>
-            <if test="fxlb != null  and fxlb != ''"> and fxlb = #{fxlb}</if>
+            <if test="fxlb != null  and fxlb != ''"> and fxlb like concat('%', #{fxlb}, '%')</if>
             <if test="sczt != null  and sczt != ''"> and sczt = #{sczt}</if>
-            <if test="fxlb != null  and fxlb != ''"> and fxlb = #{fxlb}</if>
         </where>
     </select>
 
@@ -244,9 +250,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
             <if test="fxlb != null  and fxlb != ''">
-                AND fxlb in
-                <foreach item="fxlb" index="index" collection="fxlb.split(',')" open="(" separator="," close=")">
-                    #{fxlb}
+                AND
+                <foreach item="item" index="index" collection="fxlb.split(',')" open="(" close=")" separator="or">
+                    (
+                    fxlb LIKE CONCAT('%',#{item},'%')
+                    )
                 </foreach>
             </if>
             <if test="dwxz != null  and dwxz != ''">
@@ -591,6 +599,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isQyylzx != null">is_qyylzx = #{isQyylzx},</if>
             <if test="fwrc != null">fwrc = #{fwrc},</if>
             <if test="tgfwlx != null">tgfwlx = #{tgfwlx},</if>
+            <if test="isSzzhzq != null">is_szzhzq = #{isSzzhzq},</if>
+            <if test="zqmj != null">zqmj = #{zqmj},</if>
+            <if test="zqcw != null">zqcw = #{zqcw},</if>
+            <if test="pbrys != null">pbrys = #{pbrys},</if>
+            <if test="szzhzqRzlnrs != null">szzhzq_rzlnrs = #{szzhzqRzlnrs},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/domain/YljgYgJbxx.java

@@ -298,6 +298,12 @@ public class YljgYgJbxx extends BaseEntity
     @Size(max = 500, message = "{护理员津贴发放审核意见}")
     private String hlyJtffShyj;
 
+    /** 护理员津贴发放审核人姓名 */
+    @ApiModelProperty(value = "护理员津贴发放审核人姓名")
+    @Size(min  = 1, max = 72, message = "{护理员津贴发放审核人姓名}")
+    @ChineseV(message = "{护理员津贴发放审核人姓名}")
+    @EncryptionV
+    private String hlyJtffShrxm;
 
     @ApiModelProperty(value = "入职奖励类型")
     @TableField(exist = false)

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/IYljgYgJbxxService.java

@@ -34,6 +34,7 @@ public interface IYljgYgJbxxService
     public List<YljgYgJbxx> selectYljgYgJbxxList(YljgYgJbxx yljgYgJbxx);
     public List<YljgYgJbxx> selectYljgHlyxxList(YljgYgJbxx yljgYgJbxx);
     public List<YljgYgJbxx> selectYljgHlyJtffList(YljgYgJbxx yljgYgJbxx);
+    public List<YljgYgJbxx> hlyJtffCxList(YljgYgJbxx yljgYgJbxx);
     @Slave
     public List<YljgYgJbxx> selectYljgYgJbxxAdvancedList(YljgYgJbxx yljgYgJbxx);
 

ruoyi-modules/mz-organization-yggl/src/main/java/com/ruoyi/organization/service/impl/YljgYgJbxxServiceImpl.java

@@ -215,6 +215,16 @@ public class YljgYgJbxxServiceImpl implements IYljgYgJbxxService
             return yljgYgJbxxMapper.selectYljgHlyJtffList(yljgYgJbxx);
     }
 
+    @Override
+    public List<YljgYgJbxx> hlyJtffCxList(YljgYgJbxx yljgYgJbxx)
+    {
+        if (StringUtils.isBlank(yljgYgJbxx.getJtffZtCx())){
+            yljgYgJbxx.setJtffZtCx("06");
+        }
+        return yljgYgJbxxMapper.selectYljgHlyJtffList(yljgYgJbxx);
+    }
+
+
 
     @Override
     public List<YljgYgJbxx> selectYljgYgJbxxAdvancedList(YljgYgJbxx yljgYgJbxx)

ruoyi-modules/mz-organization-yggl/src/main/resources/mapper/organization/YljgYgJbxxMapper.xml

@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isTsknqt"    column="is_tsknqt"    />
         <result property="hdyrJlms"    column="hdyr_jlms"    />
         <result property="hlyJtffShyj"    column="hly_jtff_shyj"    />
+        <result property="hlyJtffShrxm"    column="hly_jtff_shrxm"    />
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createUserType"    column="create_user_type"    />
@@ -134,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
         a.id, xm, a.sfzlx, a.sfzhm, a.xb, a.lxdh, a.whcd, a.shbn,
         a.zylx, a.zylx_qt, a.gwlx,
-        a.is_hlyyzs, a.hlydj, a.gq_hlydj, a.jg_id, a.zw,
+        a.is_hlyyzs, a.hlydj, a.gq_hlydj, a.jg_id, a.zw, a.hly_jtff_shyj,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit,a.create_tounit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name,
         b.zzmc, a.jtff_zt, a.is_qy
@@ -165,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.is_hlyyzs, a.is_jnsb, a.hlydj, a.gq_hlydj, a.jg_id, a.zw, a.sfzhm_url, a.whcd_url,
         a.create_time_str, a.create_user_id, a.create_by, a.create_unit,a.create_tounit, a.create_unit_name,
         a.update_time_str, a.update_user_id, a.update_by, a.update_unit, a.update_unit_name,
-        b.zzmc, a.is_scrz, a.is_scrz_url, a.is_sybz, a.is_tsknqt, a.hdyr_jlms, a.hly_jtff_shyj
+        b.zzmc, a.is_scrz, a.is_scrz_url, a.is_sybz, a.is_tsknqt, a.hdyr_jlms, a.hly_jtff_shyj, a.hly_jtff_shrxm
         from yljg_yg_jbxx a
         LEFT JOIN yljg_bmxx b ON a.shbn = b.id
         where a.id = #{id}
@@ -187,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN a.is_scrz = '1' AND a.whcd IN ('40','60') THEN 3
         WHEN a.is_tsknqt = '1' THEN 4 ELSE 0
         END) AS rzjtLx,
-            IFNULL(a.hdyr_jlms,'暂无信息') as hdyrJlms, a.hly_jtff_shyj,
+            IFNULL(a.hdyr_jlms,'暂无信息') as hdyrJlms, a.hly_jtff_shyj as hlyJtffShyj, a.hly_jtff_shrxm as hlyJtffShrxm,
             a.id, a.jg_id, xm, a.sfzlx, a.sfzhm, a.csrq, a.cyrq, a.xb, a.lxdh, a.whcd, a.shbn,
             a.zzzt, a.lzsj, a.rzsj, a.zylx, a.zylx_qt as zylxQt, a.gwlx, a.jtff_zt as jtffZt, a.is_qy as isQy,
             a.is_hlyyzs as isHlyyzs, a.is_jnsb as isJnsb, a.hlydj, a.gq_hlydj as gqHlydj, a.jg_id as jgId, a.zw,
@@ -354,6 +355,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isQy != null and isQy != ''">is_qy = #{isQy},</if>
             <if test="hdyrJlms != null and hdyrJlms != ''">hdyr_jlms = #{hdyrJlms},</if>
             <if test="hlyJtffShyj != null">hly_jtff_shyj = #{hlyJtffShyj},</if>
+            <if test="hlyJtffShrxm != null">hly_jtff_shrxm = #{hlyJtffShrxm},</if>
             update_time_str = #{updateTimeStr},
             update_user_id = #{updateUserId},
             update_by = #{updateBy},
@@ -442,6 +444,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="jtffZtCx == 1"> and a.jtff_zt = '05'</if>
         <if test="jtffZtCx == '03'"> and a.jtff_zt in ('02','03','04')</if>
         <if test="jtffZtCx == '05'"> and a.jtff_zt in ('03','05')</if>
+        <if test="jtffZtCx == '06'"> and a.jtff_zt = '05'</if>
         <if test="isQy != null  and isQy != ''"> and a.is_qy = #{isQy}</if>
         <if test="jgId != null  and jgId != ''"> and a.jg_id = #{jgId}</if>
         <if test="sfzlx != null  and sfzlx != ''"> and a.sfzlx = #{sfzlx}</if>

ruoyi-modules/mz-organization/src/main/java/com/ruoyi/organization/controller/YljgYgJbxxController.java

@@ -101,6 +101,21 @@ public class YljgYgJbxxController extends BaseController
         return getDataTable(list);
     }
 
+    @RequiresPermissions("search:hlyJtff:list")
+    @GetMapping("/search/hlyJtff/list")
+    public TableDataInfo hlyJtffCxList(YljgYgJbxx yljgYgJbxx)
+    {
+        if(StringUtils.isNotNull(yljgYgJbxx.getXzqhId()) && !"1".equals(yljgYgJbxx.getIsBj())){
+            Map<String,String> map = SubCodeUtil.getSubCode(yljgYgJbxx.getXzqhId());
+            yljgYgJbxx.setXzqhId(map.get("code"));
+        }else if (StringUtils.isNull(yljgYgJbxx.getXzqhId()) && "1".equals(yljgYgJbxx.getIsBj())){
+            yljgYgJbxx.setXzqhId(SecurityUtils.getAreaCode());
+        }
+        startPage();
+        List<YljgYgJbxx> list = yljgYgJbxxService.hlyJtffCxList(yljgYgJbxx);
+        return getDataTable(list);
+    }
+
     /**
      * 护理员资格确认-机构
      */

ruoyi-ui/src/api/organization/yggl/hlyBtxx.js

@@ -27,6 +27,15 @@ export function listHlyjtff(query) {
   })
 }
 
+// 护理员津贴发放查询
+export function listHlyjtffCx(query) {
+  return request({
+    url: '/organization/ygJbxx/search/hlyJtff/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 护理员发放津贴
 export function updateHlyJtff(data) {
   return request({

ruoyi-ui/src/views/business/btgl/hlyJt/detail.vue

@@ -183,13 +183,17 @@
 							<div class="formFlex">
 								<el-form-item label="审核结果" prop="jtffZt" class="formWidth">
 									<el-select v-model="checkForm.jtffZt" placeholder="请选择审核结果" :disabled="disabled">
-										<el-option label="通过" value="03"></el-option>
-										<el-option label="不通过" value="04"></el-option>
+										<el-option label="通过" value="03"/>
+										<el-option label="不通过" value="04"/>
+										<el-option label="已发放津贴" value="05"/>
 									</el-select>
 								</el-form-item>
 								<el-form-item label="审核意见" prop="hlyJtffShyj" class="formWidth">
 									<el-input class="shyj" type="text" v-model="checkForm.hlyJtffShyj" placeholder="请输入审核意见" :disabled="disabled"/>
 								</el-form-item>
+                <el-form-item label="审核人姓名" prop="hlyJtffShrxm" class="formWidth">
+                  <el-input class="shyj" type="text" v-model="checkForm.hlyJtffShrxm" placeholder="请输入审核人姓名" :disabled="disabled"/>
+                </el-form-item>
 							</div>
 						</el-form>
 					</el-tab-pane>
@@ -296,11 +300,13 @@ export default {
 				hdyrJlms: '',
 				jtffZt: '',
 				hlyJtffShyj: '',
+        hlyJtffShrxm: '',
 			},
 			checkRules: {
 				hdyrJlms: [{ required: true, message: '荣誉奖励说明不能为空', trigger: 'blur' }],
 				jtffZt: [{ required: true, message: '审核结果不能为空', trigger: 'change' }],
 				hlyJtffShyj: [{ required: true, message: '审核意见不能为空', trigger: 'blur' }],
+        hlyJtffShrxm: [{ required: true, message: '审核人姓名不能为空', trigger: 'blur' }],
 			},
 		};
 	},
@@ -324,13 +330,14 @@ export default {
 			this.dialogLoading = true
 			// 基本信息数据请求
 			getYgJbxx(this.cyryId).then(res => {
-				this.baseInfo = decryptData_ECB(res.data, ['xm', 'sfzhm', 'lxdh'], [1, 2, 3]);
+				this.baseInfo = decryptData_ECB(res.data, ['xm', 'sfzhm', 'lxdh', 'hlyJtffShrxm'], [1, 2, 3, 1]);
 				// 初始化有审核结果则显示审核结果
-				if (['03', '04'].includes(this.baseInfo.jtffZt)) {
+				if (['03', '04', '05'].includes(this.baseInfo.jtffZt)) {
 					this.disabled = true
 					this.checkForm.hdyrJlms = this.baseInfo.hdyrJlms;
 					this.checkForm.jtffZt = this.baseInfo.jtffZt;
 					this.checkForm.hlyJtffShyj = this.baseInfo.hlyJtffShyj;
+					this.checkForm.hlyJtffShrxm = this.baseInfo.hlyJtffShrxm;
 				} else {
 					this.disabled = false
 					this.resetForm('checkForm');

ruoyi-ui/src/views/organization/jggl/sqJcxx/index.vue

@@ -325,6 +325,20 @@
 				        ></el-option>
 			        </el-select>
 		        </el-form-item>
+<!--            <el-form-item label="分项类别" prop="fxlb" class="formWidth4">-->
+<!--              <el-checkbox-group-->
+<!--                v-model="form.fxlb"-->
+<!--                @change="getSzlrlx(form.fxlb)"-->
+<!--              >-->
+<!--                <el-checkbox-->
+<!--                  v-for="dict in dict.type.CZ030"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.value"-->
+<!--                >-->
+<!--                  {{ dict.label }}-->
+<!--                </el-checkbox>-->
+<!--              </el-checkbox-group>-->
+<!--            </el-form-item>-->
 	        </div>
           <div class="formFlex">
 	          <el-form-item label="所处位置" prop="scwz" class="formWidth2">

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

@@ -80,30 +80,32 @@
 					<tr>
 						<td>类别</td>
 						<td>{{ translateDict('CH034', form.lb) }}</td>
-						<td>单位性质</td>
-						<td>{{ translateDict('C0038', form.dwxz) }}</td>
-						<td>兴办主体</td>
-						<td>{{ translateDict('CH010', form.xbzt) }}</td>
+            <td>分项类别</td>
+            <td>{{ translateDict('CZ030', form.fxlb, true) }}</td>
 					</tr>
+          <tr>
+            <td>单位性质</td>
+            <td>{{ translateDict('C0038', form.dwxz) }}</td>
+            <td>兴办主体</td>
+            <td>{{ translateDict('CH010', form.xbzt) }}</td>
+            <td>所处位置</td>
+            <td>{{ translateDict('CH012', form.scwz) }}</td>
+          </tr>
 					<tr>
 						<td>是否街道(乡镇)区域性养老中心</td>
 						<td>{{ translateDict('CZ035', form.isQyxylfwzx) }}</td>
-						<td>所处位置</td>
-						<td>{{ translateDict('CH012', form.scwz) }}</td>
-						<td>是否投保责任险代码</td>
-						<td>{{ translateDict('CZ035', form.isTbzrx) }}</td>
-					</tr>
-					<tr>
-						<td>是否长护险定点机构</td>
-						<td>{{ translateDict('CZ035', form.isChxddjg) }}</td>
-						<td>社区养老服务项目(月均)</td>
-						<td>{{ form.isTgjjylsmfw == '1' ? ((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) +
-							Number(form.tgsqylfwWyrc) +
-							Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
-						) / 6) : '--'
-							}}</td>
+            <td>是否投保责任险代码</td>
+            <td>{{ translateDict('CZ035', form.isTbzrx) }}</td>
+            <td>是否长护险定点机构</td>
+            <td>{{ translateDict('CZ035', form.isChxddjg) }}</td>
 					</tr>
 					<tr>
+            <td>社区养老服务项目(月均)</td>
+            <td>{{ form.isTgjjylsmfw == '1' ? ((Number(form.tgsqylfwRtrc) + Number(form.tgsqylfwCzrc) +
+              Number(form.tgsqylfwWyrc) +
+              Number(form.tgsqylfwZfrc) + Number(form.tgsqylfwKfrc) + Number(form.tgsqylfwQtrc)
+            ) / 6) : '--'
+              }}</td>
 						<td>是否提供居家上门服务</td>
 						<td>{{ translateDict('CZ035', form.isTgjjylsmfw) }}</td>
 						<td>居家上门服务项目(月均)</td>
@@ -155,7 +157,7 @@ import { decryptData_ECB } from '@/api/tool/sm4'
 
 export default {
 	name: 'SqDetail',
-	dicts: ['C0038', 'CH026', 'CH007', 'CH009', 'CH010', 'CH012', 'CH013', 'CH014', 'C0015', 'CH052', 'CZ035', 'CH034'],
+	dicts: ['C0038', 'CH026', 'CH007', 'CH009', 'CH010', 'CH012', 'CH013', 'CH014', 'C0015', 'CH052', 'CZ035', 'CH034', 'CZ030'],
 	props: {
 		visible: {
 			type: Boolean,

ruoyi-ui/src/views/search/xxcx/hlycx/index.vue

@@ -1,265 +1,284 @@
 <template>
-  <div class="app-container">
-    <p class="jqqd">该区域暂未开放，敬请期待！</p>
-  </div>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="170px">
+			<el-form-item label="员工姓名" prop="xm">
+				<el-input
+					v-model="queryParams.xm"
+					placeholder="请输入姓名"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="证件号码" prop="sfzhm">
+				<el-input
+					v-model="queryParams.sfzhm"
+					placeholder="请输入公民身份证件号码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="手机号码" prop="lxdh">
+				<el-input
+					v-model="queryParams.lxdh"
+					placeholder="请输入手机号码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+
+			<el-form-item label="是否有护理人员等级证书" prop="isHlyyzs">
+				<el-select v-model="queryParams.isHlyyzs" placeholder="请选择是否有护理人员等级证书" @change="changeHlyzs" 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="hlydj">
+				<el-select v-model="queryParams.hlydj" placeholder="请选择护理员等级" clearable :disabled="disabledHlydj">
+					<el-option
+						v-for="dict in dict.type.CH020"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value"
+					/>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="岗位" prop="gwlx">
+				<el-select v-model="queryParams.gwlx" placeholder="请选择岗位类型" clearable>
+					<el-option
+						v-for="dict in dict.type.CH062"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value"
+					/>
+				</el-select>
+			</el-form-item>
+
+			<el-form-item label="是否发放津贴" prop="jtffZtCx">
+				<el-select v-model="queryParams.jtffZtCx" 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>
+				<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-table v-loading="loading" :data="ygJbxxList">
+			<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="xm" />
+			<el-table-column label="证件号码" align="center" prop="sfzhm" width="180" />
+			<el-table-column label="性别" align="center" prop="xb">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.C0007" :value="scope.row.xb" />
+				</template>
+			</el-table-column>
+			<el-table-column label="手机号码" align="center" prop="lxdh" />
+			<el-table-column label="学历" align="center" prop="whcd">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.XZ113" :value="scope.row.whcd" />
+				</template>
+			</el-table-column>
+			<el-table-column label="所在部门" align="center" prop="zzmc" />
+			<el-table-column label="护理员等级" align="center" prop="hlydj">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.CH020" :value="scope.row.hlydj" />
+				</template>
+			</el-table-column>
+			<el-table-column label="岗位类型" align="center" prop="gwlx">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.CH062" :value="scope.row.gwlx" />
+				</template>
+			</el-table-column>
+			<el-table-column label="审核状态" align="center" prop="shzt">
+				<template slot-scope="scope">
+					<dict-tag :options="dict.type.XZ120" :value="scope.row.jtffZt" />
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="is_Component" width="120">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleDetails(scope.row)"
+						v-hasPermi="['business:hlyJt:query']"
+					>详情
+					</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" />
+
+		<!--详细-->
+		<Detail :visible.sync="openXQ" :id="cyryId"></Detail>
+	</div>
 </template>
 
 <script>
-import { mapState, mapGetters } from 'vuex'
-import { getXXTJList } from '@/api/search/xxtj/yljgtj/yljgtj.js'
-import { gettreedata, objtableList, getstatisticaldata } from '@/api/system/dict/type'
-import dict from "@/store/modules/dict";
-import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+import { getYgJbxx, listYgJbxx, updateYgJbxx } from '@/api/organization/yggl/ygJbxx'
+import { listHlyjtffCx, updateHlyxx } from '@/api/organization/yggl/hlyBtxx'
+import Detail from '@/views/business/btgl/hlyJt/detail.vue'
+import { decryptData_ECB, decryptRowData_ECB } from '@/api/tool/sm4'
 
 export default {
-  name: 'hlytj',
-  dicts: ['TJ001'],
-  computed: {
-    ...mapState(['user']),
-    ...mapGetters(['level']),
-  },
-  data() {
-    return {
-      ydtitle: '',
-      dw: '单位：家',
-      loading: true,
-      // 外侧tabs绑定的name
-      activeName1: '1',
-      // 内侧tabs绑定的name
-      activeName2: '1',
-      activeName2o: ['1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1'],
-      tabisini: [false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false],
-      treeliadzt: [false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false],
-      queryParams: {
-        dictType: 'TJ001',
-        para1: '1',
-        para2: null,
-        para3: '1',
-        para4: null
-      },
-      formDataidx: 1,
-      formData: [{
-        unit: null, vales: null, keys: null
-      }, {
-        unit: null,
-        vales: null,
-        keys: null
-      }],
-    }
-  },
-  methods: {
-    // 月度标题方法
-    clkcall(methodswords) {
-      this.$emit('clkcallbk', methodswords)
-    },
-    changeTitle(index) {
-      switch (index) {
-        case 0:
-          this.ydtitle = '养老机构备案情况统计-月度'
-          return this.ydtitle
-        case 1:
-          this.ydtitle = '养老机构法人类型统计-月度'
-          return this.ydtitle
-        case 2:
-          this.ydtitle = '特困救助供养机构统计-月度'
-          return this.ydtitle
-        case 3:
-          this.ydtitle = '光荣院统计-月度'
-          return this.ydtitle
-        case 4:
-          this.ydtitle = '街道（乡镇）区域性养老中心-月度'
-          return this.ydtitle
-        case 5:
-          this.ydtitle = '养老机构兴办主体统计-月度'
-          return this.ydtitle
-        case 6:
-          this.ydtitle = '养老机构入住率统计-月度'
-          return this.ydtitle
-        case 7:
-          this.ydtitle = '医疗服务方式-月度'
-          return this.ydtitle
-        case 8:
-          this.ydtitle = '养老机构单位性质统计-月度'
-          return this.ydtitle
-      }
-    },
-    // 接收月日期改变的数据
-    changeDateMonth(val) {
-      this.queryParams.para4 = val
-      this.getTableList()
-    },
-    // 接收年日期改变的数据
-    changDateYear(val) {
-      this.queryParams.para4 = val
-      this.getTableList()
-    },
-    // 多选框改变接收子组件的数据
-    getNewYear(val) {
-      if (val === 'half') {
-        this.formData[this.formDataidx].vales.splice(6)
-      } else {
-        this.getTableList()
-      }
-    },
-    // 父tabs栏切换事件
-    handleClick() {
+	name: 'YgJbxx',
+	dicts: ['XZ113', 'CZ035', 'CH062', 'C0015', 'C0007', 'CZ001', 'CH061', 'CH020', 'XZ115', 'XZ120'],
+	data() {
+		return {
+			cyryId: null,
+			disabledHlydj: true,
+			// 遮罩层
+			loading: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 基本信息表格数据
+			ygJbxxList: [],
+			dataDetails: {},
+			// 是否显示弹出层
+			openXQ: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				xm: null,
+				sjbmid: null,
+				sfzlx: null,
+				sfzhm: null,
+				xb: null,
+				lxdh: null,
+				shbn: null,
+				zzzt: null,
+				zylx: null,
+				gwlx: null,
+				jtffZtCx: null,
+				isHlyyzs: null,
+				hlydj: null,
+				gqHlydj: null,
+				zw: null,
+				jgId: null
+			}
+		}
+	},
+	components: { Detail },
+	props: {
+		isComponent: {
+			type: Boolean,
+			default: true
+		}
+	},
+	computed: {
+		is_Component() {
+			return this.isComponent
+		}
+	},
+	created() {
+		this.getList()
+	},
+	methods: {
+		changeHlyzs(value) {
+			if (value === '1') {
+				this.disabledHlydj = false
+			} else {
+				this.disabledHlydj = true
+				this.queryParams.hlydj = ''
+			}
+		},
 
-      this.activeName2 = this.activeName2o[this.activeName1];
-      this.queryParams.para2 = null
-      this.queryParams.para4 = null
-      this.queryParams.para3 = this.activeName2
-      this.queryParams.para1 = this.activeName1
-      this.formDataidx = (this.activeName1 - 1) * 3 + parseInt(this.activeName2);
-      if (this.tabisini[this.formDataidx] == false) {
-        this.treeliadzt[this.formDataidx] = true;
-        this.getTableList();
-        this.tabisini[this.formDataidx] = true;
-      }
-    },
-    // 子tabs栏切换事件
-    handleTabsClick() {
-      this.activeName2o[this.activeName1] = this.activeName2;
-      this.queryParams.para2 = null
-      this.queryParams.para4 = null
-      this.queryParams.para3 = this.activeName2
-      this.formDataidx = (this.activeName1 - 1) * 3 + parseInt(this.activeName2);
-      if (this.tabisini[this.formDataidx] == false) {
-        this.treeliadzt[this.formDataidx] = true;
-        this.getTableList();
-        this.tabisini[this.formDataidx] = true;
-      }
-    },
+		translateDict(type, value) {return this.selectDictLabel(this.dict.type[type], value)},
 
-    // 节点单击事件
-    NodeClick(idxa, idxb, data) {
-      this.queryParams.para2 = data.code;
-      this.getTableList();
-    },
+		/** 查询基本信息列表 */
+		getList() {
+			this.loading = true
+			listHlyjtffCx(this.queryParams).then(response => {
+				this.ygJbxxList = decryptRowData_ECB(response.rows, ['xm', 'sfzhm', 'lxdh'], [1, 2, 3])
+				this.total = response.total
+				this.loading = false
+			})
+		},
 
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getTableList()
-    },
-    // 获取表格数据
-    keys() {
-      let arr = []
-      let unit = ["总数", "公办", "民办"]
-      let number = 3
-      let num = 0
-      if ((this.activeName1 !== '2' && this.activeName1 !== '7' && this.activeName1 !== '9' && this.activeName1 !== '10') && (this.activeName2 !== '3')) {
-        // let unit = this.formData[this.formDataidx].unit.split(',')
-        this.formData[this.formDataidx].keys.forEach((item) => {
-          if (item.type === 'fixed') {
-            arr.push(item)
-          } else if (item.type === 'select') {
-            if (num % number === 0) {
-              var temitem = JSON.parse(JSON.stringify(item))
-              temitem.data = []
-              temitem.data.push({ ...item, label: unit[num % number], width: '100' })
-              arr.push(temitem)
-            } else {
-              arr[arr.length - 1].data.push({ ...item, label: unit[num % number], width: '100' })
-            }
-            num++
-          }
-        })
-        this.formData[this.formDataidx].keys = arr;
-      } else if (this.activeName1 === '7' && this.activeName2 === '1') {
-        this.formData[this.formDataidx].keys.forEach((item) => {
-          if (item.type === 'fixed') {
-            arr.push(item)
-          } else if (item.type === 'select') {
-            if (num % number === 0 && num < 9) {
-              var temitem = JSON.parse(JSON.stringify(item))
-              temitem.data = []
-              temitem.data.push({ ...item, label: unit[num % number], width: '100' })
-              arr.push(temitem)
-            } else if (num >= 9) {
-              arr.push(item)
-            } else {
-              arr[arr.length - 1].data.push({ ...item, label: unit[num % number], width: '100' })
-            }
-            num++
-          }
-        })
-        this.formData[this.formDataidx].keys = arr;
-      }
-    },
-    async getTableList() {
-      this.loading = true
-      let retdata = await getstatisticaldata(this.queryParams)
-      this.loading = false
-      if (retdata.code == 200) {
-        var data = this.$DBRetToObjA(retdata.data)
-        this.formData[this.formDataidx] = data[0];
-        this.keys();
-      }
-    }
-  },
-  created() {
-    for (let i = 0; i < 100; i++) {
-      this.formData[i] = { unit: null, vales: null, keys: null }
-    }
-    this.getTableList();
-    this.treeliadzt[1] = true;
-  }
-}
-</script>
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1
+			this.getList()
+		},
 
-<style scoped>
-.jqqd{
-	font-size: 24px;
-	font-weight: bold;
-	color: #1890ff;
-	margin: 330px auto 0;
-	text-align: center;
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm('queryForm')
+			this.handleQuery()
+		},
+
+		/** 详情按钮操作 */
+		handleDetails(row) {
+			this.cyryId = row.id
+			this.openXQ = true
+		}
+	}
 }
-.echarts-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+table td {
+	width: 10%;
+	height: 2.5rem;
+	padding: .5%;
+	font-weight: 500;
+	border: 1px solid #ddd;
 }
 
-.ssqh {
-  width: 20%;
+table {
+	width: 100%;
+	border-collapse: collapse;
+	border: 1px solid #ddd;
 }
 
-.echarts {
-  padding: 20px;
-  width: 85%;
+table td:nth-child(odd) {
+	text-align: right;
+	background: #f5f5f5;
 }
 
-.echarts-text,
-.echarts-radio,
-.xxtj-table {
-  margin-top: 15px;
+.formFlex {
+	display: flex;
+	width: 100%;
 }
 
-.xxtj-table,
-.echarts,
-.ssqh {
-  border: 1px solid #dfe4ed;
+.formFlex ::v-deep .el-form-item__content {
+	width: 50%;
 }
 
-.el-tab-pane {
-  position: relative;
+.formWidth {
+	width: 32%;
+	display: flex !important;
 }
 
-.left-bottom-text {
-  position: absolute;
-  right: 0;
-  bottom: 10%;
-  z-index: 99;
-}
+::v-deep .formWidth2 {
+	width: 32%;
+	display: flex !important;
 
-.echarts-text,
-.left-bottom-text {
-  color: #000000a6;
+	.el-form-item__content {
+		width: 61%;
+	}
 }
 
-.sxzd {
-  font-weight: 600;
-  margin: 10px 15px;
+::v-deep .custom > .el-dialog__body {
+	height: 770px;
 }
 </style>

ruoyi-ui/src/views/search/xxcx/hlycx/indexOld-CH.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="app-container">
+    <p class="jqqd">该区域暂未开放，敬请期待！</p>
+  </div>
+</template>
+
+<script>
+import { mapState, mapGetters } from 'vuex'
+import { getXXTJList } from '@/api/search/xxtj/yljgtj/yljgtj.js'
+import { gettreedata, objtableList, getstatisticaldata } from '@/api/system/dict/type'
+import dict from "@/store/modules/dict";
+import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+
+export default {
+  name: 'hlytj',
+  dicts: ['TJ001'],
+  computed: {
+    ...mapState(['user']),
+    ...mapGetters(['level']),
+  },
+  data() {
+    return {
+      ydtitle: '',
+      dw: '单位：家',
+      loading: true,
+      // 外侧tabs绑定的name
+      activeName1: '1',
+      // 内侧tabs绑定的name
+      activeName2: '1',
+      activeName2o: ['1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1'],
+      tabisini: [false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false],
+      treeliadzt: [false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false],
+      queryParams: {
+        dictType: 'TJ001',
+        para1: '1',
+        para2: null,
+        para3: '1',
+        para4: null
+      },
+      formDataidx: 1,
+      formData: [{
+        unit: null, vales: null, keys: null
+      }, {
+        unit: null,
+        vales: null,
+        keys: null
+      }],
+    }
+  },
+  methods: {
+    // 月度标题方法
+    clkcall(methodswords) {
+      this.$emit('clkcallbk', methodswords)
+    },
+    changeTitle(index) {
+      switch (index) {
+        case 0:
+          this.ydtitle = '养老机构备案情况统计-月度'
+          return this.ydtitle
+        case 1:
+          this.ydtitle = '养老机构法人类型统计-月度'
+          return this.ydtitle
+        case 2:
+          this.ydtitle = '特困救助供养机构统计-月度'
+          return this.ydtitle
+        case 3:
+          this.ydtitle = '光荣院统计-月度'
+          return this.ydtitle
+        case 4:
+          this.ydtitle = '街道（乡镇）区域性养老中心-月度'
+          return this.ydtitle
+        case 5:
+          this.ydtitle = '养老机构兴办主体统计-月度'
+          return this.ydtitle
+        case 6:
+          this.ydtitle = '养老机构入住率统计-月度'
+          return this.ydtitle
+        case 7:
+          this.ydtitle = '医疗服务方式-月度'
+          return this.ydtitle
+        case 8:
+          this.ydtitle = '养老机构单位性质统计-月度'
+          return this.ydtitle
+      }
+    },
+    // 接收月日期改变的数据
+    changeDateMonth(val) {
+      this.queryParams.para4 = val
+      this.getTableList()
+    },
+    // 接收年日期改变的数据
+    changDateYear(val) {
+      this.queryParams.para4 = val
+      this.getTableList()
+    },
+    // 多选框改变接收子组件的数据
+    getNewYear(val) {
+      if (val === 'half') {
+        this.formData[this.formDataidx].vales.splice(6)
+      } else {
+        this.getTableList()
+      }
+    },
+    // 父tabs栏切换事件
+    handleClick() {
+
+      this.activeName2 = this.activeName2o[this.activeName1];
+      this.queryParams.para2 = null
+      this.queryParams.para4 = null
+      this.queryParams.para3 = this.activeName2
+      this.queryParams.para1 = this.activeName1
+      this.formDataidx = (this.activeName1 - 1) * 3 + parseInt(this.activeName2);
+      if (this.tabisini[this.formDataidx] == false) {
+        this.treeliadzt[this.formDataidx] = true;
+        this.getTableList();
+        this.tabisini[this.formDataidx] = true;
+      }
+    },
+    // 子tabs栏切换事件
+    handleTabsClick() {
+      this.activeName2o[this.activeName1] = this.activeName2;
+      this.queryParams.para2 = null
+      this.queryParams.para4 = null
+      this.queryParams.para3 = this.activeName2
+      this.formDataidx = (this.activeName1 - 1) * 3 + parseInt(this.activeName2);
+      if (this.tabisini[this.formDataidx] == false) {
+        this.treeliadzt[this.formDataidx] = true;
+        this.getTableList();
+        this.tabisini[this.formDataidx] = true;
+      }
+    },
+
+    // 节点单击事件
+    NodeClick(idxa, idxb, data) {
+      this.queryParams.para2 = data.code;
+      this.getTableList();
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getTableList()
+    },
+    // 获取表格数据
+    keys() {
+      let arr = []
+      let unit = ["总数", "公办", "民办"]
+      let number = 3
+      let num = 0
+      if ((this.activeName1 !== '2' && this.activeName1 !== '7' && this.activeName1 !== '9' && this.activeName1 !== '10') && (this.activeName2 !== '3')) {
+        // let unit = this.formData[this.formDataidx].unit.split(',')
+        this.formData[this.formDataidx].keys.forEach((item) => {
+          if (item.type === 'fixed') {
+            arr.push(item)
+          } else if (item.type === 'select') {
+            if (num % number === 0) {
+              var temitem = JSON.parse(JSON.stringify(item))
+              temitem.data = []
+              temitem.data.push({ ...item, label: unit[num % number], width: '100' })
+              arr.push(temitem)
+            } else {
+              arr[arr.length - 1].data.push({ ...item, label: unit[num % number], width: '100' })
+            }
+            num++
+          }
+        })
+        this.formData[this.formDataidx].keys = arr;
+      } else if (this.activeName1 === '7' && this.activeName2 === '1') {
+        this.formData[this.formDataidx].keys.forEach((item) => {
+          if (item.type === 'fixed') {
+            arr.push(item)
+          } else if (item.type === 'select') {
+            if (num % number === 0 && num < 9) {
+              var temitem = JSON.parse(JSON.stringify(item))
+              temitem.data = []
+              temitem.data.push({ ...item, label: unit[num % number], width: '100' })
+              arr.push(temitem)
+            } else if (num >= 9) {
+              arr.push(item)
+            } else {
+              arr[arr.length - 1].data.push({ ...item, label: unit[num % number], width: '100' })
+            }
+            num++
+          }
+        })
+        this.formData[this.formDataidx].keys = arr;
+      }
+    },
+    async getTableList() {
+      this.loading = true
+      let retdata = await getstatisticaldata(this.queryParams)
+      this.loading = false
+      if (retdata.code == 200) {
+        var data = this.$DBRetToObjA(retdata.data)
+        this.formData[this.formDataidx] = data[0];
+        this.keys();
+      }
+    }
+  },
+  created() {
+    for (let i = 0; i < 100; i++) {
+      this.formData[i] = { unit: null, vales: null, keys: null }
+    }
+    this.getTableList();
+    this.treeliadzt[1] = true;
+  }
+}
+</script>
+
+<style scoped>
+.jqqd{
+	font-size: 24px;
+	font-weight: bold;
+	color: #1890ff;
+	margin: 330px auto 0;
+	text-align: center;
+}
+.echarts-box {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+
+.ssqh {
+  width: 20%;
+}
+
+.echarts {
+  padding: 20px;
+  width: 85%;
+}
+
+.echarts-text,
+.echarts-radio,
+.xxtj-table {
+  margin-top: 15px;
+}
+
+.xxtj-table,
+.echarts,
+.ssqh {
+  border: 1px solid #dfe4ed;
+}
+
+.el-tab-pane {
+  position: relative;
+}
+
+.left-bottom-text {
+  position: absolute;
+  right: 0;
+  bottom: 10%;
+  z-index: 99;
+}
+
+.echarts-text,
+.left-bottom-text {
+  color: #000000a6;
+}
+
+.sxzd {
+  font-weight: 600;
+  margin: 10px 15px;
+}
+</style>