Browse Source

11

feature/account
jiangyy 3 years ago
parent
commit
9353bba15c
  1. 165
      src/views/modules/base/epidemic/natInfo/noNatDetail.vue
  2. 241
      src/views/modules/base/epidemic/natInfo/noNatList.vue

165
src/views/modules/base/epidemic/natInfo/noNatDetail.vue

@ -0,0 +1,165 @@
<template>
<div class="epidemic-form">
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">姓名</span>
<span>{{ formData.name||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">手机号</span>
<span>{{ formData.realMobile||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">证件号</span>
<span>{{ formData.realIdCard||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">检检测地点</span>
<span>{{ formData.natAddress||'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">检测结果</span>
<span>{{ formData.natResult==='0'?'阴性':'阳性' }}</span>
</div>
</div>
</div>
</div>
<div class="div-btn">
<el-button size="small"
@click="handleCancle"> </el-button>
<!-- <el-button v-if="formType != 'detail'"
size="small"
type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button> -->
</div>
</div>
</template>
<script>
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { dateFormats } from '@/utils/index'
let loading //
export default {
data () {
return {
initLoading: false,
icNatId: '',
formData: {},
}
},
components: {},
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
},
methods: {
async initForm (row) {
this.startLoading()
// this.formData.agencyId = this.agencyId
this.formData = JSON.parse(JSON.stringify(row))
// this.icNatId = icNatId
// this.formData.icNatId = icNatId
// await this.loadFormData()
this.initLoading = true
this.endLoading()
},
async loadFormData () {
// const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
const url = '/epmetuser/icNat/detail'
let params = {
icNatId: this.icNatId,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
console.log(this.formData.isSelChannel)
this.formData.icNatId = this.icNatId
} else {
this.$message.error(msg)
}
},
handleCancle () {
// this.resetData()
this.$emit('dialogCancle')
},
watchImg (src) {
window.open(src);
},
resetData () {
this.formData = {}
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
},
props: {
// serviceList: {
// type: Array,
// default: []
// },
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

241
src/views/modules/base/epidemic/natInfo/noNatList.vue

@ -1,28 +1,28 @@
<template> <template>
<div class="div_main"> <div class="div_main">
<div class="div_search"> <div ref="ref_search"
class="div_search">
<el-form :inline="true" <el-form :inline="true"
:model="formData" :model="formData"
ref="ref_searchform" ref="ref_searchform"
:label-width="'110px'"> :label-width="'110px'">
<div> <div>
<el-form-item label="信息范围"> <el-form-item label="导入时间">
<el-select class="list_item_width_1" <el-date-picker class="list_item_width_1"
size="small" v-model="formData.importDate"
v-model.trim="formData.orgType" format="yyyy-MM-dd"
placeholder="请选择"> value-format="yyyyMMdd"
<el-option v-for="item in orgTypeList" type="date"
:key="item.value" size="small"
:label="item.label" clearable
:value="item.value"> placeholder="选择时间">
</el-option> </el-date-picker>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="本辖区居民"> <el-form-item label="本辖区居民">
<el-select class="list_item_width_1" <el-select class="list_item_width_1"
size="small" size="small"
:disabled="formData.orgType!='current'" clearable
v-model.trim="formData.isResiUser" v-model.trim="formData.isResiUser"
placeholder="请选择"> placeholder="请选择">
<el-option v-for="item in isResiUserList" <el-option v-for="item in isResiUserList"
@ -33,65 +33,48 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="核酸检测时间" <el-form-item label="姓名"
label-width="110px" prop="name">
prop="startTime"> <el-input v-model="formData.name"
<el-date-picker v-model="timeRange" size="small"
size="small" class="list_item_width_1"
type="datetimerange" clearable
@change="handleTimeChange" placeholder="请输入姓名">
format="yyyy-MM-dd HH:mm" </el-input>
value-format="yyyy-MM-dd HH:mm"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间">
</el-date-picker>
</el-form-item> </el-form-item>
<div> <el-form-item label="手机号"
<el-form-item label="姓名" prop="mobile">
prop="name"> <el-input v-model="formData.mobile"
<el-input v-model="formData.name" size="small"
size="small" class="list_item_width_1"
class="list_item_width_1" clearable
clearable placeholder="请输入手机号">
placeholder="请输入姓名"> </el-input>
</el-input>
</el-form-item>
</el-form-item> <el-form-item label="证件号"
prop="idCard">
<el-form-item label="手机号" <el-input v-model="formData.idCard"
prop="mobile"> size="small"
<el-input v-model="formData.mobile" class="list_item_width_1"
size="small" clearable
class="list_item_width_1" placeholder="请输入身份证号或护照号">
clearable </el-input>
placeholder="请输入手机号">
</el-input> </el-form-item>
</el-form-item> <el-button style="margin-left:30px"
<el-form-item label="证件号" size="small"
prop="idCard"> class="diy-button--search"
<el-input v-model="formData.idCard" @click="handleSearch">查询</el-button>
size="small" <el-button style="margin-left:10px"
class="list_item_width_1" size="small"
clearable class="diy-button--reset"
placeholder="请输入身份证号或护照号"> @click="resetSearch">重置</el-button>
</el-input>
</el-form-item>
<el-button style="margin-left:30px"
size="small"
class="diy-button--search"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
size="small"
class="diy-button--reset"
@click="resetSearch">重置</el-button>
</div>
</div> </div>
</el-form> </el-form>
</div> </div>
<div class="div_table"> <div class="div_table">
@ -157,7 +140,7 @@
label="证件号" label="证件号"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="natTime" <el-table-column prop="latestNatTime"
header-align="center" header-align="center"
align="center" align="center"
label="检测时间" label="检测时间"
@ -177,14 +160,27 @@
label="检测结果" label="检测结果"
width="100"> width="100">
</el-table-column> </el-table-column>
<el-table-column v-if="isResiUser" <el-table-column prop="isAgencyUserDesc"
prop="isResiUserShow"
header-align="center" header-align="center"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
label="本辖区居民" label="本辖区居民"
width="120"> width="120">
</el-table-column> </el-table-column>
<el-table-column prop="importTime"
header-align="center"
align="center"
show-overflow-tooltip
label="导入时间"
width="160">
</el-table-column>
<el-table-column prop="agencyName"
header-align="center"
align="center"
show-overflow-tooltip
label="导入组织"
width="120">
</el-table-column>
<el-table-column label="操作" <el-table-column label="操作"
fixed="right" fixed="right"
@ -199,30 +195,6 @@
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<!-- <el-button v-if="!isResiUser"
type="text"
class="div-table-button--edit"
size="small"
@click="handleAttention(scope.row)">同步</el-button>
<el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text"
class="div-table-button--delete "
size="small"
@click="handleDelete(scope.row)">删除</el-button>
<el-button v-if="isResiUser&&scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
type="text"
class="div-table-button--delete "
size="small"
@click="handleCancelAttention(scope.row)">取消同步</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -260,8 +232,8 @@
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaDetailClose"> @closed="diaDetailClose">
<nat-detail ref="ref_detail" <no-nat-detail ref="ref_detail"
@dialogCancle="diaDetailClose"></nat-detail> @dialogCancle="diaDetailClose"></no-nat-detail>
</el-dialog> </el-dialog>
</div> </div>
@ -270,7 +242,7 @@
<script> <script>
import natForm from './natForm' import natForm from './natForm'
import natDetail from './natDetail' import noNatDetail from './noNatDetail'
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -285,19 +257,9 @@ export default {
pageSize: 20, pageSize: 20,
pageNo: 0, pageNo: 0,
tableLoading: false, tableLoading: false,
isResiUser: true,
agencyId: '', agencyId: '',
orgTypeList: [
{
value: 'current',
label: '本辖区居民检测记录'
},
{
value: 'all',
label: '全部检测记录'
},
],
isResiUserList: [ isResiUserList: [
{ {
value: '0', value: '0',
@ -309,15 +271,12 @@ export default {
}, },
], ],
timeRange: [],
formData: { formData: {
orgType: 'current',//:current all importDate: '',//
name: '',// name: '',//
mobile: '',// mobile: '',//
idCard: '',// idCard: '',//
startTime: '',//yyyy-MM-dd HH:mm isResiUser: ''//(0: 1:)
endTime: '',//yyyy-MM-dd HH:mm
isResiUser: ''//0: 1:
}, },
@ -328,23 +287,23 @@ export default {
detailShow: false, detailShow: false,
formTitle: '新增', formTitle: '新增',
sHeight: 0
} }
}, },
components: { components: {
natForm, natDetail natForm, noNatDetail
}, },
async created () { async created () {
}, },
async mounted () { async mounted () {
// //
const { user } = this.$store.state const { user } = this.$store.state
this.agencyId = user.agencyId this.agencyId = user.agencyId
await this.loadTable() await this.loadTable()
this.sHeight = this.$refs.ref_search.offsetHeight + 270
}, },
activated () { activated () {
@ -354,7 +313,6 @@ export default {
methods: { methods: {
async handleSearch () { async handleSearch () {
this.isResiUser = this.formData.orgType === 'current'
await this.loadTable() await this.loadTable()
@ -367,8 +325,8 @@ export default {
async loadTable () { async loadTable () {
this.tableLoading = true this.tableLoading = true
const url = "/epmetuser/icNat/natlist" const url = "/epmetuser/icNatCompareRecord/page"
// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/natlist" // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNatCompareRecord/page"
let params = { let params = {
pageSize: this.pageSize, pageSize: this.pageSize,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -383,7 +341,7 @@ export default {
this.tableData.forEach(item => { this.tableData.forEach(item => {
item.isResiUserShow = item.isResiUser === '0' ? '否' : '是'
if (item.natResult === '1') { if (item.natResult === '1') {
item.natResultShow = '阳性' item.natResultShow = '阳性'
} else if (item.natResult === '0') { } else if (item.natResult === '0') {
@ -395,27 +353,12 @@ export default {
}); });
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
this.tableLoading = false this.tableLoading = false
}, },
handleTimeChange (time) {
if (time) {
this.formData.startTime = time[0]
this.formData.endTime = time[1]
} else {
this.formData.startTime = ''
this.formData.endTime = ''
}
},
diaClose () { diaClose () {
this.$refs.ref_form.resetData() this.$refs.ref_form.resetData()
this.formShow = false this.formShow = false
@ -431,7 +374,7 @@ export default {
this.formTitle = '详情' this.formTitle = '详情'
this.detailShow = true this.detailShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_detail.initForm(row.icNatId) this.$refs.ref_detail.initForm(row)
}) })
}, },
@ -576,14 +519,14 @@ export default {
// //
resetSearch () { resetSearch () {
this.formData = { this.formData = {
orgType: 'current',//:current all isResiUser: '',//(0: 1:)
name: '',// name: '',//
mobile: '',// mobile: '',//
idCard: '',// idCard: '',//
startTime: '',//yyyy-MM-dd HH:mm importDate: ''
endTime: '',//yyyy-MM-dd HH:mm
} }
this.timeRange = []
this.pageNo = 0 this.pageNo = 0
// this.loadTable() // this.loadTable()
@ -603,7 +546,7 @@ export default {
async handleExport () { async handleExport () {
let title = '核酸检测信息' let title = '核酸检测信息'
const url = "/epmetuser/icNat/export" const url = "/epmetuser/icNatCompareRecord/export"
app.ajax.exportFilePost( app.ajax.exportFilePost(
url, url,
@ -647,7 +590,7 @@ export default {
handleExportModule () { handleExportModule () {
let title = '核酸检测信息导入模板' let title = '核酸检测信息导入模板'
const url = "/epmetuser/icNat/import-template-download" const url = "/epmetuser/icNatCompareRecord/template-download"
let params = {} let params = {}
app.ajax.exportFilePost( app.ajax.exportFilePost(
@ -699,7 +642,7 @@ export default {
// //
this.$refs['upload'].clearFiles() this.$refs['upload'].clearFiles()
var url = '/epmetuser/icNat/import' var url = '/epmetuser/icNatCompareRecord/import'
let fileFormData = new FormData(); let fileFormData = new FormData();
fileFormData.append('file', this.files);//filenamefiletest.zip fileFormData.append('file', this.files);//filenamefiletest.zip
@ -747,9 +690,11 @@ export default {
}, },
computed: { computed: {
tableHeight () { tableHeight () {
console.log(this.sHeight)
return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420 // return this.$store.state.inIframe ? this.clientHeight - this.sHeight + this.iframeHeight : this.clientHeight - this.sHeight
const h = this.clientHeight - this.sHeight + this.iframeHeigh
const _h = this.clientHeight - this.sHeight
return this.$store.state.inIframe ? h : _h
}, },

Loading…
Cancel
Save