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/outpatientChargesManagement.vue

@@ -885,7 +885,7 @@
             this.hisPatientDatas = response.data.data.list_two
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
-            this.all_charge_table_data = response.data.data.charge_list
+
             this.cal_three = three_count
             this.current_index = 0
 
@@ -921,7 +921,10 @@
 
                   }
                   this.chargePatientTableData.push(obj)
+
                 }
+                this.all_charge_table_data =this.chargePatientTableData
+
 
                 if (this.chargePatientTableData.length > 0) {
                   for (let i = 0; i < this.chargePatientTableData.length; i++) {
@@ -998,7 +1001,7 @@
 
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
-            this.all_charge_table_data = response.data.data.charge_list
+            // this.all_charge_table_data = response.data.data.charge_list
             this.cal_three = three_count
             this.current_index = 0
 
@@ -1033,7 +1036,10 @@
 
                   }
                   this.chargePatientTableData.push(obj)
+
                 }
+                this.all_charge_table_data =this.chargePatientTableData
+
                 for (let i = 0; i < this.chargePatientTableData.length; i++) {
                   if (this.patientInfo.id == this.chargePatientTableData[i].id) {
                     this.current_index = i
@@ -2071,7 +2077,7 @@
 
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
-            this.all_charge_table_data = response.data.data.charge_list
+            // this.all_charge_table_data = response.data.data.charge_list
             this.cal_three = three_count
 
             switch (temp_id) {
@@ -2107,6 +2113,8 @@
                   }
                   this.chargePatientTableData.push(obj)
                 }
+                this.all_charge_table_data =this.chargePatientTableData
+
                 for (let i = 0; i < this.chargePatientTableData.length; i++) {
                   if (this.patientInfo.id == this.chargePatientTableData[i].id) {
                     this.current_index = i
@@ -2225,7 +2233,7 @@
 
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
-            this.all_charge_table_data = response.data.data.charge_list
+            // this.all_charge_table_data = response.data.data.charge_list
             // this.cal_three = three_count;
 
             switch (temp_id) {
@@ -2269,6 +2277,8 @@
                   }
                   this.chargePatientTableData.push(obj)
                 }
+                this.all_charge_table_data =this.chargePatientTableData
+
 
                 this.current_index = 0
                 this.$refs.tab.setCurrentRow(this.chargePatientTableData[0])
@@ -2362,7 +2372,7 @@
             this.hisPatientDatas = response.data.data.list_two
             this.cal_one = one_count
             this.cal_two = response.data.data.charge_list.length
-            this.all_charge_table_data = response.data.data.charge_list
+            // this.all_charge_table_data = response.data.data.charge_list
             this.current_index = 0
 
             switch (this.radio) {
@@ -2390,6 +2400,8 @@
                   }
                   this.chargePatientTableData.push(obj)
                 }
+                this.all_charge_table_data =this.chargePatientTableData
+
                 this.$refs.tab.setCurrentRow(this.chargePatientTableData[0])
                 this.getPatientInformation(this.chargePatientTableData[0].id, this.chargePatientTableData[0].number, this.patientTableData[0].his_patient_id)
                 break

src/xt_pages/hospitalStation/summary.vue

@@ -502,6 +502,7 @@
         }
 
       }, toRefund(row) {
+        console.log("~~~~~~~")
         if (row.his_hospital_patient.balance_accounts_type != 2) {
           var that = this
           this.$confirm('是否退费', '退费', {
@@ -549,9 +550,7 @@
             type: 'warning'
           }).then(() => {
             let params = {
-              'order_id': this.order.id,
-              'patient_id': this.patientInfo.id,
-              'record_time': this.record_date
+              'order_id': row.id,
 
             }
             HopitalunRefund(params).then(response => {