瀏覽代碼

合并带嘛

csx 2 年之前
父節點
當前提交
e004cbef9f

+ 7 - 3
src/xt_pages/hospitalStation/components/deskPrescription.vue 查看文件

233
                   v-if="dayorMonth == 'month'">{{ getMonthTotal() ? getMonthTotal() : '' }}元</span>
233
                   v-if="dayorMonth == 'month'">{{ getMonthTotal() ? getMonthTotal() : '' }}元</span>
234
 
234
 
235
           </div>
235
           </div>
236
-          <span   v-if="dayorMonth =='day'&&curPrescriptions.advices.length > 0"  :class="!curPrescriptions.is_medicine_status ? 'statusRed' : ''">{{curPrescriptions.is_medicine_status?'已发药':'未发药'}}</span>
237
-          <span   v-else></span>
238
-          <span :class="order_status == '未收费' ? 'statusRed' : ''">{{ order_status }}</span>
239
 
236
 
237
+          <span    :class="!is_medicine_status ? 'statusRed' : ''">{{is_medicine_status?'已发药':'未发药'}}</span>
238
+
239
+          <span :class="order_status == '未收费' ? 'statusRed' : ''">{{order_status}}</span>
240
         </div>
240
         </div>
241
       </div>
241
       </div>
242
       <div class='centerRight'>
242
       <div class='centerRight'>
620
       isShowDayPrescription: false,
620
       isShowDayPrescription: false,
621
       monthCustomTabIndex: 1,
621
       monthCustomTabIndex: 1,
622
       order_status: '',
622
       order_status: '',
623
+      is_medicine_status:false,
623
       register_types: [
624
       register_types: [
624
         { id: 1, name: '医保' },
625
         { id: 1, name: '医保' },
625
         { id: 2, name: '自费' }
626
         { id: 2, name: '自费' }
1861
         this.order_status = ''
1862
         this.order_status = ''
1862
       }
1863
       }
1863
 
1864
 
1865
+     this.is_medicine_status = this.curPrescriptions.is_medicine_status
1864
       if (this.curPrescriptions.order_status == 1) {
1866
       if (this.curPrescriptions.order_status == 1) {
1865
         this.order_status = '未收费'
1867
         this.order_status = '未收费'
1866
       }
1868
       }
1918
         this.curPrescriptions = {}
1920
         this.curPrescriptions = {}
1919
       }
1921
       }
1920
 
1922
 
1923
+      this.is_medicine_status = this.curPrescriptions.is_medicine_status
1924
+
1921
       if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1925
       if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1922
         this.curStatus = 1
1926
         this.curStatus = 1
1923
         this.customTabIndex = 1
1927
         this.customTabIndex = 1

+ 5 - 2
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue 查看文件

230
 
230
 
231
 
231
 
232
                     </div>
232
                     </div>
233
-                  <span   v-if="dayorMonth =='day'&&curPrescriptions.advices.length > 0"  :class="!curPrescriptions.is_medicine_status ? 'statusRed' : ''">{{curPrescriptions.is_medicine_status?'已发药':'未发药'}}</span>
234
-                  <span   v-else></span>
233
+                  <span    :class="!is_medicine_status ? 'statusRed' : ''">{{is_medicine_status?'已发药':'未发药'}}</span>
235
 
234
 
236
                   <span :class="order_status == '未收费' ? 'statusRed' : ''">{{order_status}}</span>
235
                   <span :class="order_status == '未收费' ? 'statusRed' : ''">{{order_status}}</span>
237
                 </div>
236
                 </div>
622
         isShowDayPrescription: false,
621
         isShowDayPrescription: false,
623
         monthCustomTabIndex: 1,
622
         monthCustomTabIndex: 1,
624
         order_status: '',
623
         order_status: '',
624
+        is_medicine_status:false,
625
         register_types: [
625
         register_types: [
626
           { id: 1, name: '医保' },
626
           { id: 1, name: '医保' },
627
           { id: 2, name: '自费' }
627
           { id: 2, name: '自费' }
1856
           }
1856
           }
1857
 
1857
 
1858
         }
1858
         }
1859
+        this.is_medicine_status = this.curPrescriptions.is_medicine_status
1859
         if (this.curPrescriptions.order_status == 0) {
1860
         if (this.curPrescriptions.order_status == 0) {
1860
           this.order_status = ''
1861
           this.order_status = ''
1861
         }
1862
         }
1885
 
1886
 
1886
       },
1887
       },
1887
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
1888
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info,sick,diagnoses) {
1889
+
1888
         this.sick = sick
1890
         this.sick = sick
1889
         this.diagnoses = diagnoses
1891
         this.diagnoses = diagnoses
1890
         this.department = department
1892
         this.department = department
1915
         } else {
1917
         } else {
1916
           this.curPrescriptions = {}
1918
           this.curPrescriptions = {}
1917
         }
1919
         }
1920
+        this.is_medicine_status =  this.curPrescriptions.is_medicine_status
1918
 
1921
 
1919
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1922
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1920
           this.curStatus = 1
1923
           this.curStatus = 1