Commit 44a21bee authored by 任鸿志's avatar 任鸿志

fix(components): 修复结算时间和发票相关问题

- 修改 SFCCardlist 组件中的日期选择器类型,从 datetimerange 改为 daterange
- 更新结算历史 API 调用时的时间格式,添加开始和结束时间的具体时分秒
- 修正 invoicepost 组件中的患者信息获取和传递逻辑
- 更新发票开具 API 调用时的参数,使用正确的患者信息
parent 29e5c35b
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<el-input v-model="ruleForm.job_number"></el-input> <el-input v-model="ruleForm.job_number"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="结算时间"> <el-form-item label="结算时间">
<el-date-picker v-model="jsDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> <el-date-picker v-model="jsDate" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -629,8 +629,8 @@ export default { ...@@ -629,8 +629,8 @@ export default {
id_card: this.ruleForm.cardid, id_card: this.ruleForm.cardid,
his_patient_id: this.ruleForm.id, his_patient_id: this.ruleForm.id,
operator_code: this.ruleForm.job_number, operator_code: this.ruleForm.job_number,
start_time: this.jsDate[0] ? this.jsDate[0] : '', start_time: this.jsDate[0] ? this.jsDate[0]+' 00:00:00' : '',
end_time: this.jsDate[1] ? this.jsDate[1] : '', end_time: this.jsDate[1] ? this.jsDate[1]+' 23:59:59' : '',
// ...this.ruleForm // ...this.ruleForm
} }
settlement_history(this.param) settlement_history(this.param)
......
...@@ -89,6 +89,12 @@ export default { ...@@ -89,6 +89,12 @@ export default {
formRef: null, formRef: null,
isOpenCardeds: false, isOpenCardeds: false,
outinvoicform: { outinvoicform: {
patient:{
name: '',
his_id: '',
id_card: '',
},
payerType: '1', payerType: '1',
id_card: '', id_card: '',
jshId: '', jshId: '',
...@@ -106,7 +112,7 @@ export default { ...@@ -106,7 +112,7 @@ export default {
if (v === true) { if (v === true) {
this.$nextTick(() => { this.$nextTick(() => {
this.outinvoicform.jshId = this.patientData.jshid this.outinvoicform.jshId = this.patientData.jshid
this.outinvoicform.id_card = this.patientData.id_card this.outinvoicform.id_card = this.patientData.id_card_number
this.outinvoicform.mobile = this.patientData.patient.phone this.outinvoicform.mobile = this.patientData.patient.phone
this.outinvoicform.name = this.patientData.patient.name this.outinvoicform.name = this.patientData.patient.name
this.outinvoicform.patientId = this.patientData.patient.his_id this.outinvoicform.patientId = this.patientData.patient.his_id
...@@ -122,13 +128,13 @@ export default { ...@@ -122,13 +128,13 @@ export default {
// 开票 // 开票
async InvoicingFun() { async InvoicingFun() {
let param = { let param = {
cardNo: this.form.cardNo, cardNo: this.outinvoicform.patient.his_id,
idCard:this.outinvoicform.idCard, idCard:this.outinvoicform.id_card,
jobNumber: localStorage.getItem('jobNumber') ?? '', jobNumber: localStorage.getItem('jobNumber') ?? '',
jshId: this.outinvoicform.jshId, jshId: this.outinvoicform.jshId,
mobile: this.outinvoicform.mobile, mobile: this.outinvoicform.mobile,
name: this.outinvoicform.name, name: this.outinvoicform.name,
patientId: this.outinvoicform.patientId, patientId: this.outinvoicform.patient.his_id,
payerType: this.outinvoicform.payerType, payerType: this.outinvoicform.payerType,
rcptNo: this.outinvoicform.jshId, rcptNo: this.outinvoicform.jshId,
totalAmount: this.outinvoicform.totalAmount, totalAmount: this.outinvoicform.totalAmount,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment