From 6642a61f39afe829a478441057e8b01e99ed74ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BD=B3=E5=AE=87?= <17601616548@163.com>
Date: Sat, 12 Oct 2024 12:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=80=89=E6=8B=A9=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=8F=B7=E6=BA=90?=
 =?UTF-8?q?=E6=B2=A1=E9=80=89=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=97=A5=E6=9C=9F=EF=BC=88=E5=B9=B4=E6=9C=88?=
 =?UTF-8?q?=E6=97=A5=EF=BC=89=EF=BC=8C=E4=BD=86=E9=BB=98=E8=AE=A4=E6=8A=8A?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=9A=84=E6=97=A5=E6=9C=9F=E8=AE=BE=E4=B8=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 h5/pages/main/yytjsj/yytjsj.vue | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/h5/pages/main/yytjsj/yytjsj.vue b/h5/pages/main/yytjsj/yytjsj.vue
index 809b88e..2ab2d98 100755
--- a/h5/pages/main/yytjsj/yytjsj.vue
+++ b/h5/pages/main/yytjsj/yytjsj.vue
@@ -182,6 +182,9 @@ const getTjTimeList = async (val) => {
     };
     apiText = "NMRGetDayPlanList";
   }
+  uni.showLoading({
+    title: "加载中",
+  });
   const response = await $api(apiText, obj);
   $response(response, () => {
     console.log(response, "response");
@@ -221,8 +224,8 @@ const changerl = (e) => {
     if (isClickDoctor.value == 1) {
       // 点击医生进入的
       status.value = 0;
-      yytjInfo.value.nmr_list[yytjInfo.value.nmr_list.length - 1].time =
-        e.fulldate;
+      // yytjInfo.value.nmr_list[yytjInfo.value.nmr_list.length - 1].time =
+      //   e.fulldate;
       yytjInfo.value.doctor_date = e.fulldate;
       $store.setYytjInfo(yytjInfo.value);
       uni.navigateTo({
@@ -233,9 +236,9 @@ const changerl = (e) => {
       calendarShow.value = false;
       return;
     }
-    uni.showLoading({
-      title: "加载中",
-    });
+    // uni.showLoading({
+    //   title: "加载中",
+    // });
     currentDate.value = e.fulldate;
     time.value = "";
     timeIndex.value = null;
@@ -259,14 +262,14 @@ const getCurrentClick = (item, i) => {
     return;
   }
   if (i != 3) {
-    if(yytjInfo.value.nmr_list.length > 1 && nmrIndex.value == 0){
+    if (yytjInfo.value.nmr_list.length > 1 && nmrIndex.value == 0) {
       yytjInfo.value.nmr_list = yytjInfo.value.nmr_list.map((val) => {
         return {
           ...val,
           time: "",
-          id: ""
-        }
-      })
+          id: "",
+        };
+      });
     }
     time.value = "";
     timeIndex.value = null;
@@ -309,7 +312,15 @@ const xmmcClick = (val, index) => {
   if (val.time) {
     currentDate.value = val.time.split(" ")[0];
   } else {
-    currentDate.value = getToday();
+    if (
+      ((yytjInfo.value.nmr_list.length > 1 && index == 1) ||
+        (yytjInfo.value.nmr_list.length == 1 && index == 0)) &&
+      yytjInfo.value.doctor_date
+    ) {
+      currentDate.value = yytjInfo.value.doctor_date;
+    } else {
+      currentDate.value = getToday();
+    }
   }
   // 体检号源
   getTjTimeList(val);