Browse Source

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

csx 4 years ago
parent
commit
25013caa4d

+ 7 - 7
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -83,14 +83,14 @@
83 83
           >结算单
84 84
           </el-button>
85 85
 
86
-          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"
87
-          >退号
88
-          </el-button>
86
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"-->
87
+          <!--&gt;退号-->
88
+          <!--</el-button>-->
89 89
 
90
-          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
91
-                     size="small" @click="open(11)" type="primary"
92
-          >撤销明细
93
-          </el-button>
90
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
91
+                     <!--size="small" @click="open(11)" type="primary"-->
92
+          <!--&gt;撤销明细-->
93
+          <!--</el-button>-->
94 94
 
95 95
 
96 96
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->

+ 3 - 3
src/xt_pages/outpatientCharges/statementTemplate/printOne.vue View File

@@ -186,9 +186,9 @@
186 186
             </tr>
187 187
             <tr>
188 188
                 <td>合计</td>
189
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total + info.operation_cost_total + info.other_cost_total + info.material_cost_total + info.western_medicine_cost_total + info.chinese_traditional_medicine_cost_total + info.check_cost_total + info.laboratory_cost_total + info.treat_cost_total}}</td>
190
-                <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total + info.operation_cost_self_total + info.other_cost_self_total + info.material_cost_self_total + info.western_medicine_cost_self_total + info.chinese_traditional_medicine_cost_self_total + info.check_cost_self_total + info.laboratory_cost_self_total + info.treat_cost_self_total}}</td>
191
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total + info.operation_cost_part_self_total + info.other_cost_part_self_total + info.material_cost_part_self_total + info.western_medicine_cost_part_self_total + info.chinese_traditional_medicine_cost_part_self_total + info.check_cost_part_self_total + info.laboratory_cost_part_self_total + info.treat_cost_part_self_total}}</td>
189
+                <td colspan="2" style="text-align:right;padding-right:10px;">{{(info.bed_cost_total + info.operation_cost_total + info.other_cost_total + info.material_cost_total + info.western_medicine_cost_total + info.chinese_traditional_medicine_cost_total + info.check_cost_total + info.laboratory_cost_total + info.treat_cost_total) * 100 /100 }}</td>
190
+                <td style="text-align:right;padding-right:10px;">{{(info.bed_cost_self_total + info.operation_cost_self_total + info.other_cost_self_total + info.material_cost_self_total + info.western_medicine_cost_self_total + info.chinese_traditional_medicine_cost_self_total + info.check_cost_self_total + info.laboratory_cost_self_total + info.treat_cost_self_total)*100/100}}</td>
191
+                <td colspan="2" style="text-align:right;padding-right:10px;">{{(info.bed_cost_part_self_total + info.operation_cost_part_self_total + info.other_cost_part_self_total + info.material_cost_part_self_total + info.western_medicine_cost_part_self_total + info.chinese_traditional_medicine_cost_part_self_total + info.check_cost_part_self_total + info.laboratory_cost_part_self_total + info.treat_cost_part_self_total)*100/100}}</td>
192 192
                 <td style="text-align:right;padding-right:10px;"></td>
193 193
                 <td colspan="2" style="text-align:right;padding-right:10px;"></td>
194 194
                 <td style="text-align:right;padding-right:10px;"></td>

+ 4 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

@@ -85,8 +85,8 @@
85 85
                 v-model="item.pre_time"
86 86
                 type="datetime"
87 87
                 :clearable="false"
88
-                format="yyyy-MM-dd hh:mm"
89
-                value-format="yyyy-MM-dd hh:mm"
88
+                format="yyyy-MM-dd HH:mm"
89
+                value-format="yyyy-MM-dd HH:mm"
90 90
                 placeholder="选择日期">
91 91
               </el-date-picker>
92 92
               <div style="float: right;margin-bottom:5px;margin-right:1%;">
@@ -105,12 +105,12 @@
105 105
                 </el-button>
106 106
               </div>
107 107
             </div>
108
-              
108
+
109 109
 
110 110
             </el-tab-pane>
111 111
             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
112 112
             </el-tab-pane>
113
-            
113
+
114 114
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
115 115
                                 :activeType="customTabIndex"></prescription-table>
116 116
           </el-tabs>