Skip to content

D
data_management_system
Commit 47808ed5 authored by zhuangxinwei's avatar zhuangxinwei
Browse files
Options

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

parents 3a28c4fd b930dd2c
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 46 deletions
ruoyi-ui/src/views/system/hscj/index.vue
View file @ 47808ed5
...@@ -268,7 +268,14 @@ ...@@ -268,7 +268,14 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<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" width="100" :show-overflow-tooltip="true" /> <el-table-column label="编号" align="center" prop="id" width="100" :show-overflow-tooltip="true" />
<el-table-column label="省" align="center" prop="province" width="100" :show-overflow-tooltip="true" />
<el-table-column label="市" align="center" prop="city" width="100" :show-overflow-tooltip="true" /> <el-table-column label="市" align="center" prop="city" width="100" :show-overflow-tooltip="true" />
<el-table-column label="采集地点" align="center" prop="cjPlace" width="100" :show-overflow-tooltip="true" />
<el-table-column label="箱号" align="center" prop="boxhao" width="100" :show-overflow-tooltip="true" />
<el-table-column label="采集管号" align="center" prop="cjgh" width="140" :show-overflow-tooltip="true" />
<el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" />
<el-table-column label="联系方式" align="center" prop="phone" width="120" :show-overflow-tooltip="true" />
<el-table-column label="居住地所在区" align="center" prop="area" width="140" :show-overflow-tooltip="true"> <el-table-column label="居住地所在区" align="center" prop="area" width="140" :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"/>
...@@ -285,19 +292,15 @@ ...@@ -285,19 +292,15 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="小区/村名称" align="center" prop="communityName" width="120" :show-overflow-tooltip="true"/> <el-table-column label="小区/村名称" align="center" prop="communityName" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="采集地点" align="center" prop="cjPlace" width="100" :show-overflow-tooltip="true" /> <el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" />
<el-table-column label="采集管号" align="center" prop="cjgh" width="140" :show-overflow-tooltip="true" />
<el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" />
<el-table-column label="联系方式" align="center" prop="phone" width="120" :show-overflow-tooltip="true" />
<el-table-column label="性别" align="center" prop="sex" width="100" :show-overflow-tooltip="true"> <el-table-column label="性别" align="center" prop="sex" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" />
<el-table-column label="年龄" align="center" prop="age" width="100" :show-overflow-tooltip="true" /> <el-table-column label="年龄" align="center" prop="age" width="100" :show-overflow-tooltip="true" />
<el-table-column label="类别" align="center" prop="category" width="100" :show-overflow-tooltip="true" /> <el-table-column label="类别" align="center" prop="category" width="100" :show-overflow-tooltip="true" />
<el-table-column label="人员关系" align="center" prop="rygx" width="100" :show-overflow-tooltip="true" />
<el-table-column label="采集时间" align="center" prop="cjTime"width="100" :show-overflow-tooltip="true"> <el-table-column label="采集时间" align="center" prop="cjTime"width="100" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.cjTime) ? parseTime(scope.row.cjTime).substring(0,10) : '' }}</span> <span>{{ parseTime(scope.row.cjTime) ? parseTime(scope.row.cjTime).substring(0,10) : '' }}</span>
...@@ -312,13 +315,6 @@ ...@@ -312,13 +315,6 @@
<span>{{parseTime(scope.row.jcTime) ? parseTime(scope.row.jcTime).substring(0,10) : '' }}</span> <span>{{parseTime(scope.row.jcTime) ? parseTime(scope.row.jcTime).substring(0,10) : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="人员关系" align="center" prop="rygx" width="100" :show-overflow-tooltip="true" />
<el-table-column label="箱号" align="center" prop="boxhao" width="100" :show-overflow-tooltip="true" />
<!-- <el-table-column label="状态" align="center" prop="status">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="备注" align="center" prop="remark" width="100" :show-overflow-tooltip="true" /> <el-table-column label="备注" align="center" prop="remark" width="100" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
......
ruoyi-ui/src/views/system/yxry/index.vue
View file @ 47808ed5
...@@ -226,15 +226,19 @@ ...@@ -226,15 +226,19 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<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" width="100" :show-overflow-tooltip="true" /> <el-table-column label="编号" align="center" prop="id" width="100" :show-overflow-tooltip="true" />
<el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="日期" align="center" prop="sbDate" width="100" :show-overflow-tooltip="true"> <el-table-column label="日期" align="center" prop="sbDate" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.sbDate, '{m}-{d}') }}</span> <span>{{ parseTime(scope.row.sbDate, '{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="流调人员" align="center" prop="ldry" width="100" :show-overflow-tooltip="true" /> <el-table-column label="采样时间" align="center" prop="cyTime" width="100" :show-overflow-tooltip="true">
<el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" /> <template slot-scope="scope">
<el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" /> <span>{{ parseTime(scope.row.cyTime, '{m}-{d}') }}</span>
<el-table-column label="联系方式" align="center" prop="phone" width="140" :show-overflow-tooltip="true" /> </template>
</el-table-column>
<el-table-column label="人员类别" align="center" prop="userType" width="100" :show-overflow-tooltip="true" />
<el-table-column label="风险来源" align="center" prop="riskSource" width="100" :show-overflow-tooltip="true" />
<el-table-column label="居住地所在区" align="center" prop="area" width="100" :show-overflow-tooltip="true" > <el-table-column label="居住地所在区" align="center" prop="area" width="100" :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"/>
...@@ -253,30 +257,41 @@ ...@@ -253,30 +257,41 @@
<el-table-column label="小区/村名称" align="center" prop="communityName" width="120" :show-overflow-tooltip="true" /> <el-table-column label="小区/村名称" align="center" prop="communityName" width="120" :show-overflow-tooltip="true" />
<el-table-column label="楼号" align="center" prop="building" width="100" :show-overflow-tooltip="true" /> <el-table-column label="楼号" align="center" prop="building" width="100" :show-overflow-tooltip="true" />
<el-table-column label="单元号" align="center" prop="unit" width="100" :show-overflow-tooltip="true" /> <el-table-column label="单元号" align="center" prop="unit" width="100" :show-overflow-tooltip="true" />
<el-table-column label="楼层" align="center" prop="floor" width="100" :show-overflow-tooltip="true" />
<el-table-column label="门牌号" align="center" prop="house" width="100" :show-overflow-tooltip="true" /> <el-table-column label="门牌号" align="center" prop="house" width="100" :show-overflow-tooltip="true" />
<el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" /> <el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" />
<!-- <el-table-column label="隔离状态" align="center" prop="isolationStatus">--> <el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" />
<!-- <template slot-scope="scope">--> <el-table-column label="联系方式" align="center" prop="phone" width="140" :show-overflow-tooltip="true" />
<!-- <dict-tag :options="dict.type.isolation_status" :value="scope.row.isolationStatus"/>--> <el-table-column label="流调人员" align="center" prop="ldry" width="100" :show-overflow-tooltip="true" />
<!-- </template>--> <el-table-column label="是否重症" align="center" prop="isYz">
<!-- </el-table-column>--> <template slot-scope="scope">
<dict-tag :options="dict.type.yz_status" :value="scope.row.isYz"/>
</template>
</el-table-column>
<el-table-column label="是否转阴" align="center" prop="isYin" width="130" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{scope.row.isYin === '0' ? '阴' :scope.row.isYin === '1' ? '否' : '' }}</span>
</template>
</el-table-column>
<el-table-column label="隔离位置" align="center" prop="glPlace" width="100" :show-overflow-tooltip="true" />
<el-table-column label="所在方舱" align="center" prop="fcName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="所在隔离点" align="center" prop="glName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="是否已管控" align="center" prop="isControl" width="100" :show-overflow-tooltip="true"> <el-table-column label="是否已管控" align="center" prop="isControl" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.control_status" :value="scope.row.isControl"/> <dict-tag :options="dict.type.control_status" :value="scope.row.isControl"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否重症" align="center" prop="isYz"> <el-table-column label="是否符合居家隔离" align="center" prop="isHome" width="130" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.yz_status" :value="scope.row.isYz"/> <span>{{scope.row.isYin === '0' ? '符合' :scope.row.isHome === '1' ? '不符合' : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="转运状态" align="center" prop="hasAcid" width="100" :show-overflow-tooltip="true" /> <el-table-column label="转运状态" align="center" prop="hasAcid" width="100" :show-overflow-tooltip="true" />
<el-table-column label="隔离位置" align="center" prop="glPlace" width="100" :show-overflow-tooltip="true" /> <el-table-column label="转运时间" align="center" prop="zyTime" width="100" :show-overflow-tooltip="true">
<!-- <el-table-column label="状态" align="center" prop="status">--> <template slot-scope="scope">
<!-- <template slot-scope="scope">--> <span>{{ parseTime(scope.row.zyTime, '{m}-{d}') }}</span>
<!-- <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" width="120" :show-overflow-tooltip="true" /> <el-table-column label="备注" align="center" prop="remark" width="120" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -432,7 +447,7 @@ ...@@ -432,7 +447,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="楼号" prop="unit"> <el-form-item label="楼号" prop="building">
<el-input maxlength="30" show-word-limit v-model="form.building" placeholder="请输入楼号" /> <el-input maxlength="30" show-word-limit v-model="form.building" placeholder="请输入楼号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -444,38 +459,43 @@ ...@@ -444,38 +459,43 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="门牌号" prop="unit"> <el-form-item label="楼层" prop="floor">
<el-input v-model="form.house" maxlength="4" show-word-limit placeholder="请输入门牌号" /> <el-input v-model="form.floor" maxlength="4" show-word-limit placeholder="请输入单元号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="门牌号" prop="house">
<el-input v-model="form.house" maxlength="4" show-word-limit placeholder="请输入门牌号" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="住址" prop="address"> <el-form-item label="住址" prop="address">
<el-input v-model="form.address" maxlength="80" show-word-limit placeholder="请输入住址" /> <el-input v-model="form.address" 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="cardNo"> <el-form-item label="身份证号码" prop="cardNo">
<el-input @blur="cardNoBlur" v-model="form.cardNo" placeholder="请输入身份证号码" /> <el-input @blur="cardNoBlur" v-model="form.cardNo" 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="phone"> <el-form-item label="联系方式" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系方式" /> <el-input v-model="form.phone" 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="ldry"> <el-form-item label="流调人员" prop="ldry">
<el-input v-model="form.ldry" maxlength="48" show-word-limit placeholder="请输入流调人员" /> <el-input v-model="form.ldry" maxlength="48" 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="是否重症"> <el-form-item label="是否重症" prop="isYz">
<el-radio-group v-model="form.isYz"> <el-radio-group v-model="form.isYz">
<el-radio <el-radio
v-for="dict in dict.type.yz_status" v-for="dict in dict.type.yz_status"
...@@ -485,6 +505,8 @@ ...@@ -485,6 +505,8 @@
</el-radio-group> </el-radio-group>
</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="isYin"> <el-form-item label="是否转阴" prop="isYin">
<el-radio-group v-model="form.isYin"> <el-radio-group v-model="form.isYin">
...@@ -493,25 +515,25 @@ ...@@ -493,25 +515,25 @@
</el-radio-group> </el-radio-group>
</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="glPlace"> <el-form-item label="患者隔离位置" prop="glPlace">
<el-input disabled v-model="form.glPlace" placeholder="请选择患者隔离位置" /> <el-input disabled v-model="form.glPlace" 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="fcName"> <el-form-item label="所在方舱" prop="fcName">
<el-input disabled v-model="form.fcName" placeholder="请输入所在方舱" /> <el-input disabled v-model="form.fcName" 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="glName"> <el-form-item label="所在隔离点" prop="glName">
<el-input disabled v-model="form.glName" placeholder="请输入所在隔离点" /> <el-input disabled v-model="form.glName" 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="isControl"> <el-form-item label="是否已管控" prop="isControl">
<el-radio-group v-model="form.isControl"> <el-radio-group v-model="form.isControl">
...@@ -523,8 +545,6 @@ ...@@ -523,8 +545,6 @@
</el-radio-group> </el-radio-group>
</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="isHome"> <el-form-item label="是否符合居家隔离" prop="isHome">
<el-radio-group v-model="form.isHome"> <el-radio-group v-model="form.isHome">
...@@ -533,13 +553,13 @@ ...@@ -533,13 +553,13 @@
</el-radio-group> </el-radio-group>
</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="hasAcid"> <el-form-item label="转运状态" prop="hasAcid">
<el-input v-model="form.hasAcid" maxlength="30" show-word-limit placeholder="请输入转运状态" /> <el-input v-model="form.hasAcid" maxlength="30" 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="zyTime"> <el-form-item label="转运时间" prop="zyTime">
<el-date-picker clearable <el-date-picker clearable
...@@ -934,6 +954,7 @@ export default { ...@@ -934,6 +954,7 @@ export default {
// 表单参数 // 表单参数
formLoading: false, formLoading: false,
form: { form: {
floor: null,
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'),
...@@ -1184,6 +1205,7 @@ export default { ...@@ -1184,6 +1205,7 @@ export default {
community: null, community: null,
building: null, building: null,
unit: null, unit: null,
floor: null,
house: null, house: null,
hasAcid: null, hasAcid: null,
isHome: null, isHome: 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