elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-fangyi' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-fangyi

shibei_master
jiangyy 3 years ago
parent
a25fb99dcd 137db3984c
commit
d1afcef1b7
2 changed files with 300 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/App.vue
  2. 337
      src/views/modules/base/epidemic/antiInfo.vue

3
src/App.vue
View File

@ -135,10 +135,11 @@ export default {
position: relative;
max-height: 82vh;
box-sizing: border-box;
padding: 0 10px 20px !important;
padding: 0 0 20px !important;
.dialog-h-content {
max-height: calc(82vh - 80px);
box-sizing: border-box;
padding: 0 10px;
overflow: auto;
}
}

337
src/views/modules/base/epidemic/antiInfo.vue
View File

@ -119,7 +119,7 @@
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入手机号">
</el-input>
</el-form-item>
@ -140,17 +140,17 @@
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入接种针次">
</el-input>
</el-form-item>
<el-form-item label="核酸检测次数"
prop="testCount">
<el-input v-model="formData.testCount"
<el-input v-model="searchForm.testCount"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
placeholder="请输入检测次数">
</el-input>
</el-form-item>
@ -181,23 +181,25 @@
type="index"
width="50"></el-table-column>
<el-table-column prop="personInCharge"
<el-table-column prop="name"
header-align="center"
align="center"
label="姓名"
width="100">
</el-table-column>
<el-table-column prop="gridNames"
<el-table-column prop="gridName"
header-align="center"
align="center"
label="所属网格"
show-overflow-tooltip
min-width="180">
</el-table-column>
<el-table-column prop="gridNames"
<el-table-column prop="houseName"
header-align="center"
align="center"
label="所属家庭"
width="180">
label="所属房屋"
show-overflow-tooltip
width="240">
</el-table-column>
<el-table-column prop="mobile"
header-align="center"
@ -205,13 +207,19 @@
label="手机号"
width="110">
</el-table-column>
<el-table-column prop="gridNames"
<el-table-column prop="idCard"
header-align="center"
align="center"
label="身份证号"
width="180">
</el-table-column>
<el-table-column prop="vaccineCount"
header-align="center"
align="center"
label="疫苗接种针次"
width="140">
</el-table-column>
<el-table-column prop="mobile"
<el-table-column prop="natCount"
header-align="center"
align="center"
label="核酸检测次数"
@ -260,15 +268,227 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
width="50%"
top="5vh"
class="dialog-h"
@closed="diaClose">
<nat-form ref="ref_form"
@dialogCancle="addFormCancle"
@dialogOk="addFormOk"></nat-form>
<div class="dialog-h-content scroll-h">
<el-form :inline="true"
:model="formDetail"
ref="detail_form"
:label-width="'100px'">
<div>
<el-form-item label="姓名:"
prop="name">
<el-input v-model="formDetail.name"
size="small"
disabled
class="list_item_width_1"
clearable
placeholder="请输入姓名">
</el-input>
<!-- <span>{{ formDetail.name }}</span> -->
</el-form-item>
<el-form-item label="所属网格"
prop="gridName">
<el-input v-model="formDetail.gridName"
size="small"
class="list_item_width_1"
clearable
disabled
placeholder="" />
<!-- <span>{{ formDetail.gridName }}</span> -->
</el-form-item>
<el-form-item label="所属房屋"
prop="houseName">
<el-input v-model="formDetail.houseName"
size="small"
class="list_item_width_1 min-w180"
clearable
disabled
placeholder="" />
<!-- <span>{{ formDetail.houseName }}</span> -->
</el-form-item>
</div>
<div>
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="formDetail.mobile"
size="small"
class="list_item_width_1"
clearable
disabled
placeholder="">
</el-input>
<!-- <span>{{ formDetail.mobile }}</span> -->
</el-form-item>
<el-form-item label="身份证"
prop="idCard">
<el-input v-model="formDetail.idCard"
size="small"
disabled
class="list_item_width_1"
clearable
placeholder="">
</el-input>
<!-- <span>{{ formDetail.idCard }}</span> -->
</el-form-item>
<el-form-item label="疫苗接种针次"
prop="vaccineCount">
<el-input v-model="formDetail.vaccineCount"
size="small"
class="list_item_width_1"
clearable
disabled
placeholder="">
</el-input>
<!-- <span>{{ formDetail.vaccineCount }}</span> -->
</el-form-item>
</div>
<div>
<el-form-item label="核酸检测次数"
prop="natCount">
<el-input v-model="formDetail.natCount"
size="small"
class="list_item_width_1"
clearable
disabled
placeholder="">
</el-input>
<!-- <span>{{ formDetail.natCount }}</span> -->
</el-form-item>
</div>
</el-form>
<div style="padding: 0 20px;">
<el-tabs v-model="activeName">
<!-- <el-tab-pane label="疫苗接种信息" name="first">
<el-table class="table"
:data="vaccineList"
border
height="400"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
align="center"
type="index"
width="50"></el-table-column>
<el-table-column prop="vaccinateTime"
header-align="center"
align="center"
label="接种时间"
width="140">
</el-table-column>
<el-table-column prop="address"
header-align="center"
align="center"
label="接种地点"
min-width="180">
</el-table-column>
<el-table-column prop="manufactor"
header-align="center"
align="center"
label="疫苗厂家"
width="240">
</el-table-column>
</el-table>
</el-tab-pane> -->
<el-tab-pane label="核酸检测信息" name="second">
<el-table class="table"
:data="natList"
border
height="400"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
align="center"
type="index"
width="50"></el-table-column>
<el-table-column prop="testTime"
header-align="center"
align="center"
label="检测时间"
width="150">
</el-table-column>
<el-table-column prop="address"
header-align="center"
align="center"
label="检测机构"
min-width="180">
</el-table-column>
<el-table-column prop="result"
header-align="center"
align="center"
label="检测结果"
width="240">
</el-table-column>
</el-table>
</el-tab-pane>
<!-- <el-tab-pane label="行程信息" name="third">
<el-table class="table"
:data="tripList"
border
height="400"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
align="center"
type="index"
width="50"></el-table-column>
<el-table-column prop="fromRegion"
header-align="center"
align="center"
label="来自地区"
min-width="100">
</el-table-column>
<el-table-column prop="arrivalTime"
header-align="center"
align="center"
label="来到本地时间"
width="140">
</el-table-column>
<el-table-column prop="leaveTime"
header-align="center"
align="center"
label="离开本地时间"
width="140">
</el-table-column>
<el-table-column prop="noticeTime"
header-align="center"
align="center"
label="最近一次通知时间"
width="140">
</el-table-column>
<el-table-column prop="remark"
header-align="center"
align="center"
label="备注"
width="120">
</el-table-column>
</el-table>
</el-tab-pane> -->
</el-tabs>
</div>
</div>
<div class="resi-btns">
<el-button size="small"
@click="handleCnalceForm">取消</el-button>
</div>
</el-dialog>
</div>
</template>
@ -285,10 +505,10 @@ export default {
return {
loading: false,
total: 0,
pageSize: 10,
pageSize: 20,
pageNo: 0,
tableLoading: false,
activeName: 'second',
agencyId: '',
sHeight: 0,
timeRange: [],
@ -305,13 +525,19 @@ export default {
vaccinateCount: '',
testCount: ''
},
formData: {
personInCharge: '',//负责人
mobile: '',//联系电话
gridId: '',//负责区域【网格Id】
ninePlaceVal: '',//场所类型【九小场所Value值】
isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是
formDetail: {
name: '',
gridName: '',
houseName: '',
mobile: '',
idCard: '',
vaccineCount: '',
natCount: ''
},
vaccineList: [], // 疫苗接种
natList: [], // 核酸检测
tripList: [], // 行程信息
optionsV: [],
optionsB: [],
optionsH: [],
@ -345,6 +571,14 @@ export default {
},
methods: {
handleCnalceForm() {
this.$refs.detail_form.resetFields()
this.vaccineList = []
this.natList = []
this.tripList = []
this.formShow = false
},
handleSearch () {
this.loadTable()
},
@ -474,16 +708,15 @@ export default {
})
},
async loadTable () {
this.tableLoading = true
const url = "/gov/org/placepatrolteam/getlist"
const url = "/epmetuser/epidemicPrevention/page"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
...this.formData
...this.searchForm
}
const { data, code, msg } = await requestPost(url, params)
@ -504,31 +737,54 @@ export default {
}
this.tableLoading = false
},
async getDetailInfo (id) {
handleScheduledTimeChange (time) {
if (time) {
this.formData.scheduledStartTime = time[0]
this.formData.scheduledEndTime = time[1]
const url = "/epmetuser/epidemicPrevention/detail"
let params = {
id
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formDetail = data
} else {
this.formData.scheduledStartTime = ''
this.formData.scheduledEndTime = ''
this.$message.error(msg)
}
},
async getDetailList (id) {
const url = "/epmetuser/epidemicPrevention/info"
let params = {
id
}
},
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
const { vaccineList, natList, tripList } = data
this.vaccineList = vaccineList
this.natList = natList
this.tripList = tripList
} else {
this.$message.error(msg)
}
},
diaClose () {
this.$refs.ref_form.resetData()
// this.$refs.ref_form.resetData()
this.formShow = false
},
handleDetail (row) {
async handleDetail (row) {
await this.getDetailInfo(row.id)
await this.getDetailList(row.id)
this.formTitle = '详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
})
// this.$nextTick(() => {
// this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
// })
},
addFormCancle () {
@ -586,7 +842,7 @@ export default {
this.searchForm.buildingId = ''
this.searchForm.unitId = ''
this.searchForm.houseId = ''
this.pageSize = 10
this.pageSize = 20
this.pageNo = 1
this.loadTable()
},
@ -638,6 +894,9 @@ export default {
.resi-cell-select:last-child {
margin-right: 0;
}
.min-w180 {
min-width: 170px;
}
</style>

Write Preview
Loading…
Cancel
Save