diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 794afa6f7..b64e02d22 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -821,3 +821,11 @@ div.el-table div.cell { text-overflow: ellipsis; word-wrap: normal; } + +input::-webkit-outer-spin-button, +input::-webkit-inner-spin-button { + -webkit-appearance: none; +} +input[type="number"] { + -moz-appearance: textfield; +} diff --git a/src/assets/scss/modules/warning.scss b/src/assets/scss/modules/warning.scss index 2c6b9fa2c..2353a9435 100644 --- a/src/assets/scss/modules/warning.scss +++ b/src/assets/scss/modules/warning.scss @@ -85,7 +85,7 @@ content: ""; width: 8px; height: 8px; - background: #2194fe; + background: #f5f502; border-radius: 50%; position: absolute; left: 12px; @@ -93,6 +93,12 @@ transform: translate(0, -50%); } + &:nth-of-type(2) { + &::after { + background: #fb500d; + } + } + div:nth-child(1) { font-size: 16px; font-family: PingFang SC; diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index c8215e63a..8d7fbc47f 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -670,21 +670,36 @@ export default { }) }, - handleEdit (row) { - this.editFormTitle = "修改核酸检测关注名单" - this.editFormShow = true + async handleEdit(row) { + this.editFormTitle = "修改核酸检测关注名单"; + this.editFormShow = true; - this.$nextTick(() => { - this.$refs.ref_form_edit.initForm('edit', row) - }) + let row2 = await this.getInfo(row); + this.$refs.ref_form_edit.initForm("edit", row2); }, - handleDetail (row) { - this.editFormTitle = "查看核酸检测关注名单" - this.editFormShow = true - this.$nextTick(() => { - this.$refs.ref_form_edit.initForm('detail', row) - }) + async handleDetail(row) { + this.editFormTitle = "查看核酸检测关注名单"; + this.editFormShow = true; + + let row2 = await this.getInfo(row); + this.$refs.ref_form_edit.initForm("detail", row2); + }, + + async getInfo(row) { + const url = "/epmetuser/icEpidemicSpecialAttention/detail"; + + let params = { + id: row.id, + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + row.mobile = data.mobile; + row.idCard = data.idCard; + } + return row; }, handleSendNotice () { diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue index 7bccd7463..87d99e65d 100644 --- a/src/views/modules/base/epidemic/vaccin.vue +++ b/src/views/modules/base/epidemic/vaccin.vue @@ -1,95 +1,110 @@ - - - diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue index 4c65d7c98..435382800 100644 --- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue +++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue @@ -1,387 +1,491 @@ - - - -