From 2e876b533f17de03f93676b0d6922e601dc4e1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Wed, 10 Apr 2024 09:47:07 +0800 Subject: [PATCH 01/10] =?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/servicewaycontent/index.vue | 63 ++++- src/views/system/taskExecuteRecord/index.vue | 234 ++++--------------- 2 files changed, 95 insertions(+), 202 deletions(-) diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue index 5ed2ebe..73f5560 100644 --- a/src/views/manage/servicewaycontent/index.vue +++ b/src/views/manage/servicewaycontent/index.vue @@ -223,7 +223,7 @@ prop="serviceWayFrequencyList" > @@ -355,7 +355,7 @@ @@ -364,6 +364,7 @@ @@ -553,6 +554,44 @@ export default { this.mentlist(); }, methods: { + changeVal() { + this.$forceUpdate(); //解决点击计数器失效问题 + }, + /**只能输入数字且有小数点最多保留两位*/ + checkPrice() { + let checkPlan = "" + this.form.serviceFrequencyStart; + checkPlan = checkPlan + .replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符 + .replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的 + .replace(/^\./g, "") // 保证第一个为数字而不是. + .replace(".", "$#$") + .replace(/\./g, "") + .replace("$#$", "."); + if (checkPlan.indexOf(".") < 0 && checkPlan !== "") { + // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额 + checkPlan = parseFloat(checkPlan) + ""; + } else if (checkPlan.indexOf(".") >= 0) { + checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数 + } + this.form.serviceFrequencyStart = checkPlan; + }, + checkPricemax() { + let checkPlan = "" + this.form.serviceFrequencyEnd; + checkPlan = checkPlan + .replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符 + .replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的 + .replace(/^\./g, "") // 保证第一个为数字而不是. + .replace(".", "$#$") + .replace(/\./g, "") + .replace("$#$", "."); + if (checkPlan.indexOf(".") < 0 && checkPlan !== "") { + // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额 + checkPlan = parseFloat(checkPlan) + ""; + } else if (checkPlan.indexOf(".") >= 0) { + checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数 + } + this.form.serviceFrequencyEnd = checkPlan; + }, // getSuppliers(e) { // console.log(e); // }, @@ -733,7 +772,6 @@ export default { this.disableda = false; this.disabledb = false; this.disabled = true; //文本 - this.form.serviceFrequencyType = "DIGIT"; console.log(this.itemname, "itemname"); if (this.itemname) { @@ -741,10 +779,6 @@ export default { this.form.serviceWayId = this.itemname; console.log(this.form, " this.form"); } - - // else if (this.itemname == null) { - // this.form.serviceWayId = "请选择服务方式" - // } this.open = true; this.title = "添加服务方式内容"; }, @@ -757,7 +791,12 @@ export default { this.reset(); getServicewaycontent(row.id).then((response) => { this.form = response.data; - // this.form.serviceWayId=row.serviceWayId + if (response.data.serviceFrequencySort) { + this.form.serviceSort = response.data.serviceFrequencySort; + } + else { + this.form.serviceSort = undefined; + } this.form.id = response.data.serviceFrequencyId; if (response.data.serviceWayId) { this.form.serviceWayId = response.data.serviceWayId; @@ -996,4 +1035,4 @@ export default { .el-button--success.is-plain { font-size: 10px; } - \ No newline at end of file + diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue index 232096d..07f4210 100644 --- a/src/views/system/taskExecuteRecord/index.vue +++ b/src/views/system/taskExecuteRecord/index.vue @@ -1,10 +1,5 @@ @@ -380,16 +240,7 @@ - - - + -
+
{{ ByRecord.hospitalAgencyName }} @@ -24,7 +24,7 @@ {{ ByRecord.packageName }} {{ ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : - ByRecord.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }} + ByRecord.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }} {{ ByRecord.serviceEndTime }} {{ ByRecord.packagePrice }} {{ ByRecord.serviceStartTime }} @@ -57,6 +57,7 @@
+
+> \ No newline at end of file diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index 0a8893c..fadda35 100644 --- a/src/views/system/ManuallyCreatingTasks/index.vue +++ b/src/views/system/ManuallyCreatingTasks/index.vue @@ -2,7 +2,7 @@
- 执行 + 保存
@@ -85,7 +85,7 @@
+ :style="formInline.taskType == 'TEXT_REMIND' ? '' : 'height:160px'"> @@ -146,8 +146,8 @@
推送方式：人工电话 - + inactive-value="0"> +
@@ -167,6 +167,11 @@ export default { data() { return { updata: { + signPatientRecordId: '', + patientId: '', + patientName: '', + departmentId: '', + departmentName: '', routeName: '', suitRange: '', routeNodeList: [], @@ -193,7 +198,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', - phonePushSign:'0', + phonePushSign: '0', }, list: [ { @@ -211,7 +216,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', - phonePushSign:'0', + phonePushSign: '0', } ], listindex: 0, @@ -219,6 +224,11 @@ export default { }, created() { this.formInline = this.list[0] + this.updata.signPatientRecordId = this.$route.query.signPatientRecordId + this.updata.patientId = this.$route.query.patientId + this.updata.patientName = this.$route.query.patientName + this.updata.departmentId = this.$route.query.departmentId + this.updata.departmentName = this.$route.query.departmentName }, methods: { addtriggerCondition() { @@ -265,7 +275,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', - phonePushSign:'0', + phonePushSign: '0', }) }, delitem(item, index) { @@ -274,7 +284,19 @@ export default { upload() { this.updata.routeNodeList = this.list signrouteadd(this.updata).then(res => { - + this.$notify({ + type: 'success', + title: '提示', + message: '保存成功,即将返回签约患者列表', + duration: 3000 + }); + setTimeout(() => { + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/patient/signRecord", + }); + }) + }, 3000); }) }, } diff --git a/src/views/system/components/script.vue b/src/views/system/components/script.vue index e6a1b9b..ad17561 100644 --- a/src/views/system/components/script.vue +++ b/src/views/system/components/script.vue @@ -164,7 +164,7 @@ export default { handleselect(item) { this.handleselectId = item.id this.handleselectName = item.commonScriptName - this.$emit("on-template", { templateId: item.id, templateName: item.commonScriptName }); + this.$emit("on-template", { templateId: item.id, templateName: item.commonScriptName, templateContent: item.scriptIntroduction }); this.classificationOpen = false }, classificationOpenfalse() { From 01176aa8e50dcd5f862fc1513dd132f1136b5ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 10 Apr 2024 11:41:42 +0800 Subject: [PATCH 08/10] =?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/manualReview.js | 11 + src/views/manage/manualReview/index.vue | 386 ++++++++++++++++++++++++ 2 files changed, 397 insertions(+) create mode 100644 src/api/manage/manualReview.js create mode 100644 src/views/manage/manualReview/index.vue diff --git a/src/api/manage/manualReview.js b/src/api/manage/manualReview.js new file mode 100644 index 0000000..afeaa74 --- /dev/null +++ b/src/api/manage/manualReview.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + +// 查询患者列表 +export function tasklist(query) { + return request({ + url: '/manage/signnode/tasklist', + method: 'get', + params: query + }) +} + diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue new file mode 100644 index 0000000..c53cad3 --- /dev/null +++ b/src/views/manage/manualReview/index.vue @@ -0,0 +1,386 @@ + + + \ No newline at end of file From f281d0267af604aa845bb8348784f6003f36321b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 10 Apr 2024 14:23:58 +0800 Subject: [PATCH 09/10] =?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/store/modules/user.js | 2 - src/views/manage/manualReview/index.vue | 155 ++++++++++-------------- src/views/manage/signRecord/index.vue | 1 + 3 files changed, 66 insertions(+), 92 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ba84d65..21a3aa8 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -52,10 +52,8 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user - console.log(user,'user') Cookies.set("userId",user.userId) Cookies.set("userName",user.userName) - // localStorage.setItem("userId",user.userId); const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; localStorage.setItem('user', JSON.stringify(user)) diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue index c53cad3..878b12e 100644 --- a/src/views/manage/manualReview/index.vue +++ b/src/views/manage/manualReview/index.vue @@ -1,5 +1,10 @@