From c2a7707b2f2e0ab9180efcb4b3e6462d582fcf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Wed, 8 Feb 2023 16:18:14 +0800 Subject: [PATCH 01/78] =?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/classifyItem.js | 44 ++ src/views/system/OperateGoodsInfo/indexjs.js | 23 +- src/views/system/classifyItem/index.vue | 578 ++++++++++++++++++ src/views/system/goodsInfo/indexjs.js | 23 +- src/views/system/nurseType/index.vue | 123 ++-- src/views/system/station/stationjs.js | 12 +- src/views/system/stationAvatar/index.vue | 5 +- src/views/system/stationItem/stationItemjs.js | 48 +- 8 files changed, 738 insertions(+), 118 deletions(-) create mode 100644 src/api/system/classifyItem.js create mode 100644 src/views/system/classifyItem/index.vue diff --git a/src/api/system/classifyItem.js b/src/api/system/classifyItem.js new file mode 100644 index 0000000..426939e --- /dev/null +++ b/src/api/system/classifyItem.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询护理机构和护理项目分类信息列表 +export function listInfo(query) { + return request({ + url: '/classifyItem/info/list', + method: 'get', + params: query + }) +} + +// 查询护理机构和护理项目分类信息详细 +export function getInfo(id) { + return request({ + url: '/classifyItem/info/' + id, + method: 'get' + }) +} + +// 新增护理机构和护理项目分类信息 +export function addInfo(data) { + return request({ + url: '/classifyItem/info/add', + method: 'post', + data: data + }) +} + +// 修改护理机构和护理项目分类信息 +export function updateInfo(data) { + return request({ + url: '/classifyItem/info/edit', + method: 'post', + data: data + }) +} + +// 删除护理机构和护理项目分类信息 +export function delInfo(id) { + return request({ + url: '/classifyItem/info/' + id, + method: 'delete' + }) +} \ No newline at end of file diff --git a/src/views/system/OperateGoodsInfo/indexjs.js b/src/views/system/OperateGoodsInfo/indexjs.js index 1a33542..5cfa635 100644 --- a/src/views/system/OperateGoodsInfo/indexjs.js +++ b/src/views/system/OperateGoodsInfo/indexjs.js @@ -73,7 +73,8 @@ export default { ], // goodAttributeDetailsLists:[], goodDetailsLists: [], - ids: 9999999, + idd: 9999999, + ids: [], // 查询参数 shangjia: { id: null, @@ -201,28 +202,28 @@ export default { // if (this.goodDetailsLists.length == 5) { // this.$message.error("最多只能5条"); // } else { - this.ids++; + this.idd++; var obj = { attributePitureUrl: "", goodsPrice: "", goodsStock: "", attributeDetailsSort: null, - ids: this.ids, + idd: this.idd, }; this.goodDetailsLists.push(obj); // } }, // 删除 delgoodAttributeDetail(item) { - if (item.ids && !item.attributeDetailsId) { + if (item.idd && !item.attributeDetailsId) { if (this.goodDetailsLists.length == 1) { this.$message.error("最后一条不可删除"); } else { this.goodDetailsLists = this.goodDetailsLists.filter( - (e) => e.ids != item.ids + (e) => e.idd != item.idd ); } - } else if (!item.ids && item.attributeDetailsId) { + } else if (!item.idd && item.attributeDetailsId) { if (this.goodDetailsLists.length == 1) { this.$message.error("最后一条不可删除"); } else { @@ -322,7 +323,7 @@ export default { goodsPrice: "", goodsStock: "", attributeDetailsSort: null, - ids: 9999999, + idd: 9999999, }, ]; this.resetForm("form"); }, @@ -363,7 +364,7 @@ export default { goodsPrice: "", goodsStock: "", sort: null, - ids: 9999999, + idd: 9999999, }, ]; this.open = true; }, @@ -464,13 +465,13 @@ export default { }, attributePitureitem(item) { let items = JSON.parse(item); - if (items.ids && !items.id) { + if (items.idd && !items.id) { this.goodDetailsLists.forEach((e) => { - if (e.ids == items.ids) { + if (e.idd == items.idd) { e.attributePitureUrl = items.attributePitureUrl; } }); - } else if (!items.ids && items.attributeDetailsId) { + } else if (!items.idd && items.attributeDetailsId) { this.goodDetailsLists.forEach((e) => { if (e.attributeDetailsId == items.attributeDetailsId) { e.attributePitureUrl = items.attributePitureUrl; diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue new file mode 100644 index 0000000..7750701 --- /dev/null +++ b/src/views/system/classifyItem/index.vue @@ -0,0 +1,578 @@ + + + diff --git a/src/views/system/goodsInfo/indexjs.js b/src/views/system/goodsInfo/indexjs.js index b679394..7a2b0e2 100644 --- a/src/views/system/goodsInfo/indexjs.js +++ b/src/views/system/goodsInfo/indexjs.js @@ -69,7 +69,7 @@ export default { }, ], goodDetailsLists: [], - ids: 9999999, + idd: 9999999, // 查询参数 shangjia: { id: null, @@ -180,28 +180,28 @@ export default { if (this.goodDetailsLists.length == 5) { this.$message.error("最多只能5条"); } else { - this.ids++; + this.idd++; var obj = { attributePitureUrl: "", goodsPrice: "", goodsStock: "", sort: "", - ids: this.ids, + idd: this.idd, }; this.goodDetailsLists.push(obj); } }, // 删除 delgoodAttributeDetail(item) { - if (item.ids && !item.attributeDetailsId) { + if (item.idd && !item.attributeDetailsId) { if (this.goodDetailsLists.length == 1) { this.$message.error("最后一条不可删除"); } else { this.goodDetailsLists = this.goodDetailsLists.filter( - (e) => e.ids != item.ids + (e) => e.idd != item.idd ); } - } else if (!item.ids && item.attributeDetailsId) { + } else if (!item.idd && item.attributeDetailsId) { if (this.goodDetailsLists.length == 1) { this.$message.error("最后一条不可删除"); } else { @@ -293,7 +293,7 @@ export default { goodsPrice: "", goodsStock: "", sort: "", - ids: 9999999, + idd: 9999999, }, ]; this.resetForm("form"); }, @@ -329,7 +329,7 @@ export default { goodsPrice: "", goodsStock: "", sort: "", - ids: 9999999, + idd: 9999999, }, ]; this.open = true; }, @@ -390,7 +390,6 @@ export default { var obj = { pictureUrlList: [] }; obj.pictureUrlList.push(row.goodsPictureUrl); updatePicture(obj).then((res) => {}); - delGoodsInfo(row.goodsInfoId).then((res) => { this.$message.success("删除成功"); this.getList(); @@ -404,13 +403,13 @@ export default { attributePitureUrl(imgUrl) {}, attributePitureitem(item) { let items = JSON.parse(item); - if (items.ids && !items.id) { + if (items.idd && !items.id) { this.goodDetailsLists.forEach((e) => { - if (e.ids == items.ids) { + if (e.idd == items.idd) { e.attributePitureUrl = items.attributePitureUrl; } }); - } else if (!items.ids && items.attributeDetailsId) { + } else if (!items.idd && items.attributeDetailsId) { this.goodDetailsLists.forEach((e) => { if (e.attributeDetailsId == items.attributeDetailsId) { e.attributePitureUrl = items.attributePitureUrl; diff --git a/src/views/system/nurseType/index.vue b/src/views/system/nurseType/index.vue index 74f21b9..9e5b8f1 100644 --- a/src/views/system/nurseType/index.vue +++ b/src/views/system/nurseType/index.vue @@ -8,7 +8,6 @@ v-show="showSearch" label-width="100px" > - - - - + + + - +
- + - + - - -
+ +
+ - - + + - + - @@ -243,7 +240,6 @@ export default { multiple: true, // 显示搜索条件 showSearch: true, - // 总条数 total: 0, // 护理类型信息表格数据 @@ -260,7 +256,6 @@ export default { userId: null, nurseTypeCode: null, nurseTypeName: null, - }, // 表单参数 form: {}, @@ -276,12 +271,12 @@ export default { ], }, nurseTypeName: [ - { - required: true, - message: "请输入护理类型名称", - trigger: "blur", - }, - ], + { + required: true, + message: "请输入护理类型名称", + trigger: "blur", + }, + ], }, }; }, @@ -289,8 +284,8 @@ export default { this.getList(); }, methods: { - //删除deldisease - deldisease(index) { + //删除deldisease + deldisease(index) { this.form.nurseTypeList.splice(index, 1); }, adddisease() { @@ -303,7 +298,7 @@ export default { this.form.nurseTypeList.push(obj); } }, - + /** 查询护理类型信息列表 */ getList() { this.loading = true; @@ -322,11 +317,11 @@ export default { // 表单重置 reset() { this.form = { - nurseTypeList:[ + nurseTypeList: [ { - nurseTypeName:"", - } - ] + nurseTypeName: "", + }, + ], }; this.resetForm("form"); }, @@ -364,8 +359,8 @@ export default { }, /** 提交按钮 */ submitForm() { - if(this.form==null){ - this.form.nurseTypeName = this.form.nurseTypeList[0].nurseTypeName + if (this.form == null) { + this.form.nurseTypeName = this.form.nurseTypeList[0].nurseTypeName; } this.$refs["form"].validate((valid) => { if (valid) { @@ -389,7 +384,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$modal - .confirm('是否确认删除护理类型信息的数据项?') + .confirm("是否确认删除护理类型信息的数据项?") .then(function () { return delNurseType(ids); }) diff --git a/src/views/system/station/stationjs.js b/src/views/system/station/stationjs.js index 9567591..fc85eac 100644 --- a/src/views/system/station/stationjs.js +++ b/src/views/system/station/stationjs.js @@ -81,7 +81,7 @@ export default { looknurseStationLabel: [{ labelDescription: "", sort: "", - ids: 1, + idd: 1, }, ], // 护理站信息表格数据 stationList: [{ @@ -103,7 +103,7 @@ export default { }, // 表单参数 form: {}, - ids: 1, + idd: 1, provincelist: [], arealist: [], citylist: [], @@ -177,7 +177,7 @@ export default { this.looknurseStationLabel = [{ labelDescription: "", sort: "", - ids: 1, + idd: 1, }, ]; } else { this.looknurseStationLabel.splice(index, 1); @@ -189,11 +189,11 @@ export default { if (this.looknurseStationLabel.length == 5) { this.$message.error("最多只能5条"); } else { - this.ids++; + this.idd++; var obj = { labelDescription: "", sort: "", - ids: this.ids, + idd: this.idd, }; this.looknurseStationLabel.push(obj); } @@ -338,7 +338,7 @@ export default { this.looknurseStationLabel = [{ labelDescription: "", sort: "", - ids: 1, + idd: 1, }, ]; this.title = "添加护理站信息"; }, diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue index b92f238..612dd08 100644 --- a/src/views/system/stationAvatar/index.vue +++ b/src/views/system/stationAvatar/index.vue @@ -227,6 +227,10 @@ export default { this.items.attributePitureUrl = response.imgUrl; this.$emit("item", JSON.stringify(this.items)); } + if (this.types == "nurseItemClassifyUrl") { + this.items.classifyPictureUrl = response.imgUrl; + this.$emit("item", JSON.stringify(this.items)); + } this.openimg = false; }); } else { @@ -235,7 +239,6 @@ export default { }, // 实时预览 realTime(data) { - console.log(data); this.previews = data; }, // 关闭窗口 diff --git a/src/views/system/stationItem/stationItemjs.js b/src/views/system/stationItem/stationItemjs.js index 1464d88..8a978c2 100644 --- a/src/views/system/stationItem/stationItemjs.js +++ b/src/views/system/stationItem/stationItemjs.js @@ -100,7 +100,7 @@ export default { nurseStationName: "请选择所属护理站", }, }, - ids: 1, + idd: 1, // 表单校验 rules: { "nurseStationItem.nurseItemName": [ @@ -119,7 +119,7 @@ export default { required: true, trigger: "blur", message: "请选择项目头像", - },], + }, ], nurseStationId: [ { required: true, trigger: "blur", message: "请选择所属护理站" }, ], @@ -138,7 +138,7 @@ export default { methods: { imgs(item) { this.imgsurl.pictureUrlList.push(item); - }, + }, imgUrl(imgUrl) { this.form.nurseStationItem.itemPictureUrl = imgUrl; @@ -295,12 +295,12 @@ export default { obj.pictureUrlList.push(this.form.nurseStationItem.itemPictureUrl); } if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => { }); + updatePicture(obj).then((res) => {}); } if (this.imgsurl.pictureUrlList.length > 0) { updatePicture(this.imgsurl).then((res) => {}); - } - this.imgsurl={pictureUrlList:[]}; + } + this.imgsurl = { pictureUrlList: [] }; this.open = false; this.reset(); @@ -310,25 +310,25 @@ export default { if (this.form.nurseStationItemPrices.length == 5) { this.$message.error("最多只能5条"); } else { - this.ids++; + this.idd++; var obj = { serveDurationUnit: "", price: "", description: "", - ids: this.ids, + idd: this.idd, }; this.form.nurseStationItemPrices.push(obj); } }, delnurseStationItemPrices(item) { - if (item.ids && !item.nurseItemPriceId) { + if (item.idd && !item.nurseItemPriceId) { if (this.form.nurseStationItemPrices.length == 1) { this.$message.error("最后一条不可删除"); } else { this.form.nurseStationItemPrices = - this.form.nurseStationItemPrices.filter((e) => e.ids != item.ids); + this.form.nurseStationItemPrices.filter((e) => e.idd != item.idd); } - } else if (!item.ids && item.nurseItemPriceId) { + } else if (!item.idd && item.nurseItemPriceId) { if (this.form.nurseStationItemPrices.length == 1) { this.$message.error("最后一条不可删除"); } else { @@ -363,8 +363,8 @@ export default { serveDurationUnit: null, price: null, description: null, - ids: this.ids, - },], + idd: this.idd, + }, ], }; this.resetForm("form"); }, @@ -429,7 +429,7 @@ export default { serveDurationUnit: "", price: "", description: "", - ids: this.ids, + idd: this.idd, }; this.form.nurseStationItemPrices.push(obj); } else if (this.form.nurseStationItemPrices.length == 0) { @@ -437,7 +437,7 @@ export default { serveDurationUnit: "", price: "", description: "", - ids: this.ids, + idd: this.idd, }; this.form.nurseStationItemPrices.push(obj); } else if (this.form.nurseStationItemPrices == null) { @@ -445,7 +445,7 @@ export default { serveDurationUnit: "", price: "", description: "", - ids: this.ids, + idd: this.idd, }; this.form.nurseStationItemPrices.push(obj); } @@ -471,13 +471,13 @@ export default { obj.pictureUrlList.push(this.imgone); } if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => { }); + updatePicture(obj).then((res) => {}); } - this.imgsurl={pictureUrlList:[]}; + this.imgsurl = { pictureUrlList: [] }; this.form.nurseStationItemPrices.forEach(e => { e.price = Number(e.price) }) - this.form.nurseStationItem.advanceAppointDuration=0 + this.form.nurseStationItem.advanceAppointDuration = 0 updateNurseItem(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -487,7 +487,7 @@ export default { this.form.nurseStationItemPrices.forEach(e => { e.price = Number(e.price) }) - this.form.nurseStationItem.advanceAppointDuration=0 + this.form.nurseStationItem.advanceAppointDuration = 0 addNurseItem(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); this.$forceUpdate(); @@ -504,16 +504,16 @@ export default { var that = this; this.$modal .confirm("是否确认删除此护理站护理项目?") - .then(function () { + .then(function() { delNurseItem(ids).then(res => { var obj = { pictureUrlList: [] }; obj.pictureUrlList.push(row.itemPictureUrl); - updatePicture(obj).then((res) => { }); + updatePicture(obj).then((res) => {}); that.getList(); that.$modal.msgSuccess("删除成功"); }) }) - .catch(() => { }); + .catch(() => {}); }, /** 导入按钮操作 */ handleExport() { @@ -521,4 +521,4 @@ export default { this.upload.open = true; }, }, -}; +}; \ No newline at end of file From dc618517e0e11fe74a128c143b150e0f9f92bf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Wed, 8 Feb 2023 16:40:11 +0800 Subject: [PATCH 02/78] =?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/classifyItem/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue index 7750701..8988798 100644 --- a/src/views/system/classifyItem/index.vue +++ b/src/views/system/classifyItem/index.vue @@ -165,6 +165,7 @@ :visible.sync="open" width="1000px" append-to-body + :before-close="cancel" > Date: Thu, 9 Feb 2023 09:53:07 +0800 Subject: [PATCH 03/78] =?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/stationClassify.js | 44 ++ src/views/system/classifyItem/index.vue | 22 - src/views/system/stationAvatar/index.vue | 4 + src/views/system/stationClassify/index.vue | 544 +++++++++++++++++++++ 4 files changed, 592 insertions(+), 22 deletions(-) create mode 100644 src/api/system/stationClassify.js create mode 100644 src/views/system/stationClassify/index.vue diff --git a/src/api/system/stationClassify.js b/src/api/system/stationClassify.js new file mode 100644 index 0000000..c0378d5 --- /dev/null +++ b/src/api/system/stationClassify.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询护理机构分类信息列表 +export function listStationClassify(query) { + return request({ + url: '/system/stationClassify/list', + method: 'get', + params: query + }) +} + +// 查询护理机构分类信息详细 +export function getStationClassify(id) { + return request({ + url: '/system/stationClassify/' + id, + method: 'get' + }) +} + +// 新增护理机构分类信息 +export function addStationClassify(data) { + return request({ + url: '/system/stationClassify/add', + method: 'post', + data: data + }) +} + +// 修改护理机构分类信息 +export function updateStationClassify(data) { + return request({ + url: '/system/stationClassify/edit', + method: 'post', + data: data + }) +} + +// 删除护理机构分类信息 +export function delStationClassify(id) { + return request({ + url: '/system/stationClassify/' + id, + method: 'delete' + }) +} \ No newline at end of file diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue index 8988798..fc0956a 100644 --- a/src/views/system/classifyItem/index.vue +++ b/src/views/system/classifyItem/index.vue @@ -24,17 +24,6 @@ @keyup.enter.native="handleQuery" /> - +
+ + + + + + + + + + + + 搜索 + 重置 + + + + + 新增 + + + 修改 + + + 删除 + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + +
+ + + From 949833165cbf235a5a1359d73486eda13f0fbff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Feb 2023 13:36:46 +0800 Subject: [PATCH 04/78] =?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/stationItem/index.vue | 129 +++++++++++++++++- src/views/system/stationItem/stationItemjs.js | 51 ++++++- 2 files changed, 172 insertions(+), 8 deletions(-) diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue index 07d7041..93760da 100644 --- a/src/views/system/stationItem/index.vue +++ b/src/views/system/stationItem/index.vue @@ -241,7 +241,6 @@ width: 208px; text-align: left; height: 36px; - padding-left: -10px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -250,6 +249,41 @@ >
+ + + --> - + --> @@ -331,7 +365,6 @@ From 86d26cf4b7b5bba19b938b683a5cb3595912cbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Feb 2023 14:25:42 +0800 Subject: [PATCH 06/78] =?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/StationDepartment/indexjs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/system/StationDepartment/indexjs.js b/src/views/system/StationDepartment/indexjs.js index 813f9f8..7d0320c 100644 --- a/src/views/system/StationDepartment/indexjs.js +++ b/src/views/system/StationDepartment/indexjs.js @@ -181,7 +181,6 @@ export default { reset() { this.form = { id: null, - nurseStationId: null, departmentCode: null, departmentName: null, departmentPerson: null, @@ -322,4 +321,4 @@ export default { ); }, }, -}; \ No newline at end of file +}; From 25985b71431c7c53f5a88929dc9ca4318dad7527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Feb 2023 15:13:00 +0800 Subject: [PATCH 07/78] =?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/stationItem/index.vue | 6 +++--- src/views/system/stationItem/stationItemjs.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue index 93760da..65f9d41 100644 --- a/src/views/system/stationItem/index.vue +++ b/src/views/system/stationItem/index.vue @@ -264,9 +264,9 @@ " @click="clickClassifyshow" v-if=" - form.nurseStationItem.nurseClassifyName == '请选择护理项目分类' + form.nurseStationItem.classifyName == '请选择护理项目分类' " - >{{ form.nurseStationItem.nurseClassifyName }}{{ form.nurseStationItem.classifyName }} {{ form.nurseStationItem.nurseClassifyName }}{{ form.nurseStationItem.classifyName }} diff --git a/src/views/system/stationItem/stationItemjs.js b/src/views/system/stationItem/stationItemjs.js index ff7d9d4..4add1c1 100644 --- a/src/views/system/stationItem/stationItemjs.js +++ b/src/views/system/stationItem/stationItemjs.js @@ -101,7 +101,7 @@ export default { itemPictureUrl: "", sort: "", nurseStationName: "请选择所属护理站", - nurseClassifyName: '请选择护理项目分类', + classifyName: '请选择护理项目分类', nurseClassifyId: '' }, }, @@ -163,7 +163,7 @@ export default { //选中 choiceclassify(e) { this.form.nurseStationItem.nurseClassifyId = e.id - this.form.nurseStationItem.nurseClassifyName = e.classifyName + this.form.nurseStationItem.classifyName = e.classifyName this.Classifyshow = false }, //重置 @@ -398,7 +398,7 @@ export default { itemPictureUrl: null, sort: null, nurseStationName: "请选择所属护理站", - nurseClassifyName: '请选择护理项目分类', + classifyName: '请选择护理项目分类', nurseClassifyId: '' }, nurseStationItemConsumables: [ From 1391c7b2ef5899ca2f601a179bfeedc02fd8074d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 9 Feb 2023 16:18:42 +0800 Subject: [PATCH 08/78] =?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/classifyItem/index.vue | 7 ++++++- src/views/system/stationClassify/index.vue | 7 ++++++- src/views/system/stationItem/index.vue | 12 +++++------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue index bd3349a..02c45c2 100644 --- a/src/views/system/classifyItem/index.vue +++ b/src/views/system/classifyItem/index.vue @@ -175,6 +175,7 @@ :prop="`nurseClassifyInfoList.${index}.classifyName`" > - + - + - + prop="classifyName" + /> {{ form.nurseStationItem.classifyName }} Date: Mon, 13 Feb 2023 10:41:29 +0800 Subject: [PATCH 09/78] =?UTF-8?q?=E6=B5=B7=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/poser.js | 66 +++ src/views/system/poser/index.vue | 883 +++++++++++++++++++++++++++++++ 2 files changed, 949 insertions(+) create mode 100644 src/api/system/poser.js create mode 100644 src/views/system/poser/index.vue diff --git a/src/api/system/poser.js b/src/api/system/poser.js new file mode 100644 index 0000000..ebb1f90 --- /dev/null +++ b/src/api/system/poser.js @@ -0,0 +1,66 @@ +import request from '@/utils/request' + +// 查询泉医到家系统海报模块信息(包含咨询简介信息)列表 +export function listPoser(query) { + return request({ + url: '/system/poser/list', + method: 'get', + params: query + }) +} +//取消 +export function updatePicture(data) { + return request({ + url: '/system/patientArchives/updatePicture', + method: 'post', + data: data + }) +} +// 查询护理机构和护理项目分类信息列表 +export function listInfo(query) { + return request({ + url: '/classifyItem/info/list', + method: 'get', + params: query + }) +} +// 查询泉医到家系统海报模块信息(包含咨询简介信息)详细 +export function getPoser(id) { + return request({ + url: '/system/poser/' + id, + method: 'get' + }) +} + +// 新增泉医到家系统海报模块信息(包含咨询简介信息) +export function addPoser(data) { + return request({ + url: 'system/poser/add', + method: 'post', + data: data + }) +} +export function getListByUser(query) { + return request({ + url: '/system/station/list', + method: 'GET', + params: query + }) +} + +// 修改泉医到家系统海报模块信息(包含咨询简介信息) +export function updatePoser(data) { + return request({ + url: 'system/poser/edit', + method: 'post', + data: data + }) +} + +// 删除泉医到家系统海报模块信息(包含咨询简介信息) +export function delPoser(id) { + return request({ + url: '/system/poser/' + id, + method: 'delete' + }) +} diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue new file mode 100644 index 0000000..467d787 --- /dev/null +++ b/src/views/system/poser/index.vue @@ -0,0 +1,883 @@ + + + + \ No newline at end of file From dcb81ccedcda106210816c7a9f8fefcd2b6cd903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 13 Feb 2023 18:32:33 +0800 Subject: [PATCH 10/78] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/hospitalDepartment.js | 53 ++ src/views/system/hospitalDepartment/index.vue | 859 ++++++++++++++++++ 2 files changed, 912 insertions(+) create mode 100644 src/api/system/hospitalDepartment.js create mode 100644 src/views/system/hospitalDepartment/index.vue diff --git a/src/api/system/hospitalDepartment.js b/src/api/system/hospitalDepartment.js new file mode 100644 index 0000000..4ea36c8 --- /dev/null +++ b/src/api/system/hospitalDepartment.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询科室信息管理列表 +export function listHospitalDepartment(query) { + return request({ + url: '/system/hospitalDepartment/list', + + method: 'get', + params: query + }) +} + +export function list(query) { + return request({ + url: '/system/hospital/list', + method: 'get', + params: query + }) +} + +// 查询科室信息管理详细 +export function getHospitalDepartment(id) { + return request({ + url: '/system/hospitalDepartment/' + id, + method: 'get' + }) +} + +// 新增科室信息管理 +export function addHospitalDepartment(data) { + return request({ + url: '/system/hospitalDepartment/add', + method: 'post', + data: data + }) +} + +// 修改科室信息管理 +export function updateHospitalDepartment(data) { + return request({ + url: '/system/hospitalDepartment/edit', + method: 'post', + data: data + }) +} + +// 删除科室信息管理 +export function delHospitalDepartment(id) { + return request({ + url: '/system/hospitalDepartment/' + id, + method: 'delete' + }) +} diff --git a/src/views/system/hospitalDepartment/index.vue b/src/views/system/hospitalDepartment/index.vue new file mode 100644 index 0000000..4adaedf --- /dev/null +++ b/src/views/system/hospitalDepartment/index.vue @@ -0,0 +1,859 @@ + + + From 215f3a9c67c6d9a7e6b8f079657956395f0d3716 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, 14 Feb 2023 11:48:08 +0800 Subject: [PATCH 11/78] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86+=E7=A7=91=E5=AE=A4=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86+=E8=B5=84=E8=AE=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/InformationCategory.js | 44 ++ src/api/system/hospital.js | 44 ++ .../system/InformationCategory/index.vue | 441 ++++++++++++++++++ src/views/system/hospital/index.vue | 372 +++++++++++++++ src/views/system/hospitalDepartment/index.vue | 20 +- 5 files changed, 914 insertions(+), 7 deletions(-) create mode 100644 src/api/system/InformationCategory.js create mode 100644 src/api/system/hospital.js create mode 100644 src/views/system/InformationCategory/index.vue create mode 100644 src/views/system/hospital/index.vue diff --git a/src/api/system/InformationCategory.js b/src/api/system/InformationCategory.js new file mode 100644 index 0000000..003f095 --- /dev/null +++ b/src/api/system/InformationCategory.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询资讯分类列表 +export function listInformationCategory(query) { + return request({ + url: '/system/InformationCategory/list', + method: 'get', + params: query + }) +} + +// 查询资讯分类详细 +export function getInformationCategory(id) { + return request({ + url: '/system/InformationCategory/' + id, + method: 'get' + }) +} + +// 新增资讯分类 +export function addInformationCategory(data) { + return request({ + url: '/system/InformationCategory/add', + method: 'post', + data: data + }) +} + +// 修改资讯分类 +export function updateInformationCategory(data) { + return request({ + url: '/system/InformationCategory/edit', + method: 'post', + data: data + }) +} + +// 删除资讯分类 +export function delInformationCategory(id) { + return request({ + url: '/system/InformationCategory/' + id, + method: 'delete' + }) +} diff --git a/src/api/system/hospital.js b/src/api/system/hospital.js new file mode 100644 index 0000000..dbd06ed --- /dev/null +++ b/src/api/system/hospital.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询医院信息管理列表 +export function listHospital(query) { + return request({ + url: '/system/hospital/list', + method: 'get', + params: query + }) +} + +// 查询医院信息管理详细 +export function getHospital(id) { + return request({ + url: '/system/hospital/' + id, + method: 'get' + }) +} + +// 新增医院信息管理 +export function addHospital(data) { + return request({ + url: '/system/hospital/add', + method: 'post', + data: data + }) +} + +// 修改医院信息管理 +export function updateHospital(data) { + return request({ + url: '/system/hospital/edit', + method: 'post', + data: data + }) +} + +// 删除医院信息管理 +export function delHospital(id) { + return request({ + url: '/system/hospital/' + id, + method: 'delete' + }) +} diff --git a/src/views/system/InformationCategory/index.vue b/src/views/system/InformationCategory/index.vue new file mode 100644 index 0000000..aa94aab --- /dev/null +++ b/src/views/system/InformationCategory/index.vue @@ -0,0 +1,441 @@ + + + diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue new file mode 100644 index 0000000..6e90208 --- /dev/null +++ b/src/views/system/hospital/index.vue @@ -0,0 +1,372 @@ + + + diff --git a/src/views/system/hospitalDepartment/index.vue b/src/views/system/hospitalDepartment/index.vue index 4adaedf..4c41c0f 100644 --- a/src/views/system/hospitalDepartment/index.vue +++ b/src/views/system/hospitalDepartment/index.vue @@ -365,9 +365,9 @@ label-width="80px" :inline="true" > - + @@ -435,16 +435,16 @@ align="center" > - - + --> @@ -541,6 +541,8 @@ export default { nurseStationqueryParams: { pageNum: 1, pageSize: 10, + hospitalCode:"", + hospitalName:"", }, infolist: [], // 非单个禁用 @@ -567,6 +569,7 @@ export default { parentId: null, hospitalId: null, hospitalName: null, + hospitalCode: null, departmentCode: null, departmentName: null, departmentPhone: null, @@ -722,7 +725,7 @@ export default { this.nnerVisibleindex = index; console.log(this.nnerVisibleindex); this.innerVisible = true; - this.homenumber = item; + // this.homenumber = item; }, //修改医院按钮 clickitem() { @@ -734,6 +737,8 @@ export default { this.nurseStationqueryParams = { pageNum: 1, pageSize: 10, + hospitalCode:"", + hospitalName:"", }; this.info(); }, @@ -747,8 +752,9 @@ export default { }); }, info() { - list(this.queryParams).then((response) => { + list(this.nurseStationqueryParams,).then((response) => { this.infolist = response.rows; + console.log(this.infolist) this.total2 = response.total; this.loading = false; }); From 6b38a3154e07926402a29d1fb457b87665d27845 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, 14 Feb 2023 17:04:38 +0800 Subject: [PATCH 12/78] =?UTF-8?q?=E8=B5=84=E8=AE=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86+=E8=B5=84=E8=AE=AF=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/informationInfo.js | 52 ++ .../system/InformationCategory/index.vue | 331 ++++++--- src/views/system/hospital/index.vue | 17 +- src/views/system/hospitalDepartment/index.vue | 58 +- src/views/system/informationInfo/index.vue | 697 ++++++++++++++++++ 5 files changed, 971 insertions(+), 184 deletions(-) create mode 100644 src/api/system/informationInfo.js create mode 100644 src/views/system/informationInfo/index.vue diff --git a/src/api/system/informationInfo.js b/src/api/system/informationInfo.js new file mode 100644 index 0000000..1fe7f74 --- /dev/null +++ b/src/api/system/informationInfo.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询资讯信息管理列表 +export function listInformationInfo(query) { + return request({ + url: '/system/informationInfo/list', + method: 'get', + params: query + }) +} + +// 查询资讯信息管理详细 +export function getInformationInfo(id) { + return request({ + url: '/system/informationInfo/' + id, + method: 'get' + }) +} + +// 新增资讯信息管理 +export function addInformationInfo(data) { + return request({ + url: '/system/informationInfo/add', + method: 'post', + data: data + }) +} + +// 修改资讯信息管理 +export function updateInformationInfo(data) { + return request({ + url: '/system/informationInfo/edit', + method: 'post', + data: data + }) +} +// 查询资讯分类列表 +export function listInformationCategory(query) { + return request({ + url: '/system/InformationCategory/list', + method: 'get', + params: query + }) +} + +// 删除资讯信息管理 +export function delInformationInfo(id) { + return request({ + url: '/system/informationInfo/' + id, + method: 'delete' + }) +} diff --git a/src/views/system/InformationCategory/index.vue b/src/views/system/InformationCategory/index.vue index aa94aab..4f52347 100644 --- a/src/views/system/InformationCategory/index.vue +++ b/src/views/system/InformationCategory/index.vue @@ -1,6 +1,13 @@ diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue index 6e90208..6834fdc 100644 --- a/src/views/system/hospital/index.vue +++ b/src/views/system/hospital/index.vue @@ -25,22 +25,7 @@ @keyup.enter.native="handleQuery" /> - - + 搜索 重置 diff --git a/src/views/system/hospitalDepartment/index.vue b/src/views/system/hospitalDepartment/index.vue index 4c41c0f..c35a8fd 100644 --- a/src/views/system/hospitalDepartment/index.vue +++ b/src/views/system/hospitalDepartment/index.vue @@ -8,22 +8,7 @@ v-show="showSearch" label-width="68px" > - - + - + +
+ + + + + + + + + + + + + + 搜索 + 重置 + + + + + + 新增 + + + 修改 + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ form.informationCategoryName }} + {{ form.informationCategoryName }} + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + +
+ + + From 1d4f6cb4e6dec79bcde6ef6b760869c721e6cda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Wed, 15 Feb 2023 09:03:08 +0800 Subject: [PATCH 13/78] =?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 | 8 + src/views/system/poser/index.vue | 845 ++++++++++++++--------- src/views/system/station/index.vue | 189 ++++- src/views/system/station/stationjs.js | 12 + src/views/system/stationAvatar/index.vue | 124 +++- 5 files changed, 811 insertions(+), 367 deletions(-) diff --git a/src/api/system/stationAvatar.js b/src/api/system/stationAvatar.js index 8355f87..d42ceb0 100644 --- a/src/api/system/stationAvatar.js +++ b/src/api/system/stationAvatar.js @@ -9,8 +9,16 @@ export function updateNurseStationHeads(data) { }) } +//海报视频上传 +export function updatePoserHeads(data) { + return request({ + url: '/system/poser/updatePoserHeads', + method: 'post', + data: data + }) +} export function posts(data) { return request({ diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue index 467d787..33a5fd3 100644 --- a/src/views/system/poser/index.vue +++ b/src/views/system/poser/index.vue @@ -6,38 +6,14 @@ size="small" :inline="true" v-show="showSearch" - label-width="90px" + label-width="110px" > - + {{ queryParams.nurseStationName }} - - - + {{ queryParams.nurseItemName }} @@ -50,54 +26,22 @@ @keyup.enter.native="handleQuery" /> - + - - -
- - - + prop="nurseItemName" + /> - - - + + + + + + - - - - - - + - - + + + + + - - - + + + + - + + + + + + + + + + + - - - + + - - + + \ No newline at end of file +} + \ No newline at end of file diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue index 68ed092..1528e26 100644 --- a/src/views/system/station/index.vue +++ b/src/views/system/station/index.vue @@ -151,7 +151,7 @@ :limit.sync="getListByUserquery.pageSize" @pagination="info" /> - +
- - + + + + + + + + + + + + + + + + + + + + 取 消
+ +
+ +
+
-
请上传图片为800x800px的正方形
+
+ 请上传图片为800x800px的正方形 +

@@ -113,7 +134,11 @@ diff --git a/src/views/system/informationInfo/index.vue b/src/views/system/informationInfo/index.vue index 0e9084e..42da695 100644 --- a/src/views/system/informationInfo/index.vue +++ b/src/views/system/informationInfo/index.vue @@ -8,14 +8,7 @@ v-show="showSearch" label-width="100px" > - + - - - - + + @@ -322,7 +253,7 @@ label-width="120" > @@ -404,8 +335,8 @@
@@ -436,7 +367,7 @@ export default { // 非多个禁用 multiple: true, innerVisible: false, - nurseStationqueryParams: { + informationqueryParams: { pageNum: 1, pageSize: 10, informationCategoryCode: "", @@ -534,16 +465,16 @@ export default { }, //重置 addresetQuery() { - this.nurseStationqueryParams = { + this.queryParams = { pageNum: 1, pageSize: 10, informationCategoryCode: "", - informationCategoryName: "", + informationTitle: "", }; this.getList(); }, addresetQuerylist() { - this.nurseStationqueryParams = { + this.informationqueryParams = { pageNum: 1, pageSize: 10, informationCategoryCode: "", @@ -552,7 +483,7 @@ export default { this.informationInfoinfo(); }, informationInfoinfo() { - listInformationCategory(this.nurseStationqueryParams).then((response) => { + listInformationCategory(this.informationqueryParams).then((response) => { this.infolist = response.rows; console.log(this.infolist); this.total2 = response.total; @@ -634,6 +565,13 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.queryParams = { + pageNum: 1, + pageSize: 10, + informationCategoryCode: "", + informationCategoryName: "", + }; + this.informationInfoinfo(); this.handleQuery(); }, // 多选框选中数据 From c6d7a20eb9c4d54d34b56215f4ff7c0443b8363f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 16 Feb 2023 15:23:34 +0800 Subject: [PATCH 27/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=80=E7=9B=B4=E9=87=8D=E5=A4=8D=E5=8F=A0=E5=8A=A0:00?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/station/stationjs.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/system/station/stationjs.js b/src/views/system/station/stationjs.js index 896175c..3ef86a0 100644 --- a/src/views/system/station/stationjs.js +++ b/src/views/system/station/stationjs.js @@ -369,12 +369,15 @@ export default { /** 提交按钮 */ submitForm() { this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime + ':00' + this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime.slice(0, 8) this.form.afternoonOpenEndTime = this.form.afternoonOpenEndTime + ':00' + this.form.afternoonOpenEndTime = this.form.afternoonOpenEndTime.slice(0, 8) this.form.morningOpenEndTime = this.form.morningOpenEndTime + ':00' + this.form.morningOpenEndTime = this.form.morningOpenEndTime.slice(0, 8) this.form.morningOpenStartTime = this.form.morningOpenStartTime + ':00' + this.form.morningOpenStartTime = this.form.morningOpenStartTime.slice(0, 8) this.form.nurseStationLabelList = this.looknurseStationLabel; this.form.nurseStationType = this.nurseStationType2; - console.log(this.form); this.$refs["form"].validate((valid) => { if (valid) { this.form.areaCode = Number(this.form.areaCode); From 73dd7e4d35b85d12423b0489c602135ad5a08ecf 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, 16 Feb 2023 15:24:34 +0800 Subject: [PATCH 28/78] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/hospitalPerson/index.vue | 603 ++++++++++++++++------ 1 file changed, 455 insertions(+), 148 deletions(-) diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index d770d9e..e43bc03 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -8,7 +8,6 @@ v-show="showSearch" label-width="130px" > - - + - + - + - + - - + + @@ -676,8 +933,8 @@ export default { components: { editor }, name: "HospitalPerson", data() { - //验证身份证 - var isCardId = (rule, value, callback) => { + //验证身份证 + var isCardId = (rule, value, callback) => { if (!value) { return new Error("请输入身份证号)"); } else { @@ -691,16 +948,19 @@ export default { } } }; - // 验证手机号的规则 - var checkMobile = (rule, value, cb) => { - // 验证手机号的正则表达式 - const regMobile = - /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/; - if (regMobile.test(value)) { - return cb(); - } - cb(new Error("请输入正确的联系电话")); - }; + // 验证手机号的规则 + // var checkMobile = (rule, value, cb) => { + // // 验证手机号的正则表达式 + // const regMobile = + // // /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/; + // // /^((0\\d{2,3}(-)?\\d{7,8})|((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[2567]{1})(17[0-9]{1})|(18[0-9]{1})|(19[0-9]{1}))+\\d{8})$/; + // /^((0\d{2,3}(-)?\d{7,8})|(13[0-9]|14[0-9]|15[0-9]|16[2567]|17[0-9]|18[0-9]|19[0-9])+\d{8})$/; + + // if (regMobile.test(value)) { + // return cb(); + // } + // cb(new Error("请输入正确的联系电话")); + // }; return { // 遮罩层 loading: true, @@ -710,6 +970,8 @@ export default { total3: 0, innerVisible: false, innerVisibledepartment: false, + innerVisibledepartmentxg: false, + innerVisiblexg: false, imgsurl: { pictureUrlList: [] }, options: [ { @@ -825,7 +1087,7 @@ export default { personIntroduce: [ { required: true, - + trigger: "blur", message: "请选择个人简介", }, @@ -840,8 +1102,8 @@ export default { personPhone: [ { required: true, - validator: checkMobile, - message: "", + // validator: checkMobile, + message: "请输入联系电话", trigger: "blur", }, ], @@ -853,7 +1115,7 @@ export default { trigger: "blur", }, ], - + consultingFee: [ { required: true, @@ -863,79 +1125,79 @@ 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: "", - trigger: "blur", - }, - ], - cardNo: [ - { - required: true, - message: "", - validator: isCardId, - trigger: "blur", - }, - ], - - consultingFee: [ - { - required: true, - message: "请选择咨询费用", - trigger: "blur", - }, - ], + { + 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", + }, + ], }, }; }, @@ -948,7 +1210,7 @@ export default { console.log(item); this.imgsurl.pictureUrlList.push(item); }, - + nurseclick(row) { console.log(row); this.form.hospitalPersonInfoList[this.nnerVisibleindex].hospitalName = @@ -957,6 +1219,13 @@ export default { row.id; this.innerVisible = false; }, + nurseclickxg(row) { + console.log(row); + this.form.hospitalName = row.hospitalName; + this.form.hospitalId = row.id; + this.innerVisiblexg = false; + }, + // 科室 departmentclick(row) { console.log(row); this.form.hospitalPersonInfoList[ @@ -967,13 +1236,28 @@ export default { // } this.innerVisibledepartment = false; }, - + departmentclickxg(row) { + console.log(row); + this.form.departmentName = row.departmentName; + this.form.departmentId = row.id; + // } + this.innerVisibledepartmentxg = false; + }, +//医院关闭 innerVisiblecancel() { this.innerVisible = false; }, + + innerVisiblecancelxg() { + this.innerVisiblexg = false; + }, + //科室关闭 innerVisiblecanceldepart() { this.innerVisibledepartment = false; }, + innerVisiblecanceldepartxg() { + this.innerVisibledepartmentxg = false; + }, //删除deldisease deldisease(index) { this.form.hospitalPersonInfoList.splice(index, 1); @@ -982,7 +1266,7 @@ export default { var obj = { hospitalId: "", departmentCode: "", - departmentId:"", + departmentId: "", departmentName: "请选择所属科室", departmentPerson: "", departmentPhone: "", @@ -1012,6 +1296,15 @@ export default { this.innerVisible = true; // this.homenumber = item; }, + // 修改医院按钮 + clickinnerVisiblexg(item) { + this.addresetQuery(); + // this.form.hospitalId = item.hospitalId; + // this.nnerVisibleindex = index; + // console.log(this.nnerVisibleindex); + this.innerVisiblexg = true; + // this.homenumber = item; + }, //新增科室按钮 clicklist(item, index) { this.departmentList(); @@ -1020,6 +1313,12 @@ export default { console.log(this.departmentListindex); this.innerVisibledepartment = true; }, + // 修改科室按钮 + clickdepartmentlist(){ + this.departmentList(); + // this.form.departmentId = item.departmentId; + this.innerVisibledepartmentxg = true; + }, departmentList() { // this.loading = true; listHospitalDepartment(this.departmentqueryParams).then((response) => { @@ -1029,7 +1328,6 @@ export default { }); }, //修改医院按钮 - addresetQuery() { this.hospitalqueryParams = { pageNum: 1, @@ -1125,6 +1423,15 @@ export default { }, /** 提交按钮 */ 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 10a0146524e226b069b7f7dd9b073988ef3fb633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 16 Feb 2023 15:27:26 +0800 Subject: [PATCH 29/78] =?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/poser/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue index 77a2f9e..67cd7b1 100644 --- a/src/views/system/poser/index.vue +++ b/src/views/system/poser/index.vue @@ -956,7 +956,6 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - console.log(selection); this.ids = selection.map((item) => item.nurseStationId); this.itemids = selection.map((item) => item.nurseItemId); this.Types = selection.map((item) => item.moduleType); @@ -973,7 +972,7 @@ export default { handleUpdate(row) { this.reset(); const id = row.nurseStationId || this.ids; - const itemid = row.nurseStationId || this.ids; + const itemid = row.nurseItemId || this.itemids; const type = row.moduleType || this.Types; getPoser(type, id, itemid).then((response) => { this.form = response.data; From a20380de0406426f302a3e90adc90e82b11f05e1 Mon Sep 17 00:00:00 2001 From: lijiahui <1289711029@qq.com> Date: Thu, 16 Feb 2023 16:13:47 +0800 Subject: [PATCH 30/78] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B3=89=E5=8C=BB?= =?UTF-8?q?=E5=88=B0=E5=AE=B6=E7=B3=BB=E7=BB=9F=E6=B5=B7=E6=8A=A5=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BF=A1=E6=81=AF=EF=BC=88=E5=8C=85=E5=90=AB=E5=92=A8?= =?UTF-8?q?=E8=AF=A2=E7=AE=80=E4=BB=8B=E4=BF=A1=E6=81=AF=EF=BC=89=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=20=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/poser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/system/poser.js b/src/api/system/poser.js index 7999bfe..8403c45 100644 --- a/src/api/system/poser.js +++ b/src/api/system/poser.js @@ -26,9 +26,9 @@ export function listInfo(query) { } // 查询泉医到家系统海报模块信息(包含咨询简介信息)详细 -export function getPoser(moduleType, nurseStationId, nurseltemId) { +export function getPoser(moduleType, nurseStationId, nurseItemId) { return request({ - url: `/system/poser/getModuleType?moduleType=${moduleType}&nurseStationId=${nurseStationId}&nurseltemId=${nurseltemId}`, + url: `/system/poser/getModuleType?moduleType=${moduleType}&nurseStationId=${nurseStationId}&nurseItemId=${nurseItemId}`, method: 'get' }) } @@ -64,4 +64,4 @@ export function delPoser(id) { url: '/system/poser/' + id, method: 'delete' }) -} \ No newline at end of file +} From 6fcfa80e05f25578a1c284c79b32462209fa7209 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, 17 Feb 2023 10:49:09 +0800 Subject: [PATCH 31/78] =?UTF-8?q?=E6=8A=A4=E7=90=86=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E5=88=86=E7=B1=BB+=E6=8A=A4=E7=90=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BA=BA=E6=95=B0=E4=B8=8A=E9=99=90=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/station.js | 9 +- src/views/system/station/index.vue | 27 ++++- src/views/system/station/stationjs.js | 104 +++++++++++++++--- src/views/system/stationItem/stationItemjs.js | 29 ++--- 4 files changed, 130 insertions(+), 39 deletions(-) diff --git a/src/api/system/station.js b/src/api/system/station.js index 418a9ec..ad0f5f5 100644 --- a/src/api/system/station.js +++ b/src/api/system/station.js @@ -36,7 +36,14 @@ export function updateStation(data) { data: data }) } - +// 查询护理机构分类信息列表 +export function listStationClassify(query) { + return request({ + url: '/system/stationClassify/list', + method: 'get', + params: query + }) +} // 删除护理站信息 export function delStation(id) { return request({ diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue index 1528e26..ed8a482 100644 --- a/src/views/system/station/index.vue +++ b/src/views/system/station/index.vue @@ -268,6 +268,7 @@ @@ -469,7 +471,7 @@
- + 选择完成 + 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } if (this.imgsurl.pictureUrlList.length > 0) { - updatePicture(this.imgsurl).then((res) => {}); + updatePicture(this.imgsurl).then((res) => { }); } this.imgsurl = { pictureUrlList: [] }; this.open = false; @@ -290,11 +304,53 @@ export default { afternoonOpenEndTime: null, //下午结束 morningOpenEndTime: null, //上午结束 morningOpenStartTime: null, //上午开始 - nurseStationClassifyIds: null, - classifyNameList: '请选择护理站所属机构分类', + nurseStationClassifyIds: [], + classifyName: '请选择护理站所属机构分类', }; this.resetForm("form"); }, + //护理机构分类 + clickinnerVisible() { + this.classifylistInfo(); + this.Classifyshow = true; + }, + + classifylistcancel() { + this.classifyquery = { + pageNum: 1, + pageSize: 10, + classifyCode: "", + classifyName: "", + }; + this.classifylistInfo(); + }, + choiceclassify(e) { + if (this.form.classifyName == '请选择护理站所属机构分类') { + this.form.classifyName = e.classifyName; + } else { + this.form.classifyName = this.form.classifyName + e.classifyName; + } + if ( this.form.nurseStationClassifyIds.find(el => el == e.id)) { + this.form.nurseStationClassifyIds = this.form.nurseStationClassifyIds.filter(ele => ele != e.id) + } + else { + this.form.nurseStationClassifyIds.push(e.id); + } + console.log(this.form.nurseStationClassifyIds) + }, + /** 查询护理机构分类信息列表 */ + classifylistInfo() { + // this.loading = true; + listStationClassify(this.classifyquery).then((response) => { + this.classifylist = response.rows; + this.classifytotal = response.total; + this.loading = false; + }); + }, + cancelClassifyshow() { + this.Classifyshow = false; + // this。 + }, //护理站列表 info() { this.loading = true @@ -347,7 +403,7 @@ export default { labelDescription: "", sort: "", idd: 1, - }, ]; + },]; this.title = "添加护理站信息"; }, /** 修改按钮操作 */ @@ -356,7 +412,15 @@ export default { this.loading = true; const id = row.id || this.ids; getStation(id).then((response) => { + + if (response.data.nurseClassifyInfoList) { + response.data.nurseStationClassifyIds=[] + response.data.nurseClassifyInfoList.forEach(e => { + response.data.nurseStationClassifyIds.push(e.id) + }) + } this.form = response.data; + this.form.classifyName=response.data.classifyNameList; this.form.streetCode = this.form.streetName; this.imgone = this.form.stationIntroducePcitureUrl; this.imgtwo = this.form.stationPictureUrl; @@ -368,6 +432,10 @@ export default { }, /** 提交按钮 */ submitForm() { + // this.form.nurseStationClassifyIds.forEach((e) => { + // e.classifyNameList = e.id; + // }); + this.form.classifyNameList=this.form.classifyName this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime + ':00' this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime.slice(0, 8) this.form.afternoonOpenEndTime = this.form.afternoonOpenEndTime + ':00' @@ -393,7 +461,7 @@ export default { } this.imgsurl = { pictureUrlList: [] }; if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } this.$modal.msgSuccess("修改成功"); this.open = false; @@ -418,7 +486,7 @@ export default { const ids = row.id || this.ids; this.$modal .confirm("是否确认删除此护理站信息?") - .then(function() { + .then(function () { return delStation(ids); }) .then(() => { @@ -426,19 +494,19 @@ export default { obj.pictureUrlList.push(row.stationIntroducePcitureUrl); obj.pictureUrlList.push(row.stationPictureUrl); if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { this.download( "system/station/export", { - ...this.getListByUserquery, - }, + ...this.getListByUserquery, + }, `station_${new Date().getTime()}.xlsx` ); }, diff --git a/src/views/system/stationItem/stationItemjs.js b/src/views/system/stationItem/stationItemjs.js index 865b22f..69b0e7e 100644 --- a/src/views/system/stationItem/stationItemjs.js +++ b/src/views/system/stationItem/stationItemjs.js @@ -78,7 +78,7 @@ export default { value: 'TWO_HOUR', label: '两小时' } - + ], value:"", optionlist: [{ @@ -88,8 +88,8 @@ export default { value: 'ONE_DAY', label: '一小时' }, - - + + ], value1:"", //权限查询 @@ -134,7 +134,7 @@ export default { nurseClassifyId: '', appointmentLimitCount:"", appointmentTimeInterval:"", - + }, }, idd: 1, @@ -157,11 +157,11 @@ export default { trigger: "blur", message: "请选择项目头像", }, ], - "nurseStationItem.appointmentLimitCount": [{ - required: true, - trigger: "blur", - message: "请输入预约人数上限", - }, ], + // "nurseStationItem.appointmentLimitCount": [{ + // required: true, + // trigger: "blur", + // message: "请输入预约人数上限", + // }, ], "nurseStationItem.appointmentTimeInterval": [{ required: true, trigger: "blur", @@ -204,8 +204,8 @@ export default { }, //选中 choiceclassify(e) { - this.form.nurseStationItem.nurseClassifyId = e.id - this.form.nurseStationItem.classifyName = e.classifyName + this.form.nurseStationItem.nurseClassifyId = e.id; + this.form.nurseStationItem.classifyName = e.classifyName; this.Classifyshow = false }, //重置 @@ -504,6 +504,7 @@ export default { this.StationConsumablequeryParams.nurseStationId = null; const id = row.id || this.ids; getNurseItem(id).then((response) => { + this.form = response.data; if (response.data.nurseStationItemConsumables) { response.data.nurseStationItemConsumables.forEach(e => { e.id = e.nurseStationConsumableId @@ -511,7 +512,7 @@ export default { } else { response.data.nurseStationItemConsumables = [] } - this.form = response.data; + this.StationConsumablequeryParams.nurseStationId = response.data.nurseStationItem.nurseStationId; this.imgone = this.form.nurseStationItem.itemPictureUrl; @@ -568,7 +569,7 @@ export default { this.form.nurseStationItemPrices.forEach(e => { e.price = Number(e.price) }) - + updateNurseItem(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -578,7 +579,7 @@ export default { this.form.nurseStationItemPrices.forEach(e => { e.price = Number(e.price) }) - + addNurseItem(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); this.$forceUpdate(); From 9c692783e174945a32c803b436f83a79d6cd4d47 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, 17 Feb 2023 11:12:00 +0800 Subject: [PATCH 32/78] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/InformationCategory/index.vue | 11 +++++------ src/views/system/informationInfo/index.vue | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/system/InformationCategory/index.vue b/src/views/system/InformationCategory/index.vue index 0f18231..24c1385 100644 --- a/src/views/system/InformationCategory/index.vue +++ b/src/views/system/InformationCategory/index.vue @@ -21,6 +21,7 @@ v-model="queryParams.informationCategoryName" placeholder="请输入资讯分类名称" clearable + maxlength="100" @keyup.enter.native="handleQuery" /> @@ -124,7 +125,7 @@ {{ scope.row.informationCategoryType == "HEALTH_NOUS" ? "健康咨询" : "" }} - {{ scope.row.informationCategoryType == "OTHER" ? "其他" : "" }} + @@ -188,6 +189,7 @@ :prop="`informationCategoryList.${index}.informationCategoryName`" > @@ -311,10 +313,7 @@ export default { options: [{ value: 'HEALTH_NOUS', label: '健康咨询' - }, { - value: 'OTHER', - label: '其他' - }], + }, ], value:"", // 遮罩层 loading: true, diff --git a/src/views/system/informationInfo/index.vue b/src/views/system/informationInfo/index.vue index 42da695..3ec9806 100644 --- a/src/views/system/informationInfo/index.vue +++ b/src/views/system/informationInfo/index.vue @@ -13,6 +13,7 @@ @@ -156,6 +157,7 @@ From a881f38a0a86054ef3d8f07ae7e0e6c4f9834ed0 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, 17 Feb 2023 13:58:45 +0800 Subject: [PATCH 33/78] =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/station/index.vue | 6 ++-- src/views/system/station/stationjs.js | 40 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue index ed8a482..3078aa7 100644 --- a/src/views/system/station/index.vue +++ b/src/views/system/station/index.vue @@ -280,8 +280,8 @@ color: #c0c4cc; margin-top: -10px; " - v-if="form.classifyName == '请选择护理站所属机构分类'" - >{{ form.classifyName }}{{ form.classifyNameList }} {{ form.classifyName }}{{ form.classifyNameList }} diff --git a/src/views/system/station/stationjs.js b/src/views/system/station/stationjs.js index f1e9ef2..8b6ee9a 100644 --- a/src/views/system/station/stationjs.js +++ b/src/views/system/station/stationjs.js @@ -305,13 +305,14 @@ export default { morningOpenEndTime: null, //上午结束 morningOpenStartTime: null, //上午开始 nurseStationClassifyIds: [], - classifyName: '请选择护理站所属机构分类', + classifyNameList: '请选择护理站所属机构分类', }; this.resetForm("form"); }, //护理机构分类 clickinnerVisible() { this.classifylistInfo(); + // this.form.classifyNameList=this.form.classifyName this.Classifyshow = true; }, @@ -325,22 +326,32 @@ export default { this.classifylistInfo(); }, choiceclassify(e) { - if (this.form.classifyName == '请选择护理站所属机构分类') { - this.form.classifyName = e.classifyName; + console.log(e) + if (this.form.classifyNameList == '请选择护理站所属机构分类') { + this.form.classifyNameList = e.classifyName; } else { - this.form.classifyName = this.form.classifyName + e.classifyName; + this.form.classifyNameList = this.form.classifyNameList + e.classifyName; } - if ( this.form.nurseStationClassifyIds.find(el => el == e.id)) { + // 若已存在id 则为删除 + if (this.form.nurseStationClassifyIds.find(el => el == e.id)) { this.form.nurseStationClassifyIds = this.form.nurseStationClassifyIds.filter(ele => ele != e.id) } else { + // 不存在 添加进id this.form.nurseStationClassifyIds.push(e.id); } - console.log(this.form.nurseStationClassifyIds) + + // 根据id获取到所有name + console.log(this.classifylist) + this.form.classifyNameList = ""; + this.form.nurseStationClassifyIds.forEach(f => { + let classify = this.classifylist.find(d => d.id == f) + this.form.classifyNameList += classify.classifyName + }) + }, /** 查询护理机构分类信息列表 */ classifylistInfo() { - // this.loading = true; listStationClassify(this.classifyquery).then((response) => { this.classifylist = response.rows; this.classifytotal = response.total; @@ -348,8 +359,9 @@ export default { }); }, cancelClassifyshow() { + this.classifylistInfo(); this.Classifyshow = false; - // this。 + }, //护理站列表 info() { @@ -412,15 +424,14 @@ export default { this.loading = true; const id = row.id || this.ids; getStation(id).then((response) => { - if (response.data.nurseClassifyInfoList) { - response.data.nurseStationClassifyIds=[] + response.data.nurseStationClassifyIds = [] response.data.nurseClassifyInfoList.forEach(e => { response.data.nurseStationClassifyIds.push(e.id) }) - } + } this.form = response.data; - this.form.classifyName=response.data.classifyNameList; + // this.form.classifyName=response.data.classifyNameList; this.form.streetCode = this.form.streetName; this.imgone = this.form.stationIntroducePcitureUrl; this.imgtwo = this.form.stationPictureUrl; @@ -432,10 +443,7 @@ export default { }, /** 提交按钮 */ submitForm() { - // this.form.nurseStationClassifyIds.forEach((e) => { - // e.classifyNameList = e.id; - // }); - this.form.classifyNameList=this.form.classifyName + // this.form.classifyNameList=this.form.classifyName this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime + ':00' this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime.slice(0, 8) this.form.afternoonOpenEndTime = this.form.afternoonOpenEndTime + ':00' From eea50bdc17f13fca448a372494ceb334500e07c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 17 Feb 2023 14:09:17 +0800 Subject: [PATCH 34/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/InformationCategory/index.vue | 34 +++++++------ src/views/system/classifyItem/index.vue | 8 --- src/views/system/person/index.vue | 15 ++++-- src/views/system/person/indexjs.js | 25 ++++++---- src/views/system/poser/index.vue | 24 ++++----- src/views/system/stationAvatar/index.vue | 2 +- src/views/system/stationClassify/index.vue | 8 --- src/views/system/stationItem/index.vue | 6 +-- src/views/system/stationItem/stationItemjs.js | 49 +++++++++---------- 9 files changed, 84 insertions(+), 87 deletions(-) diff --git a/src/views/system/InformationCategory/index.vue b/src/views/system/InformationCategory/index.vue index 24c1385..a4760d1 100644 --- a/src/views/system/InformationCategory/index.vue +++ b/src/views/system/InformationCategory/index.vue @@ -269,18 +269,18 @@ + - - - + + - + + diff --git a/src/views/system/person/indexjs.js b/src/views/system/person/indexjs.js index 00a4f20..e97de45 100644 --- a/src/views/system/person/indexjs.js +++ b/src/views/system/person/indexjs.js @@ -16,9 +16,14 @@ export default { // 验证手机号的规则 var checkMobile = (rule, value, cb) => { // 验证手机号的正则表达式 - const regMobile = - /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/; - if (regMobile.test(value)) { + // const regMobile = + // /^((0\d{2,3}(-)?\d{7,8})|(13[0-9]|14[0-9]|15[0-9]|16[2567]|17[0-9]|18[0-9]|19[0-9])+\d{8})$/;; + const isPhone = /^1([38][0-9]|4[014-9]|[59][0-35-9]|6[2567]|7[0-8])\d{8}$/ //11位合法手机号码 + const isMob0 = /0\d{2,3}\d{7,8}/ //不带-的座机:02985111752 + const isMob1 = /^([0-9]{3,4}-)?[0-9]{7,8}$/ //带一个-:029-85111752 + const isMob2 = /^([0-9]{3,4}-)?[0-9]{7,8}$/ //带二个-:029-8511-1752 + const isMob3 = /^\d{3,4}-\d{3,4}-\d{3,4}$/; //带三个-: 0752-250-520 + if (isPhone.test(value) || isMob0.test(value) || isMob1.test(value) || isMob2.test(value) || isMob3.test(value)) { return cb(); } cb(new Error("请输入正确的联系电话")); @@ -26,9 +31,12 @@ export default { // 验证手机号的规则 var checkMobile2 = (rule, value, cb) => { // 验证手机号的正则表达式 - const regMobile = - /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/; - if (regMobile.test(value)) { + // const regMobile = + // /^((0\d{2,3}(-)?\d{7,8})|(13[0-9]|14[0-9]|15[0-9]|16[2567]|17[0-9]|18[0-9]|19[0-9])+\d{8})$/;; + const isPhone = /^1([38][0-9]|4[014-9]|[59][0-35-9]|6[2567]|7[0-8])\d{8}$/ //11位合法手机号码 + const isMob1 = /0\d{2,3}\d{7,8}/ //不带-的座机:02985111752 + const isMob2 = /^([0-9]{3,4}-)?[0-9]{7,8}$/ //带一个-:029-85111752 + if (isPhone.test(value) || isMob1.test(value) || isMob2.test(value)) { return cb(); } cb(new Error("请输入正确的联系电话")); @@ -53,15 +61,12 @@ export default { value: "NURSE_TEACHER", }, ], - innerVisible: false, innerVisible2: false, innerVisiblexg: false, innerVisiblexg2: false, - // 遮罩层 loading: true, - // 用户导入参数 upload: { // 是否显示弹出层(用户导入) @@ -585,4 +590,4 @@ export default { ); }, }, -}; \ No newline at end of file +}; diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue index 67cd7b1..c15a843 100644 --- a/src/views/system/poser/index.vue +++ b/src/views/system/poser/index.vue @@ -193,7 +193,7 @@ @@ -335,7 +335,7 @@ - + - - - + Date: Mon, 20 Feb 2023 11:10:42 +0800 Subject: [PATCH 45/78] =?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/poser.js | 4 ++-- src/views/system/classifyItem/index.vue | 11 +++++++---- src/views/system/informationInfo/index.vue | 19 ++++++++++--------- src/views/system/poser/index.vue | 15 ++++++++++++--- src/views/system/stationItem/index.vue | 4 ++-- src/views/system/stationItem/stationItemjs.js | 10 ++++++++-- 6 files changed, 41 insertions(+), 22 deletions(-) diff --git a/src/api/system/poser.js b/src/api/system/poser.js index 8403c45..e4e66e5 100644 --- a/src/api/system/poser.js +++ b/src/api/system/poser.js @@ -59,9 +59,9 @@ export function updatePoser(data) { } // 删除泉医到家系统海报模块信息(包含咨询简介信息) -export function delPoser(id) { +export function delPoser(nurseStationId,moduleType,nurseItemId) { return request({ - url: '/system/poser/' + id, + url: `/system/poser/deletePoserInfo?moduleType=${moduleType}&nurseStationId=${nurseStationId}&nurseItemId=${nurseItemId}`, method: 'delete' }) } diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue index 7e57577..756a2da 100644 --- a/src/views/system/classifyItem/index.vue +++ b/src/views/system/classifyItem/index.vue @@ -287,6 +287,7 @@ export default { ids: [], // 非单个禁用 single: true, + imgone:"", // 非多个禁用 multiple: true, // 显示搜索条件 @@ -318,6 +319,7 @@ export default { }, idd: 0, classifyPictureUrl: null, + imgsurl: { pictureUrlList: [] }, // 表单校验 rules: { nurseClassifyInfoList: { @@ -418,8 +420,8 @@ export default { cancel() { if (this.editopen) { var obj = { pictureUrlList: [] }; - if (this.form.classifyPictureUrl != this.classifyPictureUrl) { - obj.pictureUrlList.push(this.classifyPictureUrl); + if (this.form.classifyPictureUrl != this.imgone) { + obj.pictureUrlList.push(this.form.classifyPictureUrl); } updatePicture(obj).then((res) => { this.editopen = false; @@ -493,6 +495,7 @@ export default { const id = row.id || this.ids; getInfo(id).then((response) => { this.form = response.data; + this.imgone = this.form.classifyPictureUrl; this.classifyPictureUrl = response.data.classifyPictureUrl; this.editopen = true; this.title = "修改护理项目分类信息"; @@ -506,9 +509,9 @@ export default { if (this.form.id != null) { updateInfo(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); - if (this.form.classifyPictureUrl != this.classifyPictureUrl) { + if (this.form.classifyPictureUrl != this.imgone) { var obj = { pictureUrlList: [] }; - obj.pictureUrlList.push(this.classifyPictureUrl); + obj.pictureUrlList.push(this.imgone); updatePicture(obj).then((res) => {}); } this.editopen = false; diff --git a/src/views/system/informationInfo/index.vue b/src/views/system/informationInfo/index.vue index e4ede3c..97b24fc 100644 --- a/src/views/system/informationInfo/index.vue +++ b/src/views/system/informationInfo/index.vue @@ -215,6 +215,7 @@ placeholder="请输入资讯图文内容" style="width: 80%; margin-left: 18%; margin-top: -5%" v-model="form.informationContent" + /> @@ -438,17 +439,17 @@ export default { message: "请输入显示顺序", }, ], - informationContent: [ - { required: true, message: "请输入资讯图文内容", trigger: "blur" }, - ], // informationContent: [ - // { - // required: true, - // message: "请输入资讯图文内容", - // trigger: "blur", - // message: "", - // }, + // { required: true, message: "请输入资讯图文内容", trigger: "blur" }, // ], + informationContent: [ + { + required: true, + message: "请输入资讯图文内容", + trigger: "blur", + + }, + ], }, infolist: [], imgone: "", diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue index 18d53aa..780d03b 100644 --- a/src/views/system/poser/index.vue +++ b/src/views/system/poser/index.vue @@ -607,6 +607,8 @@ export default { imgs: { pictureUrlList: [] }, // 选中数组 ids: [], + nurseItemIds: [], + moduleTypes: [], itemids: [], Types: [], idd: 9999999, @@ -681,9 +683,12 @@ export default { posterIntroduce: [ { required: true, message: "请输入海报简介", trigger: "blur" }, ], - posterPictureUrl: [ + "posterPictureUrlLists.posterPictureUrl": [ { required: true, message: "请选择海报图片", trigger: "blur" }, ], + "posterPictureUrlLists.jumpType":[ + { required: true, message: "请选择图片跳转标识", trigger: "blur" }, + ], posterVideoUrl: [ { required: true, message: "请选择海报视频", trigger: "blur" }, ], @@ -1018,7 +1023,11 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const ids = row.id || this.ids; + console.log(row) + const ids = row. id || this. ids; + const nurseStationIds = row.nurseStationId || this.nurseStationIds; + const moduleTypes = row.moduleType||this.moduleTypes; + const nurseItemIds =row.nurseItemId||this.nurseItemIds; this.$modal .confirm( '是否确认删除泉医到家系统海报模块信息(包含咨询简介信息)编号为"' + @@ -1026,7 +1035,7 @@ export default { '"的数据项?' ) .then(function () { - return delPoser(ids); + return delPoser(nurseStationIds,moduleTypes,nurseItemIds); }) .then(() => { this.getList(); diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue index fda3280..d7a3411 100644 --- a/src/views/system/stationItem/index.vue +++ b/src/views/system/stationItem/index.vue @@ -232,7 +232,7 @@ > - + - + @@ -184,7 +188,7 @@ /> - + {{ form.nurseStationName }} @@ -271,10 +278,12 @@ - --> + --> - + @@ -167,7 +143,7 @@ :prop="`nurseClassifyInfoList.${index}.classifyName`" > - + @@ -273,7 +245,7 @@ import { getInfo, delInfo, addInfo, - updateInfo, + updateInfo } from "@/api/system/classifyItem.js"; import { updatePicture } from "@/api/system/station"; export default { @@ -287,7 +259,7 @@ export default { ids: [], // 非单个禁用 single: true, - imgone:"", + imgone: "", // 非多个禁用 multiple: true, // 显示搜索条件 @@ -308,15 +280,15 @@ export default { parentId: null, classifyCode: null, classifyName: null, - + classifyLevel: null, classifyType: null, classifyPictureUrl: null, - classifySort: null, + classifySort: null }, // 表单参数 form: { - nurseClassifyInfoList: [], + nurseClassifyInfoList: [] }, idd: 0, classifyPictureUrl: null, @@ -328,46 +300,46 @@ export default { { required: true, message: "请输入分类名称", - trigger: "blur", - }, + trigger: "blur" + } ], classifyPictureUrl: [ { required: true, message: "请选择分类图标", - trigger: "blur", - }, + trigger: "blur" + } ], classifySort: [ { required: true, message: "请输入分类排序", - trigger: "blur", - }, - ], + trigger: "blur" + } + ] }, classifyName: [ { required: true, message: "请输入分类名称", - trigger: "blur", - }, + trigger: "blur" + } ], classifyPictureUrl: [ { required: true, message: "请选择分类图标", - trigger: "blur", - }, + trigger: "blur" + } ], classifySort: [ { required: true, message: "请输入分类排序", - trigger: "blur", - }, - ], - }, + trigger: "blur" + } + ] + } }; }, created() { @@ -385,7 +357,7 @@ export default { classifyName: "", classifyPictureUrl: "", classifySort: "", - idd: this.idd, + idd: this.idd }; if (this.form.nurseClassifyInfoList.length == 5) { this.$message.error("最多批量添加5条"); @@ -399,7 +371,7 @@ export default { imgclassifyPictureitem(item) { let items = JSON.parse(item); if (items.idd && !items.id) { - this.form.nurseClassifyInfoList.forEach((e) => { + this.form.nurseClassifyInfoList.forEach(e => { if (e.idd == items.idd) { e.classifyPictureUrl = items.classifyPictureUrl; } @@ -411,7 +383,7 @@ export default { /** 查询护理机构和护理项目分类信息列表 */ getList() { this.loading = true; - listInfo(this.queryParams).then((response) => { + listInfo(this.queryParams).then(response => { this.infoList = response.rows; this.total = response.total; this.loading = false; @@ -424,18 +396,18 @@ export default { if (this.form.classifyPictureUrl != this.imgone) { obj.pictureUrlList.push(this.form.classifyPictureUrl); } - updatePicture(obj).then((res) => { + updatePicture(obj).then(res => { this.editopen = false; }); } if (this.open) { var obj = { pictureUrlList: [] }; if (this.form.nurseClassifyInfoList) { - this.form.nurseClassifyInfoList.forEach((e) => { + this.form.nurseClassifyInfoList.forEach(e => { obj.pictureUrlList.push(e.classifyPictureUrl); }); } - updatePicture(obj).then((res) => { + updatePicture(obj).then(res => { this.open = false; }); } @@ -455,7 +427,7 @@ export default { createBy: null, createTime: null, updateBy: null, - updateTime: null, + updateTime: null }; this.resetForm("form"); }, @@ -471,7 +443,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map((item) => item.id); + this.ids = selection.map(item => item.id); this.single = selection.length !== 1; this.multiple = !selection.length; }, @@ -483,11 +455,9 @@ export default { classifyName: "", classifyPictureUrl: "", classifySort: "", - idd: this.idd, - }, - ], - - + idd: this.idd + } + ] }; this.open = true; this.title = "添加护理项目分类信息"; @@ -496,7 +466,7 @@ export default { handleUpdate(row) { this.reset(); const id = row.id || this.ids; - getInfo(id).then((response) => { + getInfo(id).then(response => { this.form = response.data; this.imgone = this.form.classifyPictureUrl; this.classifyPictureUrl = response.data.classifyPictureUrl; @@ -506,27 +476,27 @@ export default { }, /** 提交按钮 */ submitForm() { - console.log(this.form); - this.$refs["form"].validate((valid) => { + this.form.classifySort = Number(this.form.classifySort); + this.$refs["form"].validate(valid => { if (valid) { - if (this.form.id != null) { - updateInfo(this.form).then((response) => { + updateInfo(this.form).then(response => { this.$modal.msgSuccess("修改成功"); if (this.form.classifyPictureUrl != this.imgone) { var obj = { pictureUrlList: [] }; obj.pictureUrlList.push(this.imgone); - updatePicture(obj).then((res) => {}); + updatePicture(obj).then(res => {}); } this.editopen = false; this.getList(); }); } else { - if(this.form.nurseClassifyInfoList[0].classifySort){ - this.form.nurseClassifyInfoList[0].classifySort = parseInt(this.form.nurseClassifyInfoList[0].classifySort); + if (this.form.nurseClassifyInfoList[0].classifySort) { + this.form.nurseClassifyInfoList[0].classifySort = parseInt( + this.form.nurseClassifyInfoList[0].classifySort + ); } - - addInfo(this.form).then((response) => { + addInfo(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); @@ -541,7 +511,7 @@ export default { console.log(row); this.$modal .confirm("是否确认删除?") - .then(function () { + .then(function() { return delInfo(ids); }) .then(() => { @@ -555,11 +525,11 @@ export default { this.download( "classify/info/export", { - ...this.queryParams, + ...this.queryParams }, `info_${new Date().getTime()}.xlsx` ); - }, - }, + } + } }; diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue index e06ded0..590e0d8 100644 --- a/src/views/system/poser/index.vue +++ b/src/views/system/poser/index.vue @@ -9,14 +9,18 @@ label-width="110px" > - {{ + + {{ queryParams.nurseStationName - }} + }} + - {{ + + {{ queryParams.nurseItemName - }} + }} + - + - + > @@ -50,16 +49,8 @@ /> - 搜索 - 重置 + 搜索 + 重置 @@ -71,8 +62,7 @@ size="mini" @click="handleAdd" v-hasPermi="['system:poser:add']" - >新增 + >新增 修改 + >修改 删除 + >删除 - + --> + - + - - + + - + @@ -194,19 +161,9 @@ :before-close="cancel" append-to-body > - + - + @@ -221,8 +178,7 @@ :key="item.value" :label="item.label" :value="item.value" - > - + > @@ -230,7 +186,7 @@ v-model="form.poserSort" placeholder="请输入海报显示顺序" oninput="value=value.replace(/[^\d]/g,'')" - maxLength="5" + maxlength="5" /> {{ form.nurseItemName }} + >{{ form.nurseItemName }} {{ form.nurseItemName }} - + >{{ form.nurseItemName }} + + - +