Browse Source

核酸检测

shibei_master
jiangyy 3 years ago
parent
commit
6769be9bc2
  1. 15
      src/views/modules/base/epidemic/natInfo/natForm.vue
  2. 30
      src/views/modules/base/epidemic/natInfo/natList.vue
  3. 41
      src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
  4. 2
      src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
  5. 61
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
  6. 2
      src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
  7. 2
      src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue

15
src/views/modules/base/epidemic/natInfo/natForm.vue

@ -149,8 +149,10 @@
:before-upload="beforeUpload" :before-upload="beforeUpload"
:on-change="handleEditChange" :on-change="handleEditChange"
:file-list="fileList"> :file-list="fileList">
<i class="el-icon-plus"></i> <i v-if="formType!=='detail'"
<div slot="tip" class="el-icon-plus"></i>
<div v-if="formType!=='detail'"
slot="tip"
class="el-upload__tip">请选择1张图片只能上传jpgpnggif格式</div> class="el-upload__tip">请选择1张图片只能上传jpgpnggif格式</div>
</el-upload> </el-upload>
@ -261,7 +263,6 @@ export default {
async mounted () { async mounted () {
const { user } = this.$store.state const { user } = this.$store.state
this.agencyId = user.agencyId this.agencyId = user.agencyId
this.formData.agencyId = user.agencyId
// //
await this.loadGrid() await this.loadGrid()
}, },
@ -269,7 +270,9 @@ export default {
methods: { methods: {
async initForm (type, icNatId) { async initForm (type, icNatId) {
this.startLoading()
this.formData.agencyId = this.agencyId
this.$refs['ref_form'].resetFields(); this.$refs['ref_form'].resetFields();
this.formType = type this.formType = type
@ -280,7 +283,7 @@ export default {
this.isFromResi = false this.isFromResi = false
await this.loadFormData() await this.loadFormData()
} }
this.endLoading()
}, },
@ -469,7 +472,7 @@ export default {
// if (!isLt1M) { // if (!isLt1M) {
// this.$message.error(' 5MB!') // this.$message.error(' 5MB!')
// } // }
return isLt1M // return isLt1M
}, },

30
src/views/modules/base/epidemic/natInfo/natList.vue

@ -94,7 +94,7 @@
:show-file-list='false' :show-file-list='false'
:before-upload="beforeUpload" :before-upload="beforeUpload"
action="" action=""
accept=".xls,.xlsx" accept=".xlsx"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:http-request="uploadFile"> :http-request="uploadFile">
@ -512,7 +512,8 @@ export default {
this.formData, this.formData,
(data, rspMsg) => { (data, rspMsg) => {
this.download(data, title + '.xls')
this.download(data, title + '.xlsx')
}, },
(rspMsg, data) => { (rspMsg, data) => {
this.$message.error(rspMsg); this.$message.error(rspMsg);
@ -558,7 +559,7 @@ export default {
params, params,
(data, rspMsg) => { (data, rspMsg) => {
this.download(data, title + '.xls') this.download(data, title + '.xlsx')
}, },
(rspMsg, data) => { (rspMsg, data) => {
this.$message.error(rspMsg); this.$message.error(rspMsg);
@ -568,15 +569,15 @@ export default {
// //
beforeUpload (file) { beforeUpload (file) {
this.files = file;
const isText = file.type === 'application/vnd.ms-excel'
const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
if (!isText && !isTextComputer) { const array = file.name.split('.')
this.$message.error('请选择正确格式的文件') const extension = array[array.length - 1]
// const isLt1M = (file.size / 1024 / 1024) < 5
if (extension !== 'xlsx') {
this.$message.error('只能上传xlsx文件!')
return false return false
} else { } else {
this.files = file;
this.fileName = file.name; this.fileName = file.name;
return true return true
} }
@ -607,8 +608,6 @@ export default {
let fileFormData = new FormData(); let fileFormData = new FormData();
fileFormData.append('file', this.files);//filenamefiletest.zip fileFormData.append('file', this.files);//filenamefiletest.zip
this.importRoomLoading = true
window.app.ajax.post2(url, fileFormData, window.app.ajax.post2(url, fileFormData,
(data, rspMsg) => { (data, rspMsg) => {
@ -623,18 +622,17 @@ export default {
// }) // })
// this.$message.error(rspMsg) // this.$message.error(rspMsg)
} }
this.$emit('refreshTree')
this.loadTable() // this.loadTable()
this.importRoomLoading = false
}, },
(rspMsg, data) => { (rspMsg, data) => {
this.importRoomLoading = false
}, { headers: { 'Content-Type': 'multipart/form-data' } }) }, { headers: { 'Content-Type': 'multipart/form-data' } })
}, },
// //
startLoading () { startLoading () {
loading = Loading.service({ loading = Loading.service({

41
src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@ -1,5 +1,5 @@
<template> <template>
<div> <div class="epidemic-form">
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-tabs v-model="activeName" <el-tabs v-model="activeName"
@ -27,13 +27,13 @@
</el-form-item> </el-form-item>
<el-form-item label="手机号" <el-form-item label="手机号"
prop="phone" prop="mobile"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_2" <el-input class="item_width_2"
placeholder="请输入手机号" placeholder="请输入手机号"
clearable clearable
v-model="formData1.phone"> v-model="formData1.mobile">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="身份证号"
@ -74,7 +74,7 @@
</el-form-item> </el-form-item>
<el-form-item label="通知内容" <el-form-item label="通知内容"
prop="noticeContent" prop="content"
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_1" <el-input class="item_width_1"
@ -84,7 +84,7 @@
:autosize="{ minRows: 4, maxRows: 10 }" :autosize="{ minRows: 4, maxRows: 10 }"
clearable clearable
placeholder="请输入通知内容" placeholder="请输入通知内容"
v-model="formData1.noticeContent"></el-input> v-model="formData1.content"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -241,7 +241,7 @@
</el-form-item> </el-form-item>
<el-form-item label="通知内容" <el-form-item label="通知内容"
prop="noticeContent" prop="content"
label-width="100px" label-width="100px"
style="display: block"> style="display: block">
<el-input class="item_width_1" <el-input class="item_width_1"
@ -251,7 +251,7 @@
:autosize="{ minRows: 4, maxRows: 10 }" :autosize="{ minRows: 4, maxRows: 10 }"
clearable clearable
placeholder="请输入通知内容" placeholder="请输入通知内容"
v-model="formData2.noticeContent"></el-input> v-model="formData2.content"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -298,10 +298,10 @@ export default {
formData1: { formData1: {
name: '', name: '',
idCard: '', idCard: '',
phone: '', mobile: '',
remark: '', remark: '',
noticeWay: [], noticeWay: [],
noticeContent: '', content: '',
}, },
@ -309,7 +309,7 @@ export default {
personList: [], personList: [],
remark: '', remark: '',
noticeWay: [], noticeWay: [],
noticeContent: '', content: '',
}, },
tableData: [], tableData: [],
total: 0, total: 0,
@ -528,15 +528,12 @@ export default {
let url = '' let url = ''
if (this.formType === 'add') {
url = '/gov/project/memoConcern/save'
// url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
this.formData.id = ''
} else { url = '/epmetuser/icEpidemicSpecialAttention/vaccination-add'
url = '/gov/project/memoConcern/update' // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
// url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update" this.formData.id = ''
}
const { data, code, msg } = await requestPost(url, this.formData) const { data, code, msg } = await requestPost(url, this.formData)
@ -579,10 +576,10 @@ export default {
this.formData1 = { this.formData1 = {
name: '', name: '',
idCard: '', idCard: '',
phone: '', mobile: '',
remark: '', remark: '',
noticeWay: [], noticeWay: [],
noticeContent: '', content: '',
} }
@ -590,7 +587,7 @@ export default {
personList: [], personList: [],
remark: '', remark: '',
noticeWay: [], noticeWay: [],
noticeContent: '', content: '',
} }
this.formDataSearch = { this.formDataSearch = {
selGridId: '', selGridId: '',
@ -645,7 +642,7 @@ export default {
idCard: [ idCard: [
{ required: true, message: '身份证号不能为空', trigger: 'blur' } { required: true, message: '身份证号不能为空', trigger: 'blur' }
], ],
phone: [ mobile: [
{ required: true, message: '手机号不能为空', trigger: 'blur' }, { required: true, message: '手机号不能为空', trigger: 'blur' },
], ],

2
src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue

@ -1,5 +1,5 @@
<template> <template>
<div> <div class="epidemic-form">
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-form ref="ref_form1" <el-form ref="ref_form1"

61
src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@ -80,7 +80,7 @@
:show-file-list='false' :show-file-list='false'
:before-upload="beforeUpload" :before-upload="beforeUpload"
action="" action=""
accept=".xls,.xlsx" accept=".xlsx"
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:http-request="uploadFile"> :http-request="uploadFile">
@ -115,7 +115,6 @@
@select-all="handleSelAll" @select-all="handleSelAll"
style="width: 100%"> style="width: 100%">
<el-table-column type="selection" <el-table-column type="selection"
:selectable="checkSelect"
width="55"></el-table-column> width="55"></el-table-column>
<el-table-column label="序号" <el-table-column label="序号"
header-align="center" header-align="center"
@ -305,7 +304,7 @@ export default {
loading: false, loading: false,
total: 0, total: 0,
pageSize: 20, pageSize: 20,
pageNo: 0, pageNo: 1,
tableLoading: false, tableLoading: false,
selection: [], selection: [],
@ -339,6 +338,9 @@ export default {
}, },
async created () { async created () {
},
activated () {
this.$refs['ref_table'].doLayout()
}, },
async mounted () { async mounted () {
for (let i = 0; i < 11; i++) { for (let i = 0; i < 11; i++) {
@ -524,14 +526,17 @@ export default {
}, },
async handleDelete (row) { async handleDelete (row) {
if (this.selectionAll.length === 0) {
this.$confirm("确认删除?", "提示", { this.$message.info('请选择要取消关注的名单')
return false
}
this.$confirm("确认取消关注选择的名单?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
this.deleteNat(row) this.deleteFocus(row)
}) })
.catch(err => { .catch(err => {
if (err == "cancel") { if (err == "cancel") {
@ -541,12 +546,17 @@ export default {
}); });
}, },
async deleteNat (row) { async deleteFocus (row) {
const url = "/gov/org/placepatrolteam/del" const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
let idCards = []
this.selectionAll.forEach(element => {
idCards.push(element.idCard)
});
let params = { let params = {
veroFocusId: row.veroFocusId attentionType: 1,
idCards: idCards
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
@ -554,7 +564,7 @@ export default {
if (code === 0) { if (code === 0) {
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功" message: "操作成功"
}); });
this.loadTable() this.loadTable()
@ -573,8 +583,8 @@ export default {
vaccinationCount: '', vaccinationCount: '',
} }
this.pageNo = 0 this.pageNo = 1
this.loadTable() // this.loadTable()
}, },
@ -605,7 +615,7 @@ export default {
params, params,
(data, rspMsg) => { (data, rspMsg) => {
this.download(data, title + '.xls') this.download(data, title + '.xlsx')
}, },
(rspMsg, data) => { (rspMsg, data) => {
this.$message.error(rspMsg); this.$message.error(rspMsg);
@ -652,7 +662,7 @@ export default {
params, params,
(data, rspMsg) => { (data, rspMsg) => {
this.download(data, title + '.xls') this.download(data, title + '.xlsx')
}, },
(rspMsg, data) => { (rspMsg, data) => {
this.$message.error(rspMsg); this.$message.error(rspMsg);
@ -660,17 +670,18 @@ export default {
); );
}, },
// //
beforeUpload (file) { beforeUpload (file) {
this.files = file;
const isText = file.type === 'application/vnd.ms-excel'
const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
if (!isText && !isTextComputer) { const array = file.name.split('.')
this.$message.error('请选择正确格式的文件') const extension = array[array.length - 1]
// const isLt1M = (file.size / 1024 / 1024) < 5
if (extension !== 'xlsx') {
this.$message.error('只能上传xlsx文件!')
return false return false
} else { } else {
this.files = file;
this.fileName = file.name; this.fileName = file.name;
return true return true
} }
@ -703,7 +714,7 @@ export default {
fileFormData.append('orgId', this.agencyObj.id);//filenamefiletest.zip fileFormData.append('orgId', this.agencyObj.id);//filenamefiletest.zip
fileFormData.append('orgType', this.agencyObj.level);//filenamefiletest.zip fileFormData.append('orgType', this.agencyObj.level);//filenamefiletest.zip
this.importRoomLoading = true
window.app.ajax.post2(url, fileFormData, window.app.ajax.post2(url, fileFormData,
(data, rspMsg) => { (data, rspMsg) => {
@ -718,12 +729,12 @@ export default {
// }) // })
// this.$message.error(rspMsg) // this.$message.error(rspMsg)
} }
this.$emit('refreshTree')
this.loadTable() // this.loadTable()
this.importRoomLoading = false
}, },
(rspMsg, data) => { (rspMsg, data) => {
this.importRoomLoading = false
}, { headers: { 'Content-Type': 'multipart/form-data' } }) }, { headers: { 'Content-Type': 'multipart/form-data' } })

2
src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue

@ -1,5 +1,5 @@
<template> <template>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h ">
<div class="div_table"> <div class="div_table">
<el-table class="table" <el-table class="table"

2
src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue

@ -1,5 +1,5 @@
<template> <template>
<div> <div class="epidemic-form">
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-form ref="ref_form1" <el-form ref="ref_form1"

Loading…
Cancel
Save