Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -157,7 +157,8 @@
             </el-table-column>
             <el-table-column align="center" prop="project_name" label="规格">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.project_name }}</span>
+                  <span v-if="scope.row.type==2">{{ scope.row.project_name }}</span>
+                  <span v-if="scope.row.type==3">{{ scope.row.good_info.specification_name }}</span>
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
@@ -772,11 +773,13 @@
       this.getInitData()
 
     },
+    created(){
+      console.log('prescription',this.prescription);
+    },
     watch: {
       'prescription.advices': {
         handler(newVal, oldVal) {
-          console.log("检查我我我我",this.prescription.advices)
-          console.log("检查我我我我",this.prescription.project)
+          console.log("检查我我我我",this.prescription)
         },
         deep: true
       }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1995,7 +1995,7 @@ export default {
           this.case_history.physical_examination = this.case_history.physical_examination
           this.case_history.special_inspection = this.case_history.special_inspection
           this.case_history.lab_apparatus = this.case_history.lab_apparatus
-    
+
           //处方相关
           this.prescriptionList = response.data.data.prescription
 
@@ -2104,7 +2104,7 @@ export default {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
-                    } else if(this.org_id == 10206 ){
+                    } else if(this.org_id == 10206 || this.org_id == 10598){
                       preTime = this.record_date + ' ' + '6:00'
                     } else {
                       preTime = this.record_date + ' ' + '7:00'
@@ -2135,7 +2135,7 @@ export default {
                   if(nowTime.split(" ")[0] != this.record_date){
                     // preTime = this.record_date
                     if(this.schedule.schedule_type == 1){
-                      if(this.org_id == 10206  || this.org_id == 0) {
+                      if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                         preTime = this.record_date+ ' ' + '6:00'
                       }else {
                         preTime = this.record_date + ' ' + '7:00'
@@ -2299,7 +2299,7 @@ export default {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
-                    } else if(this.org_id == 10206  ) {
+                    } else if(this.org_id == 10206  || this.org_id == 10598) {
                       preTime = this.record_date+ ' ' + '6:00'
                     } else {
                       preTime = this.record_date + ' ' + '7:00'
@@ -2318,7 +2318,7 @@ export default {
 
                 if(nowTime.split(" ")[0] != this.record_date){
                   if(this.schedule.schedule_type == 1){
-                    if(this.org_id == 10206  || this.org_id == 0) {
+                    if(this.org_id == 10206  || this.org_id == 0 ||  this.org_id == 10598) {
                       preTime = this.record_date+ ' ' + '6:00'
                     }else {
                       preTime = this.record_date + ' ' + '7:00'
@@ -2374,7 +2374,7 @@ export default {
               if(nowTime.split(" ")[0] != this.record_date){
                 // preTime = this.record_date
                 if(this.schedule.schedule_type == 1){
-                  if(this.org_id == 10206  || this.org_id == 0) {
+                  if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                     preTime = this.record_date+ ' ' + '6:00'
                   }else {
                     preTime = this.record_date + ' ' + '7:00'
@@ -2678,7 +2678,7 @@ export default {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206 ){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -2701,7 +2701,7 @@ export default {
                       if (prescription.pre_time == 0) {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0) {
+                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -2866,7 +2866,7 @@ export default {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -2887,7 +2887,7 @@ export default {
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -2936,7 +2936,7 @@ export default {
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
@@ -3323,7 +3323,7 @@ export default {
                       // preTime = nowTime
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -3480,7 +3480,7 @@ export default {
                       var preTime = nowTime
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -3527,7 +3527,7 @@ export default {
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
@@ -3900,7 +3900,7 @@ export default {
                     // preTime = nowTime
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
@@ -4056,7 +4056,7 @@ export default {
                     var preTime = nowTime
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
@@ -4104,7 +4104,7 @@ export default {
                 } else {
                   if(nowTime.split(" ")[0] != this.record_date){
                     if(this.schedule.schedule_type == 1){
-                      if(this.org_id == 10206  || this.org_id == 0) {
+                      if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                         preTime = this.record_date+ ' ' + '6:00'
                       }else {
                         preTime = this.record_date + ' ' + '7:00'
@@ -4564,7 +4564,7 @@ export default {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
 
                             preTime = this.record_date + ' ' + '6:00'
 
@@ -4592,7 +4592,7 @@ export default {
                         // preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0) {
+                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -4755,7 +4755,7 @@ export default {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date+ ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -4773,7 +4773,7 @@ export default {
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -4828,7 +4828,7 @@ export default {
 
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
@@ -5191,7 +5191,7 @@ export default {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -5215,7 +5215,7 @@ export default {
                         preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0) {
+                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -5379,7 +5379,7 @@ export default {
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -5398,7 +5398,7 @@ export default {
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
@@ -5452,7 +5452,7 @@ export default {
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -166,6 +166,7 @@
       >
       </el-pagination>
       <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
+
       <el-dialog
           class="centerDialog"
           width="600px"
@@ -213,7 +214,7 @@ import { uParseTime } from '@/utils/tools'
 import print from './batch_print_template/index'
 import treatPrint from './batch_print_treatTemplate/index'
 import checkPrint from './batch_print_checkTemplate/index'
-
+import prints from "print-js";
 export default {
   components: {
     BreadCrumb,
@@ -425,17 +426,14 @@ export default {
         }
         getBatchPrint(params).then((res) => {
           let Arr = res.data.data.patients
-
           let new_patients = []
           if (type != 3) {
-
             if (type == 1){
               Arr.forEach((i) => {
                 if (i.prescriptions.length != 0) {
                   new_patients.push(i)
                 }
               })
-
             }else {
               Arr.forEach((i) => {
                 if (i.prescriptions.length != 0) {