From a684225de2960ab75b2d9abc3555ede7eccc0c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Tue, 28 Mar 2023 16:05:40 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/nurseItem.js | 7 ++++ src/api/system/poser.js | 11 ++++- src/views/system/poser/index.vue | 42 ++++++++----------- src/views/system/stationItem/index.vue | 12 +++++- src/views/system/stationItem/stationItemjs.js | 25 +++++++++++ 5 files changed, 71 insertions(+), 26 deletions(-) diff --git a/src/api/system/nurseItem.js b/src/api/system/nurseItem.js index 49ad1da..ad03c1e 100644 --- a/src/api/system/nurseItem.js +++ b/src/api/system/nurseItem.js @@ -68,3 +68,10 @@ export function updatePicture(data) { data: data }) } + +export function updateShelfStatus(id, shelfStatus) { + return request({ + url: `/system/stationItem/updateShelfStatus?id=${id}&shelfStatus=${shelfStatus}`, + method: 'post', + }) +} \ No newline at end of file diff --git a/src/api/system/poser.js b/src/api/system/poser.js index e4e66e5..ceada46 100644 --- a/src/api/system/poser.js +++ b/src/api/system/poser.js @@ -59,9 +59,18 @@ export function updatePoser(data) { } // 删除泉医到家系统海报模块信息（包含咨询简介信息） -export function delPoser(nurseStationId,moduleType,nurseItemId) { +export function delPoser(nurseStationId, moduleType, nurseItemId) { return request({ url: `/system/poser/deletePoserInfo?moduleType=${moduleType}&nurseStationId=${nurseStationId}&nurseItemId=${nurseItemId}`, method: 'delete' }) } + + + +export function selectPosterImageJump() { + return request({ + url: '/system/poser/selectPosterImageJump', + method: 'GET', + }) +} \ No newline at end of file diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue index f39198e..4e710f6 100644 --- a/src/views/system/poser/index.vue +++ b/src/views/system/poser/index.vue @@ -266,7 +266,6 @@ >{{ form.nurseItemName }} - @@ -284,9 +283,9 @@ @@ -456,7 +455,8 @@ import { addPoser, getListByUser, updatePoser, - updatePicture + updatePicture, + selectPosterImageJump } from "@/api/system/poser"; import { list } from "@/api/system/nurseItem"; import stationAcatar from "../stationAvatar/index.vue"; @@ -587,22 +587,8 @@ export default { label: "护理机构轮播图" } ], - objitem: [], - jumpTypes: [ - { - value: "NEW_PEOPLE_WELFARE", - label: "新人福利" - }, - { - value: "HOME_PAGE", - label: "首页" - }, - { - value: "SHOPPING", - label: "商城" - } - ], + jumpTypes: [], //页面链接 stationid: "", imgone: [], @@ -626,8 +612,16 @@ export default { this.videourl = baseurl + "/system/station/updateNurseStationHeads"; this.getList(); this.nurseItemlistInfo(); + this.PosterImageJump(); }, methods: { + //类型字典 + PosterImageJump() { + selectPosterImageJump().then(res => { + this.jumpTypes = res.data; + console.log(this.jumpTypes); + }); + }, //删除海报图片列表 delPictureUrl(item) { console.log(item); @@ -674,7 +668,7 @@ export default { }, //选中护理项目 choicenurseItem(e) { - console.log(e) + console.log(e); this.nurseitemid = e.id; if (this.homenumber) { this.queryParams.nurseItemName = e.nurseItemName; @@ -705,8 +699,8 @@ export default { }, //所属护理站页面 ParamsStation(item) { - this.queryParams.nurseItemName=""; - this.form.nurseItemName="请选择所属护理项目"; + this.queryParams.nurseItemName = ""; + this.form.nurseItemName = "请选择所属护理项目"; this.info(); this.nurseStationshow = true; this.homenumber = item; @@ -718,7 +712,7 @@ export default { }, //所属护理项目页面 ParamsStationxm(item) { - console.log(item) + console.log(item); if (this.nurseItemquery.nurseStationId) { this.nurseItemlistInfo(); this.homenumber = item; diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue index e2fc41c..1b046d5 100644 --- a/src/views/system/stationItem/index.vue +++ b/src/views/system/stationItem/index.vue @@ -8,7 +8,7 @@ v-show="showSearch" label-width="110px" > - + {{ queryParams.nurseStationName @@ -108,6 +108,16 @@ + + + diff --git a/src/views/system/stationItem/stationItemjs.js b/src/views/system/stationItem/stationItemjs.js index 0b680cd..7cdbe51 100644 --- a/src/views/system/stationItem/stationItemjs.js +++ b/src/views/system/stationItem/stationItemjs.js @@ -10,6 +10,7 @@ import { addNurseItem, updateNurseItem, updatePicture, + updateShelfStatus } from "@/api/system/nurseItem"; import { getToken } from "@/utils/auth"; import { getListByUser } from "@/api/system/userlist.js"; @@ -196,6 +197,23 @@ export default { this.classifylistInfo(); }, methods: { + //点击上架 + upwhetherShelf(row) { + let shelfStatus = null + if (row.shelfStatus == false) { + shelfStatus = 'NOT_SHELF' + } else if (row.shelfStatus == true) { + shelfStatus = 'SHELF' + } + updateShelfStatus(row.id, shelfStatus).then((res) => { + if (row.shelfStatus == false) { + this.$modal.msgSuccess("已修改上架状态为未上架"); + } else { + this.$modal.msgSuccess("已修改上架状态为上架"); + } + this.getList(); + }); + }, //// //护理项目list //打开遮罩层 clickClassifyshow() { @@ -374,6 +392,13 @@ export default { getList() { this.loading = true; list(this.queryParams).then((response) => { + response.rows.forEach(e => { + if (e.shelfStatus == 'SHELF') { + e.shelfStatus = true + } else { + e.shelfStatus = false + } + }) this.nurseItemList = response.rows; this.total = response.total; this.loading = false; From 231109f01332c567605d4aa12c182a2ade8bfad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Wed, 29 Mar 2023 08:57:29 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/poser/index.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue index 4e710f6..ee7542b 100644 --- a/src/views/system/poser/index.vue +++ b/src/views/system/poser/index.vue @@ -157,7 +157,7 @@ @@ -286,10 +286,16 @@ :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue" + @click.native="taptypes(scope.row,item)" > + + +