From 3b881a36c2cd9ac3a53a918eb21fcc67bb16d991 Mon Sep 17 00:00:00 2001
From: "1747191978@qq.com" <1942943850@qq.com>
Date: Mon, 14 Apr 2025 12:49:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E8=BF=87=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/screening/h5eva.vue             | 68 ++++++++++++-------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/acupuncture-前台/src/views/screening/h5eva.vue b/acupuncture-前台/src/views/screening/h5eva.vue
index e5bfd303..b6948d3f 100644
--- a/acupuncture-前台/src/views/screening/h5eva.vue
+++ b/acupuncture-前台/src/views/screening/h5eva.vue
@@ -283,17 +283,22 @@
       :show-close="false"
       :close-on-click-modal="false"
     >
-      <div class="popup-title">已经筛查过是否查看结论</div>
+      <div class="popup-box">
+        <el-radio v-model="popupRadio" :label="1" class="popup-radio">
+          编辑信息</el-radio
+        >
+        <el-radio v-model="popupRadio" :label="2" class="popup-radio"
+          >查看结论</el-radio
+        >
+      </div>
+
       <div class="submit-box submit-box1">
         <el-button
           type="primary"
           class="submit-box-but"
-          @click="handleContinue"
+          @click="handlePopupVerify"
         >
-          编辑信息
-        </el-button>
-        <el-button type="primary" class="submit-box-but" @click="handleResult">
-          查看结论
+          确认
         </el-button>
       </div>
     </el-dialog>
@@ -313,6 +318,7 @@ export default {
   name: "Notice",
   data() {
     return {
+      popupRadio: 1,
       open: false,
       loading: false,
       disabled: true,
@@ -648,22 +654,22 @@ export default {
   },
   methods: {
     // 编辑信息
-    handleContinue() {
-      this.form = { ...this.form, ...this.detailList };
-      setTimeout(() => {
+    handlePopupVerify() {
+      if (this.popupRadio === 1) {
+        this.form = { ...this.form, ...this.detailList };
+        setTimeout(() => {
+          this.open = false;
+        }, 500);
+      } else {
+        this.$router.replace({
+          path: "/screening/h5Result",
+          query: {
+            tenantName: this.tenantName,
+            data: JSON.stringify(this.detailList),
+          },
+        });
         this.open = false;
-      }, 500);
-    },
-    // 查看结果
-    handleResult() {
-      this.$router.replace({
-        path: "/screening/h5Result",
-        query: {
-          tenantName: this.tenantName,
-          data: JSON.stringify(this.detailList),
-        },
-      });
-      this.open = false;
+      }
     },
     // 通过手机号查询
     getqueryDetailNoToken() {
@@ -985,6 +991,13 @@ export default {
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
+.popup-item {
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
 .popup-title {
   font-size: 20px;
   color: #333333;
@@ -1074,20 +1087,27 @@ export default {
   color: #555555;
   line-height: 20px;
 }
+.popup-box {
+  display: flex;
+}
 .submit-box {
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.submit-box1 .submit-box-but {
-  border: none;
-}
+
 .submit-box .submit-box-but {
   background: #c6a268;
   width: 100%;
   font-size: 16px;
   margin-bottom: 10px;
 }
+.submit-box1 .submit-box-but {
+  width: 65% !important;
+  border: none;
+  margin-top: 30px;
+  margin-bottom: 0;
+}
 .card {
   padding: 16px;
   background: #fff;