11

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -119,7 +119,7 @@
 
                       </el-tab-pane>
 
-                      <charge-month-prescription-table v-if="this.radio == 1"
+                      <charge-month-prescription-table v-loading="loading_two" v-if="this.radio == 1"
                                                        :prescription="curPrescriptions"></charge-month-prescription-table>
 
                     </el-tabs>
@@ -232,23 +232,18 @@
                       <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
                       <!--<month-prescription-table ref="prescription_tables"-->
                       <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
-                      <charge-month-prescription-table v-if="this.radio == 1"
+                      <charge-month-prescription-table v-loading="loading_two" v-if="this.radio == 1"
                                                        :prescription="curMonthPrescriptions"></charge-month-prescription-table>
 
-                      <settle-prescription-table v-if="this.radio == 2"
+                      <settle-prescription-table v-loading="loading_two"  v-if="this.radio == 2"
                                                  :prescription="curMonthPrescriptions"></settle-prescription-table>
-
                     </el-tabs>
-
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>
                     <span>处方总价：<span style="color:red;">{{ all_month_total }}元</span></span>
-
-
                   </div>
                 </div>
-
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -306,6 +301,7 @@ export default {
       dialogVisible:false,
       charge_type:1,
       isloading: false,
+      loading_two:false,
       isdisabled: false,
       register: [
         { value: 1, label: '门诊' },
@@ -822,7 +818,7 @@ export default {
           .catch(function(error) {
           })
       }
-    }, 
+    },
 
     changePatientInfo() {
       let params = {
@@ -894,6 +890,7 @@ export default {
       }
       getZuoBiaoPatientList(params).then(response => {
         if (response.data.state == 0) {
+
           this.$message.error(response.data.msg)
           return false
         } else {
@@ -1281,18 +1278,23 @@ export default {
         'is_upload': this.radio
       }
       this.loading = true
+      this.loading_two = true
       getZuoBiaoPatientInfo(params).then(response => {
         if (response.data.state == 0) {
           this.loading = false
+          this.loading_two = false
+
           this.$message.error(response.data.msg)
           return false
         } else {
+          this.loading_two = false
+
+          this.loading = false
 
           this.prescriptions = []
           this.month_prescriptions = []
           this.curPrescriptions = {}
           this.curMonthPrescriptions = {}
-          this.loading = false
           this.hisPatientInfo = response.data.data.patient
           this.prescription_info = response.data.data.prescription_info
           this.sick_type = this.prescription_info.sick_type

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -334,7 +334,9 @@
       },getfapiaonumber(){
         getfapiaonumber().then((res) => {
           if (res.data.state == 1) {
-            this.form.fapiao_number = res.data.data.fapiao_number;
+            if(this.$store.getters.xt_user.org.id != 10644) {
+              this.form.fapiao_number = res.data.data.fapiao_number;
+            }
           }
         })
       },