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

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -422,7 +422,7 @@
         }
         let searchArray = [];
         PostSearch(key).then(response => {
-          if (response.data.state == 1) {
+          if (response.data.state == 1) {balance_accounts_type
             searchArray = response.data.data.patient;
             cb(searchArray)
           } else {

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -117,15 +117,15 @@
         efs: []
       }
     }, mounted() {
-      getInitData().then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.drugways = response.data.data.drugways
-          this.efs = response.data.data.efs
-        }
-      })
+      // getInitData().then(response => {
+      //   if (response.data.state == 0) {
+      //     this.$message.error(response.data.msg)
+      //     return false
+      //   } else {
+      //     this.drugways = response.data.data.drugways
+      //     this.efs = response.data.data.efs
+      //   }
+      // })
     }, methods:  {
 
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2,7 +2,7 @@
     <div class="main-contain outpatientChargesManagement" v-loading="newLoading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.4)">
+    element-loading-background="rgba(0, 0, 0, 0.8)">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
@@ -4252,17 +4252,5 @@
     }
 
     }
-    .el-icon-loading{
-      font-size: 30px;
-    }
-    .el-loading-spinner .el-loading-text{
-      font-size: 30px;
-    }
-    // .outpatientChargesManagement{
-    //   .el-loading-mask{
-    //     z-index: 5000;
-    //   }
-    // }
-    
 </style>
 

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -264,6 +264,7 @@
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
                 groupno: index,
+                hosp_appr_flag:"1",
               };
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){
                 obj['retail_price'] =  prescription.doctor_advice[b].drug.min_price

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2261,7 +2261,6 @@
                 this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
                 this.prescriptions[i].advices[b].groupno = parseInt(this.prescriptions[i].advices[b].groupno)
 
-
               }
 
               for (let b = 0; b < this.prescriptions[i].project.length; b++) {
@@ -2832,7 +2831,8 @@
                   prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b],
-                  groupno: index + temp_index
+                  groupno: index + temp_index,
+                  hosp_appr_flag:"1",
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -321,6 +321,7 @@
                 id:prescription.doctor_advice[b].drug_id,
                 drug:prescription.doctor_advice[b].drug,
                 groupno:index,
+                hosp_appr_flag:"1"
               };
 
               if (obj.prescribing_number_unit == prescription.doctor_advice[b].drug.min_unit){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1353,7 +1353,8 @@
                     medical_insurance_number: prescription.advices[b].med_list_codg,
                     id: prescription.advices[b].drug_id,
                     drug: prescription.advices[b].drug,
-                    groupno: prescription.advices[b].groupno
+                    groupno: prescription.advices[b].groupno,
+                    hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
 
                   }
                   tempAdvice.push(obj)
@@ -1460,7 +1461,9 @@
                       medical_insurance_number: prescription.advices[b].med_list_codg,
                       id: prescription.advices[b].drug_id,
                       drug: prescription.advices[b].drug,
-                      groupno: index
+                      groupno: index,
+                      hosp_appr_flag:"1",
+
 
                     }
 
@@ -1625,8 +1628,8 @@
 
                   this.month_prescriptions = []
 
-                  var month_prescriptions = response.data.data.month_prescriptions
-                  this.setMonthPrescription(month_prescriptions)
+                  // var month_prescriptions = response.data.data.month_prescriptions
+                  // this.setMonthPrescription(month_prescriptions)
 
                   this.patientInfo = response.data.data.xt_info
                   this.hisPatientInfo = response.data.data.his_info
@@ -1710,7 +1713,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: prescription.advices[b].groupno
+                          groupno: prescription.advices[b].groupno,
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                         }
                         tempAdvice.push(obj)
@@ -1816,7 +1821,9 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index
+                            groupno: index,
+                            hosp_appr_flag: "1",
+
 
                           }
                           console.log('看看数据1：')
@@ -2079,8 +2086,8 @@
 
                   this.month_prescriptions = []
 
-                  var month_prescriptions = response.data.data.month_prescriptions
-                  this.setMonthPrescription(month_prescriptions)
+                  // var month_prescriptions = response.data.data.month_prescriptions
+                  // this.setMonthPrescription(month_prescriptions)
 
                   this.patientInfo = response.data.data.xt_info
                   this.hisPatientInfo = response.data.data.his_info
@@ -2163,7 +2170,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: prescription.advices[b].groupno
+                          groupno: prescription.advices[b].groupno,
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                         }
                         tempAdvice.push(obj)
@@ -2262,7 +2271,10 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index
+                            groupno: index,
+                            hosp_appr_flag: "1",
+
+
 
                           }
                           console.log('看看数据2：')
@@ -2512,8 +2524,8 @@
 
                 this.month_prescriptions = []
 
-                var month_prescriptions = response.data.data.month_prescriptions
-                this.setMonthPrescription(month_prescriptions)
+                // var month_prescriptions = response.data.data.month_prescriptions
+                // this.setMonthPrescription(month_prescriptions)
 
                 this.patientInfo = response.data.data.xt_info
                 this.hisPatientInfo = response.data.data.his_info
@@ -2596,7 +2608,9 @@
                         medical_insurance_number: prescription.advices[b].med_list_codg,
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
-                        groupno: prescription.advices[b].groupno
+                        groupno: prescription.advices[b].groupno,
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                       }
                       tempAdvice.push(obj)
@@ -2695,7 +2709,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: index
+                          groupno: index,
+                          hosp_appr_flag: "1",
+
                         }
                         console.log('看看数据3：')
                         console.log(obj.prescribing_number_unit)
@@ -3090,7 +3106,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: prescription.advices[b].groupno
+                          groupno: prescription.advices[b].groupno,
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                         }
                         tempAdvice.push(obj)
@@ -3196,7 +3214,9 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index
+                            groupno: index,
+                            hosp_appr_flag: "1",
+
                           }
                           console.log('看看数据4：')
                           console.log(obj.prescribing_number_unit)
@@ -3612,7 +3632,9 @@
                           medical_insurance_number: prescription.advices[b].med_list_codg,
                           id: prescription.advices[b].drug_id,
                           drug: prescription.advices[b].drug,
-                          groupno: prescription.advices[b].groupno
+                          groupno: prescription.advices[b].groupno,
+                          hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+
 
                         }
                         tempAdvice.push(obj)
@@ -3718,7 +3740,9 @@
                             medical_insurance_number: prescription.advices[b].med_list_codg,
                             id: prescription.advices[b].drug_id,
                             drug: prescription.advices[b].drug,
-                            groupno: index
+                            groupno: index,
+                            hosp_appr_flag: "1",
+
                           }
                           console.log('看看数据5：')
                           console.log(obj.prescribing_number_unit)