合并带嘛

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -233,10 +233,10 @@
                   v-if="dayorMonth == 'month'">{{ getMonthTotal() ? getMonthTotal() : '' }}元</span>
 
           </div>
-          <span   v-if="dayorMonth =='day'&&curPrescriptions.advices.length > 0"  :class="!curPrescriptions.is_medicine_status ? 'statusRed' : ''">{{curPrescriptions.is_medicine_status?'已发药':'未发药'}}</span>
-          <span   v-else></span>
-          <span :class="order_status == '未收费' ? 'statusRed' : ''">{{ order_status }}</span>
 
+          <span    :class="!is_medicine_status ? 'statusRed' : ''">{{is_medicine_status?'已发药':'未发药'}}</span>
+
+          <span :class="order_status == '未收费' ? 'statusRed' : ''">{{order_status}}</span>
         </div>
       </div>
       <div class='centerRight'>
@@ -620,6 +620,7 @@ export default {
       isShowDayPrescription: false,
       monthCustomTabIndex: 1,
       order_status: '',
+      is_medicine_status:false,
       register_types: [
         { id: 1, name: '医保' },
         { id: 2, name: '自费' }
@@ -1861,6 +1862,7 @@ export default {
         this.order_status = ''
       }
 
+     this.is_medicine_status = this.curPrescriptions.is_medicine_status
       if (this.curPrescriptions.order_status == 1) {
         this.order_status = '未收费'
       }
@@ -1918,6 +1920,8 @@ export default {
         this.curPrescriptions = {}
       }
 
+      this.is_medicine_status = this.curPrescriptions.is_medicine_status
+
       if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
         this.curStatus = 1
         this.customTabIndex = 1

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -230,8 +230,7 @@
 
 
                     </div>
-                  <span   v-if="dayorMonth =='day'&&curPrescriptions.advices.length > 0"  :class="!curPrescriptions.is_medicine_status ? 'statusRed' : ''">{{curPrescriptions.is_medicine_status?'已发药':'未发药'}}</span>
-                  <span   v-else></span>
+                  <span    :class="!is_medicine_status ? 'statusRed' : ''">{{is_medicine_status?'已发药':'未发药'}}</span>
 
                   <span :class="order_status == '未收费' ? 'statusRed' : ''">{{order_status}}</span>
                 </div>
@@ -622,6 +621,7 @@
         isShowDayPrescription: false,
         monthCustomTabIndex: 1,
         order_status: '',
+        is_medicine_status:false,
         register_types: [
           { id: 1, name: '医保' },
           { id: 2, name: '自费' }
@@ -1856,6 +1856,7 @@
           }
 
         }
+        this.is_medicine_status = this.curPrescriptions.is_medicine_status
         if (this.curPrescriptions.order_status == 0) {
           this.order_status = ''
         }
@@ -1885,6 +1886,7 @@
 
       },
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
+
         this.sick = sick
         this.diagnoses = diagnoses
         this.department = department
@@ -1915,6 +1917,7 @@
         } else {
           this.curPrescriptions = {}
         }
+        this.is_medicine_status =  this.curPrescriptions.is_medicine_status
 
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1