Skip to content

D
data_management_system
Commit 0c456225 authored by zhuangxinwei's avatar zhuangxinwei
Browse files
Options

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

parents 10ae1c98 10995709
Show whitespace changes
Inline Side-by-side
Showing with 178 additions and 67 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YxryController.java
View file @ 0c456225
...@@ -147,8 +147,11 @@ public class YxryController extends BaseController ...@@ -147,8 +147,11 @@ public class YxryController extends BaseController
List<SysDictData> isHomes = DictUtils.getDictCache("home_status"); List<SysDictData> isHomes = DictUtils.getDictCache("home_status");
String[] isYin=isYins.stream().map(SysDictData::getDictLabel).toArray(String[]::new); String[] isYin=isYins.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
String[] isHome=isHomes.stream().map(SysDictData::getDictLabel).toArray(String[]::new); String[] isHome=isHomes.stream().map(SysDictData::getDictLabel).toArray(String[]::new);
String[] level={"1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20",
"21","22","23","24","25","26","27","28","29","30","31","32"};
ExcelUtil.setClassExcelAttribute( clazz,"isYin","combo",isYin); ExcelUtil.setClassExcelAttribute( clazz,"isYin","combo",isYin);
ExcelUtil.setClassExcelAttribute( clazz,"isHome","combo",isHome); ExcelUtil.setClassExcelAttribute( clazz,"isHome","combo",isHome);
ExcelUtil.setClassExcelAttribute( clazz,"level","combo",level);
//设置文本格式表头在第几列 //设置文本格式表头在第几列
String columes = "13"; String columes = "13";
util.importTemplateExcelSetHead(response, "阳性人员",columes); util.importTemplateExcelSetHead(response, "阳性人员",columes);
......
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/JcglTask.java
View file @ 0c456225
...@@ -38,6 +38,9 @@ public class JcglTask ...@@ -38,6 +38,9 @@ public class JcglTask
jcglry.setBuilding(yxries.get(0).getBuilding()); jcglry.setBuilding(yxries.get(0).getBuilding());
jcglry.setUnit(yxries.get(0).getUnit()); jcglry.setUnit(yxries.get(0).getUnit());
jcglry.setHouse(yxries.get(0).getHouse()); jcglry.setHouse(yxries.get(0).getHouse());
if ("1".equals(yxries.get(0).getArea())){
jcglry.setIsArea("0");
}
jcglries.add(jcglry); jcglries.add(jcglry);
} }
} }
......
ruoyi-system/src/main/java/com/ruoyi/system/domain/Fkqk.java
View file @ 0c456225
...@@ -43,6 +43,10 @@ public class Fkqk extends BaseEntity ...@@ -43,6 +43,10 @@ public class Fkqk extends BaseEntity
@Excel(name = "单元号") @Excel(name = "单元号")
private String unit; private String unit;
/** 楼号单元号门牌号 */
@Excel(name = "楼层（填写1-32，如果有多个楼层，用英文,分割，例：1,2）")
private String level;
/** 封控明细 */ /** 封控明细 */
@Excel(name = "封控明细") @Excel(name = "封控明细")
private String fkDetailed; private String fkDetailed;
...@@ -265,4 +269,12 @@ public class Fkqk extends BaseEntity ...@@ -265,4 +269,12 @@ public class Fkqk extends BaseEntity
public void setCommittee(String committee) { public void setCommittee(String committee) {
this.committee = committee; this.committee = committee;
} }
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
} }
ruoyi-system/src/main/resources/mapper/system/FkqkMapper.xml
View file @ 0c456225
...@@ -27,16 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -27,16 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="level" column="level" />
</resultMap> </resultMap>
<sql id="selectFkqkVo"> <sql id="selectFkqkVo">
select id, area,street, community, unit, fk_time, jf_time, status, create_by, create_time, update_by, update_time, del_flag, remark, select id, area,street, community, unit, fk_time, jf_time, status, create_by, create_time, update_by, update_time, del_flag, remark,
committee,floor,fk_detailed,fk_hs,fk_rs,is_jf,real_time,hs_time from fkqk committee,floor,fk_detailed,fk_hs,fk_rs,is_jf,real_time,hs_time,level from fkqk
</sql> </sql>
<select id="selectFkqkList" parameterType="Fkqk" resultMap="FkqkResult"> <select id="selectFkqkList" parameterType="Fkqk" resultMap="FkqkResult">
select a.id,a.area, a.street, a.community, a.unit, a.fk_time, a.jf_time, a.status, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, select a.id,a.area, a.street, a.community, a.unit, a.fk_time, a.jf_time, a.status, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark,
a.committee,a.floor,a.fk_detailed,a.fk_hs,a.fk_rs,a.is_jf,a.real_time,a.hs_time a.committee,a.floor,a.fk_detailed,a.fk_hs,a.fk_rs,a.is_jf,a.real_time,a.hs_time,a.level
from fkqk a from fkqk 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
...@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isJf != null">is_jf,</if> <if test="isJf != null">is_jf,</if>
<if test="realTime != null">real_time,</if> <if test="realTime != null">real_time,</if>
<if test="hsTime != null">hs_time,</if> <if test="hsTime != null">hs_time,</if>
<if test="level != null">level,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="street != null">#{street},</if> <if test="street != null">#{street},</if>
...@@ -118,13 +120,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -118,13 +120,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isJf != null">#{isJf},</if> <if test="isJf != null">#{isJf},</if>
<if test="realTime != null">#{realTime},</if> <if test="realTime != null">#{realTime},</if>
<if test="hsTime != null">#{hsTime},</if> <if test="hsTime != null">#{hsTime},</if>
<if test="level != null">#{level},</if>
</trim> </trim>
</insert> </insert>
<insert id="insertBatchFkqk" parameterType="Fkqk"> <insert id="insertBatchFkqk" parameterType="Fkqk">
insert into fkqk (area,committee,street,community,floor,unit,fk_time,jf_time,create_by,create_time,remark,fk_detailed,fk_hs,fk_rs,is_jf,real_time,hs_time) values insert into fkqk (area,committee,street,community,floor,unit,fk_time,jf_time,create_by,create_time,remark,
fk_detailed,fk_hs,fk_rs,is_jf,real_time,hs_time,level) values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
(#{item.area},#{item.committee},#{item.street},#{item.community},#{item.floor},#{item.unit},#{item.fkTime},#{item.jfTime}, (#{item.area},#{item.committee},#{item.street},#{item.community},#{item.floor},#{item.unit},#{item.fkTime},#{item.jfTime},
#{item.createBy},#{item.createTime},#{item.remark},#{item.fkDetailed},#{item.fkHs},#{item.fkRs},#{item.isJf},#{item.realTime},#{item.hsTime}) #{item.createBy},#{item.createTime},#{item.remark},#{item.fkDetailed},#{item.fkHs},#{item.fkRs},#{item.isJf},
#{item.realTime},#{item.hsTime},#{item.level})
</foreach> </foreach>
</insert> </insert>
...@@ -152,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -152,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
real_time = #{realTime}, real_time = #{realTime},
hs_time = #{hsTime}, hs_time = #{hsTime},
<if test="fkRs != null">fk_rs = #{fkRs},</if> <if test="fkRs != null">fk_rs = #{fkRs},</if>
<if test="level != null">level = #{level},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
......
ruoyi-system/src/main/resources/mapper/system/JcglryMapper.xml
View file @ 0c456225
...@@ -242,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -242,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach item="item" index="index" collection="list" separator=";"> <foreach item="item" index="index" collection="list" separator=";">
update jcglry update jcglry
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="item.isArea != null">is_area = #{item.isArea},</if>
street = #{item.street}, street = #{item.street},
committee = #{item.committee}, committee = #{item.committee},
community = #{item.community}, community = #{item.community},
......
ruoyi-ui/src/views/system/fkqk/index.vue
View file @ 0c456225
...@@ -132,6 +132,11 @@ ...@@ -132,6 +132,11 @@
<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="小区名称" width="140" align="center" prop="community" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.community" :value="scope.row.community"/>
</template>
</el-table-column>
<el-table-column label="街道/镇名称" width="140" align="center" prop="street" :show-overflow-tooltip="true"> <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"/>
...@@ -142,24 +147,20 @@ ...@@ -142,24 +147,20 @@
<dict-tag :options="dict.type.committee" :value="scope.row.committee"/> <dict-tag :options="dict.type.committee" :value="scope.row.committee"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="小区名称" width="140" align="center" prop="community" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.community" :value="scope.row.community"/>
</template>
</el-table-column>
<el-table-column label="楼号" align="center" prop="floor" :show-overflow-tooltip="true"> <el-table-column label="楼号" align="center" prop="floor" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.floor ? scope.row.floor : '-' }}</span> <span>{{ scope.row.floor ? scope.row.floor : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true"> <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.unit ? scope.row.unit : '-' }}</span> <span>{{ scope.row.unit ? scope.row.unit : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="楼层" align="center" prop="level" width="100" :show-overflow-tooltip="true" />
<el-table-column label="封控明细" align="center" prop="fkDetailed" width="120" :show-overflow-tooltip="true"> <el-table-column label="封控明细" align="center" prop="fkDetailed" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.fkDetailed ? scope.row.fkDetailed : '-' }}</span> <span>{{ scope.row.fkDetailed ? scope.row.fkDetailed : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="涉及封控户数" align="center" prop="fkHs" width="120" :show-overflow-tooltip="true"/> <el-table-column label="涉及封控户数" align="center" prop="fkHs" width="120" :show-overflow-tooltip="true"/>
...@@ -244,15 +245,15 @@ ...@@ -244,15 +245,15 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="街道/镇名称" label="小区名称"
prop="street" prop="community"
:rules="[ :rules="[
{ required: form.area === '1', message: '请选择街道/镇', trigger: ['blur','change'] } { required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: ['blur','change'] }
]" ]"
> >
<el-select v-model="form.street" @blur="streetBlur('street')" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect" style="width: 100%"> <el-select v-model="form.community" @blur="streetBlur('community')" @chang="streetBlur('community')" placeholder="请选择小区/村名称" :disabled="form.area !== '1'" style="width: 100%">
<el-option <el-option
v-for="dict in zhen" v-for="dict in cun"
:key="dict.code" :key="dict.code"
:label="dict.name" :label="dict.name"
:value="dict.code" :value="dict.code"
...@@ -264,15 +265,15 @@ ...@@ -264,15 +265,15 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="居委会" label="街道/镇名称"
prop="committee" prop="street"
:rules="[ :rules="[
{ required: form.area === '1' && juList.map(item=> item.parent).includes(form.street), message: '请选择居委会', trigger: ['blur','change'] } { required: form.area === '1', message: '请选择街道/镇', trigger: ['blur','change'] }
]" ]"
> >
<el-select v-model="form.committee" @blur="streetBlur('committee')" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect" style="width: 100%"> <el-select v-model="form.street" @blur="streetBlur('street')" placeholder="请选择街道/镇" :disabled="form.area !== '1'" @change="zhenSelect" style="width: 100%">
<el-option <el-option
v-for="dict in ju" v-for="dict in zhen"
:key="dict.code" :key="dict.code"
:label="dict.name" :label="dict.name"
:value="dict.code" :value="dict.code"
...@@ -282,15 +283,15 @@ ...@@ -282,15 +283,15 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="小区名称" label="居委会"
prop="community" prop="committee"
:rules="[ :rules="[
{ required: form.area === '1' && cunList.map(item=> item.parent).includes(form.committee), message: '请选择小区/村名称', trigger: ['blur','change'] } { required: form.area === '1' && juList.map(item=> item.parent).includes(form.street), message: '请选择居委会', trigger: ['blur','change'] }
]" ]"
> >
<el-select v-model="form.community" @blur="streetBlur('community')" @chang="streetBlur('community')" placeholder="请选择小区/村名称" :disabled="form.area !== '1'" style="width: 100%"> <el-select v-model="form.committee" @blur="streetBlur('committee')" placeholder="请选择居委会" :disabled="form.area !== '1'" @change="juSelect" style="width: 100%">
<el-option <el-option
v-for="dict in cun" v-for="dict in ju"
:key="dict.code" :key="dict.code"
:label="dict.name" :label="dict.name"
:value="dict.code" :value="dict.code"
...@@ -312,23 +313,37 @@ ...@@ -312,23 +313,37 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="楼层" prop="level">
<el-select style="width: 100%" multiple v-model="form.level" clearable placeholder="请选择楼层">
<el-option
v-for="item in floorOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="封控明细" prop="fkDetailed"> <el-form-item label="封控明细" prop="fkDetailed">
<el-input v-model.trim="form.fkDetailed" maxlength="80" show-word-limit placeholder="请输入封控明细" /> <el-input v-model.trim="form.fkDetailed" maxlength="80" show-word-limit placeholder="请输入封控明细" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="涉及封控户数" prop="fkHs"> <el-form-item label="涉及封控户数" prop="fkHs">
<el-input-number style="width: 100%" v-model.trim="form.fkHs" placeholder="请输入涉及封控户数" /> <el-input-number style="width: 100%" v-model.trim="form.fkHs" placeholder="请输入涉及封控户数" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="涉及封控人数" prop="fkRs"> <el-form-item label="涉及封控人数" prop="fkRs">
<el-input-number style="width: 100%" v-model.trim="form.fkRs" placeholder="请输入涉及封控人数" /> <el-input-number style="width: 100%" v-model.trim="form.fkRs" placeholder="请输入涉及封控人数" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="封控时间" prop="fkTime"> <el-form-item label="封控时间" prop="fkTime">
<el-date-picker clearable <el-date-picker clearable
...@@ -342,8 +357,6 @@ ...@@ -342,8 +357,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="拟解封时间" prop="jfTime"> <el-form-item label="拟解封时间" prop="jfTime">
<el-date-picker clearable <el-date-picker clearable
...@@ -357,6 +370,8 @@ ...@@ -357,6 +370,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否解封" prop="isJf"> <el-form-item label="是否解封" prop="isJf">
<el-select v-model="form.isJf" placeholder="请选择是否解封" style="width: 100%"> <el-select v-model="form.isJf" placeholder="请选择是否解封" style="width: 100%">
...@@ -365,8 +380,6 @@ ...@@ -365,8 +380,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实际解封时间" prop="realTime"> <el-form-item label="实际解封时间" prop="realTime">
<el-date-picker clearable <el-date-picker clearable
...@@ -380,6 +393,8 @@ ...@@ -380,6 +393,8 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="封控后最近一次核酸检测时间" prop="hsTime"> <el-form-item label="封控后最近一次核酸检测时间" prop="hsTime">
<el-date-picker clearable <el-date-picker clearable
...@@ -393,37 +408,12 @@ ...@@ -393,37 +408,12 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model.trim="form.remark" maxlength="200" show-word-limit placeholder="请输入备注" /> <el-input v-model.trim="form.remark" maxlength="200" show-word-limit placeholder="请输入备注" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
</el-col>
</el-row> </el-row>
<!-- <el-form-item label="状态">-->
<!-- <el-radio-group v-model="form.status">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.sys_normal_disable"-->
<!-- :key="dict.value"-->
<!--:label="dict.value"-->
<!-- >{{dict.label}}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="删除标志" prop="delFlag">-->
<!-- <el-input v-model="form.delFlag" 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>
...@@ -567,8 +557,44 @@ export default { ...@@ -567,8 +557,44 @@ export default {
floor: null, floor: null,
}, },
formLoading: false, formLoading: false,
floorOptions: [
{label: '1', value: '1'},
{label: '2', value: '2'},
{label: '3', value: '3'},
{label: '4', value: '4'},
{label: '5', value: '5'},
{label: '6', value: '6'},
{label: '7', value: '7'},
{label: '8', value: '8'},
{label: '9', value: '9'},
{label: '10', value: '10'},
{label: '11', value: '11'},
{label: '12', value: '12'},
{label: '13', value: '13'},
{label: '14', value: '14'},
{label: '15', value: '15'},
{label: '16', value: '16'},
{label: '17', value: '17'},
{label: '18', value: '18'},
{label: '19', value: '19'},
{label: '20', value: '20'},
{label: '21', value: '21'},
{label: '22', value: '22'},
{label: '23', value: '23'},
{label: '24', value: '24'},
{label: '25', value: '25'},
{label: '26', value: '26'},
{label: '27', value: '27'},
{label: '28', value: '28'},
{label: '29', value: '29'},
{label: '30', value: '30'},
{label: '31', value: '31'},
{label: '32', value: '32'},
],
// 表单参数 // 表单参数
form: {}, form: {
level:[],
},
// 表单校验 // 表单校验
rules: { rules: {
// community: [{ required: true, message: '请输入小区名称', trigger: 'blur' }], // community: [{ required: true, message: '请输入小区名称', trigger: 'blur' }],
...@@ -973,6 +999,7 @@ export default { ...@@ -973,6 +999,7 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
level:[],
id: null, id: null,
street: null, street: null,
committee: null, committee: null,
...@@ -1043,6 +1070,9 @@ export default { ...@@ -1043,6 +1070,9 @@ export default {
this.juSelect(response.data.committee) this.juSelect(response.data.committee)
} }
this.form = response.data; this.form = response.data;
if(this.form.level.length > 0) {
this.form.level = this.form.level.split(',')
}
this.title = "查看小区封控情况"; this.title = "查看小区封控情况";
this.formLoading = false this.formLoading = false
}); });
...@@ -1061,6 +1091,9 @@ export default { ...@@ -1061,6 +1091,9 @@ export default {
this.juSelect(response.data.committee) this.juSelect(response.data.committee)
} }
this.form = response.data; this.form = response.data;
if(this.form.level.length > 0) {
this.form.level = this.form.level.split(',')
}
this.title = "修改小区封控情况"; this.title = "修改小区封控情况";
this.formLoading = false this.formLoading = false
}); });
...@@ -1069,6 +1102,9 @@ export default { ...@@ -1069,6 +1102,9 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if(this.form.level.length > 0) {
this.form.level = this.form.level.toString()
}
if (this.form.id != null) { if (this.form.id != null) {
updateFkqk(this.form).then(response => { updateFkqk(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
......
ruoyi-ui/src/views/system/yxry/index.vue
View file @ 0c456225
...@@ -460,7 +460,14 @@ ...@@ -460,7 +460,14 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="楼层" prop="floor"> <el-form-item label="楼层" prop="floor">
<el-input v-model="form.floor" maxlength="4" show-word-limit placeholder="请输入单元号" /> <el-select style="width: 100%" v-model="form.floor" placeholder="请选择楼层">
<el-option
v-for="item in floorOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -953,8 +960,42 @@ export default { ...@@ -953,8 +960,42 @@ export default {
}, },
// 表单参数 // 表单参数
formLoading: false, formLoading: false,
floorOptions: [
{label: '1', value: '1'},
{label: '2', value: '2'},
{label: '3', value: '3'},
{label: '4', value: '4'},
{label: '5', value: '5'},
{label: '6', value: '6'},
{label: '7', value: '7'},
{label: '8', value: '8'},
{label: '9', value: '9'},
{label: '10', value: '10'},
{label: '11', value: '11'},
{label: '12', value: '12'},
{label: '13', value: '13'},
{label: '14', value: '14'},
{label: '15', value: '15'},
{label: '16', value: '16'},
{label: '17', value: '17'},
{label: '18', value: '18'},
{label: '19', value: '19'},
{label: '20', value: '20'},
{label: '21', value: '21'},
{label: '22', value: '22'},
{label: '23', value: '23'},
{label: '24', value: '24'},
{label: '25', value: '25'},
{label: '26', value: '26'},
{label: '27', value: '27'},
{label: '28', value: '28'},
{label: '29', value: '29'},
{label: '30', value: '30'},
{label: '31', value: '31'},
{label: '32', value: '32'},
],
form: { form: {
floor: null, floor: [],
sbDate: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), sbDate: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
cyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), cyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
zyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'), zyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
...@@ -1205,7 +1246,7 @@ export default { ...@@ -1205,7 +1246,7 @@ export default {
community: null, community: null,
building: null, building: null,
unit: null, unit: null,
floor: null, floor: [],
house: null, house: null,
hasAcid: null, hasAcid: null,
isHome: null, isHome: null,
...@@ -1257,6 +1298,9 @@ export default { ...@@ -1257,6 +1298,9 @@ export default {
this.juSelect(response.data.committee) this.juSelect(response.data.committee)
} }
this.form = response.data; this.form = response.data;
if(this.form.floor.length > 0) {
this.form.floor = this.form.floor.split(',')
}
this.getInfoByCard() this.getInfoByCard()
this.formLoading = false this.formLoading = false
}); });
...@@ -1275,6 +1319,9 @@ export default { ...@@ -1275,6 +1319,9 @@ export default {
this.juSelect(response.data.committee) this.juSelect(response.data.committee)
} }
this.form = response.data; this.form = response.data;
if(this.form.floor.length > 0) {
this.form.floor = this.form.floor.split(',')
}
this.getInfoByCard() this.getInfoByCard()
this.title = "修改阳性人员"; this.title = "修改阳性人员";
this.formLoading = false this.formLoading = false
...@@ -1297,6 +1344,9 @@ export default { ...@@ -1297,6 +1344,9 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if(this.form.floor.length > 0) {
this.form.floor = this.form.floor.toString()
}
if (this.form.id != null) { if (this.form.id != null) {
updateYxry(this.form).then(response => { updateYxry(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
......
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