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/api/unitconfig/patientConfiguration.js b/src/api/unitconfig/patientConfiguration.js index 0013d7f..512b375 100644 --- a/src/api/unitconfig/patientConfiguration.js +++ b/src/api/unitconfig/patientConfiguration.js @@ -12,7 +12,7 @@ export function listVisitRecord(query) { // 查询患者就诊记录基本信息详细 export function getVisitRecord(id) { return request({ - url: '/manage/visitRecord/' + id, + url: '/manage/patientInfo/' + id, method: 'get' }) } 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/components/healthEducation.vue b/src/views/manage/components/healthEducation.vue index 80b2804..c97b08f 100644 --- a/src/views/manage/components/healthEducation.vue +++ b/src/views/manage/components/healthEducation.vue @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/src/views/manage/project/index.vue b/src/views/manage/project/index.vue index 563096a..30e8ca4 100644 --- a/src/views/manage/project/index.vue +++ b/src/views/manage/project/index.vue @@ -373,9 +373,9 @@ /> - + diff --git a/src/views/manage/projectdevice/index.vue b/src/views/manage/projectdevice/index.vue index 6604276..6affaff 100644 --- a/src/views/manage/projectdevice/index.vue +++ b/src/views/manage/projectdevice/index.vue @@ -556,6 +556,8 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + + this.queryParams.deviceType='' this.handleQuery(); }, // 多选框选中数据 diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue index 5ed2ebe..3ff9505 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 +555,41 @@ export default { this.mentlist(); }, methods: { + /**只能输入数字且有小数点最多保留两位*/ + 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 +770,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 +777,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 +789,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 +1033,4 @@ export default { .el-button--success.is-plain { font-size: 10px; } - \ No newline at end of file + diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index 493b494..b4ad50c 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -89,8 +89,11 @@ 重置 - - --> +
@@ -164,7 +167,8 @@
- + @@ -333,7 +337,8 @@ export default { patientId: [ { required: true, message: "患者信息表id不能为空", trigger: "blur" } ], - } + }, + addTaskitem: {}, }; }, created() { @@ -431,6 +436,29 @@ export default { this.resetForm("queryForm"); this.handleQuery(); }, + //选中某行 + singleElection(item) { + this.addTaskitem = item + }, + //手动创建任务 + addTask() { + if (this.addTaskitem) { + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/patient/ManuallyCreatingTasks", + query: { + signPatientRecordId: this.addTaskitem.id, + patientId: this.addTaskitem.patientId, + patientName: this.addTaskitem.patientName, + departmentId: this.addTaskitem.departmentId, + departmentName: this.addTaskitem.departmentName, + }, + }); + }) + } else { + this.$message.error('请先选择一名签约服务中患者'); + } + }, // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) @@ -480,6 +508,7 @@ export default { this.queryParams.intentionalTimeStart = null this.queryParams.intentionalTimeEnd = null this.signTime = [] + this.queryParams.pageNum = 1; this.queryParams.signTimeStart = null this.queryParams.signTimeEnd = null this.getList(); @@ -692,3 +721,13 @@ export default { } }; +> \ No newline at end of file diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index 4a78f91..fadda35 100644 --- a/src/views/system/ManuallyCreatingTasks/index.vue +++ b/src/views/system/ManuallyCreatingTasks/index.vue @@ -2,7 +2,7 @@
- 执行 + 保存
@@ -84,7 +84,8 @@
-
+
@@ -121,21 +122,30 @@
-
- 推送方式：短信 - - +
+
+ 推送方式：短信 + + +
+
+ 推送方式：公众号 + + +
+
+ 推送方式：小程序 + + +
-
- 推送方式：公众号 - - -
-
- 推送方式：小程序 - + 推送方式：人工电话 +
@@ -157,6 +167,11 @@ export default { data() { return { updata: { + signPatientRecordId: '', + patientId: '', + patientName: '', + departmentId: '', + departmentName: '', routeName: '', suitRange: '', routeNodeList: [], @@ -183,6 +198,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', + phonePushSign: '0', }, list: [ { @@ -200,6 +216,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', + phonePushSign: '0', } ], listindex: 0, @@ -207,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() { @@ -253,6 +275,7 @@ export default { officialPushSign: '0', messagePushSign: '0', appletPushSign: '0', + phonePushSign: '0', }) }, delitem(item, index) { @@ -261,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() { 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 @@ - - - + @@ -242,9 +242,9 @@ export default { cardNo: [ { required: true, message: "身份证号不能为空", trigger: "blur" } ], - patientId: [ - { required: true, message: "患者表id不能为空", trigger: "blur" } - ], + // patientId: [ + // { required: true, message: "患者表id不能为空", trigger: "blur" } + // ], } }; },