Sfoglia il codice sorgente

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

csx 3 anni fa
parent
commit
e0a452b6d7

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

112
             </el-button>
112
             </el-button>
113
 
113
 
114
             <el-button v-loading="loadingtwo"
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
                        size="small"
116
                        size="small"
117
                        @click="open(3)"
117
                        @click="open(3)"
118
                        type="primary">收费
118
                        type="primary">收费
119
             </el-button>
119
             </el-button>
120
 
120
 
121
             <el-button v-loading="loadingtwo"
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
                        size="small"
123
                        size="small"
124
                        @click="open(3)"
124
                        @click="open(3)"
125
                        type="primary">收费
125
                        type="primary">收费