From 3d59432230099c99d143ba5bf80a4932378e390a Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 6 Mar 2024 11:56:58 +0800 Subject: [PATCH 1/3] =?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/system/stationAvatar.js | 9 ++++++++ src/views/manage/message/index.vue | 8 +++++-- src/views/manage/propaganda/index.vue | 8 +++++-- src/views/manage/script/index.vue | 14 ++++++------ src/views/manage/servicepackage/index.vue | 10 ++++++--- src/views/manage/template/index.vue | 8 +++++-- src/views/system/stationAvatar/index.vue | 26 +++++++++++++++++++---- 7 files changed, 63 insertions(+), 20 deletions(-) diff --git a/src/api/system/stationAvatar.js b/src/api/system/stationAvatar.js index 8a1664f..6792fde 100644 --- a/src/api/system/stationAvatar.js +++ b/src/api/system/stationAvatar.js @@ -15,6 +15,15 @@ export function uploadFilefm(data) { data: data }) } +// 话术图片 +export function uploadScriptInfo(data) { + return request({ + url: '/manage/script/uploadScriptInfo', + method: 'post', + data: data + }) +} + //海报视频上传 export function updatePoserHeads(data) { diff --git a/src/views/manage/message/index.vue b/src/views/manage/message/index.vue index a7f8a27..36f3ddd 100644 --- a/src/views/manage/message/index.vue +++ b/src/views/manage/message/index.vue @@ -445,9 +445,9 @@ label-width="80px" :inline="true" > - + @@ -563,6 +563,8 @@ export default { querydisease: { pageNum: 1, pageSize: 10, + diseaseTypeName:null, + departmentId:null, }, listdisease: [], diseasetotal: 0, @@ -737,6 +739,8 @@ export default { nurseclick(row) { this.form.departmentId = row.departmentCode; this.departmentName = row.departmentName; + this.form.diseaseTypeId = ''; + this.diseaseTypeName = '请选择病种'; console.log(this.departmentName, '0000') this.innerVisibleshow = false; }, diff --git a/src/views/manage/propaganda/index.vue b/src/views/manage/propaganda/index.vue index e5e49b2..40186a0 100644 --- a/src/views/manage/propaganda/index.vue +++ b/src/views/manage/propaganda/index.vue @@ -503,9 +503,9 @@ label-width="80px" :inline="true" > - + @@ -642,6 +642,8 @@ export default { querydisease: { pageNum: 1, pageSize: 10, + diseaseTypeName:null, + departmentId:null, }, listdisease: [], diseasetotal: 0, @@ -938,6 +940,8 @@ export default { nurseclick(row) { this.form.departmentId = row.departmentCode; this.departmentName = row.departmentName; + this.form.diseaseTypeId = ''; + this.diseaseTypeName = '请选择病种'; this.innerVisibleshow = false; }, diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue index 9797d80..66ee270 100644 --- a/src/views/manage/script/index.vue +++ b/src/views/manage/script/index.vue @@ -438,9 +438,9 @@ label-width="80px" :inline="true" > - + @@ -549,6 +549,8 @@ export default { querydisease: { pageNum: 1, pageSize: 10, + diseaseTypeName:null, + departmentId:null, }, listdisease: [], diseasetotal: 0, @@ -647,11 +649,7 @@ export default { scriptSort: null, scriptRemark: null, }, - queryDisease: { - pageNum: 1, - pageSize: 10, - departmentId: null, - }, + querydepartmen: { departmentName: "", // pageNum: 1, @@ -778,6 +776,8 @@ export default { nurseclick(row) { this.form.departmentId = row.departmentCode; this.departmentName = row.departmentName; + this.form.diseaseTypeId = ''; + this.diseaseTypeName = '请选择病种'; this.innerVisibleshow = false; }, diff --git a/src/views/manage/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue index 5f6d0aa..0281b6f 100644 --- a/src/views/manage/servicepackage/index.vue +++ b/src/views/manage/servicepackage/index.vue @@ -583,9 +583,9 @@ label-width="80px" :inline="true" > - + @@ -758,6 +758,8 @@ export default { querydisease: { pageNum: 1, pageSize: 10, + diseaseTypeName:null, + departmentId:null, }, listdisease: [], diseasetotal: 0, @@ -1096,6 +1098,8 @@ export default { nurseclick(row) { this.form.departmentId = row.departmentCode; this.departmentName = row.departmentName; + this.form.diseaseTypeId = ''; + this.diseaseTypeName = '请选择病种'; this.innerVisibleshow = false; // this.form.diseaseTypeId = null; // this.diseaseTypeName = '请选择科室'; @@ -1128,7 +1132,7 @@ export default { }, // 重置 resetdisease() { - querydisease = { + this.querydisease = { pageNum: 1, pageSize: 10, }; diff --git a/src/views/manage/template/index.vue b/src/views/manage/template/index.vue index 6000dd2..9d7bc16 100644 --- a/src/views/manage/template/index.vue +++ b/src/views/manage/template/index.vue @@ -384,9 +384,9 @@ label-width="80px" :inline="true" > - + @@ -493,6 +493,8 @@ export default { querydisease: { pageNum: 1, pageSize: 10, + diseaseTypeName:null, + departmentId:null, }, listdisease: [], diseasetotal: 0, @@ -661,6 +663,8 @@ export default { nurseclick(row) { this.form.departmentId = row.departmentCode; this.departmentName = row.departmentName; + this.form.diseaseTypeId = ''; + this.diseaseTypeName = '请选择病种'; this.innerVisibleshow = false; }, diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue index 2ff71f1..1ee100b 100644 --- a/src/views/system/stationAvatar/index.vue +++ b/src/views/system/stationAvatar/index.vue @@ -128,7 +128,8 @@ import { uploadTrainingCategoryPicture, updatePoserHeads, uploadUrl, - uploadFilefm + uploadFilefm, + uploadScriptInfo } from "@/api/system/stationAvatar.js"; export default { @@ -165,7 +166,7 @@ export default { }, created() { this.types = this.type; - console.log(this.types) + this.items = this.item; if (this.tovideo == null) { @@ -173,7 +174,7 @@ export default { } else if (this.tovideo == "") { this.video.VideoPath = null; } else { - console.log(this.tovideo) + this.video.VideoPath = process.env.VUE_APP_BASE_API + this.tovideo; } if (this.img == null) { @@ -249,7 +250,7 @@ export default { }, // 上传预处理 beforeUpload(file) { - console.log(file) + if (this.types == "materialsVideoUrl") { const reader = new FileReader(); this.previews.data = file; @@ -383,6 +384,23 @@ export default { } }); } + // 话术图片 + else if(this.types == "scriptUrl"){ + let formDatanew = new FormData(); + formDatanew.append("file", this.previews.data); + uploadScriptInfo(formDatanew).then(response => { + if (response.code == 200) { + this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; + this.$emit("imgUrl", response.imgUrl); + this.openimg = false; + } else { + setTimeout(e => { + this.openimg = false; + }, 1000); + } + }); + } + else { updateNurseStationHeads(formData).then(response => { From 06eb02a9522723c685b30d3dac6ac7dacfe9b0ec Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 6 Mar 2024 13:13:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/servicepackage.js | 4 ++-- src/views/manage/servicepackage/index.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/manage/servicepackage.js b/src/api/manage/servicepackage.js index 0e1c4b5..ab7372a 100644 --- a/src/api/manage/servicepackage.js +++ b/src/api/manage/servicepackage.js @@ -18,9 +18,9 @@ export function serviceWayList(query) { }) } // 查询服务内容 -export function serviccontent(id) { +export function serviccontent(serviceWayId) { return request({ - url: `/manage/servicewaycontent/list?id=${id}`, + url: `/manage/servicewaycontent/list?serviceWayId=${serviceWayId}`, method: 'get', }) } diff --git a/src/views/manage/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue index 0281b6f..6f5013c 100644 --- a/src/views/manage/servicepackage/index.vue +++ b/src/views/manage/servicepackage/index.vue @@ -1011,9 +1011,9 @@ export default { }, // 服务方式点击事件 changeway(e) { - var id = null - id = this.optionsway.find(f => f.serviceWayName == e).id - serviccontent(id).then(response => { + var serviceWayId = null + serviceWayId = this.optionsway.find(f => f.serviceWayName == e).id + serviccontent(serviceWayId).then(response => { this.optionscontent = response.rows; }); this.form.voList.serviceContent=''; From 45f03dfb5ef1d6c231552bac4d003c38bdb6b3e8 Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 6 Mar 2024 13:42:48 +0800 Subject: [PATCH 3/3] =?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/script/index.vue | 6 +++--- src/views/manage/servicepackage/index.vue | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue index 66ee270..8e5853c 100644 --- a/src/views/manage/script/index.vue +++ b/src/views/manage/script/index.vue @@ -89,7 +89,7 @@ -
+
科室名称