From 3b59f63dce4311a0ccce815960859944a83bf744 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 30 Mar 2022 09:32:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=98=B2=E7=96=AB=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 +- src/views/modules/base/epidemic/antiInfo.vue | 337 ++++++++++++++++--- 2 files changed, 300 insertions(+), 40 deletions(-) diff --git a/src/App.vue b/src/App.vue index f472317a..f743cc40 100644 --- a/src/App.vue +++ b/src/App.vue @@ -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; } } diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 8388bc4d..86e205e6 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -119,7 +119,7 @@ size="small" class="list_item_width_1" clearable - placeholder="请输入身份证"> + placeholder="请输入手机号"> @@ -140,17 +140,17 @@ size="small" class="list_item_width_1" clearable - placeholder="请输入身份证"> + placeholder="请输入接种针次"> - + placeholder="请输入检测次数"> @@ -181,23 +181,25 @@ type="index" width="50"> - - - + label="所属房屋" + show-overflow-tooltip + width="240"> - + + - - +
+ +
+ + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + +
+
+ + + + + +
+ +
+ + + + + + + + + + + + + + + + +
+
+
+ 取消 +
+ @@ -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; + } From 137db3984c45afcd909e8105d0faecaa81a4f8db Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 30 Mar 2022 09:33:31 +0800 Subject: [PATCH 2/2] dd --- src/views/modules/base/epidemic/antiInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 86e205e6..cc3cc13d 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -418,7 +418,7 @@ header-align="center" align="center" label="检测时间" - width="140"> + width="150">