diff --git a/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue
index 3533da1b2..2eab4c19f 100644
--- a/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue
+++ b/src/views/modules/base/epidemic/unitEpid/staffEpidList.vue
@@ -6,142 +6,106 @@
ref="ref_searchform"
:label-width="'110px'">
-
- 新增
-
- 下载模板
-
- 导入
-
-
- 导出
-
- 定时
-
+
+
-
-
+
-
-
-
-
-
-
查看
- 同步
-
- 修改
-
- 删除
- 取消同步
-
@@ -298,42 +228,41 @@ export default {
pageSize: 20,
pageNo: 0,
tableLoading: false,
- isResiUser: true,
agencyId: '',
- orgTypeList: [
- {
- value: 'current',
- label: '本辖区居民检测记录'
- },
- {
- value: 'all',
- label: '全部检测记录'
- },
- ],
- isResiUserList: [
+ placeCategoryList: [
{
value: '0',
- label: '否'
+ label: '九小场所'
},
{
value: '1',
- label: '是'
+ label: '企事业单位'
+ }
+ ],//场所类型list
+ statusList: [
+ {
+ value: '1',
+ label: '已检测'
},
+ {
+ value: '0',
+ label: '未检测'
+ }
],
+
timeRange: [],
- sampleTimeRange: [],
+
formData: {
- orgType: 'current',//当前组织:current 根组织:all
+ checkStatus: '',//检查状态,1:已检测;0:未检测
name: '',//姓名
mobile: '',//手机号
idCard: '',//身份证号码
- startTime: '',//检测开始时间yyyy-MM-dd HH:mm
- endTime: '',//检测结束时间yyyy-MM-dd HH:mm
- sampleStartTime: '',//采样开始时间yyyy-MM-dd HH:mm
- sampleEndTime: '',//采样结束时间yyyy-MM-dd HH:mm
- isResiUser: ''//0:否 1:是
+ natStartDate: '',//核酸检测开始日期,eg:2022-02-02
+ natEndDate: '',//核酸检测结束日期,eg:2022-02-02
+ placeOrgName: '',//场所名称
+ placeCategory: '',//场所类别:0九小场所、1企事业单位
},
@@ -353,8 +282,6 @@ export default {
},
async mounted () {
- //获取场所类型
-
const { user } = this.$store.state
this.agencyId = user.agencyId
@@ -370,7 +297,6 @@ export default {
methods: {
async handleSearch () {
- this.isResiUser = this.formData.orgType === 'current'
await this.loadTable()
@@ -411,8 +337,6 @@ export default {
});
-
-
} else {
this.$message.error(msg)
}
@@ -421,24 +345,12 @@ export default {
handleTimeChange (time) {
if (time) {
- this.formData.startTime = time[0]
- this.formData.endTime = time[1]
+ this.formData.natStartDate = time[0]
+ this.formData.natEndDate = time[1]
} else {
- this.formData.startTime = ''
- this.formData.endTime = ''
-
- }
-
- },
- handleSampleTimeChange (time) {
- if (time) {
- this.formData.sampleStartTime = time[0]
- this.formData.sampleEndTime = time[1]
-
- } else {
- this.formData.sampleStartTime = ''
- this.formData.sampleEndTime = ''
+ this.formData.natStartDate = ''
+ this.formData.natEndDate = ''
}
@@ -455,29 +367,7 @@ export default {
},
- handleDetail (row) {
- this.formTitle = '详情'
- this.detailShow = true
- this.$nextTick(() => {
- this.$refs.ref_detail.initForm(row.icNatId)
- })
- },
- handleAdd () {
- this.formTitle = '新增'
- this.formShow = true
- this.$nextTick(() => {
- this.$refs.ref_form.initForm('add', null)
- })
- },
-
- handleEdit (row) {
- this.formTitle = '修改'
- this.formShow = true
- this.$nextTick(() => {
- this.$refs.ref_form.initForm('edit', row.icNatId)
- })
- },
addFormOk () {
this.formShow = false
@@ -560,47 +450,6 @@ export default {
}
},
- async handleTiming (row) {
-
- this.$confirm("确认执行定时任务?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- this.timingNat(row)
- })
- .catch(err => {
- if (err == "cancel") {
-
- }
-
- });
- },
-
- async timingNat (row) {
- const url = "/epmetuser/dataSyncConfig/natInfoScanTask"
- // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
-
- let params = {
- isSync: '1',
- dataCode: 'hesuan',
- agencyId: this.agencyId
- }
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
- this.$message({
- type: "success",
- message: "操作成功"
- });
-
- // this.loadTable()
- } else {
- this.$message.error(msg)
- }
- },
async handleAttention (row) {
this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", {
@@ -645,17 +494,17 @@ export default {
//重置搜索条件
resetSearch () {
this.formData = {
- orgType: 'current',//当前组织:current 根组织:all
+ checkStatus: '',//检查状态,1:已检测;0:未检测
name: '',//姓名
mobile: '',//手机号
idCard: '',//身份证号码
- startTime: '',//检测开始时间yyyy-MM-dd HH:mm
- endTime: '',//检测结束时间yyyy-MM-dd HH:mm
- sampleStartTime: '',//采样开始时间yyyy-MM-dd HH:mm
- sampleEndTime: '',//采样结束时间yyyy-MM-dd HH:mm
+ natStartDate: '',//核酸检测开始日期,eg:2022-02-02
+ natEndDate: '',//核酸检测结束日期,eg:2022-02-02
+ placeOrgName: '',//场所名称
+ placeCategory: '',//场所类别:0九小场所、1企事业单位
}
this.timeRange = []
- this.sampleTimeRange = []
+
this.pageNo = 0
// this.loadTable()
@@ -690,116 +539,6 @@ export default {
},
- // 下载文件
- download (data, fileName) {
- if (!data) {
- return
- }
-
- var csvData = new Blob([data])
-
- if (window.navigator && window.navigator.msSaveOrOpenBlob) {
- window.navigator.msSaveOrOpenBlob(csvData, fileName);
- }
- // for Non-IE (chrome, firefox etc.)
- else {
- var a = document.createElement('a');
- document.body.appendChild(a);
- a.style = 'display: none';
- var url = window.URL.createObjectURL(csvData);
- a.href = url;
- a.download = fileName;
- a.click();
- a.remove();
- window.URL.revokeObjectURL(url);
- }
-
- },
-
- handleExportModule () {
- let title = '核酸检测信息导入模板'
-
- const url = "/epmetuser/icNat/import-template-download"
- let params = {}
-
- app.ajax.exportFilePost(
- url,
- params,
- (data, rspMsg) => {
-
- this.download(data, title + '.xlsx')
- },
- (rspMsg, data) => {
- this.$message.error(rspMsg);
- }
- );
- },
-
- // 上传文件之前的钩子
- beforeUpload (file) {
-
- const array = file.name.split('.')
- const extension = array[array.length - 1]
- // const isLt1M = (file.size / 1024 / 1024) < 5
- if (extension !== 'xlsx') {
- this.$message.error('只能上传xlsx文件!')
- return false
- } else {
- this.files = file;
- this.fileName = file.name;
- return true
- }
-
- },
- // 上传文件个数超过定义的数量
- handleExceed (files, fileList) {
- this.$message.warning(`当前限制选择 1 个文件,请删除后继续上传`)
- },
-
- async uploadFile () {
- if (this.fileName == "") {
- this.$message.warning('请选择要上传的文件!')
- return false
- }
-
- this.$message({
- showClose: true,
- message: '导入中,请到系统管理-导入记录中查看进度',
- duration: 0
- })
-
- //清空上传列表
- this.$refs['upload'].clearFiles()
-
- var url = '/epmetuser/icNat/import'
-
- let fileFormData = new FormData();
- fileFormData.append('file', this.files);//filename是键,file是值,就是要传的文件,test.zip是要传的文件名
-
- window.app.ajax.post2(url, fileFormData,
- (data, rspMsg) => {
-
- if (data.code === 0 && data.msg == 'success') {
- // this.$message.success('导入成功')
- } else {
- // this.$message({
- // showClose: true,
- // message: rspMsg,
- // duration: 0,
- // type: "error"
- // })
- // this.$message.error(rspMsg)
- }
-
- // this.loadTable()
-
- },
- (rspMsg, data) => {
-
- }, { headers: { 'Content-Type': 'multipart/form-data' } })
-
-
- },
// 开启加载动画
startLoading () {