diff --git a/src/api/manage/signRecord.js b/src/api/manage/signRecord.js new file mode 100644 index 0000000..65094a4 --- /dev/null +++ b/src/api/manage/signRecord.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询签约记录列表 +export function listSignRecord(query) { + return request({ + url: '/manage/signRecord/list', + method: 'get', + params: query + }) +} + +// 查询签约记录详细 +export function getSignRecord(id) { + return request({ + url: '/manage/signRecord/' + id, + method: 'get' + }) +} + +// 新增签约记录 +export function addSignRecord(data) { + return request({ + url: '/manage/signRecord', + method: 'post', + data: data + }) +} + +// 修改签约记录 +export function updateSignRecord(data) { + return request({ + url: '/manage/signRecord', + method: 'put', + data: data + }) +} + +// 删除签约记录 +export function delSignRecord(id) { + return request({ + url: '/manage/signRecord/' + id, + method: 'delete' + }) +} diff --git a/src/api/manage/signingRecords.js b/src/api/manage/signingRecords.js new file mode 100644 index 0000000..c64af87 --- /dev/null +++ b/src/api/manage/signingRecords.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + + +// 根据患者主键查询签约记录 +export function getByPatient(patientId) { + return request({ + url: `/manage/signRecord/getByPatient/${patientId}`, + method: 'get', + }) +} + +// 根据签约记录表主键查询签约详情 +export function getByRecordId(patientSignRecordId) { + return request({ + url: `/manage/signRecord/getByRecordId/${patientSignRecordId}`, + method: 'get', + }) +} \ No newline at end of file diff --git a/src/assets/manage/gld.png b/src/assets/manage/gld.png index a9b9bcd..1003e99 100644 Binary files a/src/assets/manage/gld.png and b/src/assets/manage/gld.png differ diff --git a/src/assets/manage/gzh.png b/src/assets/manage/gzh.png index a2aa156..ccc9bec 100644 Binary files a/src/assets/manage/gzh.png and b/src/assets/manage/gzh.png differ diff --git a/src/assets/manage/xcx.png b/src/assets/manage/xcx.png index 6dba3a4..e063fb7 100644 Binary files a/src/assets/manage/xcx.png and b/src/assets/manage/xcx.png differ diff --git a/src/views/manage/components/healthEducation.vue b/src/views/manage/components/healthEducation.vue index c9e8d6e..80b2804 100644 --- a/src/views/manage/components/healthEducation.vue +++ b/src/views/manage/components/healthEducation.vue @@ -48,16 +48,6 @@ export default { name: "healthEducation", data() { return { - pickerOptions: { - disabledDate(time) { - return time.getTime() > Date.now(); //禁止选择今天以后的时间 - }, - }, - //选择时间区间 - datePickerStart: "", - datePickerEnd: "", - //右侧标题选中 - recordindex: 0, //左侧类型选中 categoryindex: 0, //左侧选中的item diff --git a/src/views/manage/components/indicatorMonitoring.vue b/src/views/manage/components/indicatorMonitoring.vue index 940c63b..b391a76 100644 --- a/src/views/manage/components/indicatorMonitoring.vue +++ b/src/views/manage/components/indicatorMonitoring.vue @@ -20,16 +20,6 @@ export default { name: "indicatorMonitoring", data() { return { - pickerOptions: { - disabledDate(time) { - return time.getTime() > Date.now(); //禁止选择今天以后的时间 - }, - }, - //选择时间区间 - datePickerStart: "", - datePickerEnd: "", - //右侧标题选中 - recordindex: 0, //左侧类型选中 categoryindex: 0, //左侧选中的item diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue index 4f718cb..3176a50 100644 --- a/src/views/manage/components/signingRecords.vue +++ b/src/views/manage/components/signingRecords.vue @@ -3,13 +3,9 @@
-
{{ item.time }} +
{{ item.signTime }}
-
- {{ item.name }} -
-
- {{ item.text }} +
{{ item.packageName }}
服务中 @@ -18,66 +14,91 @@
- kooriookami - 18100000000 - 苏州市 - 苏州市 - 苏州市 - 苏州市 + {{ ByRecord.hospitalAgencyName }} + {{ ByRecord.departmentName }} + {{ ByRecord.signDiagnosis }} + {{ ByRecord.campusAgencyName }} + {{ ByRecord.wardName }} + {{ ByRecord.reviewDiagnosis }} - kooriookami - 18100000000 - 苏州市 - ￥1188 - 2024-02-19 00:00:00至2024-03-1823:59:59 - 苏州市 1188 号 - 2024-02-19 15:43:40 + {{ ByRecord.packageName }} + {{ + ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES' ? + '未缴费' : '' + }} + {{ ByRecord.serviceEndTime }} + {{ ByRecord.packagePrice }} + {{ ByRecord.serviceStartTime }} + {{ ByRecord.serviceCycle }}月 + {{ ByRecord.signTime }} + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue index 3c0fa0e..d1c6ae7 100644 --- a/src/views/manage/patientInfo/index.vue +++ b/src/views/manage/patientInfo/index.vue @@ -250,7 +250,12 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - this.queryParams.admissionDate = []; + this.admissionDate = []; + this.queryParams.admissionDateStart = null + this.queryParams.admissionDateEnd = null + this.visitTime = [] + this.queryParams.visitTimeStart = null + this.queryParams.visitTimeEnd = null this.resetForm("queryForm"); this.handleQuery(); }, diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue index 6b4a35c..b148522 100644 --- a/src/views/manage/preHospitalized/index.vue +++ b/src/views/manage/preHospitalized/index.vue @@ -486,6 +486,8 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.appointmentDate = [] + this.queryParams.appointmentDateStart = '' this.queryParams.appointmentDateEnd = '' this.resetForm("queryForm"); this.handleQuery(); diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue new file mode 100644 index 0000000..a443544 --- /dev/null +++ b/src/views/manage/signRecord/index.vue @@ -0,0 +1,405 @@ + + + diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue index be453a1..bd83495 100644 --- a/src/views/manage/visitin/index.vue +++ b/src/views/manage/visitin/index.vue @@ -505,6 +505,8 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.admissionDate = [] + this.queryParams.admissionDateStart = '' this.queryParams.admissionDateEnd = '' this.resetForm("queryForm"); this.handleQuery(); diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue index 995ac3b..6ed68d1 100644 --- a/src/views/manage/visitout/index.vue +++ b/src/views/manage/visitout/index.vue @@ -511,6 +511,8 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.dischargeDate = [] + this.queryParams.dischargeDateStart = '' this.queryParams.dischargeDateEnd = '' this.resetForm("queryForm"); this.handleQuery();