Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -223,7 +223,7 @@
                                 </el-button>
 
                                 <el-button
-                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
+                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
                                   size="small"
                                   @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                   type="primary"
@@ -3404,7 +3404,9 @@ export default {
         form['record_time'] = this.record_date
         form['ids'] = this.temp_ids
         var time_arr = this.form.diagnosis_time.split(" ")
-        let hh = new Date().getHours();
+        let hh =  new Date().getHours() < 10
+          ? "0" + new Date().getHours()
+          : new Date().getHours();
         let mf =
           new Date().getMinutes() < 10
             ? "0" + new Date().getMinutes()