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

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -294,6 +294,7 @@ export default {
 
     },
     getInfo(order_id,obj) {
+
       if (obj.balance_accounts_type == 2){
         let params = {
           his_patient_id: obj.his_patient_id,
@@ -541,6 +542,7 @@ export default {
   },
 
   created() {
+    console.log(this.paramsObj)
     this.getInfo(this.paramsObj.order_id,this.paramsObj);
     this.org_id = this.$store.getters.xt_user.org_id;
     console.log("this.org_id",this.org_id)
@@ -548,7 +550,10 @@ export default {
   watch:{
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
+
         this.paramsObj = val;
+        console.log(this.paramsObj)
+
         this.getInfo(this.paramsObj.order_id,this.paramsObj)
 
       },

src/xt_pages/outpatientCharges/summary.vue

@@ -429,7 +429,8 @@
           order_id: row.id,
           settle_type: row.settle_type,
           start_time: row.settle_start_time,
-          end_time: row.settle_end_time
+          end_time: row.settle_end_time,
+          balance_accounts_type:row.his_patient.balance_accounts_type
         }
         this.orderObj = obj
 

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -256,7 +256,7 @@
           }
           for (let b = 0; b < prescription.project.length; b++) {
             if(prescription.project[b].type == 2){
-              if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+              if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
                 prescription.project.splice(b--,1)
               }
             }else if(prescription.project[b].type == 3){

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -307,7 +307,7 @@
           }
           for (let b = 0; b < prescription.project.length; b++) {
             if(prescription.project[b].type == 2){
-              if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+              if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
                 prescription.project.splice(b--,1)
               }
             }else if(prescription.project[b].type == 3){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1446,7 +1446,7 @@
                   }
                   for (let b = 0; b < prescription.project.length; b++) {
                     if(prescription.project[b].type == 2){
-                      if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                      if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
                         prescription.project.splice(b--,1)
                       }
                     }else if(prescription.project[b].type == 3){
@@ -1830,7 +1830,7 @@
                         }
                         for (let b = 0; b < prescription.project.length; b++) {
                           if(prescription.project[b].type == 2){
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                            if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
                               prescription.project.splice(b--,1)
                             }
                           }else if(prescription.project[b].type == 3){
@@ -2301,7 +2301,7 @@
                         }
                         for (let b = 0; b < prescription.project.length; b++) {
                           if(prescription.project[b].type == 2){
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                            if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
                               prescription.project.splice(b--,1)
                             }
                           }else if(prescription.project[b].type == 3){
@@ -2760,7 +2760,7 @@
                       }
                       for (let b = 0; b < prescription.project.length; b++) {
                         if(prescription.project[b].type == 2){
-                          if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                          if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
                             prescription.project.splice(b--,1)
                           }
                         }else if(prescription.project[b].type == 3){
@@ -3286,7 +3286,7 @@
                         }
                         for (let b = 0; b < prescription.project.length; b++) {
                           if(prescription.project[b].type == 2){
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                            if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
                               prescription.project.splice(b--,1)
                             }
                           }else if(prescription.project[b].type == 3){
@@ -3833,7 +3833,7 @@
                         }
                         for (let b = 0; b < prescription.project.length; b++) {
                           if(prescription.project[b].type == 2){
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
+                            if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
                               prescription.project.splice(b--,1)
                             }
                           }else if(prescription.project[b].type == 3){

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -401,6 +401,34 @@
           }
         }
 
+
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          for(let b = 0; b < this.prescriptions[i].advices.length; b++){
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，开非特病类型的药")
+              return
+            }
+
+          }
+
+          for(let c = 0; c < this.prescriptions[i].project.length; c++){
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 2  && this.prescriptions[i].project[c].project.disease_directory != 1) {
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，请开特病类型的项目")
+              return
+            }
+
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 3  && this.prescriptions[i].project[c].good_info.is_special_diseases != 1) {
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方，请开特病类型的耗材")
+              return　
+            }
+          }
+        }
+
+
+
+
+
+
         let params = {
           name: this.tempForm.name,
           mode_id: this.tempForm.mode_id,