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

@@ -133,7 +133,7 @@
                                                             >预结算
                                                             </el-button>
                                                             <el-button
-                                                                    v-if="items.curPrescriptions.order.order_status == 1 && items.curPrescriptions.order.is_pre == 1 && hisPatientInfo.balance_accounts_type != 2"
+                                                                    v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2"
                                                                     size="small" @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)" type="primary"
                                                             >撤销明细
                                                             </el-button>