Merge branch 'dev-0420' into test

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;
+}

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;

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -670,21 +670,36 @@ export default {
       })
     },
 
-    handleEdit (row) {
+    async handleEdit(row) {
-      this.editFormTitle = "修改核酸检测关注名单"
+      this.editFormTitle = "修改核酸检测关注名单";
-      this.editFormShow = true
+      this.editFormShow = true;
 
-      this.$nextTick(() => {
+      let row2 = await this.getInfo(row);
-        this.$refs.ref_form_edit.initForm('edit', row)
+      this.$refs.ref_form_edit.initForm("edit", row2);
-      })
     },
 
-    handleDetail (row) {
+    async handleDetail(row) {
-      this.editFormTitle = "查看核酸检测关注名单"
+      this.editFormTitle = "查看核酸检测关注名单";
-      this.editFormShow = true
+      this.editFormShow = true;
-      this.$nextTick(() => {
+
-        this.$refs.ref_form_edit.initForm('detail', row)
+      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 () {