mainqaq 2 years ago
parent
commit
9e179886c7

+ 1 - 0
src/xt_pages/Pharmacy/DrugDispensing.vue View File

423
           this.handleCurrentChange(this.currentRow);
423
           this.handleCurrentChange(this.currentRow);
424
           this.fun4(tps);
424
           this.fun4(tps);
425
           this.state = 2;
425
           this.state = 2;
426
+          this.multipleSelection = []
426
         }else{
427
         }else{
427
           this.$message.error("操作失败:" + res.data.msg)
428
           this.$message.error("操作失败:" + res.data.msg)
428
           //刷新列表
429
           //刷新列表

+ 3 - 3
src/xt_pages/Pharmacy/PatientDispensing.vue View File

249
       })
249
       })
250
     },
250
     },
251
     async fun5(tmp){
251
     async fun5(tmp){
252
-      console.log("fun3")
252
+      console.log("fun5555")
253
       this.fun1().then(val => {
253
       this.fun1().then(val => {
254
         console.log("this.alreadmount_data",this.waitmount_data)
254
         console.log("this.alreadmount_data",this.waitmount_data)
255
         for (let i = 0;i < this.waitmount_data.length;i++){
255
         for (let i = 0;i < this.waitmount_data.length;i++){
256
           console.log("tmp = ",tmp)
256
           console.log("tmp = ",tmp)
257
           if (this.waitmount_data[i].PatientID == tmp){
257
           if (this.waitmount_data[i].PatientID == tmp){
258
             console.log("i = ",i)
258
             console.log("i = ",i)
259
-            this.$refs.table02.setCurrentRow(this.waitmount_data[i]);
259
+            this.$refs.table01.setCurrentRow(this.waitmount_data[i]);
260
             this.handleCurrentChange(this.waitmount_data[i])
260
             this.handleCurrentChange(this.waitmount_data[i])
261
           }
261
           }
262
         }
262
         }
479
             this.gettodaynumber();
479
             this.gettodaynumber();
480
             this.searchAction();
480
             this.searchAction();
481
             this.tableData = null;
481
             this.tableData = null;
482
-            this.fun4(tmp);
482
+            this.fun5(tmp);
483
             this.state = 1;
483
             this.state = 1;
484
           }else {
484
           }else {
485
             this.$message.error(res.data.msg);
485
             this.$message.error(res.data.msg);

+ 8 - 3
src/xt_pages/hospitalStation/components/deskPrescription.vue View File

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

+ 9 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

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
         }
1915
         } else {
1916
         } else {
1916
           this.curPrescriptions = {}
1917
           this.curPrescriptions = {}
1917
         }
1918
         }
1918
-
1919
+        this.is_medicine_status =  this.curPrescriptions.is_medicine_status
1919
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1920
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1920
           this.curStatus = 1
1921
           this.curStatus = 1
1921
           this.customTabIndex = 1
1922
           this.customTabIndex = 1
2651
       },
2652
       },
2652
       addTab(targetName) {
2653
       addTab(targetName) {
2653
 
2654
 
2655
+        console.log("this.prescriptions",this.prescriptions)
2654
         for(let i = 0; i < this.prescriptions.length; i++){
2656
         for(let i = 0; i < this.prescriptions.length; i++){
2655
           if (this.prescriptions[i].is_medicine_status) {
2657
           if (this.prescriptions[i].is_medicine_status) {
2656
             this.$message.error('处方中包含已发药处方,无法新增')
2658
             this.$message.error('处方中包含已发药处方,无法新增')
2746
           type: 'warning'
2748
           type: 'warning'
2747
         }).then(() => {
2749
         }).then(() => {
2748
           let id = 0
2750
           let id = 0
2751
+          console.log("this.prescriptions???",this.prescriptions)
2749
           for (let i = 0; i < this.prescriptions.length; i++) {
2752
           for (let i = 0; i < this.prescriptions.length; i++) {
2750
             if (this.prescriptions[i].name == targetName) {
2753
             if (this.prescriptions[i].name == targetName) {
2751
               id = this.prescriptions[i].id
2754
               id = this.prescriptions[i].id
2780
                 }
2783
                 }
2781
               }
2784
               }
2782
             }
2785
             }
2783
-            console.log("oo233232233232323",this.prescriptions)
2786
+            console.log("oo233ooooosdada",this.prescriptions)
2784
             if (this.prescriptions.length == 0) {
2787
             if (this.prescriptions.length == 0) {
2788
+              console.log("this.curPrescrip的tions前",this.curPrescriptions)
2785
               this.curPrescriptions = []
2789
               this.curPrescriptions = []
2786
               this.curStatus = 0
2790
               this.curStatus = 0
2791
+              console.log("this.curPrescrip的tions后",this.curPrescriptions)
2787
             }
2792
             }
2788
             this.$parent.getInitDataOne(this.prescriptions)
2793
             this.$parent.getInitDataOne(this.prescriptions)
2789
           } else {
2794
           } else {