Browse Source

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

28169 6 months ago
parent
commit
00ff3b01cd

+ 1 - 1
src/xt_pages/eleFaPiao/settleDetail.vue View File

@@ -168,7 +168,7 @@
168 168
               下载
169 169
             </el-button>
170 170
 
171
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0 && scope.row.result.fapiao_status == '2'"
171
+            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"
172 172
                        @click="chaxun(scope.row)">
173 173
               查询并同步发票号码
174 174
             </el-button>

+ 3 - 3
src/xt_pages/outpatientCharges/summary.vue View File

@@ -72,7 +72,7 @@
72 72
                      type="primary" @click="export_detail_ten_two">报表下载3
73 73
           </el-button>
74 74
 
75
-          
75
+
76 76
         </div>
77 77
       </div>
78 78
 
@@ -222,10 +222,10 @@
222 222
 
223 223
         <el-table-column align="center" width="60" prop="name" label="收费类型">
224 224
           <template slot-scope="scope">
225
-            <div v-if="scope.row.his_patient.balance_accounts_type != 2">
225
+            <div v-if="scope.row.is_medicine_insurance == 1">
226 226
               医保
227 227
             </div>
228
-            <div v-if="scope.row.his_patient.balance_accounts_type == 2">
228
+            <div v-if="scope.row.is_medicine_insurance != 1">
229 229
               自费
230 230
             </div>
231 231
           </template>