Browse Source

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

csx 3 years ago
parent
commit
e0a452b6d7
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/xt_pages/hospitalStation/outpatientChargesManagement.vue

+ 2 - 2
src/xt_pages/hospitalStation/outpatientChargesManagement.vue View File

@@ -112,14 +112,14 @@
112 112
             </el-button>
113 113
 
114 114
             <el-button v-loading="loadingtwo"
115
-                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1) || (this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 1) ||   (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 3)"
115
+                       v-if="(this.radio == 1 && this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1) || (this.activeName != 'first' &&this.hisPatientInfo.balance_accounts_type != 2 &&  this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 1) ||   (this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1 && this.order.order_status == 3)"
116 116
                        size="small"
117 117
                        @click="open(3)"
118 118
                        type="primary">收费
119 119
             </el-button>
120 120
 
121 121
             <el-button v-loading="loadingtwo"
122
-                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
122
+                       v-if="(this.radio == 1 &&this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
123 123
                        size="small"
124 124
                        @click="open(3)"
125 125
                        type="primary">收费