From 21fac2ae86e8bda93d16320a13b7539c7e237809 Mon Sep 17 00:00:00 2001 From: huangdeliang <huangdeliang@skieer.com> Date: Fri, 19 Mar 2021 18:57:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=80=81=E7=9A=84=E4=BD=93?= =?UTF-8?q?=E5=BE=81=E6=95=B0=E6=8D=AE=E5=A4=87=E6=B3=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysCustomerHealthyController.java | 16 +++++ stdiet-ui/src/api/custom/healthy.js | 62 ++++++++++--------- .../src/components/BodySignView/index.vue | 14 ++--- 3 files changed, 57 insertions(+), 35 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java index 1d9c91beb..404dc8c54 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java @@ -3,7 +3,10 @@ package com.stdiet.custom.controller; import java.util.List; import com.stdiet.common.utils.StringUtils; +import com.stdiet.custom.domain.SysCustomerPhysicalSigns; +import com.stdiet.custom.domain.SysPhysicalSigns; import com.stdiet.custom.dto.request.HealthyDetailRequest; +import com.stdiet.custom.service.ISysCustomerPhysicalSignsService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,6 +32,9 @@ public class SysCustomerHealthyController extends BaseController @Autowired private ISysCustomerHealthyService sysCustomerHealthyService; + @Autowired + private ISysCustomerPhysicalSignsService sysCustomerPhysicalSignsService; + /** * 查询客户健康列表 */ @@ -120,4 +126,14 @@ public class SysCustomerHealthyController extends BaseController { return sysCustomerHealthyService.generateHealthyReport(healthyDetailRequest); } + + /** + * 修改老的体征数据 + * @param sysPhysicalSigns + * @return + */ + @PutMapping("/edit/physical") + public AjaxResult editPhysical(@RequestBody SysCustomerPhysicalSigns sysPhysicalSigns) { + return toAjax(sysCustomerPhysicalSignsService.updateSysCustomerPhysicalSigns(sysPhysicalSigns)); + } } \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/healthy.js b/stdiet-ui/src/api/custom/healthy.js index f4b718818..213b419cb 100644 --- a/stdiet-ui/src/api/custom/healthy.js +++ b/stdiet-ui/src/api/custom/healthy.js @@ -1,74 +1,80 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 查询客户健康列表 export function listHealthy(query) { return request({ - url: '/custom/healthy/list', - method: 'get', + url: "/custom/healthy/list", + method: "get", params: query - }) + }); } // 查询客户健康详细 export function getHealthy(id) { return request({ - url: '/custom/healthy/' + id, - method: 'get' - }) + url: "/custom/healthy/" + id, + method: "get" + }); } // 新增客户健康 export function addHealthy(data) { return request({ - url: '/custom/healthy', - method: 'post', + url: "/custom/healthy", + method: "post", data: data - }) + }); } // 修改客户健康 export function updateHealthy(data) { return request({ - url: '/custom/healthy', - method: 'put', + url: "/custom/healthy", + method: "put", data: data - }) + }); } // 删除客户健康 export function delHealthy(id) { return request({ - url: '/custom/healthy/' + id, - method: 'delete' - }) + url: "/custom/healthy/" + id, + method: "delete" + }); } // 导出客户健康 export function exportHealthy(query) { return request({ - url: '/custom/healthy/export', - method: 'get', + url: "/custom/healthy/export", + method: "get", params: query - }) + }); } // 下载文件 export function download(fileName) { return request({ - url: '/common/download', - method: 'get', - params: {"fileName": fileName} - }) + url: "/common/download", + method: "get", + params: { fileName: fileName } + }); } // 生成健康体征报告 export function generateHealthyReport(healthyDetail) { return request({ - url: '/custom/healthy/generateHealthyReport', - method: 'post', + url: "/custom/healthy/generateHealthyReport", + method: "post", data: healthyDetail - }) + }); } - - +// 修改老的体征 +export function editPhysicalSigns(data) { + return request({ + url: "/custom/healthy/edit/physical", + method: "put", + data + }); +} diff --git a/stdiet-ui/src/components/BodySignView/index.vue b/stdiet-ui/src/components/BodySignView/index.vue index ed5c404dd..b3a228bc6 100644 --- a/stdiet-ui/src/components/BodySignView/index.vue +++ b/stdiet-ui/src/components/BodySignView/index.vue @@ -2,14 +2,14 @@ <div class="body_sign_view_wrapper"> <div> <h2>{{ this.data.name }}</h2> - <!-- <el-button + <el-button v-if="dev" size="mini" type="primary" class="remark_btn" @click="handleOnRemark" >修改备注</el-button - > --> + > <div class="msg-info" v-for="(info, idx) in basicInfo" :key="idx"> <text-info v-for="con in info" @@ -25,7 +25,7 @@ <el-dialog title="修改备注" :visible.sync="open" width="480px"> <el-input type="textarea" - v-model="data.remark" + v-model="data.remarks" rows="6" placeholder="请输入备注信息" maxlength="300" @@ -40,7 +40,7 @@ </template> <script> import TextInfo from "@/components/TextInfo"; -import { updateHealthy } from "@/api/custom/healthy"; +import { editPhysicalSigns } from "@/api/custom/healthy"; export default { name: "BodySignView", @@ -111,7 +111,7 @@ export default { { title: "不运动总热量", value: "notSportHeat" }, ]); basicInfo.splice(basicInfo.length, 0, [ - { title: "备注", value: "remark" }, + { title: "备注", value: "remarks" }, ]); } return { @@ -127,8 +127,8 @@ export default { this.open = false; }, submit() { - const { id, remark } = this.data; - updateHealthy({ id, remark }).then((res) => { + const { id, remarks } = this.data; + editPhysicalSigns({ id, remarks }).then((res) => { if (res.code === 200) { this.$message.success("修改成功"); this.open = false;