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

@@ -136,8 +136,8 @@
                                                                     size="small" @click="open(11)" type="primary"
                                                             >撤销明细
                                                             </el-button>
-                                                            <div>{{ items.curPrescriptions.order.order_status}}</div>
-                                                            <div>{{ items.prescriptions[0].order.order_status}}</div>
+                                                            <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
+                                                            <!--<div>{{ items.prescriptions[0].order.order_status}}</div>-->
 
 
                                                             <el-button v-loading="loadingtwo"
@@ -3347,6 +3347,12 @@
                   tempAddition.push(obj)
                 }
                 const index = i + 1
+                console.log("~~~~~~~~")
+                console.log( prescription.order)
+                prescription.order.order_status =  prescription.order.order_status.toString()
+                prescription.order.order_status =  parseInt(prescription.order.order_status)
+
+
                 const obj = {
                   id: prescription.id,
                   name: this.getPName(prescription.med_type, index),