diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerPhysicalSigns.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerPhysicalSigns.java index ffe435bc5..4af1aad63 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerPhysicalSigns.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerPhysicalSigns.java @@ -1,6 +1,7 @@ package com.stdiet.custom.domain; import com.alibaba.fastjson.JSONArray; +import com.fasterxml.jackson.annotation.JsonFormat; import com.stdiet.common.annotation.Excel; import lombok.Data; @@ -224,6 +225,7 @@ public class SysCustomerPhysicalSigns { private JSONArray avoidFood; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date createTime; private Date updateTime; diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue index 79b223773..fdfb923be 100644 --- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue @@ -16,22 +16,21 @@ 下载报告 减脂指导 修改备注 @@ -39,14 +38,14 @@ v-hasPermi="['custom:healthy:edit']" type="warning" v-show="dataType == 0" - @click="handleEditHealthyClick()" + @click="handleEditHealthyClick" plain >修改信息 删除信息 @@ -177,28 +176,39 @@ -
- -
+ + + - -
- 健康评估表链接 - -
+ + + + +
+
+
+ +
+ 健康评估表链接 +
@@ -207,19 +217,19 @@ @@ -433,9 +443,10 @@ export default { if (res.data.customerHealthy) { //判断是体征还是健康评估 this.dataType = res.data.type; + this.healthyData = res.data.customerHealthy; + this.dataList = []; + this.remarkList[0].remarkValue = this.healthyData.remark; if (this.dataType == 0) { - this.healthyData = Object.assign({}, res.data.customerHealthy); - this.remarkList[0].remarkValue = this.healthyData.remark; this.guidanceList[0].guidanceValue = this.healthyData.guidance; this.getDataListByHealthyMessage(res.data.customerHealthy); } else { @@ -847,7 +858,8 @@ export default { handleEditRemarkClick() { this.$refs["physicalSignsRemarkDialog"].showDialog( this.data, - this.healthyData + this.healthyData, + this.dataType ); }, handleEditGuidanceClick() { diff --git a/stdiet-ui/src/components/PhysicalSignsRemark/index.vue b/stdiet-ui/src/components/PhysicalSignsRemark/index.vue index a2d43b832..ab3b89249 100644 --- a/stdiet-ui/src/components/PhysicalSignsRemark/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsRemark/index.vue @@ -1,49 +1,61 @@ diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue index 127446616..8150bdd56 100644 --- a/stdiet-ui/src/views/custom/customer/index.vue +++ b/stdiet-ui/src/views/custom/customer/index.vue @@ -74,9 +74,7 @@ 搜索 - 重置 + 重置