yaofang

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -423,6 +423,7 @@ export default {
           this.handleCurrentChange(this.currentRow);
           this.fun4(tps);
           this.state = 2;
+          this.multipleSelection = []
         }else{
           this.$message.error("操作失败：" + res.data.msg)
           //刷新列表

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -249,14 +249,14 @@ export default {
       })
     },
     async fun5(tmp){
-      console.log("fun3")
+      console.log("fun5555")
       this.fun1().then(val => {
         console.log("this.alreadmount_data",this.waitmount_data)
         for (let i = 0;i < this.waitmount_data.length;i++){
           console.log("tmp = ",tmp)
           if (this.waitmount_data[i].PatientID == tmp){
             console.log("i = ",i)
-            this.$refs.table02.setCurrentRow(this.waitmount_data[i]);
+            this.$refs.table01.setCurrentRow(this.waitmount_data[i]);
             this.handleCurrentChange(this.waitmount_data[i])
           }
         }
@@ -479,7 +479,7 @@ export default {
             this.gettodaynumber();
             this.searchAction();
             this.tableData = null;
-            this.fun4(tmp);
+            this.fun5(tmp);
             this.state = 1;
           }else {
             this.$message.error(res.data.msg);

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -233,9 +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>
@@ -620,6 +621,7 @@ export default {
       isShowDayPrescription: false,
       monthCustomTabIndex: 1,
       order_status: '',
+      is_medicine_status:false,
       register_types: [
         { id: 1, name: '医保' },
         { id: 2, name: '自费' }
@@ -1861,6 +1863,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 +1921,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 = ''
         }
@@ -1915,7 +1916,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
           this.customTabIndex = 1
@@ -2651,6 +2652,7 @@
       },
       addTab(targetName) {
 
+        console.log("this.prescriptions",this.prescriptions)
         for(let i = 0; i < this.prescriptions.length; i++){
           if (this.prescriptions[i].is_medicine_status) {
             this.$message.error('处方中包含已发药处方,无法新增')
@@ -2746,6 +2748,7 @@
           type: 'warning'
         }).then(() => {
           let id = 0
+          console.log("this.prescriptions???",this.prescriptions)
           for (let i = 0; i < this.prescriptions.length; i++) {
             if (this.prescriptions[i].name == targetName) {
               id = this.prescriptions[i].id
@@ -2780,10 +2783,12 @@
                 }
               }
             }
-            console.log("oo233232233232323",this.prescriptions)
+            console.log("oo233ooooosdada",this.prescriptions)
             if (this.prescriptions.length == 0) {
+              console.log("this.curPrescrip的tions前",this.curPrescriptions)
               this.curPrescriptions = []
               this.curStatus = 0
+              console.log("this.curPrescrip的tions后",this.curPrescriptions)
             }
             this.$parent.getInitDataOne(this.prescriptions)
           } else {