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

@@ -328,7 +328,6 @@
         addtions_charge: [],
         treatVisible: false,
         orderObj:{
-          order_id:0
         },
         paramsObj: {
         },
@@ -789,6 +788,10 @@
 
         } else if (index == 9){
           this.statementVisible = true
+          let obj = {
+            order_id:this.order.id
+          }
+          this.orderObj = obj
           // this.$refs.print.getInfo(this.order.id)
 
 

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -13,7 +13,7 @@
       </template>
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :info="info"></printOne>
+        <printOne :info="info"></printOne>
       </div>
   </div>
 </template>
@@ -56,7 +56,7 @@ export default {
       patient_id:0,
       prescription_id:0,
       ids:'',
-      info:{}
+      info:null,
     };
   },
   methods:{
@@ -149,10 +149,12 @@ export default {
     searchAction(){
 
     },
-    getInfo(order_id){
+    getInfo(order_id) {
+      if (this.$store.getters.xt_user.org_id == 4) {
+
         axios.get('http://127.0.0.1:9532/api/settle/query', {
           params: {
-            order_id:order_id,
+            order_id: order_id,
           }
         })
           .then(function (response) {
@@ -160,7 +162,12 @@ export default {
               this.$message.error(response.data.msg)
               return false
             } else {
+              console.log("logloglog")
+
+              console.log(response.data.data.info)
+
               this.info = response.data.data.info
+              console.log(this.info)
 
               this.info['bed_cost_total'] = response.data.data.bedCostTotal
               this.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
@@ -199,24 +206,25 @@ export default {
               this.info['treat_cost_total'] = response.data.data.treatCostTotal
               this.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
               this.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
+              console.log(this.info)
             }
           })
           .catch(function (error) {
 
           });
       }
+    }
 
   },
 
   created() {
-
+    this.getInfo(this.paramsObj.order_id)
   },
   watch:{
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
-        console.log("~~~~~")
-        console.log("~~~~~")
         this.paramsObj = val
+        this.getInfo(this.paramsObj.order_id)
 
       },
       deep:true

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -230,9 +230,14 @@
 </template>
 <script>
   export default {
-    props:{
-      info:Object
-    },
+    props: {
+      info: {
+        type: Object,
+        default: function () {
+          return {};
+        }
+      },
+    }
   }