From 1c3bf9705af621cf428a524c2d6befb7c3d2b8a0 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, 8 Mar 2023 09:56:07 +0800 Subject: [PATCH 01/25] =?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/system/hospital/index.vue | 3 ++- src/views/system/hospitalDepartment/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue index 491fb7e..433ca79 100644 --- a/src/views/system/hospital/index.vue +++ b/src/views/system/hospital/index.vue @@ -116,7 +116,7 @@ /> - + @@ -138,6 +138,7 @@ @imgs="imgs" :min-height="100" v-model="form.hospitalIntroduce" + style="width:1000px;" > diff --git a/src/views/system/hospitalDepartment/index.vue b/src/views/system/hospitalDepartment/index.vue index f197abe..2dc4627 100644 --- a/src/views/system/hospitalDepartment/index.vue +++ b/src/views/system/hospitalDepartment/index.vue @@ -162,7 +162,7 @@ @@ -399,7 +399,7 @@ /> - + Date: Wed, 8 Mar 2023 10:31:11 +0800 Subject: [PATCH 02/25] =?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/system/hospitalDepartment/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/system/hospitalDepartment/index.vue b/src/views/system/hospitalDepartment/index.vue index 2dc4627..fb06566 100644 --- a/src/views/system/hospitalDepartment/index.vue +++ b/src/views/system/hospitalDepartment/index.vue @@ -399,8 +399,8 @@ /> - - + + Date: Thu, 9 Mar 2023 14:57:33 +0800 Subject: [PATCH 03/25] =?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/system/hospitalPerson/index.vue | 717 +++++++++++++--------- 1 file changed, 430 insertions(+), 287 deletions(-) diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index 9a0928d..c2e7851 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -169,7 +169,7 @@ + + {{ form.hospitalName }} + {{ form.hospitalName }} + + + {{ form.departmentName }} + {{ form.departmentName }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- {{ item.hospitalName }} - {{ item.hospitalName }} - - - {{ item.departmentName }} - {{ item.departmentName }} - - - - - + + + + - - - - - - - - - - - - - - - - - - {{ foem.hospitalName }}{{ form.hospitalName }} - + + + + + +
+ + + + + + + + + + + + +
确 定 @@ -945,8 +1029,10 @@ import { updateHospitalPerson, } from "@/api/system/hospitalPerson"; import editor from "@/components/Editor"; +import stationAcatar from "../stationAvatar/index.vue"; +import { updatePicture } from "@/api/system/station"; export default { - components: { editor }, + components: { editor, stationAcatar }, name: "HospitalPerson", data() { //验证身份证 @@ -980,6 +1066,7 @@ export default { return { // 遮罩层 loading: true, + idd: 0, nnerVisibleindex: "", departmentListindex: "", total2: 0, @@ -1023,10 +1110,13 @@ export default { showSearch: true, // 总条数 total: 0, + imgone: "", // 健康咨询-科室人员信息表格数据 hospitalPersonList: [], // 弹出层标题 title: "", + deletNewImgs: [], + objitem: [], // 是否显示弹出层 open: false, addopen: false, @@ -1045,9 +1135,15 @@ export default { consultingFee: null, personIntroduce: null, personSort: null, + personPictureUrl: null, + certificateSort: null, + certificateName: null, + certificateUrl: null, }, // 表单参数 - form: {}, + form: { + // hospitalPersonCertificateList:[], + }, hospitalDepartmentList: [], hospitalqueryParams: { pageNum: 1, @@ -1062,84 +1158,9 @@ export default { departmentName: "", }, infolist: [], + deletUploadImages:[], // 表单校验 rules: { - hospitalPersonInfoList: { - hospitalId: [ - { - required: true, - message: "请选择所属医院", - trigger: "blur", - }, - ], - departmentId: [ - { - required: true, - message: "请选择所属科室", - trigger: "blur", - }, - ], - personName: [ - { - required: true, - message: "请选择科室人员名称", - trigger: "blur", - }, - ], - personAddress: [ - { - required: true, - message: "请选择科室人员地址", - trigger: "blur", - }, - ], - academicTitle: [ - { - required: true, - message: "请选择人员职称", - trigger: "blur", - }, - ], - personIntroduce: [ - { - required: true, - - trigger: "blur", - message: "请选择个人简介", - }, - ], - personSort: [ - { - required: true, - message: "请选择排序", - trigger: "blur", - }, - ], - personPhone: [ - { - required: true, - // validator: checkMobile, - message: "请输入联系电话", - trigger: "blur", - }, - ], - cardNo: [ - { - required: true, - message: "", - validator: isCardId, - trigger: "blur", - }, - ], - - consultingFee: [ - { - required: true, - message: "请选择咨询费用", - trigger: "blur", - }, - ], - }, hospitalId: [ { required: true, @@ -1194,7 +1215,7 @@ export default { { required: true, // validator: checkMobile, - message: "11", + message: "请输入联系电话", trigger: "blur", }, ], @@ -1215,6 +1236,103 @@ export default { }, ], }, + hospitalId: [ + { + required: true, + message: "请选择所属医院", + trigger: "blur", + }, + ], + departmentId: [ + { + required: true, + message: "请选择所属科室", + trigger: "blur", + }, + ], + personName: [ + { + required: true, + message: "请选择科室人员名称", + trigger: "blur", + }, + ], + personAddress: [ + { + required: true, + message: "请选择科室人员地址", + trigger: "blur", + }, + ], + academicTitle: [ + { + required: true, + message: "请选择人员职称", + trigger: "blur", + }, + ], + personIntroduce: [ + { + required: true, + + trigger: "blur", + message: "请选择个人简介", + }, + ], + personSort: [ + { + required: true, + message: "请选择排序", + trigger: "blur", + }, + ], + personPhone: [ + { + required: true, + // validator: checkMobile, + message: "11", + trigger: "blur", + }, + ], + cardNo: [ + { + required: true, + message: "", + validator: isCardId, + trigger: "blur", + }, + ], + + consultingFee: [ + { + required: true, + message: "请选择咨询费用", + trigger: "blur", + }, + ], + hospitalPersonCertificateList: { + certificateName: [ + // { + // required: true, + // message: "请输入证书名称", + // trigger: "blur", + // }, + ], + certificateSort: [ + // { + // required: true, + // message: "请输入证书顺序", + // trigger: "blur", + // }, + ], + certificateUrl: [ + // { + // required: true, + // message: "请上传证书", + // trigger: "blur", + // }, + ], + }, }; }, created() { @@ -1226,13 +1344,34 @@ export default { console.log(item); this.imgsurl.pictureUrlList.push(item); }, + //接收图片所属的item + imgclassifyItem(item) { + let imgUrlData = JSON.parse(item); + // 存贮新上传的图片数组 + this.deletNewImgs.push(imgUrlData.certificateUrl); + this.objitem.push(imgUrlData.certificateUrl); + console.log(item, "接受图片item"); + let items = JSON.parse(item); + if (items.idd && !items.id) { + this.form.hospitalPersonCertificateList.forEach((e) => { + if (e.idd == items.idd) { + e.certificateUrl = items.certificateUrl; + } + }); + } else if (!items.idd && items.id) { + this.form.certificateUrl = items.certificateUrl; + } + }, + imgUrl(imgUrl) { + console.log(imgUrl,'新上传'); + this.form.personPictureUrl = imgUrl; + this.deletUploadImages.push(imgUrl) + }, nurseclick(row) { console.log(row); - this.form.hospitalPersonInfoList[this.nnerVisibleindex].hospitalName = - row.hospitalName; - this.form.hospitalPersonInfoList[this.nnerVisibleindex].hospitalId = - row.id; + this.form.hospitalName = row.hospitalName; + this.form.hospitalId = row.id; this.innerVisible = false; }, nurseclickxg(row) { @@ -1244,11 +1383,8 @@ export default { // 科室 departmentclick(row) { console.log(row); - this.form.hospitalPersonInfoList[ - this.departmentListindex - ].departmentName = row.departmentName; - this.form.hospitalPersonInfoList[this.departmentListindex].departmentId = - row.id; + this.form.departmentName = row.departmentName; + this.form.departmentId = row.id; // } this.innerVisibledepartment = false; }, @@ -1276,22 +1412,20 @@ export default { }, //删除deldisease deldisease(index) { - this.form.hospitalPersonInfoList.splice(index, 1); + this.form.hospitalPersonCertificateList.splice(index, 1); }, adddisease() { + this.idd++; var obj = { - hospitalId: "", - departmentCode: "", - departmentId: "", - departmentName: "请选择所属科室", - departmentPerson: "", - departmentPhone: "", - hospitalName: "请选择所属医院", + certificateName: "", + certificateSort: "", + certificateUrl: "", + idd: this.idd, }; - if (this.form.hospitalPersonInfoList.length == 5) { + if (this.form.hospitalPersonCertificateList.length == 5) { this.$message.error("最多只能5条"); } else { - this.form.hospitalPersonInfoList.push(obj); + this.form.hospitalPersonCertificateList.push(obj); } }, /** 查询健康咨询-科室人员信息列表 */ @@ -1304,29 +1438,18 @@ export default { }); }, // 新增医院按钮 - clickinnerVisible(item, index) { + clickinnerVisible() { // this.addresetQuery(); - this.form.hospitalId = item.hospitalId; - this.nnerVisibleindex = index; - console.log(this.nnerVisibleindex); this.innerVisible = true; - // this.homenumber = item; }, // 修改医院按钮 - clickinnerVisiblexg(item) { + clickinnerVisiblexg() { this.addresetQuery(); - // this.form.hospitalId = item.hospitalId; - // this.nnerVisibleindex = index; - // console.log(this.nnerVisibleindex); this.innerVisiblexg = true; - // this.homenumber = item; }, //新增科室按钮 - clicklist(item, index) { + clicklist() { this.departmentList(); - this.form.departmentId = item.departmentId; - this.departmentListindex = index; - console.log(this.departmentListindex); this.innerVisibledepartment = true; }, // 修改科室按钮 @@ -1372,6 +1495,19 @@ export default { }, // 取消按钮 cancel() { + var obj = { pictureUrlList: [] }; + if (this.form.hospitalPersonCertificateList) { + this.form.hospitalPersonCertificateList.forEach((e) => { + obj.pictureUrlList.push(e.certificateUrl); + }); + } + console.log("2222", this.deletNewImgs); + if(this.deletUploadImages.length>0){ + updatePicture({pictureUrlList:this.deletUploadImages}).then((res) => { + this.open = false; + }); + } + this.imgsurl = { pictureUrlList: [] }; this.addopen = false; this.open = false; this.reset(); @@ -1379,30 +1515,34 @@ export default { // 表单重置 reset() { this.form = { - hospitalPersonInfoList: [ + id: null, + hospitalId: null, + departmentId: null, + personCode: null, + personName: null, + personPhone: null, + personAddress: null, + cardNo: null, + academicTitle: null, + consultingFee: null, + personIntroduce: null, + personSort: null, + personPictureUrl: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null, + hospitalName: "请选择所属医院", + departmentName: "请选择所属科室", + hospitalPersonCertificateList: [ { - id: null, - hospitalId: null, - departmentId: null, - personCode: null, - personName: null, - personPhone: null, - personAddress: null, - cardNo: null, - academicTitle: null, - consultingFee: null, - personIntroduce: null, - personSort: null, - createBy: null, - createTime: null, - updateBy: null, - updateTime: null, - hospitalName: "请选择所属医院", - departmentName: "请选择所属科室", + certificateName: "", + certificateSort: "", + certificateUrl: "", }, ], }; - + this.deletUploadImages=[] // this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -1423,6 +1563,17 @@ export default { }, /** 新增按钮操作 */ handleAdd() { + this.form = { + hospitalPersonCertificateList: [ + { + certificateSort: "", + certificateName: "", + certificateUrl: "", + + idd: this.idd, + }, + ], + }; this.reset(); this.addopen = true; this.title = "添加健康咨询-科室人员信息"; @@ -1433,21 +1584,13 @@ export default { const id = row.id || this.ids; getHospitalPerson(id).then((response) => { this.form = response.data; + this.imgone = this.form.certificateUrl; this.open = true; this.title = "修改健康咨询-科室人员信息"; }); }, /** 提交按钮 */ submitForm() { - // if (this.form.id == null) { - // this.form.departmentName = this.form.hospitalPersonInfoList[0].departmentName - // this.form.personName = this.form.hospitalPersonInfoList[0].personName - // this.form.personPhone = this.form.hospitalPersonInfoList[0].personPhone - // this.form.personAddress = this.form.hospitalPersonInfoList[0].personAddress - // this.form.cardNo = this.form.hospitalPersonInfoList[0].cardNo - // this.form.academicTitle = this.form.hospitalPersonInfoList[0].academicTitle - // this.form.consultingFee = this.form.hospitalPersonInfoList[0].consultingFee - // } this.$refs["form"].validate((valid) => { if (valid) { if (this.form.id != null) { From a20abd0837b5744a53ed3713d2858eb7d6eb3a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 9 Mar 2023 16:51:58 +0800 Subject: [PATCH 04/25] =?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/system/hospital/index.vue | 3 ++- src/views/system/hospitalDepartment/index.vue | 2 +- src/views/system/hospitalPerson/index.vue | 22 +++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue index 433ca79..14c3c38 100644 --- a/src/views/system/hospital/index.vue +++ b/src/views/system/hospital/index.vue @@ -142,6 +142,7 @@ > +
@@ -340,7 +341,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('是否确认删除医院信息管理编号为"' + ids + '"的数据项？').then(function() { + this.$modal.confirm('是否确认删除此医院的信息？').then(function() { return delHospital(ids); }).then(() => { this.getList(); diff --git a/src/views/system/hospitalDepartment/index.vue b/src/views/system/hospitalDepartment/index.vue index fb06566..3ce6d36 100644 --- a/src/views/system/hospitalDepartment/index.vue +++ b/src/views/system/hospitalDepartment/index.vue @@ -804,7 +804,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$modal - .confirm('是否确认删除科室信息管理编号为"' + ids + '"的数据项？') + .confirm('是否确认删除此科室的信息？') .then(function () { return delHospitalDepartment(ids); }) diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index c2e7851..899f2c9 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -16,10 +16,10 @@ @keyup.enter.native="handleQuery" /> - + @@ -84,7 +84,7 @@ >删除 - + - + @@ -238,11 +238,11 @@ - + @@ -301,6 +301,7 @@ @@ -315,8 +316,7 @@ :prop="`hospitalPersonCertificateList.${index}.certificateName`" > @@ -662,7 +662,7 @@ maxlength="15" /> - + Date: Fri, 10 Mar 2023 09:28:53 +0800 Subject: [PATCH 05/25] =?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/system/hospitalPerson/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index 899f2c9..520730c 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -1576,7 +1576,7 @@ export default { }; this.reset(); this.addopen = true; - this.title = "添加健康咨询-科室人员信息"; + this.title = "添加科室人员信息"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -1586,7 +1586,7 @@ export default { this.form = response.data; this.imgone = this.form.certificateUrl; this.open = true; - this.title = "修改健康咨询-科室人员信息"; + this.title = "修改科室人员信息"; }); }, /** 提交按钮 */ From 5f7ff8f2328160c5ba3835211b6e39958c9e4955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Fri, 10 Mar 2023 10:08:34 +0800 Subject: [PATCH 06/25] =?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/system/hospital/index.vue | 2 +- src/views/system/hospitalDepartment/index.vue | 12 ++--- src/views/system/hospitalPerson/index.vue | 54 ++++++++++--------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue index 14c3c38..3052b5f 100644 --- a/src/views/system/hospital/index.vue +++ b/src/views/system/hospital/index.vue @@ -131,7 +131,7 @@ - + - + /> --> - + /> --> @@ -443,7 +443,7 @@ diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index 520730c..a626a4f 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -25,14 +25,14 @@ /> - + - + - @@ -286,7 +286,7 @@ @@ -298,12 +298,15 @@ /> - + > +
@@ -704,15 +707,16 @@ - + >
@@ -1199,9 +1205,8 @@ export default { personIntroduce: [ { required: true, - trigger: "blur", - message: "请选择个人简介", + message: "请输入个人简介", }, ], personSort: [ @@ -1340,10 +1345,7 @@ export default { this.info(); }, methods: { - imgs(item) { - console.log(item); - this.imgsurl.pictureUrlList.push(item); - }, + //接收图片所属的item imgclassifyItem(item) { let imgUrlData = JSON.parse(item); @@ -1439,7 +1441,7 @@ export default { }, // 新增医院按钮 clickinnerVisible() { - // this.addresetQuery(); + this.info(); this.innerVisible = true; }, // 修改医院按钮 From 42b2a9d6931d0b222abc4d8ef2ffba8a3475264e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Fri, 10 Mar 2023 10:17:00 +0800 Subject: [PATCH 07/25] =?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/system/hospitalPerson/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index a626a4f..ec417e3 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -113,7 +113,7 @@ - + - + Date: Fri, 10 Mar 2023 15:48:30 +0800 Subject: [PATCH 08/25] =?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/system/hospitalPerson/index.vue | 274 ++++++++++++++-------- 1 file changed, 182 insertions(+), 92 deletions(-) diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index ec417e3..566f08e 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -8,11 +8,22 @@ v-show="showSearch" label-width="130px" > + + + {{ queryParams.hospitalName }} + + + + + {{ queryParams.departmentName }} + + @@ -182,18 +193,19 @@ {{ form.hospitalName }} - + @@ -277,8 +294,8 @@ @@ -302,11 +319,10 @@ type="textarea" :rows="5" maxlength="30" - style="width: 540px;" + style="width: 540px" placeholder="请输入个人简介" v-model="form.personIntroduce" > -
@@ -539,7 +555,7 @@ @@ -605,7 +621,7 @@ @@ -678,6 +694,7 @@ v-model="form.personAddress" placeholder="请输入科室地址" style="width: 250px" + maxlength="300" /> @@ -707,10 +724,10 @@ @@ -735,10 +752,10 @@ prop="personIntroduce" style="margin-top: 10px; margin-left: 10px" > - @@ -751,8 +768,7 @@ > - + > -->
@@ -810,7 +824,7 @@
- @@ -901,7 +915,7 @@ :show-overflow-tooltip="true" > --> - - + --> - @@ -1020,7 +1034,7 @@ :limit.sync="departmentqueryParams.pageSize" @pagination="departmentList" /> - + -->
@@ -1126,6 +1140,7 @@ export default { // 是否显示弹出层 open: false, addopen: false, + homenumber: false, // 查询参数 queryParams: { pageNum: 1, @@ -1134,6 +1149,8 @@ export default { departmentId: null, personCode: null, personName: null, + departmentName: null, + hospitalName: null, personPhone: null, personAddress: null, cardNo: null, @@ -1160,11 +1177,12 @@ export default { departmentqueryParams: { pageNum: 1, pageSize: 10, + hospitalId: "", departmentCode: "", departmentName: "", }, infolist: [], - deletUploadImages:[], + deletUploadImages: [], // 表单校验 rules: { hospitalId: [ @@ -1345,7 +1363,24 @@ export default { this.info(); }, methods: { - + /**只能输入数字且有小数点最多保留两位*/ + checkPrice() { + let checkPlan = "" + this.form.consultingFee; + 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.consultingFee = checkPlan; + }, //接收图片所属的item imgclassifyItem(item) { let imgUrlData = JSON.parse(item); @@ -1366,52 +1401,69 @@ export default { }, imgUrl(imgUrl) { - console.log(imgUrl,'新上传'); + console.log(imgUrl, "新上传"); this.form.personPictureUrl = imgUrl; - this.deletUploadImages.push(imgUrl) + this.deletUploadImages.push(imgUrl); }, + nurseclick(row) { - console.log(row); - this.form.hospitalName = row.hospitalName; + console.log(this.homenumber); + if (this.homenumber) { + this.queryParams.hospitalName = row.hospitalName; + this.queryParams.hospitalId = row.id; + } else { + this.hospitalId = row.id; + // this.form.hospitalId = row.id; + this.form.hospitalName = row.hospitalName; + } this.form.hospitalId = row.id; this.innerVisible = false; + // this.stationcancel(); }, - nurseclickxg(row) { - console.log(row); - this.form.hospitalName = row.hospitalName; - this.form.hospitalId = row.id; - this.innerVisiblexg = false; - }, + // nurseclickxg(row) { + // console.log(row); + // this.form.hospitalName = row.hospitalName; + // this.hospitalId = row.id; + // this.innerVisiblexg = false; + // }, // 科室 departmentclick(row) { console.log(row); + this.departmentId = row.id; this.form.departmentName = row.departmentName; - this.form.departmentId = row.id; - // } + // this.form.departmentId = row.id; + if (this.homenumber) { + this.queryParams.departmentName = row.departmentName; + this.queryParams.departmentId = row.id; + this.form.departmentId = row.id; + } else { + this.form.departmentId = row.id; + this.form.departmentName = row.departmentName; + } this.innerVisibledepartment = false; }, - departmentclickxg(row) { - console.log(row); - this.form.departmentName = row.departmentName; - this.form.departmentId = row.id; - // } - this.innerVisibledepartmentxg = false; - }, + // departmentclickxg(row) { + // console.log(row); + // this.form.departmentName = row.departmentName; + // this.departmentId = row.id; + // // } + // this.innerVisibledepartmentxg = false; + // }, //医院关闭 innerVisiblecancel() { this.innerVisible = false; }, - innerVisiblecancelxg() { - this.innerVisiblexg = false; - }, + // innerVisiblecancelxg() { + // this.innerVisiblexg = false; + // }, //科室关闭 innerVisiblecanceldepart() { this.innerVisibledepartment = false; }, - innerVisiblecanceldepartxg() { - this.innerVisibledepartmentxg = false; - }, + // innerVisiblecanceldepartxg() { + // this.innerVisibledepartmentxg = false; + // }, //删除deldisease deldisease(index) { this.form.hospitalPersonCertificateList.splice(index, 1); @@ -1419,9 +1471,9 @@ export default { adddisease() { this.idd++; var obj = { - certificateName: "", - certificateSort: "", - certificateUrl: "", + certificateName: null, + certificateSort: null, + certificateUrl: null, idd: this.idd, }; if (this.form.hospitalPersonCertificateList.length == 5) { @@ -1433,6 +1485,7 @@ export default { /** 查询健康咨询-科室人员信息列表 */ getList() { this.loading = true; + // this.queryParams.hospitalId = this.form.hospitalId; listHospitalPerson(this.queryParams).then((response) => { this.hospitalPersonList = response.rows; this.total = response.total; @@ -1440,28 +1493,40 @@ export default { }); }, // 新增医院按钮 - clickinnerVisible() { + clickinnerVisible(item) { + console.log(item); this.info(); this.innerVisible = true; + this.homenumber = item; + if (this.homenumber) { + this.hospitalId = this.queryParams.hospitalId; + } else { + this.hospitalId = this.form.hospitalId; + } }, - // 修改医院按钮 - clickinnerVisiblexg() { - this.addresetQuery(); - this.innerVisiblexg = true; - }, + // // 修改医院按钮 + // clickinnerVisiblexg() { + // this.addresetQuery(); + // this.innerVisiblexg = true; + // }, //新增科室按钮 - clicklist() { - this.departmentList(); - this.innerVisibledepartment = true; - }, - // 修改科室按钮 - clickdepartmentlist() { - this.departmentList(); - // this.form.departmentId = item.departmentId; - this.innerVisibledepartmentxg = true; + clicklist(item) { + this.homenumber = item; + if (this.homenumber) { + // 为查询页面时 + this.hospitalId = this.queryParams.hospitalId; + } else { + this.hospitalId = this.form.hospitalId; + } + if (this.hospitalId) { + this.departmentList(); + this.innerVisibledepartment = true; + } else { + this.$message.error("请先选择所属医院"); + } }, departmentList() { - // this.loading = true; + this.departmentqueryParams.hospitalId = this.hospitalId; listHospitalDepartment(this.departmentqueryParams).then((response) => { this.hospitalDepartmentList = response.rows; this.total3 = response.total; @@ -1504,10 +1569,12 @@ export default { }); } console.log("2222", this.deletNewImgs); - if(this.deletUploadImages.length>0){ - updatePicture({pictureUrlList:this.deletUploadImages}).then((res) => { - this.open = false; - }); + if (this.deletUploadImages.length > 0) { + updatePicture({ pictureUrlList: this.deletUploadImages }).then( + (res) => { + this.open = false; + } + ); } this.imgsurl = { pictureUrlList: [] }; this.addopen = false; @@ -1532,6 +1599,8 @@ export default { personPictureUrl: null, createBy: null, createTime: null, + departmentId: null, + hospitalId: null, updateBy: null, updateTime: null, hospitalName: "请选择所属医院", @@ -1544,7 +1613,7 @@ export default { }, ], }; - this.deletUploadImages=[] + this.deletUploadImages = []; // this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -1554,7 +1623,17 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - this.resetForm("queryForm"); + this.form.departmentId = ""; + this.form.hospitalId = ""; + this.departmentqueryParams = { + pageNum: 1, + pageSize: 10, + }; + this.queryParams = { + pageNum: 1, + pageSize: 10, + }; + // this.resetForm("queryForm"); this.handleQuery(); }, // 多选框选中数据 @@ -1593,6 +1672,10 @@ export default { }, /** 提交按钮 */ submitForm() { + if (this.form.consultingFee) { + this.form.consultingFee = Number(this.form.consultingFee); + } + this.$refs["form"].validate((valid) => { if (valid) { if (this.form.id != null) { @@ -1615,9 +1698,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$modal - .confirm( - '是否确认删除此人员信息？' - ) + .confirm("是否确认删除此人员信息？") .then(function () { return delHospitalPerson(ids); }) @@ -1640,3 +1721,12 @@ export default { }, }; + \ No newline at end of file From 85d6b97e8f576878eefb55e4d28e4d3a2846783d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 10 Mar 2023 15:51:29 +0800 Subject: [PATCH 09/25] =?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/system/goodsOrder/indexjs.js | 102 ++++++++++++------------- 1 file changed, 48 insertions(+), 54 deletions(-) diff --git a/src/views/system/goodsOrder/indexjs.js b/src/views/system/goodsOrder/indexjs.js index 97cf9bb..5bc9690 100644 --- a/src/views/system/goodsOrder/indexjs.js +++ b/src/views/system/goodsOrder/indexjs.js @@ -25,8 +25,7 @@ export default { innerrefund: false, orderList: [], refundlist: [], - orderTypelist: [ - { + orderTypelist: [{ value: "INTEGRAL_EXCHANGE", label: "积分兑换", }, @@ -40,45 +39,45 @@ export default { ], ratelist: {}, //评分list orderStatuslist: [{ - value: "WAIT_PAY", - label: "待付款", - }, - { - value: "PAY", - label: "待发货", - }, - { - value: "WAIT_RECEIVED_GOODS", - label: "待收货", - }, - { - value: "RECEIVED_GOODS", - label: "待评价", - }, - { - value: "EVALUATED", - label: "交易完成", - }, - { - value: "CANCEL", - label: "已取消", - }, - { - value: "WAIT_RETURNED_GOODS", - label: "待退货", - }, - { - value: "RETURNED_GOODS", - label: "已退货", - }, - { - value: "WAIT_REFUND", - label: "退款中", - }, - { - value: "REFUNDED", - label: "退款成功", - }, + value: "WAIT_PAY", + label: "待付款", + }, + { + value: "PAY", + label: "待发货", + }, + { + value: "WAIT_RECEIVED_GOODS", + label: "待收货", + }, + { + value: "RECEIVED_GOODS", + label: "待评价", + }, + { + value: "EVALUATED", + label: "交易完成", + }, + { + value: "CANCEL", + label: "已取消", + }, + { + value: "WAIT_RETURNED_GOODS", + label: "待退货", + }, + { + value: "RETURNED_GOODS", + label: "已退货", + }, + { + value: "WAIT_REFUND", + label: "退款中", + }, + { + value: "REFUNDED", + label: "退款成功", + }, ], // 遮罩层 loading: true, @@ -157,13 +156,6 @@ export default { this.queryParams.nurseStationId = item.id; this.nurseStationshow = false; }, - //护理站list - info() { - getListByUser(this.getListByUserquery).then((res) => { - this.nurseStationlist = res.rows; - this.stationtotal = res.total; - }); - }, //页面所属护理站 ParamsStation(item) { console.log(this.getListByUserquery) @@ -236,6 +228,8 @@ export default { return "护理站"; case "SHOPPING_MALL": return "商城"; + case "HEALTH_CONSULTATION": + return "健康咨询"; default: break; } @@ -258,7 +252,7 @@ export default { this.ratelist = {} if (row.orderStatus == 'EVALUATED') { this.ratelist = res.data.orderEvaluatePictureInfoList - } else { } + } else {} }); }, // 查看录入物流单号弹框 @@ -298,7 +292,7 @@ export default { //确认退款 确定按钮 submitRefundOrder() { var obj = {}; - obj.orderType=this.refundlist.orderType; + obj.orderType = this.refundlist.orderType; obj.orderNo = this.refundlist.goOrderNo; obj.refundReason = this.refundlist.dictLabel; obj.refundPrice = this.refundlist.godTotalPrice; @@ -419,21 +413,21 @@ export default { const ids = row.id || this.ids; this.$modal .confirm('是否确认删除商品订单编号为"' + ids + '"的数据项？') - .then(function () { + .then(function() { return delGoodsOrder(ids); }) .then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => { }); + .catch(() => {}); }, /** 导出按钮操作 */ handleExport() { this.download( "system/goodsOrder/export", { - ...this.queryParams, - }, + ...this.queryParams, + }, `goodsOrder_${new Date().getTime()}.xlsx` ); }, From 3efa817f1a17d8b0f75fb6a878f41d7ee1f5c23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 10 Mar 2023 15:53:05 +0800 Subject: [PATCH 10/25] =?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/components/Editor/index.vue | 66 +++++++++++++------------- src/views/system/goodsOrder/indexjs.js | 1 - 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 8aa4a6c..32c29b4 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -11,8 +11,7 @@ style="display: none" ref="upload" v-if="this.type == 'url'" - > - + >
@@ -30,32 +29,32 @@ export default { /* 编辑器的内容 */ value: { type: String, - default: "", + default: "" }, /* 高度 */ height: { type: Number, - default: null, + default: null }, /* 最小高度 */ minHeight: { type: Number, - default: null, + default: null }, /* 只读 */ readOnly: { type: Boolean, - default: false, + default: false }, // 上传文件大小限制(MB) fileSize: { type: Number, - default: 5, + default: 5 }, /* 类型（base64格式、url格式） */ type: { type: String, - default: "url", + default: "url" } }, data() { @@ -73,21 +72,21 @@ export default { modules: { // 工具栏配置 toolbar: [ - ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线 - ["blockquote", "code-block"], // 引用 代码块 - [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表 - [{ indent: "-1" }, { indent: "+1" }], // 缩进 - [{ size: ["small", false, "large", "huge"] }], // 字体大小 - [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 - [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 - [{ align: [] }], // 对齐方式 - ["clean"], // 清除文本格式 - ["link", "image"] // 链接、图片、视频 - ], + ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线 + ["blockquote", "code-block"], // 引用 代码块 + [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表 + [{ indent: "-1" }, { indent: "+1" }], // 缩进 + [{ size: ["small", false, "large", "huge"] }], // 字体大小 + [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 + [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 + [{ align: [] }], // 对齐方式 + ["clean"], // 清除文本格式 + ["link", "image"] // 链接、图片、视频 + ] }, placeholder: "请输入内容", - readOnly: this.readOnly, - }, + readOnly: this.readOnly + } }; }, computed: { @@ -100,7 +99,7 @@ export default { style.height = `${this.height}px`; } return style; - }, + } }, watch: { value: { @@ -112,8 +111,8 @@ export default { } } }, - immediate: true, - }, + immediate: true + } }, mounted() { this.init(); @@ -126,9 +125,9 @@ export default { const editor = this.$refs.editor; this.Quill = new Quill(editor, this.options); // 如果设置了上传地址则自定义图片上传事件 - if (this.type == 'url') { + if (this.type == "url") { let toolbar = this.Quill.getModule("toolbar"); - toolbar.addHandler("image", (value) => { + toolbar.addHandler("image", value => { this.uploadType = "image"; if (value) { this.$refs.upload.$children[0].$refs.input.click(); @@ -176,10 +175,12 @@ export default { // 获取光标所在位置 let length = quill.getSelection().index; // 插入图片 res.url为服务器返回的图片地址 - quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName); - + quill.insertEmbed( + length, + "image", + process.env.VUE_APP_BASE_API + res.fileName + ); this.$emit("imgs", res.fileName); - // 调整光标到最后 quill.setSelection(length + 1); } else { @@ -188,13 +189,14 @@ export default { }, handleUploadError() { this.$message.error("图片插入失败"); - }, - }, + } + } };