Skip to content

D
data_management_system
Commit 62d1a3e7 authored by zhuangxinwei's avatar zhuangxinwei
Browse files
Options

Merge remote-tracking branch 'origin/master' into master

parents 201a50a1 7ae095db
Hide whitespace changes
Inline Side-by-side
Showing with 595 additions and 304 deletions
ruoyi-common/src/main/java/com/ruoyi/common/utils/CheckUtils.java
View file @ 62d1a3e7
...@@ -37,5 +37,6 @@ public class CheckUtils ...@@ -37,5 +37,6 @@ public class CheckUtils
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(checkPhone("15922013137")); System.out.println(checkPhone("15922013137"));
System.out.println(checkCard("110101199003078371"));
} }
} }
ruoyi-system/src/main/java/com/ruoyi/system/domain/Fcry.java
View file @ 62d1a3e7
...@@ -101,6 +101,16 @@ public class Fcry extends BaseEntity ...@@ -101,6 +101,16 @@ public class Fcry extends BaseEntity
@Transient @Transient
private String value; private String value;
/** 从其他隔离点转来时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date otherGldTime;
/** 从其他方舱转来时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date otherFcTime;
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
...@@ -342,4 +352,20 @@ public class Fcry extends BaseEntity ...@@ -342,4 +352,20 @@ public class Fcry extends BaseEntity
public void setValue(String value) { public void setValue(String value) {
this.value = value; this.value = value;
} }
public Date getOtherFcTime() {
return otherFcTime;
}
public void setOtherFcTime(Date otherFcTime) {
this.otherFcTime = otherFcTime;
}
public Date getOtherGldTime() {
return otherGldTime;
}
public void setOtherGldTime(Date otherGldTime) {
this.otherGldTime = otherGldTime;
}
} }
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GldryServiceImpl.java
View file @ 62d1a3e7
...@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; ...@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
...@@ -166,40 +167,69 @@ public class GldryServiceImpl implements IGldryService ...@@ -166,40 +167,69 @@ public class GldryServiceImpl implements IGldryService
Gldry hldryQuerry = new Gldry(); Gldry hldryQuerry = new Gldry();
hldryQuerry.setCardNo(gldry.getCardNo()); hldryQuerry.setCardNo(gldry.getCardNo());
List<Gldry> gldries = gldryMapper.selectGldryList(hldryQuerry); List<Gldry> gldries = gldryMapper.selectGldryList(hldryQuerry);
if (StringUtils.isNotEmpty(gldry.getArea())) {
List<SysDictData> dictDataList = sysDictDataMapper.selectDictDataByType("residential_area"); // 校验 隔离点名称
String area = gldry.getArea(); if (StringUtils.isNotEmpty(gldry.getGlPlace())){
int isExist = 0; List<SysDictData> isolation_point = DictUtils.getDictCache("isolation_point");
for (SysDictData sysDictData : dictDataList) { List<String> values = isolation_point.stream().filter(l->gldry.getGlPlace().equals(l.getDictLabel()))
if (sysDictData.getDictLabel().equals(area)) { .map(SysDictData::getDictValue).collect(Collectors.toList());
area = sysDictData.getDictValue(); if (!values.isEmpty())
isExist = 1; gldry.setGlPlace(values.get(0));
} else {
failureList.add(gldry);
continue;
} }
if (isExist == 1){ }
gldry.setArea(area); // 校验四级联动是否对应字典的值
}else { // 校验 所在区
if (StringUtils.isNotEmpty(gldry.getArea())){
List<SysDictData> residential_area = DictUtils.getDictCache("residential_area");
List<String> values = residential_area.stream().filter(l->gldry.getArea().equals(l.getDictLabel()))
.map(SysDictData::getDictValue).collect(Collectors.toList());
if (!values.isEmpty())
gldry.setArea(values.get(0));
else {
failureList.add(gldry); failureList.add(gldry);
continue; continue;
} }
} }
if (StringUtils.isNotEmpty(gldry.getStreet())) { // 校验 街道/镇
List<SysDictData> dictDataList = sysDictDataMapper.selectDictDataByType("street_town"); if (StringUtils.isNotEmpty(gldry.getStreet())){
String street = gldry.getStreet(); List<SysDictData> street_town = DictUtils.getDictCache("street_town");
int isExist = 0; List<String> values = street_town.stream().filter(l->gldry.getStreet().equals(l.getDictLabel()))
for (SysDictData sysDictData : dictDataList) { .map(SysDictData::getDictValue).collect(Collectors.toList());
if (sysDictData.getDictLabel().equals(street)) { if (!values.isEmpty())
street = sysDictData.getDictValue(); gldry.setStreet(values.get(0));
isExist = 1; else {
} failureList.add(gldry);
continue;
} }
if (isExist == 1){ }
gldry.setStreet(street); // 校验 居委会
}else { if (StringUtils.isNotEmpty(gldry.getCommittee())){
List<SysDictData> committee = DictUtils.getDictCache("committee");
List<String> values = committee.stream().filter(l->gldry.getCommittee().equals(l.getDictLabel()))
.map(SysDictData::getDictValue).collect(Collectors.toList());
if (!values.isEmpty())
gldry.setCommittee(values.get(0));
else {
failureList.add(gldry); failureList.add(gldry);
continue; continue;
} }
} }
// 校验 小区/村名称
if (StringUtils.isNotEmpty(gldry.getCommunity())){
List<SysDictData> community = DictUtils.getDictCache("community");
List<String> values = community.stream().filter(l->gldry.getCommunity().equals(l.getDictLabel()))
.map(SysDictData::getDictValue).collect(Collectors.toList());
if (!values.isEmpty())
gldry.setCommunity(values.get(0));
else {
failureList.add(gldry);
continue;
}
}
if (!gldries.isEmpty()){ if (!gldries.isEmpty()){
for (Gldry gldryUpdate:gldries){ for (Gldry gldryUpdate:gldries){
gldry.setId(gldryUpdate.getId()); gldry.setId(gldryUpdate.getId());
...@@ -221,7 +251,11 @@ public class GldryServiceImpl implements IGldryService ...@@ -221,7 +251,11 @@ public class GldryServiceImpl implements IGldryService
if (!trueList.isEmpty()){ if (!trueList.isEmpty()){
for (Gldry gldry:trueList){ for (Gldry gldry:trueList){
gldry.setCreateBy(String.valueOf(SecurityUtils.getUserId())); String createBy = DataUtils.getValue(gldry.getArea(),gldry.getStreet(),gldry.getCommittee());
if (createBy.equals("null")){
throw new ServiceException("所选居住地、街道、社区不存在");
}
gldry.setCreateBy(createBy);
gldry.setCreateTime(DateUtils.getNowDate()); gldry.setCreateTime(DateUtils.getNowDate());
gldryMapper.insertGldry(gldry); gldryMapper.insertGldry(gldry);
} }
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/HscjServiceImpl.java
View file @ 62d1a3e7
...@@ -2,19 +2,16 @@ package com.ruoyi.system.service.impl; ...@@ -2,19 +2,16 @@ package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.CheckUtils; import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.DataUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.Zlqk; import com.ruoyi.system.domain.Zlqk;
import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.system.mapper.HscjMapper; import com.ruoyi.system.mapper.HscjMapper;
import com.ruoyi.system.domain.Hscj; import com.ruoyi.system.domain.Hscj;
...@@ -158,36 +155,51 @@ public class HscjServiceImpl implements IHscjService { ...@@ -158,36 +155,51 @@ public class HscjServiceImpl implements IHscjService {
&& StringUtils.isNotEmpty(hscj.getCjPhone()) && StringUtils.isNotEmpty(hscj.getCjPhone())
&& StringUtils.isNotEmpty(hscj.getBblx()) && StringUtils.isNotEmpty(hscj.getBblx())
) { ) {
if (StringUtils.isNotEmpty(hscj.getArea())) { // 校验四级联动是否对应字典的值
List<SysDictData> dictDataList = sysDictDataMapper.selectDictDataByType("residential_area"); // 校验 所在区
String area = hscj.getArea(); if (StringUtils.isNotEmpty(hscj.getArea())){
int isExist = 0; List<SysDictData> residential_area = DictUtils.getDictCache("residential_area");
for (SysDictData sysDictData : dictDataList) { List<String> values = residential_area.stream().filter(l->hscj.getArea().equals(l.getDictLabel()))
if (sysDictData.getDictLabel().equals(area)) { .map(SysDictData::getDictValue).collect(Collectors.toList());
area = sysDictData.getDictValue(); if (!values.isEmpty())
isExist = 1; hscj.setArea(values.get(0));
} else {
failureList.add(hscj);
continue;
} }
if (isExist == 1){ }
hscj.setArea(area); // 校验 街道/镇
}else { if (StringUtils.isNotEmpty(hscj.getStreet())){
List<SysDictData> street_town = DictUtils.getDictCache("street_town");
List<String> values = street_town.stream().filter(l->hscj.getStreet().equals(l.getDictLabel()))
.map(SysDictData::getDictValue).collect(Collectors.toList());
if (!values.isEmpty())
hscj.setStreet(values.get(0));
else {
failureList.add(hscj); failureList.add(hscj);
continue; continue;
} }
} }
if (StringUtils.isNotEmpty(hscj.getStreet())) { // 校验 居委会
List<SysDictData> dictDataList = sysDictDataMapper.selectDictDataByType("street_town"); if (StringUtils.isNotEmpty(hscj.getCommittee())){
String street = hscj.getStreet(); List<SysDictData> committee = DictUtils.getDictCache("committee");
int isExist = 0; List<String> values = committee.stream().filter(l->hscj.getCommittee().equals(l.getDictLabel()))
for (SysDictData sysDictData : dictDataList) { .map(SysDictData::getDictValue).collect(Collectors.toList());
if (sysDictData.getDictLabel().equals(street)) { if (!values.isEmpty())
street = sysDictData.getDictValue(); hscj.setCommittee(values.get(0));
isExist = 1; else {
} failureList.add(hscj);
continue;
} }
if (isExist == 1){ }
hscj.setStreet(street); // 校验 小区/村名称
}else { if (StringUtils.isNotEmpty(hscj.getCommunity())){
List<SysDictData> community = DictUtils.getDictCache("community");
List<String> values = community.stream().filter(l->hscj.getCommunity().equals(l.getDictLabel()))
.map(SysDictData::getDictValue).collect(Collectors.toList());
if (!values.isEmpty())
hscj.setCommunity(values.get(0));
else {
failureList.add(hscj); failureList.add(hscj);
continue; continue;
} }
......
ruoyi-system/src/main/resources/mapper/system/FcryMapper.xml
View file @ 62d1a3e7
...@@ -32,19 +32,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -32,19 +32,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="committee" column="committee" /> <result property="committee" column="committee" />
<result property="floor" column="floor" /> <result property="floor" column="floor" />
<result property="doorplate" column="doorplate" /> <result property="doorplate" column="doorplate" />
<result property="otherGldTime" column="other_gld_time" />
<result property="otherFcTime" column="other_fc_time" />
</resultMap> </resultMap>
<sql id="selectFcryVo"> <sql id="selectFcryVo">
select id, fc_place, room, jz_name, card_no, phone, area, street, community, unit, zr_time, zc_time, gl_place, select id, fc_place, room, jz_name, card_no, phone, area, street, community, unit, zr_time, zc_time, gl_place,
status, del_flag, create_by, create_time, update_by, update_time, remark,check_card,people_type,is_positive, status, del_flag, create_by, create_time, update_by, update_time, remark,check_card,people_type,is_positive,
positive_only,committee,floor,doorplate positive_only,committee,floor,doorplate,other_fc_time,other_gld_time
from fcry from fcry
</sql> </sql>
<select id="selectFcryList" parameterType="Fcry" resultMap="FcryResult"> <select id="selectFcryList" parameterType="Fcry" resultMap="FcryResult">
select a.id, a.fc_place, a.room, a.jz_name, a.card_no, a.phone, a.area, a.street, a.community, a.unit, a.zr_time, select a.id, a.fc_place, a.room, a.jz_name, a.card_no, a.phone, a.area, a.street, a.community, a.unit, a.zr_time,
a.zc_time, a.gl_place, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.zc_time, a.gl_place, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time,
a.remark ,a.check_card ,a.people_type ,a.is_positive ,a.positive_only ,a.committee ,a.floor ,a.doorplate from fcry a a.remark ,a.check_card ,a.people_type ,a.is_positive ,a.positive_only ,a.committee ,a.floor ,a.doorplate,
a.other_fc_time,a.other_gld_time from fcry a
left join sys_user u on u.user_id = a.create_by left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0 where a.del_flag = 0
...@@ -74,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -74,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select a.id, a.fc_place, a.room, a.jz_name, a.card_no, a.phone, a.area, a.street, a.community, select a.id, a.fc_place, a.room, a.jz_name, a.card_no, a.phone, a.area, a.street, a.community,
a.floor, a.unit, a.doorplate, a.zr_time, a.gl_place, a.status, a.del_flag, a.create_by, a.floor, a.unit, a.doorplate, a.zr_time, a.gl_place, a.status, a.del_flag, a.create_by,
a.create_time, a.update_by, a.update_time, a.remark , a.check_card , a.is_positive , a.positive_only, a.create_time, a.update_by, a.update_time, a.remark , a.check_card , a.is_positive , a.positive_only,
a.other_point_time, a.people_type from fcry a a.other_point_time, a.people_type,a.other_fc_time,a.other_gld_time from fcry a
where a.del_flag = 0 and a.card_no = #{cardNo} where a.del_flag = 0 and a.card_no = #{cardNo}
</select> </select>
...@@ -107,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -107,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isPositive != null">is_positive,</if> <if test="isPositive != null">is_positive,</if>
<if test="checkCard != null">check_card,</if> <if test="checkCard != null">check_card,</if>
<if test="peopleType != null">people_type,</if> <if test="peopleType != null">people_type,</if>
<if test="otherFcTime != null">other_fc_time,</if>
<if test="otherGldTime != null">other_gld_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fcPlace != null">#{fcPlace},</if> <if test="fcPlace != null">#{fcPlace},</if>
...@@ -135,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -135,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isPositive != null">#{isPositive},</if> <if test="isPositive != null">#{isPositive},</if>
<if test="checkCard != null">#{checkCard},</if> <if test="checkCard != null">#{checkCard},</if>
<if test="peopleType != null">#{peopleType},</if> <if test="peopleType != null">#{peopleType},</if>
<if test="otherFcTime != null">#{otherFcTime},</if>
<if test="otherGldTime != null">#{otherGldTime},</if>
</trim> </trim>
</insert> </insert>
<insert id="insertBatchFcry" parameterType="Fcry"> <insert id="insertBatchFcry" parameterType="Fcry">
...@@ -176,6 +183,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -176,6 +183,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isPositive != null">is_positive = #{isPositive},</if> <if test="isPositive != null">is_positive = #{isPositive},</if>
<if test="checkCard != null">check_card = #{checkCard},</if> <if test="checkCard != null">check_card = #{checkCard},</if>
<if test="peopleType != null">people_type = #{peopleType},</if> <if test="peopleType != null">people_type = #{peopleType},</if>
<if test="otherGldTime != null">other_gld_time = #{otherGldTime},</if>
<if test="otherFcTime != null">other_fc_time = #{otherFcTime},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
ruoyi-ui/src/api/system/yxry.js
View file @ 62d1a3e7
...@@ -17,12 +17,13 @@ export function cardGetInfo(query) { ...@@ -17,12 +17,13 @@ export function cardGetInfo(query) {
}) })
} }
// 下载治疗情况导入模板 // 下载导入模板
export function importTemplate(params) { export function importTemplate(params) {
return request({ return request({
url: '/system/yxry/importTemplate', url: '/system/yxry/importTemplate',
method: 'post', method: 'post',
responseType: 'blob', responseType: 'blob',
timeout: 30 * 1000,
params params
}) })
} }
...@@ -33,6 +34,7 @@ export function importExcel(data) { ...@@ -33,6 +34,7 @@ export function importExcel(data) {
url: '/system/yxry/importData', url: '/system/yxry/importData',
method: 'post', method: 'post',
responseType: 'blob', responseType: 'blob',
timeout: 30 * 1000,
data data
}) })
} }
......
ruoyi-ui/src/views/system/fcry/index.vue
View file @ 62d1a3e7
...@@ -193,35 +193,35 @@ ...@@ -193,35 +193,35 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="fcryList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="fcryList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" /> <el-table-column label="编号" align="center" prop="id" />
<el-table-column label="方舱名称" align="center" prop="fcPlace"> <el-table-column label="方舱名称" align="center" prop="fcPlace" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.shelters" :value="scope.row.fcPlace"/> <dict-tag :options="dict.type.shelters" :value="scope.row.fcPlace"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="房间号/床号" align="center" prop="room" /> <el-table-column label="房间号/床号" align="center" prop="room" width="100"/>
<el-table-column label="居住人姓名" align="center" prop="jzName" width="150"/> <el-table-column label="居住人姓名" align="center" prop="jzName" width="150"/>
<el-table-column label="身份证号码" align="center" prop="cardNo" width="180"/> <el-table-column label="身份证号码" align="center" prop="cardNo" width="180"/>
<el-table-column label="人员类别" align="center" prop="peopleType"/> <el-table-column label="人员类别" align="center" prop="peopleType"/>
<el-table-column label="是否疾控判定阳性" align="center" prop="isPositive" width="180"/> <el-table-column label="是否疾控判定阳性" align="center" prop="isPositive" width="180"/>
<el-table-column label="仅抗原阳性" align="center" prop="positiveOnly" width="150"/> <el-table-column label="仅抗原阳性" align="center" prop="positiveOnly" width="150"/>
<el-table-column label="联系方式" align="center" prop="phone" /> <el-table-column label="联系方式" align="center" prop="phone" width="150"/>
<el-table-column label="居住地所在区" align="center" prop="area" width="180"> <el-table-column label="居住地所在区" align="center" prop="area" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.residential_area" :value="scope.row.area"/> <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="街道/镇" align="center" prop="street"> <el-table-column label="街道/镇" width="120" align="center" prop="street" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.street_town" :value="scope.row.street"/> <dict-tag :options="dict.type.street_town" :value="scope.row.street"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="小区/村名称" align="center" prop="community" width="150"/> <el-table-column label="小区/村名称" align="center" prop="community" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="楼号" align="center" prop="floor" /> <el-table-column label="楼号" align="center" prop="floor" />
<el-table-column label="单元号" align="center" prop="unit" /> <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true"/>
<el-table-column label="门牌号" align="center" prop="doorplate" /> <el-table-column label="门牌号" align="center" prop="doorplate" :show-overflow-tooltip="true"/>
<el-table-column label="转入时间" align="center" prop="zrTime" width="180"> <el-table-column label="转入时间" align="center" prop="zrTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.zrTime) }}</span> <span>{{ parseTime(scope.row.zrTime) }}</span>
...@@ -232,14 +232,14 @@ ...@@ -232,14 +232,14 @@
<span>{{ parseTime(scope.row.zcTime) }}</span> <span>{{ parseTime(scope.row.zcTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="隔离位置" align="center" prop="glPlace" /> <el-table-column label="隔离位置" align="center" prop="glPlace" width="120" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="状态" align="center" prop="status">--> <!-- <el-table-column label="状态" align="center" prop="status">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>--> <!-- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="140" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -268,112 +268,198 @@ ...@@ -268,112 +268,198 @@
/> />
<!-- 添加或修改方舱人员对话框 --> <!-- 添加或修改方舱人员对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="auto">
<el-form-item label="方舱名称" prop="fcPlace"> <el-row>
<el-select v-model="form.fcPlace" placeholder="请选择方舱名称" :disabled="true"> <el-col :span="12">
<el-option <el-form-item label="方舱名称" prop="fcPlace">
v-for="dict in dict.type.shelters" <el-select v-model="form.fcPlace" placeholder="请选择方舱名称" :disabled="true" style="width: 100%">
:key="dict.value" <el-option
:label="dict.label" v-for="dict in dict.type.shelters"
:value="dict.value" :key="dict.value"
/> :label="dict.label"
</el-select> :value="dict.value"
</el-form-item> />
<el-form-item label="房间号/床号" prop="room"> </el-select>
<el-input v-model="form.room" placeholder="请输入房间号/床号" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="居住人姓名" prop="jzName"> <el-col :span="12">
<el-input v-model="form.jzName" placeholder="请输入居住人姓名" /> <el-form-item label="房间号/床号" prop="room">
</el-form-item> <el-input v-model="form.room" placeholder="请输入房间号/床号" />
<el-form-item label="身份证号码" prop="cardNo"> </el-form-item>
<el-input v-model="form.cardNo" placeholder="请输入身份证号码" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="联系方式" prop="phone"> <el-row>
<el-input v-model="form.phone" placeholder="请输入联系方式" /> <el-col :span="12">
</el-form-item> <el-form-item label="居住人姓名" prop="jzName">
<el-form-item label="居住地所在区" prop="area"> <el-input v-model="form.jzName" placeholder="请输入居住人姓名" />
<el-select v-model="form.area" placeholder="请选择居住地所在区" @change="quSelect"> </el-form-item>
<el-option </el-col>
v-for="dict in quList" <el-col :span="12">
:key="dict.code" <el-form-item label="身份证号码" prop="cardNo">
:label="dict.name" <el-input v-model="form.cardNo" placeholder="请输入身份证号码" />
:value="dict.code" </el-form-item>
></el-option> </el-col>
</el-select> </el-row>
</el-form-item> <el-row>
<el-form-item label="街道/镇" prop="street"> <el-col :span="12">
<el-select v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect"> <el-form-item label="人员类别" prop="doorplate">
<el-option <el-input v-model="form.peopleType" placeholder="请输入人员类别" />
v-for="dict in zhen" </el-form-item>
:key="dict.code" </el-col>
:label="dict.name" <el-col :span="12">
:value="dict.code" <el-form-item label="是否疾控判定阳性" prop="isPositive">
></el-option> <el-select v-model="form.isPositive" placeholder="请选择是否疾控判定阳性" style="width: 100%">
</el-select> <el-option value="是" label="是"></el-option>
</el-form-item> <el-option value="否" label="否"></el-option>
<el-form-item label="居委会" prop="committee"> </el-select>
<el-select v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect"> </el-form-item>
<el-option </el-col>
v-for="dict in ju" </el-row>
:key="dict.code" <el-row>
:label="dict.name" <el-col :span="12">
:value="dict.code" <el-form-item label="仅抗原阳性" prop="positiveOnly">
></el-option> <el-select v-model="form.positiveOnly" placeholder="请选择仅抗原阳性" style="width: 100%">
</el-select> <el-option value="是" label="是"></el-option>
</el-form-item> <el-option value="否" label="否"></el-option>
<el-form-item label="小区/村名称" prop="community" > </el-select>
<el-select v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'"> </el-form-item>
<el-option </el-col>
v-for="dict in cun" <el-col :span="12">
:key="dict.code" <el-form-item label="联系方式" prop="phone">
:label="dict.name" <el-input v-model="form.phone" placeholder="请输入联系方式" />
:value="dict.code" </el-form-item>
></el-option> </el-col>
</el-select> </el-form-item> </el-row>
<el-form-item label="楼号" prop="floor"> <el-row>
<el-input v-model="form.floor" placeholder="请输入楼号" /> <el-col :span="12">
</el-form-item> <el-form-item label="居住地所在区" prop="area">
<el-form-item label="单元号" prop="unit"> <el-select v-model="form.area" placeholder="请选择居住地所在区" @change="quSelect" style="width: 100%">
<el-input v-model="form.unit" placeholder="请输入单元号" /> <el-option
</el-form-item> v-for="dict in quList"
<el-form-item label="门牌号" prop="doorplate"> :key="dict.code"
<el-input v-model="form.doorplate" placeholder="请输入门牌号" /> :label="dict.name"
</el-form-item> :value="dict.code"
<el-form-item label="人员类别" prop="doorplate"> ></el-option>
<el-input v-model="form.peopleType" placeholder="请输入人员类别" /> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否疾控判定阳性" prop="isPositive"> </el-col>
<el-select v-model="form.isPositive" placeholder="请选择是否疾控判定阳性"> <el-col :span="12">
<el-option value="是" label="是"></el-option> <el-form-item label="街道/镇" prop="street">
<el-option value="否" label="否"></el-option> <el-select v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect" style="width: 100%"
</el-select>
</el-form-item> >
<el-form-item label="仅抗原阳性" prop="positiveOnly"> <el-option
<el-select v-model="form.positiveOnly" placeholder="请选择仅抗原阳性"> v-for="dict in zhen"
<el-option value="是" label="是"></el-option> :key="dict.code"
<el-option value="否" label="否"></el-option> :label="dict.name"
</el-select> :value="dict.code"
</el-form-item> ></el-option>
<el-form-item label="转入时间" prop="zrTime"> </el-select>
<el-date-picker clearable </el-form-item>
v-model="form.zrTime" </el-col>
type="datetime" </el-row>
value-format="yyyy-MM-dd HH:mm:ss" <el-row>
placeholder="请选择转入时间"> <el-col :span="12">
</el-date-picker> <el-form-item label="居委会" prop="committee">
</el-form-item> <el-select v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect" style="width: 100%">
<el-form-item label="转出时间" prop="zcTime"> <el-option
<el-date-picker clearable v-for="dict in ju"
v-model="form.zcTime" :key="dict.code"
type="datetime" :label="dict.name"
value-format="yyyy-MM-dd HH:mm:ss" :value="dict.code"
placeholder="请选择转出时间"> ></el-option>
</el-date-picker> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="隔离位置" prop="glPlace"> </el-col>
<el-input v-model="form.glPlace" placeholder="请输入隔离位置" /> <el-col :span="12">
</el-form-item> <el-form-item label="小区/村名称" prop="community" >
<el-select v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'" style="width: 100%">
<el-option
v-for="dict in cun"
:key="dict.code"
:label="dict.name"
:value="dict.code"
></el-option>
</el-select> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="楼号" prop="floor">
<el-input v-model="form.floor" placeholder="请输入楼号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单元号" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单元号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="门牌号" prop="doorplate">
<el-input v-model="form.doorplate" placeholder="请输入门牌号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="转入时间" prop="zrTime">
<el-date-picker clearable
v-model="form.zrTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择转入时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="从其他方舱转来时间" prop="otherFcTime">
<el-date-picker clearable
v-model="form.otherFcTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择从其他方舱转来时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="从其他隔离点转来时间" prop="zrTme">
<el-date-picker clearable
v-model="form.otherGldTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择从其他隔离点转来时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="转出时间" prop="zcTime">
<el-date-picker clearable
v-model="form.zcTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择转出时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="隔离位置" prop="glPlace">-->
<!-- <el-input v-model="form.glPlace" placeholder="请输入隔离位置" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态">--> <!-- <el-form-item label="状态">-->
<!-- <el-radio-group v-model="form.status">--> <!-- <el-radio-group v-model="form.status">-->
<!-- <el-radio--> <!-- <el-radio-->
...@@ -386,9 +472,6 @@ ...@@ -386,9 +472,6 @@
<!-- <el-form-item label="删除标志" prop="delFlag">--> <!-- <el-form-item label="删除标志" prop="delFlag">-->
<!-- <el-input v-model="form.delFlag" placeholder="请输入删除标志" />--> <!-- <el-input v-model="form.delFlag" placeholder="请输入删除标志" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -518,8 +601,8 @@ export default { ...@@ -518,8 +601,8 @@ export default {
area: [{ required: true, message: '请选择居住地所在区', trigger: 'change' }], area: [{ required: true, message: '请选择居住地所在区', trigger: 'change' }],
street: [{ required: true, message: '请选择街道/镇', trigger: 'change' }], street: [{ required: true, message: '请选择街道/镇', trigger: 'change' }],
peopleType: [{ required: true, message: '请输入人员类别', trigger: 'blur' }], peopleType: [{ required: true, message: '请输入人员类别', trigger: 'blur' }],
isPositive: [{ required: true, message: '请选择是否疾控判定阳性', trigger: 'change' }], // isPositive: [{ required: true, message: '请选择是否疾控判定阳性', trigger: 'change' }],
positiveOnly: [{ required: true, message: '请选择仅抗原阳性', trigger: 'change' }], // positiveOnly: [{ required: true, message: '请选择仅抗原阳性', trigger: 'change' }],
zrTime: [{ required: true, validator: validateStartTime, trigger: 'blur' }] zrTime: [{ required: true, validator: validateStartTime, trigger: 'blur' }]
}, },
quList: [ quList: [
...@@ -929,7 +1012,9 @@ export default { ...@@ -929,7 +1012,9 @@ export default {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
remark: null remark: null,
otherFcTime: null,
otherGldTime: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
......
ruoyi-ui/src/views/system/fkqk/index.vue
View file @ 62d1a3e7
...@@ -125,25 +125,25 @@ ...@@ -125,25 +125,25 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="fkqkList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="fkqkList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" /> <el-table-column label="编号" align="center" prop="id" />
<el-table-column label="街道/镇名称" align="center" prop="street"> <el-table-column label="街道/镇名称" width="140" align="center" prop="street" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.street_town" :value="scope.row.street"/> <dict-tag :options="dict.type.street_town" :value="scope.row.street"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="小区名称" align="center" prop="community" /> <el-table-column label="小区名称" width="140" align="center" prop="community" :show-overflow-tooltip="true"/>
<el-table-column label="所在区" align="center" prop="area" width="180"> <el-table-column label="所在区" width="140" align="center" prop="area" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.residential_area" :value="scope.row.area"/> <dict-tag :options="dict.type.residential_area" :value="scope.row.area"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="楼号" align="center" prop="floor" /> <el-table-column label="楼号" align="center" prop="floor" />
<el-table-column label="单元号" align="center" prop="unit" /> <el-table-column label="单元号" align="center" prop="unit" />
<el-table-column label="封控明细" align="center" prop="fkDetailed" /> <el-table-column label="封控明细" align="center" prop="fkDetailed" width="120"/>
<el-table-column label="涉及封控户数" align="center" prop="fkHs" width="180"/> <el-table-column label="涉及封控户数" align="center" prop="fkHs" width="120"/>
<el-table-column label="涉及封控人数" align="center" prop="fkRs" width="180"/> <el-table-column label="涉及封控人数" align="center" prop="fkRs" width="120"/>
<el-table-column label="封控时间" align="center" prop="fkTime" width="180"> <el-table-column label="封控时间" align="center" prop="fkTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.fkTime) }}</span> <span>{{ parseTime(scope.row.fkTime) }}</span>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<span>{{ parseTime(scope.row.realTime) }}</span> <span>{{ parseTime(scope.row.realTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="封控后最近一次核酸检测时间" align="center" prop="hsTime" width="180"> <el-table-column label="封控后最近一次核酸检测时间" width="200" align="center" prop="hsTime" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.hsTime) }}</span> <span>{{ parseTime(scope.row.hsTime) }}</span>
</template> </template>
...@@ -170,8 +170,8 @@ ...@@ -170,8 +170,8 @@
<!-- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>--> <!-- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" width="120" align="center" prop="remark" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" width="140" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -200,101 +200,164 @@ ...@@ -200,101 +200,164 @@
/> />
<!-- 添加或修改小区封控情况对话框 --> <!-- 添加或修改小区封控情况对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="auto">
<el-form-item label="所在区" prop="area"> <el-row>
<el-select v-model="form.area" placeholder="请选择所在区" @change="quSelect"> <el-col :span="12">
<el-option <el-form-item label="小区名称" prop="community">
v-for="dict in quList" <el-select v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'" style="width: 100%">
:key="dict.code" <el-option
:label="dict.name" v-for="dict in cun"
:value="dict.code" :key="dict.code"
></el-option> :label="dict.name"
</el-select> :value="dict.code"
</el-form-item> ></el-option>
<el-form-item label="街道/镇名称" prop="street"> </el-select>
<el-select v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect"> </el-form-item>
<el-option </el-col>
v-for="dict in zhen" <el-col :span="12">
:key="dict.code" <el-form-item label="所在区" prop="area">
:label="dict.name" <el-select v-model="form.area" placeholder="请选择所在区" @change="quSelect" style="width: 100%">
:value="dict.code" <el-option
></el-option> v-for="dict in quList"
</el-select> :key="dict.code"
</el-form-item> :label="dict.name"
<el-form-item label="居委会" prop="committee"> :value="dict.code"
<el-select v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect"> ></el-option>
<el-option </el-select>
v-for="dict in ju" </el-form-item>
:key="dict.code" </el-col>
:label="dict.name" </el-row>
:value="dict.code" <el-row>
></el-option> <el-col :span="12">
</el-select> <el-form-item label="街道/镇名称" prop="street">
</el-form-item> <el-select v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect" style="width: 100%">
<el-form-item label="小区名称" prop="community"> <el-option
<el-select v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'"> v-for="dict in zhen"
<el-option :key="dict.code"
v-for="dict in cun" :label="dict.name"
:key="dict.code" :value="dict.code"
:label="dict.name" ></el-option>
:value="dict.code" </el-select>
></el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="楼号" prop="floor"> <el-form-item label="居委会" prop="committee">
<el-input v-model="form.floor" placeholder="请输入楼号" /> <el-select v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect" style="width: 100%">
</el-form-item> <el-option
<el-form-item label="单元号" prop="unit"> v-for="dict in ju"
<el-input v-model="form.unit" placeholder="请输入单元号" /> :key="dict.code"
</el-form-item> :label="dict.name"
<el-form-item label="封控明细" prop="fkDetailed"> :value="dict.code"
<el-input v-model="form.fkDetailed" placeholder="请输入封控明细" /> ></el-option>
</el-form-item> </el-select>
<el-form-item label="涉及封控户数" prop="fkHs"> </el-form-item>
<el-input v-model="form.fkHs" placeholder="请输入涉及封控户数" /> </el-col>
</el-form-item> </el-row>
<el-form-item label="涉及封控人数" prop="fkRs"> <el-row>
<el-input v-model="form.fkRs" placeholder="请输入涉及封控人数" /> <el-col :span="12">
</el-form-item> <el-form-item label="楼号" prop="floor">
<el-form-item label="封控时间" prop="fkTime"> <el-input v-model="form.floor" placeholder="请输入楼号" />
<el-date-picker clearable </el-form-item>
v-model="form.fkTime" </el-col>
type="datetime" <el-col :span="12">
value-format="yyyy-MM-dd HH:mm:ss" <el-form-item label="单元号" prop="unit">
placeholder="请选择封控时间"> <el-input v-model="form.unit" placeholder="请输入单元号" />
</el-date-picker> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="拟解封时间" prop="jfTime"> </el-row>
<el-date-picker clearable <el-row>
v-model="form.jfTime" <el-col :span="12">
type="datetime" <el-form-item label="封控明细" prop="fkDetailed">
value-format="yyyy-MM-dd HH:mm:ss" <el-input v-model="form.fkDetailed" placeholder="请输入封控明细" />
placeholder="请选择拟解封时间"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="是否解封" prop="isJf"> <el-form-item label="涉及封控户数" prop="fkHs">
<el-select v-model="form.isJf" placeholder="请选择是否解封"> <el-input v-model="form.fkHs" placeholder="请输入涉及封控户数" />
<el-option value="是" label="是"></el-option> </el-form-item>
<el-option value="否" label="否"></el-option> </el-col>
</el-select> </el-row>
</el-form-item> <el-row>
<el-form-item label="实际解封时间" prop="realTime"> <el-col :span="12">
<el-date-picker clearable <el-form-item label="涉及封控人数" prop="fkRs">
v-model="form.realTime" <el-input v-model="form.fkRs" placeholder="请输入涉及封控人数" />
type="datetime" </el-form-item>
value-format="yyyy-MM-dd HH:mm:ss" </el-col>
placeholder="请选择实际解封时间"> <el-col :span="12">
</el-date-picker> <el-form-item label="封控时间" prop="fkTime">
</el-form-item> <el-date-picker clearable
<el-form-item label="封控后最近一次核酸检测时间" prop="hsTime"> v-model="form.fkTime"
<el-date-picker clearable type="datetime"
v-model="form.hsTime" value-format="yyyy-MM-dd HH:mm:ss"
type="datetime" placeholder="请选择封控时间"
value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
placeholder="请选择封控后最近一次核酸检测时间"> </el-date-picker>
</el-date-picker> </el-form-item>
</el-form-item> </el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="拟解封时间" prop="jfTime">
<el-date-picker clearable
v-model="form.jfTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择拟解封时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否解封" prop="isJf">
<el-select v-model="form.isJf" placeholder="请选择是否解封" style="width: 100%">
<el-option value="是" label="是"></el-option>
<el-option value="否" label="否"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="实际解封时间" prop="realTime">
<el-date-picker clearable
v-model="form.realTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择实际解封时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="封控后最近一次核酸检测时间" prop="hsTime">
<el-date-picker clearable
v-model="form.hsTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择封控后最近一次核酸检测时间"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<!-- <el-form-item label="状态">--> <!-- <el-form-item label="状态">-->
<!-- <el-radio-group v-model="form.status">--> <!-- <el-radio-group v-model="form.status">-->
<!-- <el-radio--> <!-- <el-radio-->
...@@ -307,9 +370,7 @@ ...@@ -307,9 +370,7 @@
<!-- <el-form-item label="删除标志" prop="delFlag">--> <!-- <el-form-item label="删除标志" prop="delFlag">-->
<!-- <el-input v-model="form.delFlag" placeholder="请输入删除标志" />--> <!-- <el-input v-model="form.delFlag" placeholder="请输入删除标志" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
......
ruoyi-ui/src/views/system/hscj/index.vue
View file @ 62d1a3e7
...@@ -28,7 +28,10 @@ ...@@ -28,7 +28,10 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="街道/镇" prop="street"> <el-form-item
label="街道/镇"
prop="street"
>
<el-select v-model="queryParams.street" placeholder="请选择街道/镇" clearable> <el-select v-model="queryParams.street" placeholder="请选择街道/镇" clearable>
<el-option <el-option
v-for="dict in dict.type.street_town" v-for="dict in dict.type.street_town"
...@@ -406,7 +409,13 @@ ...@@ -406,7 +409,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="街道/镇" prop="street"> <el-form-item
label="街道/镇"
prop="street"
:rules="[
{ required: form.area === '1', message: '请选择街道/镇', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect"> <el-select style="width: 100%" v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect">
<el-option <el-option
v-for="dict in zhen" v-for="dict in zhen"
...@@ -420,7 +429,13 @@ ...@@ -420,7 +429,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="居委会" prop="committee"> <el-form-item
label="居委会"
prop="committee"
:rules="[
{ required: form.area === '1', message: '请选择居委会', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect"> <el-select style="width: 100%" v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect">
<el-option <el-option
v-for="dict in ju" v-for="dict in ju"
...@@ -432,7 +447,13 @@ ...@@ -432,7 +447,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="小区/村名称" prop="community" > <el-form-item
label="小区/村名称"
prop="community"
:rules="[
{ required: form.area === '1', message: '请选择小区/村名称', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'"> <el-select style="width: 100%" v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'">
<el-option <el-option
v-for="dict in cun" v-for="dict in cun"
...@@ -534,8 +555,8 @@ ...@@ -534,8 +555,8 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检测结果" prop="cjResult"> <el-form-item label="检测结果" prop="cjResult">
<el-radio-group v-model="form.cjResult"> <el-radio-group v-model="form.cjResult">
<el-radio :label="0">阳性</el-radio> <el-radio :label="'0'">阳性</el-radio>
<el-radio :label="1">阴性</el-radio> <el-radio :label="'1'">阴性</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -917,6 +938,7 @@ export default { ...@@ -917,6 +938,7 @@ export default {
}, },
// 表单参数 // 表单参数
form: { form: {
cjTime: new Date(),
province: '河北省', province: '河北省',
city: '石家庄市', city: '石家庄市',
}, },
...@@ -1143,6 +1165,7 @@ export default { ...@@ -1143,6 +1165,7 @@ export default {
xh: null, xh: null,
city: '石家庄市', city: '石家庄市',
area: null, area: null,
committee: null,
street: null, street: null,
community: null, community: null,
cjPlace: null, cjPlace: null,
...@@ -1154,7 +1177,7 @@ export default { ...@@ -1154,7 +1177,7 @@ export default {
address: null, address: null,
age: null, age: null,
category: null, category: null,
cjTime: null, cjTime: new Date(),
cjName: null, cjName: null,
cjPhone: null, cjPhone: null,
bblx: '咽拭子', bblx: '咽拭子',
......
ruoyi-ui/src/views/system/ycsb/index.vue
View file @ 62d1a3e7
...@@ -274,7 +274,13 @@ ...@@ -274,7 +274,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="街道/镇" prop="street"> <el-form-item
label="街道/镇"
prop="street"
:rules="[
{ required: form.area === '1', message: '请选择街道/镇', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect"> <el-select style="width: 100%" v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect">
<el-option <el-option
v-for="dict in zhen" v-for="dict in zhen"
...@@ -286,7 +292,13 @@ ...@@ -286,7 +292,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="居委会" prop="committee"> <el-form-item
label="居委会"
prop="committee"
:rules="[
{ required: form.area === '1', message: '请选择居委会', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect"> <el-select style="width: 100%" v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect">
<el-option <el-option
v-for="dict in ju" v-for="dict in ju"
...@@ -300,7 +312,13 @@ ...@@ -300,7 +312,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="小区/村名称" prop="community" > <el-form-item
label="小区/村名称"
prop="community"
:rules="[
{ required: form.area === '1', message: '请选择小区/村名称', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'"> <el-select style="width: 100%" v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'">
<el-option <el-option
v-for="dict in cun" v-for="dict in cun"
...@@ -841,7 +859,7 @@ export default { ...@@ -841,7 +859,7 @@ export default {
const downloadElement = document.createElement('a') const downloadElement = document.createElement('a')
const href = window.URL.createObjectURL(blob)// 创建下载的链接 const href = window.URL.createObjectURL(blob)// 创建下载的链接
downloadElement.href = href downloadElement.href = href
downloadElement.download = '治疗情况导入模板' + '.xls' // 下载后文件名 downloadElement.download = '抗原异常上报导入模板' + '.xls' // 下载后文件名
document.body.appendChild(downloadElement) document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载 downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素 document.body.removeChild(downloadElement)// 下载完成移除元素
...@@ -886,6 +904,7 @@ export default { ...@@ -886,6 +904,7 @@ export default {
phone: null, phone: null,
address: null, address: null,
area: null, area: null,
committee: null,
street: null, street: null,
house: null, house: null,
building: null, building: null,
......
ruoyi-ui/src/views/system/yxry/index.vue
View file @ 62d1a3e7
...@@ -363,7 +363,13 @@ ...@@ -363,7 +363,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="街道/镇" prop="street"> <el-form-item
label="街道/镇"
prop="street"
:rules="[
{ required: form.area === '1', message: '请选择街道/镇', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect"> <el-select style="width: 100%" v-model="form.street" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect">
<el-option <el-option
v-for="dict in zhen" v-for="dict in zhen"
...@@ -375,7 +381,13 @@ ...@@ -375,7 +381,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="居委会" prop="committee"> <el-form-item
label="居委会"
prop="committee"
:rules="[
{ required: form.area === '1', message: '请选择居委会', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect"> <el-select style="width: 100%" v-model="form.committee" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect">
<el-option <el-option
v-for="dict in ju" v-for="dict in ju"
...@@ -389,7 +401,13 @@ ...@@ -389,7 +401,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="小区/村名称" prop="community" > <el-form-item
label="小区/村名称"
prop="community"
:rules="[
{ required: form.area === '1', message: '请选择小区/村名称', trigger: ['blur','change'] }
]"
>
<el-select style="width: 100%" v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'"> <el-select style="width: 100%" v-model="form.community" placeholder="请选择小区/村名称" :disabled="form.area !== '1'">
<el-option <el-option
v-for="dict in cun" v-for="dict in cun"
...@@ -1091,6 +1109,7 @@ export default { ...@@ -1091,6 +1109,7 @@ export default {
cardNo: null, cardNo: null,
phone: null, phone: null,
area: null, area: null,
committee: null,
street: null, street: null,
isolationStatus: null, isolationStatus: null,
fcName: null, fcName: null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment