更新

src/pages/allDoctorAdvice/index.vue

@@ -7,17 +7,21 @@
       </div>
     </van-sticky>
     <div class="orderBox">
-      <div class="orderBoxOne" v-for="(item, index) in doctorAdvicedetail" :key="index">
+      <div
+        class="orderBoxOne"
+        v-for="(item, index) in doctorAdvicedetail"
+        :key="index"
+      >
         <div v-for="(it, i) in item.child" :key="i">
-          <p class="time">{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>
+          <p class="time">
+            {{ it.advice_date ? getTime(it.advice_date) : "" }}
+          </p>
           <div class="statOrder">
             <div v-if="it.advice_type == 1 && it.parent_id == 0">
               <div class="statOrderTitle">
                 <span>长期医嘱</span>
                 <span style="margin-left:1rem">
-                  {{
-                  getTimes(it.start_time)
-                  }}
+                  {{ getTimes(it.start_time) }}
                 </span>
               </div>
               <div class="orderContent">
@@ -39,20 +43,24 @@
                   </p>
                 </div>
               </div>
-              <div class="doctorBox" v-if="it.advice_doctor || it.execution_staff || it.checker">
+              <div
+                class="doctorBox"
+                v-if="it.advice_doctor || it.execution_staff || it.checker"
+              >
                 <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
                 <p>执行护士：{{ getDoctor(item.execution_staff) }}</p>
                 <p>核对护士：{{ getDoctor(item.checker) }}</p>
               </div>
             </div>
 
-            <div class="statOrder" v-if="it.advice_type == 3 && it.parent_id == 0">
+            <div
+              class="statOrder"
+              v-if="it.advice_type == 3 && it.parent_id == 0"
+            >
               <div class="longOrderTitle">
                 <span>临时医嘱</span>
                 <span style="margin-left:1rem">
-                  {{
-                  getTimes(item.child[0].start_time)
-                  }}
+                  {{ getTimes(item.child[0].start_time) }}
                 </span>
               </div>
               <div class="orderContent">
@@ -75,7 +83,10 @@
                   </p>
                 </div>
               </div>
-              <div class="doctorBox" v-if="it.advice_doctor || it.execution_staff || it.checker">
+              <div
+                class="doctorBox"
+                v-if="it.advice_doctor || it.execution_staff || it.checker"
+              >
                 <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
                 <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
                 <p>核对护士：{{ getDoctor(it.checker) }}</p>
@@ -114,6 +125,7 @@ export default {
       GetDoctorAdviceDetail(id).then(response => {
         if (response.data.state === 1) {
           var doctorAdvicedetail = response.data.data.doctorAdvicedetail;
+          console.log("doctorAdvicedetail", doctorAdvicedetail);
           this.patient_name = doctorAdvicedetail[0].name;
           let objarr = [];
           for (let i = 0; i < doctorAdvicedetail.length; i++) {

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -23,8 +23,17 @@
       </div>
 
       <div class="adviceBox" v-show="showOne">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-          <div class="adviceOne" v-for="(item, index) in doctorAdvice" :key="index">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in doctorAdvice"
+            :key="index"
+          >
             <div v-for="(it, i) in item.child" :key="i">
               <div class="adviceTitle" v-if="it.advice_date">
                 <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>
@@ -35,13 +44,14 @@
                 />
               </div>
 
-              <div class="statOrder" v-if="it.advice_type == 1 && it.parent_id == 0">
+              <div
+                class="statOrder"
+                v-if="it.advice_type == 1 && it.parent_id == 0"
+              >
                 <div class="statOrderTitle" v-if="i < 3">
                   <span>长期医嘱</span>
                   <span style="margin-left:1rem">
-                    {{
-                    getTimes(it.start_time)
-                    }}
+                    {{ getTimes(it.start_time) }}
                   </span>
                 </div>
                 <div class="orderContent" v-if="i < 3">
@@ -65,7 +75,11 @@
                 </div>
                 <div
                   class="doctorBox"
-                  v-if="it.user_name || it.execution_staff || it.checker && i == item.child.length"
+                  v-if="
+                    it.user_name ||
+                      it.execution_staff ||
+                      (it.checker && i == item.child.length)
+                  "
                 >
                   <p>开嘱医生：{{ it.user_name }}</p>
                   <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
@@ -73,13 +87,14 @@
                 </div>
               </div>
 
-              <div class="statOrder" v-if="it.advice_type == 3 && it.parent_id == 0">
+              <div
+                class="statOrder"
+                v-if="it.advice_type == 3 && it.parent_id == 0"
+              >
                 <div class="longOrderTitle" v-if="i < 3">
                   <span>临时医嘱</span>
                   <span style="margin-left:1rem">
-                    {{
-                    getTimes(item.child[0].start_time)
-                    }}
+                    {{ getTimes(item.child[0].start_time) }}
                   </span>
                 </div>
                 <div class="orderContent" v-if="i < 3">
@@ -104,7 +119,11 @@
                 </div>
                 <div
                   class="doctorBox"
-                  v-if="it.user_name || it.execution_staff || it.checker && i == item.child.length"
+                  v-if="
+                    it.user_name ||
+                      it.execution_staff ||
+                      (it.checker && i == item.child.length)
+                  "
                 >
                   <p>开嘱医生：{{ it.user_name }}</p>
                   <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
@@ -112,7 +131,12 @@
                 </div>
               </div>
             </div>
-            <div class="all" @click="toDoctorAdviceDetail(item.child[0].groupno)">全部</div>
+            <div
+              class="all"
+              @click="toDoctorAdviceDetail(item.child[0].groupno)"
+            >
+              全部
+            </div>
           </div>
         </van-list>
       </div>
@@ -129,11 +153,24 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
 
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"