Bladeren bron

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

yq1 9 maanden geleden
bovenliggende
commit
6e82c00824
1 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 4 2
      src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

+ 4 - 2
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Bestand weergeven

223
                                 </el-button>
223
                                 </el-button>
224
 
224
 
225
                                 <el-button
225
                                 <el-button
226
-                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
226
+                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
227
                                   size="small"
227
                                   size="small"
228
                                   @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
228
                                   @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
229
                                   type="primary"
229
                                   type="primary"
3404
         form['record_time'] = this.record_date
3404
         form['record_time'] = this.record_date
3405
         form['ids'] = this.temp_ids
3405
         form['ids'] = this.temp_ids
3406
         var time_arr = this.form.diagnosis_time.split(" ")
3406
         var time_arr = this.form.diagnosis_time.split(" ")
3407
-        let hh = new Date().getHours();
3407
+        let hh =  new Date().getHours() < 10
3408
+          ? "0" + new Date().getHours()
3409
+          : new Date().getHours();
3408
         let mf =
3410
         let mf =
3409
           new Date().getMinutes() < 10
3411
           new Date().getMinutes() < 10
3410
             ? "0" + new Date().getMinutes()
3412
             ? "0" + new Date().getMinutes()