From 228ea4565f396bc4249a2d12de7b0a3d4e442187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 4 Mar 2024 16:47:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/newSigning.js | 10 ++ src/api/manage/signRecord.js | 9 + src/views/manage/blacklist/index.vue | 7 +- src/views/manage/continueSigning/index.vue | 193 +++++++++++++++++++++ src/views/manage/newSigning/index.vue | 134 ++++++++++++-- src/views/manage/patientInfo/index.vue | 2 +- src/views/manage/preHospitalized/index.vue | 2 +- src/views/manage/signRecord/index.vue | 41 +++-- 8 files changed, 366 insertions(+), 32 deletions(-) create mode 100644 src/api/manage/newSigning.js create mode 100644 src/views/manage/continueSigning/index.vue diff --git a/src/api/manage/newSigning.js b/src/api/manage/newSigning.js new file mode 100644 index 0000000..f706f96 --- /dev/null +++ b/src/api/manage/newSigning.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 签约 +export function addsign(data) { + return request({ + url: '/manage/signRecord/sign', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/api/manage/signRecord.js b/src/api/manage/signRecord.js index 65094a4..83b3fa1 100644 --- a/src/api/manage/signRecord.js +++ b/src/api/manage/signRecord.js @@ -42,3 +42,12 @@ export function delSignRecord(id) { method: 'delete' }) } + +//解约 +export function updateSignStatus(data) { + return request({ + url: '/manage/signRecord/updateSignStatus', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue index 22a3e53..8d26afc 100644 --- a/src/views/manage/blacklist/index.vue +++ b/src/views/manage/blacklist/index.vue @@ -135,15 +135,14 @@ - + - + + + + + + + + + + + + + + + 至 + + + + + + + + + +
+ + + + + + + + + + 删除 + +
+ 新增硬件 + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index e396fd8..eb98c24 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -1,41 +1,133 @@ @@ -61,6 +153,18 @@ export default { margin: 0 auto; border-radius: 8px; } + + .btns { + position: absolute; + top: 30px; + right: 30px; + } + + .addbtn { + margin-right: 100px; + float: right; + transform: translateY(-200%); + } } \ No newline at end of file diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue index 41f0a2f..057350f 100644 --- a/src/views/manage/patientInfo/index.vue +++ b/src/views/manage/patientInfo/index.vue @@ -70,7 +70,7 @@ --> - + diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue index b2bc84e..1ecfa27 100644 --- a/src/views/manage/preHospitalized/index.vue +++ b/src/views/manage/preHospitalized/index.vue @@ -89,7 +89,7 @@ --> diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index 568e8cf..d980203 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -4,7 +4,7 @@ - + - + @@ -164,12 +164,10 @@ @@ -182,7 +180,7 @@ From cbe4a2af4521be2f3897f1d01a04ec3eca2db822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 4 Mar 2024 16:56:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/signRecord/index.vue | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index d980203..7287040 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -166,8 +166,7 @@ v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'">签约 详情 - 解约 + 取消签约 续约 @@ -365,13 +364,21 @@ export default { }, /** 解约按钮操作 */ handleDelete(row) { - const ids = row.id || this.ids; - this.$modal.confirm('是否确认解约？').then(function () { - return delSignRecord(ids); - }).then(() => { - this.getList(); - this.$modal.msgSuccess("解约成功"); - }).catch(() => { }); + // const ids = row.id || this.ids; + this.$prompt('原因', '取消签约', { + confirmButtonText: '确定', + cancelButtonText: '取消', + }).then(({ value }) => { + const query = { + id: row.id, + signStatus: 'SEPARATE_SIGN', + separateReason: value, + } + updateSignStatus(query).then(res => { + this.getList(); + this.$modal.msgSuccess("取消签约成功"); + }) + }) }, /** 导出按钮操作 */ handleExport() { From 40d684fe71d71b5fc5d5827468f10a0e0046c783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Tue, 5 Mar 2024 11:07:56 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/servicewaycontent/index.vue | 157 ++++++++++++++----- 1 file changed, 119 insertions(+), 38 deletions(-) diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue index e10c3e7..fa93e56 100644 --- a/src/views/manage/servicewaycontent/index.vue +++ b/src/views/manage/servicewaycontent/index.vue @@ -103,10 +103,10 @@ size="mini" @click="handleAdd" v-hasPermi="['manage:servicewaycontent:add']" - >新增新增服务内容配置 - + +
+ + + + +
+
+ + + + + + + + + +
+ + + + + + - + - - + 数字 -
文本
-
- - - - - -
确 定 @@ -462,7 +508,11 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {}, + rules: { + serviceFrequencyType: [ + { required: true, message: "请选中服务频次", trigger: "blur" }, + ], + }, itemname: null, querydepartmen: { serviceWayName: "", @@ -470,11 +520,11 @@ export default { disabled: true, disabledb: false, disableda: false, + valuePlus:'', }; }, watch: { name(val) { - // console.log(val,'55') this.querydepartmen.serviceWayName = val; this.mentlist(); }, @@ -482,12 +532,18 @@ export default { created() { this.getList(); this.mentlist(); - - // listMessage(this.queryParams).then(response => { - // this.count = response.total; - // }); }, methods: { + getSuppliers(e) { + console.log(e); + }, + blurInput(val) { + console.log(val, "555"); + }, + blurInputs(val) { + console.log(val, "666"); + this.form.id = val; + }, textlist(e) { if (e == true) { this.disableda = true; @@ -575,6 +631,10 @@ export default { this.loading = true; listServicewaycontent(this.queryParams).then((response) => { this.servicewaycontentList = response.rows; + this.servicewaycontentList.forEach((e) => { + this.serviceFrequencyType = e.serviceFrequencyType; + }); + this.total = response.total; this.loading = false; }); @@ -632,19 +692,37 @@ export default { }, /** 修改按钮操作 */ handleUpdate(row) { - // this.reset(); - console.log(row); + this.reset(); + console.log(row,'99999'); // const id = row.id - row.serviceWayFrequencyList.forEach((e) => { + + // -------------- + if(!this.form.id){ + row.serviceWayFrequencyList.forEach((e) => { this.form.id = e.id; }); + } + getServicewaycontent(this.form.id).then((response) => { this.form = response.data; this.form.id = response.data.serviceFrequencyId; + // ---------- + if (response.data.serviceFrequencyType == "DIGIT") { + this.DIGIT = true; + this.TEXT = false; + + }else{ + this.TEXT=true + this.DIGIT = false; + + } + + // --------------- this.open = true; this.title = "修改服务方式内容"; }); + // ----------- }, /** 提交按钮 */ submitForm() { @@ -787,4 +865,7 @@ export default { top: 16px; left: 12px; } +.el-button--success.is-plain { + font-size: 10px; +} \ No newline at end of file From 0e4511c23dc98829db6c9d09c54892c9cd037015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 5 Mar 2024 14:23:43 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/continueSigning.js | 10 + src/views/manage/components/visitRecords.vue | 1 - src/views/manage/continueSigning/index.vue | 211 ++++++++++++++----- src/views/manage/newSigning/index.vue | 104 ++++++--- src/views/manage/signRecord/index.vue | 38 +++- 5 files changed, 269 insertions(+), 95 deletions(-) create mode 100644 src/api/manage/continueSigning.js diff --git a/src/api/manage/continueSigning.js b/src/api/manage/continueSigning.js new file mode 100644 index 0000000..b101213 --- /dev/null +++ b/src/api/manage/continueSigning.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + + +//续约界面查询签约详情 +export function getByRecordId(patientSignRecordId) { + return request({ + url: `/manage/signRecord/getByRecordId/${patientSignRecordId}`, + method: 'get', + }) +} diff --git a/src/views/manage/components/visitRecords.vue b/src/views/manage/components/visitRecords.vue index 3735e3e..1c1c7ab 100644 --- a/src/views/manage/components/visitRecords.vue +++ b/src/views/manage/components/visitRecords.vue @@ -20,7 +20,6 @@ {{ item.createBy }} - 赵明
住院 diff --git a/src/views/manage/continueSigning/index.vue b/src/views/manage/continueSigning/index.vue index 18da1fd..c0cb9bb 100644 --- a/src/views/manage/continueSigning/index.vue +++ b/src/views/manage/continueSigning/index.vue @@ -1,69 +1,82 @@ - + + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index eb98c24..d22c1c4 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -2,24 +2,25 @@
- 取消 + 取消 签约
{{ $route.query.patientName }} - {{ $route.query.sex }} + {{ $route.query.sex == 'MALE' ? '男' : '' }}{{ + $route.query.sex == 'FEMALE' ? '女' : '' }} {{ $route.query.age }} {{ $route.query.patientPhone }} {{ - $route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod == 'BE_IN_HOSPITAL' ? - '住院' : '' + $route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod == + 'BE_IN_HOSPITAL' ? + '住院' : '' }} - {{ $route.query.mainDiagnosis }} - {{ $route.query.admissionNumber }}{{ $route.query.outpatientNumber - }} + {{ $route.query.reviewDiagnosis }} + {{ $route.query.inHospitalNumber }} {{ $route.query.hospitalAgencyName }} {{ $route.query.departmentName }} {{ $route.query.paymentStatus == 'PAID' ? '已缴费' : '' }} @@ -30,25 +31,25 @@ - + - + -
- +
+ - + @@ -59,39 +60,46 @@ - +
- + + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index 7287040..66de49a 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -113,7 +113,7 @@ - + @@ -128,12 +128,14 @@ + + @@ -144,6 +146,7 @@ + + +