Merge branch '陈航-与国家不同的页面-修改' of sckj/mz-cloud into master

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/YljgXfaqzcxxServiceImpl.java

@@ -79,7 +79,7 @@ public class YljgXfaqzcxxServiceImpl implements IYljgXfaqzcxxService
     public List<YljgXfaqzcxx> selectYljgXfaqzcxxList(YljgXfaqzcxx yljgXfaqzcxx)
     {
         List<YljgXfaqzcxx> list = yljgXfaqzcxxMapper.selectYljgXfaqzcxxList(yljgXfaqzcxx);
-        list.stream().forEach(item-> {
+        list.forEach(item-> {
             item.setIsYh(Integer.parseInt(item.getIsYh())>0?"1":"0");
         });
         return list;
@@ -89,7 +89,7 @@ public class YljgXfaqzcxxServiceImpl implements IYljgXfaqzcxxService
     {
         yljgXfaqzcxx.setCreateUnit(SecurityUtils.getUserUnitId());
         List<YljgXfaqzcxx> list = yljgXfaqzcxxMapper.selectYljgXfaqjcxxList(yljgXfaqzcxx);
-        list.stream().forEach(item-> item.setIsYh(Integer.parseInt(item.getIsYh())>0?"1":"0"));
+        list.forEach(item-> item.setIsYh(Integer.parseInt(item.getIsYh())>0?"1":"0"));
         return list;
     }
 
@@ -99,7 +99,7 @@ public class YljgXfaqzcxxServiceImpl implements IYljgXfaqzcxxService
         if(StringUtils.isNotNull(yljgXfaqzcxx.getIsJc())){
             if("0".equals(yljgXfaqzcxx.getIsJc())){  // 自查
                 List<YljgXfaqzcxx> list = yljgXfaqzcxxMapper.selectYljgXfaqzcxxListByJgIdGroup(yljgXfaqzcxx);
-                list.stream().forEach(item-> item.setIsYh(Integer.parseInt(item.getIsYh())>0?"1":"0"));
+                list.forEach(item-> item.setIsYh(Integer.parseInt(item.getIsYh())>0?"1":"0"));
                 return list;
             }else{ // 检查
                 return selectYljgXfaqjcxxList(yljgXfaqzcxx);

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

@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="szxzqh != null  and szxzqh != ''"> and b.szxzqh like concat( #{szxzqh}, '%')</if>
             <if test="ssxzqh != null  and ssxzqh != ''"> and a.ssxzqh like concat( #{ssxzqh}, '%')</if>
             <if test="isCl != null  and isCl != ''"> and a.is_cl = #{isCl}</if>
+            <if test="lytj != null  and lytj != ''"> and a.lytj = #{lytj}</if>
         </where>
     </select>
 

ruoyi-modules/mz-organization-rcyy/src/main/java/com/ruoyi/organization/domain/YljgCrk.java

@@ -6,11 +6,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.system.validate.ChineseV;
+import com.ruoyi.system.validate.DateV;
+import com.ruoyi.system.validate.group.AddGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 养老机构_出入库对象 yljg_crk
@@ -52,6 +59,12 @@ public class YljgCrk extends BaseEntity
     @ApiModelProperty(value = "备注")
     private String bz;
 
+    /** 操作人 */
+    @ApiModelProperty(value = "操作人")
+    @ChineseV(message = "{操作人}")
+    @Size(min = 1, max = 72, message = "{操作人}")
+    private String czr;
+
     //物资名称
     @TableField(exist = false)
     private String wzmc;
@@ -60,5 +73,9 @@ public class YljgCrk extends BaseEntity
     @TableField(exist = false)
     private String wzlx;
 
+    // 出入库时间
+    @TableField(exist = false)
+    private String crksj;
+
 
 }

ruoyi-modules/mz-organization-rcyy/src/main/java/com/ruoyi/organization/domain/YljgRkgl.java

@@ -77,12 +77,18 @@ public class YljgRkgl extends BaseEntity
     @TableField(exist = false)
     private String wzlx;
 
+    @TableField(exist = false)
+    private String czr;
+
+    @TableField(exist = false)
+    private String bz;
+
     //备注
     @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     @NotBlank(message = "{备注}",groups = AddGroup.class)
     @Size(min  = 1, max = 300,message = "{备注}")
-    @TableField(exist = false)
+//    @TableField(exist = false)
     private String bc;
 
     public interface CKV {

ruoyi-modules/mz-organization-rcyy/src/main/java/com/ruoyi/organization/service/impl/YljgRkglServiceImpl.java

@@ -124,6 +124,7 @@ public class YljgRkglServiceImpl implements IYljgRkglService
         yljgCrk.setSl(yljgRkgl.getWzsl());
         yljgCrk.setCrkzt(CrkStatus.RK.getCode());
         yljgCrk.setBz(yljgRkgl.getBc());
+        yljgCrk.setCzr(SecurityUtils.getLoginUser().getSysUser().getNickName());
         yljgCrkMapper.insert(yljgCrk);
         return result;
     }
@@ -157,7 +158,8 @@ public class YljgRkglServiceImpl implements IYljgRkglService
         yljgCrk.setWzId(yljgRkgl.getWzId());
         yljgCrk.setSl(yljgRkgl.getWzsl());
         yljgCrk.setCrkzt(CrkStatus.CK.getCode());
-        yljgCrk.setBz(yljgRkgl.getBc());
+        yljgCrk.setBz(yljgRkgl.getBz());
+        yljgCrk.setCzr(yljgRkgl.getCzr());
         yljgCrkMapper.insert(yljgCrk);
         return result;
     }

ruoyi-modules/mz-organization-rcyy/src/main/resources/mapper/business/YljgCrkMapper.xml

@@ -24,10 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
         <result property="wzmc"    column="wzmc"    />
         <result property="wzlx"    column="wzlx"    />
+        <result property="czr"    column="czr"    />
+        <result property="crksj"    column="crksj"    />
     </resultMap>
 
     <select id="selectYljgCrkList" parameterType="YljgCrk" resultMap="YljgCrkResult" >
-        select crk.id as id, crk.wz_id as wz_id, crk.sl as sl, crk.crkzt as crkzt, crk.bz as bz, wz.wzmc as wzmc, wz.wzlx as wzlx from yljg_crk crk
+        select crk.id as id, crk.czr, crk.wz_id as wz_id, crk.sl as sl, crk.crkzt as crkzt, crk.create_time_str as crksj, crk.bz as bz, wz.wzmc as wzmc, wz.wzlx as wzlx from yljg_crk crk
             left join yljg_wz wz on wz.id = crk.wz_id
         <where>
             <if test="wzId != null and wzId != ''"> and wz_id = #{wzId}</if>

ruoyi-modules/mz-organization-rcyy/src/main/resources/mapper/business/YljgRkglMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wzlx"    column="wzlx"    />
     </resultMap>
     <select id="selectYljgRkglList" parameterType="YljgRkgl" resultMap="YljgRkglResult" >
-        select kc.id as id, kc.wz_id as wz_id, kc.wzsl as wzsl, kc.rksj as rksj,  wz.wzmc as wzmc, wz.wzlx as wzlx from yljg_rkgl kc
+        select kc.id as id, kc.wz_id as wz_id, kc.wzsl as wzsl, kc.rksj as rksj, kc.bc,  wz.wzmc as wzmc, wz.wzlx as wzlx from yljg_rkgl kc
         left join yljg_wz wz on wz.id = kc.wz_id
         <where>
             <if test="wzId != null and wzId != ''"> and wz_id = #{wzId}</if>

ruoyi-ui/src/views/business/fwjggl/ajgsx/jzxx/index.vue

@@ -30,7 +30,7 @@
       </el-form-item>
         </span>
 
-      <el-form-item label="捐赠人" prop="jzrmc">
+      <el-form-item label="捐赠人名称" prop="jzrmc">
         <el-input
           v-model="queryParams.jzrmc"
           placeholder="请输入捐赠人"
@@ -38,10 +38,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="捐赠方式" prop="jzfs">
-        <el-select v-model="queryParams.jzfs" placeholder="请选择捐赠方式" clearable>
+      <el-form-item label="捐赠主体" prop="jzzt">
+        <el-select v-model="queryParams.jzzt" placeholder="请选择捐赠主体" clearable>
           <el-option
-            v-for="dict in dict.type.CZ009"
+            v-for="dict in dict.type.XZ010"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -76,25 +76,27 @@
           {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="单位名称" align="center" prop="jgmc" width="180"/>
-      <el-table-column label="单位所在行政区划" align="center" prop="szxzqhName" width="200"/>
+      <el-table-column label="机构名称" align="center" prop="jgmc" width="180"/>
+      <el-table-column label="机构所在区划" align="center" prop="szxzqhName" width="200"/>
       <el-table-column label="机构统一社会信用代码" align="center" prop="tyshxydm" width="200"/>
+      <el-table-column label="捐赠人姓名(单位)" align="center" prop="jzrmc"/>
+      <el-table-column label="捐赠人姓名(单位)联系电话" align="center" prop="lxdh"/>
       <el-table-column label="捐赠主体" align="center" prop="jzzt">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.XZ010" :value="scope.row.jzzt"/>
         </template>
       </el-table-column>
-      <el-table-column label="捐赠日期" align="center" prop="jzsj" width="180">
+      <el-table-column label="捐赠时间" align="center" prop="jzsj" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.jzsj) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="捐赠方式" align="center" prop="jzfs">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.CZ009" :value="scope.row.jzfs"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="捐赠人名称" align="center" prop="jzrmc"/>
+<!--      <el-table-column label="捐赠方式" align="center" prop="jzfs">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.CZ009" :value="scope.row.jzfs"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ruoyi-ui/src/views/business/fwjggl/ajgsx/qtaqjc/index.vue

@@ -63,6 +63,11 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="qtaqzcList">
+      <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="jgmc" />
       <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
       <el-table-column label="所在行政区划" align="center" prop="szxzqhName" v-if="isZc" />

ruoyi-ui/src/views/business/fwjggl/ajgsx/xfaqjcxx/index.vue

@@ -98,7 +98,7 @@
       </el-table-column>
       <el-table-column label="所在行政区划" align="center" prop="szxzqhName" />
       <el-table-column label="是否存在安全隐患问题" align="center" prop="isYh" :formatter="stateFormat" />
-      <el-table-column label="是否纳入民办养老机构消防安全达标提升工程" align="center" prop="isJgxfaqdbgc">
+      <el-table-column label="是否纳入民办养老机构消防安全达标提升工程" align="center" prop="isJgxfaqdbgc" v-if="!isZc">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.CZ035" :value="scope.row.isJgxfaqdbgc" />
         </template>

ruoyi-ui/src/views/business/fwjggl/ajgsx/zdsj/index.vue

@@ -16,9 +16,9 @@
         </el-form-item>
       </span>
 
-      <el-form-item label="事件主题" prop="sjzt">
-        <el-input v-model="queryParams.sjzt" placeholder="请输入事件主题" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
+<!--      <el-form-item label="事件主题" prop="sjzt">-->
+<!--        <el-input v-model="queryParams.sjzt" placeholder="请输入事件主题" clearable @keyup.enter.native="handleQuery" />-->
+<!--      </el-form-item>-->
 
       <el-form-item label="严重程度" prop="yzcd">
         <el-select v-model="queryParams.yzcd" placeholder="请选择严重程度" clearable>
@@ -56,7 +56,7 @@
           {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="180" />
+<!--      <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="180" />-->
       <el-table-column label="单位名称" align="center" prop="jgmc" width="180" />
       <el-table-column label="单位所在行政区划" align="center" prop="szxzqhName" width="200" />
       <el-table-column label="事件主题" align="center" prop="sjzt" :show-overflow-tooltip="true" />

ruoyi-ui/src/views/business/fwjggl/ajgsx/zhjgbzssqk/index.vue

@@ -13,7 +13,7 @@
         </el-form-item>
       </span>
 
-      <el-form-item label="是否符合《养老机构服务安全基本规范》" prop="sfjgaqgf">
+      <el-form-item label="是否符合《养老机构服务安全基本规范》(GB38600-2019)" prop="sfjgaqgf">
         <el-radio-group v-model="queryParams.sfjgaqgf">
           <el-radio
             v-for="dict in dict.type.CZ035"
@@ -24,7 +24,7 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="是否符合养老机构服务质量基本规范" prop="sfjgzlgf">
+      <el-form-item label="是否符合《养老机构服务质量基本规范》(GB/T35769-2017)" prop="sfjgzlgf">
         <el-radio-group v-model="queryParams.sfjgzlgf">
           <el-radio
             v-for="dict in dict.type.CZ035"
@@ -77,23 +77,23 @@
         <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
         <el-table-column label="机构名称" align="center" prop="jgmc" />
         <el-table-column label="所在行政区划" align="center" prop="szxzqhName" />
-        <el-table-column label="是否符合养老机构服务安全基本规范" align="center" prop="sfjgaqgf">
+        <el-table-column label="是否符合《养老机构服务安全基本规范》(GB38600-2019)" align="center" prop="sfjgaqgf">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.CZ035" :value="scope.row.sfjgaqgf"/>
           </template>
         </el-table-column>
-        <el-table-column label="是否符合养老机构服务质量基本规范" align="center" prop="sfjgzlgf">
+        <el-table-column label="是否符合《养老机构服务质量基本规范》(GB/T35796-2017)" align="center" prop="sfjgzlgf">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.CZ035" :value="scope.row.sfjgzlgf"/>
           </template>
         </el-table-column>
-        <el-table-column label="依据国家标准评定等级和有关规定" align="center" prop="yjbzpddj">
+        <el-table-column label="依据《养老机构等级划分与评定》(GB/T3726-2018)国家标准评定等级和有关规定" align="center" prop="yjbzpddj">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.XZ097" :value="scope.row.yjbzpddj"/>
           </template>
         </el-table-column>
-        <el-table-column label="等级有效期" align="center" prop="djyxq" />
-        <el-table-column label="核实部门" align="center" prop="hsbm" />
+<!--        <el-table-column label="等级有效期" align="center" prop="djyxq" />-->
+<!--        <el-table-column label="核实部门" align="center" prop="hsbm" />-->
 <!--        <el-table-column label="等级评定组织方" align="center" prop="djpdzzf" />-->
 <!--        <el-table-column label="上传等级评定证书" align="center" prop="djpdzssc" />-->
         <el-table-column label="提交日期" align="center" prop="tjrq" width="180">

ruoyi-ui/src/views/business/fwjggl/ajgsx/zhjgtsjb/index.vue

@@ -43,7 +43,7 @@
       <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
       <el-table-column label="单位名称" align="center" prop="jgmc" />
       <el-table-column label="行政区划" align="center" prop="szxzqhName" />
-      <el-table-column label="单位通信地址" align="center" prop="txdz" />
+<!--      <el-table-column label="单位通信地址" align="center" prop="txdz" />-->
       <el-table-column label="投诉举报日期" align="center" prop="tsjbrq" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.tsjbrq) }}</span>

ruoyi-ui/src/views/business/fwjggl/ajgsx/zhjgxzcf/index.vue

@@ -17,6 +17,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="来源途径" prop="lytj">
+        <el-select v-model="queryParams.lytj" placeholder="请选择来源途径" clearable>
+          <el-option
+            v-for="dict in dict.type.CH042"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <span v-if="isXzqh">
       <el-form-item label="所在行政区划" prop="xzqh" v-if="!queryParams.jgId">
         <RegionCascaderSelect
@@ -463,7 +473,8 @@ export default {
           pageSize: 10,
           tyshxydm: null,
           jgmc: null,
-          isCl: null
+          isCl: null,
+          lytj: null
         },
         // 表单参数
         form: {},

ruoyi-ui/src/views/business/fwjggl/jgfwjc/index.vue

@@ -30,7 +30,7 @@
         ></RegionCascaderSelect>
       </el-form-item>
 
-      <el-form-item label="机构类型" prop="yljglx">
+      <el-form-item label="流转状态" prop="yljglx">
         <el-select v-model="queryParams.yljglx" placeholder="请选择" clearable>
           <el-option
             v-for="dict in dict.type.CH027"

ruoyi-ui/src/views/organization/rcyy/crk/index.vue

@@ -38,6 +38,12 @@
           <dict-tag :options="dict.type.XZ011" :value="scope.row.crkzt"/>
         </template>
       </el-table-column>
+      <el-table-column label="操作人" align="center" prop="czr" />
+      <el-table-column label="操作时间" align="center" prop="crksj" width="180">
+        <template slot-scope="scope">
+          <span>{{ special(scope.row.crksj,'time') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="bz" />
     </el-table>
 

ruoyi-ui/src/views/organization/rcyy/rkgl/index.vue

@@ -45,12 +45,14 @@
           <dict-tag :options="dict.type.XZ003" :value="scope.row.wzlx"/>
         </template>
       </el-table-column>
-      <el-table-column label="物资数量" align="center" prop="wzsl"/>
-      <el-table-column label="入库日期" align="center" prop="rksj" width="180">
+      <el-table-column label="入库日期" align="center" prop="bz" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.rksj) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="库存数量" align="center" prop="wzsl"/>
+      <el-table-column label="备注" align="center" prop="bc"/>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -99,10 +101,18 @@
           <number v-model.sync="form.wzsl" placeholder="物资数量" :min="1" :max="999999" />
         </el-form-item>
 
-        <el-form-item label="备注" prop="bc">
+        <el-form-item label="领取人" prop="czr"  v-if="title == '物资出库'">
+          <el-input v-model="form.czr"   maxlength="72" show-word-limit placeholder="请输入领取人"/>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="bc" v-if="title == '物资入库'">
           <el-input v-model="form.bc" type="textarea"  maxlength="300" show-word-limit placeholder="请输入物资备注"/>
         </el-form-item>
 
+        <el-form-item label="备注" prop="bz" v-if="title == '物资出库'">
+          <el-input v-model="form.bz" type="textarea"  maxlength="200" show-word-limit placeholder="请输入最多200个字符"/>
+        </el-form-item>
+
         <el-form-item label="入库日期" prop="rksj" v-if="title != '物资入库' && title != '物资出库'">
           <el-date-picker clearable
                           v-model="form.rksj"

ruoyi-ui/src/views/search/xxcx/fwjg/baxx/babgcx/index.vue

@@ -39,7 +39,8 @@
       </el-table-column>
       <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
       <el-table-column label="单位名称" align="center" prop="jgmc" />
-      <el-table-column label="所属行政区划" align="center" prop="ssxzqhName" />
+      <el-table-column label="所在行政区划" align="center" prop="szxzqhName" />
+<!--      <el-table-column label="所属行政区划" align="center" prop="ssxzqhName" />-->
       <el-table-column label="变更日期" align="center" prop="babgRq" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.babgRq) }}</span>

ruoyi-ui/src/views/search/xxcx/fwjg/baxx/baxxcx/index.vue

@@ -33,7 +33,7 @@
       <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
       <el-table-column label="单位名称" align="center" prop="jgmc" />
       <el-table-column label="所在行政区划" align="center" prop="szxzqhName" />
-      <el-table-column label="所属行政区划" align="center" prop="ssxzqhName" />
+<!--      <el-table-column label="所属行政区划" align="center" prop="ssxzqhName" />-->
       <el-table-column label="备案日期" align="center" prop="barq" width="180">
         <template slot-scope="scope">
           <span>{{ special(scope.row.barq) }}</span>

ruoyi-ui/src/views/search/xxcx/fwjg/sqyljg/lryp/commonality/index.vue

@@ -62,23 +62,23 @@
             </template>
           </el-table-column>
           <el-table-column label="单位名称" align="center" prop="jgmc" />
-          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
           <el-table-column label="单位所在行政区" align="center" prop="szxzqhName" />
-          <el-table-column label="老年用品名称" align="center" prop="lrypmc" />
-          <el-table-column label="老年用品类型" align="center" prop="lryplx">
+          <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
+          <el-table-column label="产品类型" align="center" prop="lryplx">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.CH001" :value="scope.row.lryplx" />
             </template>
           </el-table-column>
+          <el-table-column label="产品名称" align="center" prop="lrypmc" />
           <el-table-column label="产品用途" align="center" prop="lrypyt" v-if="isJg" />
-          <el-table-column label="老年用品使用对象" align="center" prop="lrypsydx" v-if="isJg">
+          <el-table-column label="产品使用对象" align="center" prop="lrypsydx" v-if="isJg">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.XZ006" :value="scope.row.lrypsydx" />
             </template>
           </el-table-column>
           <el-table-column label="生产厂商" align="center" prop="ypsccs" v-if="isJg" />
-          <el-table-column label="老年用品价格(元)" align="center" prop="ypjg" />
-          <el-table-column label="老年用品规格型号" align="center" prop="lrypggxh" v-if="isJg">
+          <el-table-column label="产品价格(元)" align="center" prop="ypjg" />
+          <el-table-column label="产品规格型号" align="center" prop="lrypggxh" v-if="isJg">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.XZ007" :value="scope.row.lrypggxh" />
             </template>