Pārlūkot izejas kodu

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

yq1 9 mēnešus atpakaļ
vecāks
revīzija
9f2e3590da

+ 15 - 3
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Parādīt failu

223
                                 </el-button>
223
                                 </el-button>
224
 
224
 
225
                                 <el-button
225
                                 <el-button
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)"
226
+                                  v-if="(hisPatientInfo.id_card_type != 3  && 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"
1770
           this.loadingone = false
1770
           this.loadingone = false
1771
           return false
1771
           return false
1772
         } else {
1772
         } else {
1773
-          if(response.data.data.status = 1){
1773
+          if(response.data.data.status == 1){
1774
+
1774
             this.$refs.call_prescription.show(this.patientInfo.name, this.patientInfo.id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
1775
             this.$refs.call_prescription.show(this.patientInfo.name, this.patientInfo.id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
1775
           }
1776
           }
1776
         }
1777
         }
3402
         form['his_patient_id'] = this.hisPatientInfo.id
3403
         form['his_patient_id'] = this.hisPatientInfo.id
3403
         form['record_time'] = this.record_date
3404
         form['record_time'] = this.record_date
3404
         form['ids'] = this.temp_ids
3405
         form['ids'] = this.temp_ids
3405
-        form['begin_time'] = this.form.diagnosis_time
3406
+        var time_arr = this.form.diagnosis_time.split(" ")
3407
+        let hh = new Date().getHours();
3408
+        let mf =
3409
+          new Date().getMinutes() < 10
3410
+            ? "0" + new Date().getMinutes()
3411
+            : new Date().getMinutes();
3412
+        let ss =
3413
+          new Date().getSeconds() < 10
3414
+            ? "0" + new Date().getSeconds()
3415
+            : new Date().getSeconds();
3416
+        var new_time  = time_arr[0] + " " + hh+":"+mf+":"+ss
3417
+        form['begin_time'] = new_time
3406
         form['p_type'] = med_type
3418
         form['p_type'] = med_type
3407
         form['diagnosis'] = this.form.diagnosis.join(',')
3419
         form['diagnosis'] = this.form.diagnosis.join(',')
3408
         form['sick_type'] = this.form.sick_type
3420
         form['sick_type'] = this.form.sick_type