Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
xiezhijun 2021-03-05 20:17:35 +08:00
commit c507057f63
14 changed files with 1028 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stdiet-admin/src/main/filters/local/application.yml
View File

@ -9,8 +9,8 @@ stdiet:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
#profile: /Users/wonder/Documents/Workspaces/java/ShengtangManage/running/uploadPath
profile: D:/ruoyi/uploadPath
profile: /Users/wonder/Documents/Workspaces/java/ShengtangManage/running/uploadPath
# profile: D:/ruoyi/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证

6
stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java
View File

@ -20,8 +20,8 @@ public class MyApplicationRunner implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
/* System.out.println("项目启动调用方法");
String path = AliyunOSSUtils.uploadFileInputSteam(AliyunOSSConfig.casePrefix,"ceshi.png",new File("D:\\ceshi.png"));
System.out.println(path);*/
System.out.println("项目启动调用方法");
// String path = AliyunOSSUtils.uploadFileInputSteam(AliyunOSSConfig.casePrefix,"ceshi.png",new File("D:\\ceshi.png"));
// System.out.println(path);
}
}

1
stdiet-ui/package.json
View File

@ -64,6 +64,7 @@
"vue": "2.6.10",
"vue-count-to": "1.0.13",
"vue-cropper": "0.4.9",
"vue-qr": "^2.3.0",
"vue-router": "3.0.2",
"vue-scrollto": "^2.20.0",
"vue-splitpane": "1.0.4",

23
stdiet-ui/src/components/ContractDrawer/index.vue
View File

@ -50,21 +50,27 @@
width="200"
/>
<el-table-column
label="合同地址"
align="center"
prop="path"
width="80"
>
<el-table-column label="合同地址" align="center" prop="path">
<template slot-scope="scope">
<el-button
type="text"
style="margin-right: 8px"
icon="el-icon-copy-document"
@click="handleCopy(scope.row.path)"
class="copyBtn"
:data-clipboard-text="copyValue"
>复制
</el-button>
<el-popover placement="top" trigger="click">
<VueQr :text="copyValue" :logoSrc="logo" />
<el-button
slot="reference"
icon="el-icon-picture-outline"
type="text"
@click="handleCopy(scope.row.path)"
>二维码</el-button
>
</el-popover>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180">
@ -108,15 +114,18 @@ import { delContract, listContract } from "@/api/custom/contract";
import ContractDetail from "@/components/ContractDetail";
import Clipboard from "clipboard";
import ContractAdd from "@/components/ContractAdd";
import VueQr from "vue-qr";
const logo = require("@/assets/logo/logo_b.png");
export default {
name: "CustomerContractDrawer",
components: {
"contract-detail": ContractDetail,
"add-contract": ContractAdd,
VueQr,
},
data() {
return {
logo,
visible: false,
title: "",
data: undefined,

102
stdiet-ui/src/components/HeatStatisticsDrawer/index.vue
View File

@ -10,13 +10,31 @@
<div class="app-container">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button icon="el-icon-share" size="small" title="点击复制链接" class="copyBtn" type="primary" :data-clipboard-text="copyValue" @click="handleCopy()">外食计算器</el-button>
<el-button
icon="el-icon-share"
size="small"
title="点击复制链接"
class="copyBtn"
type="primary"
:data-clipboard-text="copyValue"
@click="handleCopy()"
>外食计算器</el-button
>
</el-col>
<el-popover :placement="bottom" trigger="click">
<VueQr :text="copyValue" :logoSrc="logo" />
<el-button slot="reference">二维码</el-button>
</el-popover>
</el-row>
<el-table :data="foodHeatStatisticsList">
<el-table-column label="日期" align="center" prop="edibleDate" width="120">
<el-table-column
label="日期"
align="center"
prop="edibleDate"
width="120"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.edibleDate, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.edibleDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="食材" align="center" prop="ingredient" />
@ -27,30 +45,41 @@
</el-table-column>
<el-table-column label="质量(克)" align="center" prop="quantity" />-->
<el-table-column label="可摄入量" align="center" prop="maxHeatValue" />
<el-table-column
label="可摄入量"
align="center"
prop="maxHeatValue"
/>
<el-table-column label="食材热量" align="center" prop="heatValue" />
<el-table-column label="热量缺口" align="center" prop="heatGap" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleDetail(scope.row)"
v-hasPermi="['custom:foodHeatStatistics:query']"
>详情</el-button>
>详情</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleCalculate(scope.row)"
>计算</el-button>
>计算</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleOnDeleteClick(scope.row)"
v-hasPermi="['custom:foodHeatStatistics:remove']"
>删除</el-button>
>删除</el-button
>
</template>
</el-table-column>
</el-table>
@ -63,26 +92,40 @@
@pagination="fetchHeatList"
/>
<heatStatisticsCalculate ref="heatStatisticsCalculateRef"></heatStatisticsCalculate>
<heatStatisticsDetail ref="heatStatisticsDetailRef"></heatStatisticsDetail>
<heatStatisticsCalculate
ref="heatStatisticsCalculateRef"
></heatStatisticsCalculate>
<heatStatisticsDetail
ref="heatStatisticsDetailRef"
></heatStatisticsDetail>
</div>
</el-drawer>
</div>
</template>
<script>
import { listFoodHeatStatistics, getFoodHeatStatistics, delFoodHeatStatistics, addFoodHeatStatistics, updateFoodHeatStatistics, exportFoodHeatStatistics } from "@/api/custom/foodHeatStatistics";
import Clipboard from 'clipboard';
import {
listFoodHeatStatistics,
getFoodHeatStatistics,
delFoodHeatStatistics,
addFoodHeatStatistics,
updateFoodHeatStatistics,
exportFoodHeatStatistics,
} from "@/api/custom/foodHeatStatistics";
import Clipboard from "clipboard";
import HeatStatisticsCalculate from "@/components/HeatStatisticsCalculate";
import HeatStatisticsDetail from "@/components/HeatStatisticsDetail";
import VueQr from "vue-qr";
const logo = require("@/assets/logo/logo_b.png");
export default {
name: "HeatStatisticsDrawer",
components: {
'heatStatisticsCalculate':HeatStatisticsCalculate,
'heatStatisticsDetail': HeatStatisticsDetail
heatStatisticsCalculate: HeatStatisticsCalculate,
heatStatisticsDetail: HeatStatisticsDetail,
VueQr,
},
data() {
return {
logo,
visible: false,
title: "",
data: undefined,
@ -94,7 +137,7 @@ export default {
pageNum: 1,
pageSize: 10,
},
copyValue: ""
copyValue: "",
};
},
methods: {
@ -106,33 +149,31 @@ export default {
}
this.title = `「${this.data.name}」热量统计列表`;
this.queryParams.customerId = data.id;
this.copyValue =
window.location.origin.replace("manage", "sign") +
"/foodHeatCalculator/" +
this.data.encId;
this.fetchHeatList();
},
fetchHeatList() {
listFoodHeatStatistics(this.queryParams).then(response => {
listFoodHeatStatistics(this.queryParams).then((response) => {
this.foodHeatStatisticsList = response.rows;
this.total = response.total;
this.visible = true;
});
},
handleAdd() {
},
handleAdd() {},
handleOnClosed() {
this.data = undefined;
this.copyValue = "";
},
handleOnDeleteClick(data) {
const ids = data.id || this.ids;
this.$confirm(
'是否确认删除该数据项?',
"警告",
{
this.$confirm("是否确认删除该数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
})
.then(function () {
return delFoodHeatStatistics(ids);
})
@ -143,11 +184,10 @@ export default {
.catch(function () {});
},
handleCopy() {
this.copyValue = window.location.origin.replace('manage', 'sign') + "/foodHeatCalculator/"+this.data.encId;
const btnCopy = new Clipboard('.copyBtn');
new Clipboard(".copyBtn");
this.$message({
message: '拷贝成功',
type: 'success'
message: "拷贝成功",
type: "success",
});
},
handleCalculate(data) {
@ -157,7 +197,7 @@ export default {
},
handleDetail(data) {
this.$refs.heatStatisticsDetailRef.showDialog(data, this.data.name);
}
},
},
};
</script>

570
stdiet-ui/src/components/PhysicalSignsDialog/index.vue
View File

@ -1,68 +1,189 @@
<template>
<el-dialog :visible.sync="visible" :title="title" append-to-body @closed="onClosed">
<el-dialog
:visible.sync="visible"
:title="title"
append-to-body
@closed="onClosed"
>
<div v-if="showFlag">
<div style="float:right;margin-top:-10px;margin-bottom: 10px;" v-show="dataList.length > 0">
<div
style="float: right; margin-top: -10px; margin-bottom: 10px"
v-show="dataList.length > 0"
>
<!-- 只有新版健康评估信息才可修改，旧的体征数据不支持修改 -->
<el-button type="info" v-show="dataType == 0" @click="generateReport()" plain>下载报告</el-button>
<el-button type="info" v-show="dataType == 0" @click="handleEditGuidanceClick()" plain>减脂指导</el-button>
<el-button v-hasPermi="['custom:healthy:edit']" type="info" v-show="dataType == 0" @click="handleEditRemarkClick()" plain>修改备注</el-button>
<el-button v-hasPermi="['custom:healthy:edit']" type="warning" v-show="dataType == 0" @click="handleEditHealthyClick()" plain>修改信息</el-button>
<el-button type="danger" v-hasPermi="['custom:healthy:remove']" @click="handleDelete()" plain>删除信息</el-button>
<el-button
type="info"
v-show="dataType == 0"
@click="generateReport()"
plain
>下载报告</el-button
>
<el-button
type="info"
v-show="dataType == 0"
@click="handleEditGuidanceClick()"
plain
>减脂指导</el-button
>
<el-button
v-hasPermi="['custom:healthy:edit']"
type="info"
v-show="dataType == 0"
@click="handleEditRemarkClick()"
plain
>修改备注</el-button
>
<el-button
v-hasPermi="['custom:healthy:edit']"
type="warning"
v-show="dataType == 0"
@click="handleEditHealthyClick()"
plain
>修改信息</el-button
>
<el-button
type="danger"
v-hasPermi="['custom:healthy:remove']"
@click="handleDelete()"
plain
>删除信息</el-button
>
</div>
<!-- 客户健康评估 -->
<div v-if="dataList.length > 0 && dataType == 0">
<!-- 基础信息 -->
<div v-for="(item,index) in dataList.slice(0,1)" style="margin-bottom: 50px;" :key="index">
<div
v-for="(item, index) in dataList.slice(0, 1)"
style="margin-bottom: 50px"
:key="index"
>
<div>
<p class="p_title_1" style="margin-top: 5px;">{{titleArray[index]}}</p>
<p class="p_title_1" style="margin-top: 5px">
{{ titleArray[index] }}
</p>
<table-detail-message :data="item"></table-detail-message>
</div>
<!-- 备注 -->
<el-table :data="remarkList" :show-header="false" border :cell-style="remarkColumnStyle" style="width: 100%;">
<el-table-column width="140" prop="remarkTitle">
</el-table-column>
<el-table
:data="remarkList"
:show-header="false"
border
:cell-style="remarkColumnStyle"
style="width: 100%"
>
<el-table-column width="140" prop="remarkTitle"> </el-table-column>
<el-table-column prop="remarkValue">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.remarkValue" :maxLength="100"/></template>
<auto-hide-message
:data="scope.row.remarkValue"
:maxLength="100"
/></template>
</el-table-column>
</el-table>
<!-- 指导 -->
<el-table :data="guidanceList" :show-header="false" border :cell-style="remarkColumnStyle" style="width: 100%;">
<el-table
:data="guidanceList"
:show-header="false"
border
:cell-style="remarkColumnStyle"
style="width: 100%"
>
<el-table-column width="140" prop="guidanceTitle">
</el-table-column>
<el-table-column prop="guidanceValue">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.guidanceValue" :maxLength="100"/></template>
<auto-hide-message
:data="scope.row.guidanceValue"
:maxLength="100"
/></template>
</el-table-column>
</el-table>
</div>
<!-- 其他信息 -->
<div style="height: 400px; overflow: auto">
<div v-for="(item,index) in dataList.slice(1,10)" style="margin-bottom: 50px;" :key="index">
<div
v-for="(item, index) in dataList.slice(1, 10)"
style="margin-bottom: 50px"
:key="index"
>
<div>
<p class="p_title_1" style="margin-top: 5px;">{{titleArray[index+1]}}</p>
<table-detail-message :data="item" v-if="index != dataList.length-2"></table-detail-message>
<el-table :show-header="false" v-if="index == dataList.length-2" :data="item" border :cell-style="columnStyle" style="width: 100%;">
<p class="p_title_1" style="margin-top: 5px">
{{ titleArray[index + 1] }}
</p>
<table-detail-message
:data="item"
v-if="index != dataList.length - 2"
></table-detail-message>
<el-table
:show-header="false"
v-if="index == dataList.length - 2"
:data="item"
border
:cell-style="columnStyle"
style="width: 100%"
>
<el-table-column width="140" prop="attr_name_one">
</el-table-column>
<el-table-column prop="value_one">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.value_one == null ? '' : (scope.row.value_one+'')" :maxLength="20"/>
<el-button type="primary" v-show="scope.row.value_one" @click="downloadFile(medicalReportPathArray[0])">下载</el-button>
<auto-hide-message
:data="
scope.row.value_one == null
? ''
: scope.row.value_one + ''
"
:maxLength="20"
/>
<el-button
type="primary"
v-show="scope.row.value_one"
@click="downloadFile(medicalReportPathArray[0])"
>下载</el-button
>
</template>
</el-table-column>
<el-table-column width="140" prop="attr_name_two"></el-table-column>
<el-table-column
width="140"
prop="attr_name_two"
></el-table-column>
<el-table-column prop="value_two">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.value_two == null ? '' : (scope.row.value_two+'')" :maxLength="20"/>
<el-button type="primary" v-show="scope.row.value_two" @click="downloadFile(medicalReportPathArray[1])">下载</el-button>
<auto-hide-message
:data="
scope.row.value_two == null
? ''
: scope.row.value_two + ''
"
:maxLength="20"
/>
<el-button
type="primary"
v-show="scope.row.value_two"
@click="downloadFile(medicalReportPathArray[1])"
>下载</el-button
>
</template>
</el-table-column>
<el-table-column width="140" prop="attr_name_three"></el-table-column>
<el-table-column
width="140"
prop="attr_name_three"
></el-table-column>
<el-table-column prop="value_three">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.value_three == null ? '' : (scope.row.value_three+'')" :maxLength="20"/>
<el-button type="primary" v-show="scope.row.value_three" @click="downloadFile(medicalReportPathArray[2])">下载</el-button>
<auto-hide-message
:data="
scope.row.value_three == null
? ''
: scope.row.value_three + ''
"
:maxLength="20"
/>
<el-button
type="primary"
v-show="scope.row.value_three"
@click="downloadFile(medicalReportPathArray[2])"
>下载</el-button
>
</template>
</el-table-column>
</el-table>
@ -72,30 +193,62 @@
</div>
<!-- 客户体征 -->
<div v-else>
<table-detail-message v-show="dataList.length > 0" :data="dataList" ></table-detail-message>
<p v-show="dataList.length == 0" style="font-size: 20px;text-align:center;">暂无数据！
<el-button icon="el-icon-share" size="small" title="点击复制链接" class="copyBtn" type="primary" :data-clipboard-text="copyValue" @click="handleCopy()">健康评估表链接</el-button>
</p>
<table-detail-message
v-show="dataList.length > 0"
:data="dataList"
></table-detail-message>
<div
v-show="dataList.length == 0"
style="font-size: 20px; text-align: center"
>
<VueQr :text="copyValue" :logoSrc="logo" />
<div style="text-align: center; margin-top: 20px">
<el-button
icon="el-icon-share"
size="small"
title="点击复制链接"
class="copyBtn"
type="primary"
:data-clipboard-text="copyValue"
@click="handleCopy()"
>健康评估表链接
</el-button>
</div>
</div>
</div>
</div>
<!-- 编辑 -->
<physicalSigns-edit ref="physicalSignsEditDialog" @refreshHealthyData="getCustomerHealthyByCusId()"></physicalSigns-edit>
<physicalSigns-edit
ref="physicalSignsEditDialog"
@refreshHealthyData="getCustomerHealthyByCusId()"
></physicalSigns-edit>
<!-- 编辑备注 -->
<physicalSigns-remark ref="physicalSignsRemarkDialog" @refreshHealthyData="getCustomerHealthyByCusId()"></physicalSigns-remark>
<physicalSigns-remark
ref="physicalSignsRemarkDialog"
@refreshHealthyData="getCustomerHealthyByCusId()"
></physicalSigns-remark>
<!-- 编辑减脂指导 -->
<physicalSigns-guidance ref="physicalSignsGuidanceDialog" @refreshHealthyData="getCustomerHealthyByCusId()"></physicalSigns-guidance>
<physicalSigns-guidance
ref="physicalSignsGuidanceDialog"
@refreshHealthyData="getCustomerHealthyByCusId()"
></physicalSigns-guidance>
</el-dialog>
</template>
<script>
import { getCustomerPhysicalSignsByCusId,delCustomerHealthy } from "@/api/custom/customer";
import {
getCustomerPhysicalSignsByCusId,
delCustomerHealthy,
} from "@/api/custom/customer";
import { generateHealthyReport } from "@/api/custom/healthy";
import TableDetailMessage from "@/components/TableDetailMessage";
import AutoHideMessage from "@/components/AutoHideMessage";
import * as healthyData from "@/utils/healthyData";
import Clipboard from 'clipboard';
import Clipboard from "clipboard";
import PhysicalSignsEdit from "@/components/PhysicalSignsEdit";
import PhysicalSignsRemark from "@/components/PhysicalSignsRemark";
import PhysicalSignsGuidance from "@/components/PhysicalSignsGuidance";
import VueQr from "vue-qr";
const logo = require("@/assets/logo/logo_b.png");
export default {
name: "PhysicalSignsDialog",
components: {
@ -103,10 +256,12 @@ export default {
"table-detail-message": TableDetailMessage,
"physicalSigns-edit": PhysicalSignsEdit,
"physicalSigns-remark": PhysicalSignsRemark,
"physicalSigns-guidance":PhysicalSignsGuidance
"physicalSigns-guidance": PhysicalSignsGuidance,
VueQr,
},
data() {
return {
logo,
visible: false,
showFlag: false,
title: "",
@ -114,8 +269,8 @@ export default {
dataList: [],
dataType: 0,
healthyData: null,
remarkList:[{"remarkTitle": "备注信息", "remarkValue": ""}],
guidanceList:[{"guidanceTitle": "减脂指导", "guidanceValue": ""}],
remarkList: [{ remarkTitle: "备注信息", remarkValue: "" }],
guidanceList: [{ guidanceTitle: "减脂指导", guidanceValue: "" }],
// 体征标题
signTitleData: [
["创建时间", "姓名", "年龄"],
@ -143,82 +298,106 @@ export default {
["experience", "difficulty", "comments"],
],
//健康评估每个模板标题，与调查表保持一致
titleArray: healthyData['titleArray'],
titleArray: healthyData["titleArray"],
// 健康评估标题
healthyTitleData: [
[
["创建时间","客户姓名","手机号"],["调理项目","性别","年龄"],["身高(厘米)","体重(斤)","地域"]
["创建时间", "客户姓名", "手机号"],
["调理项目", "性别", "年龄"],
["身高(厘米)", "体重(斤)", "地域"],
],
[
["减脂经历","减脂遇到的困难","减脂是否反弹"],["是否意识到生活习惯是减脂关键","",""]
["减脂经历", "减脂遇到的困难", "减脂是否反弹"],
["是否意识到生活习惯是减脂关键", "", ""],
],
[
["调味品种","烹调方式","烹调频次"],["洗菜方式","",""]
["调味品种", "烹调方式", "烹调频次"],
["洗菜方式", "", ""],
],
[
["早餐习惯","早餐吃的食物","午餐习惯"],["晚餐习惯","正餐中素菜占比","最常吃的肉类"],
["晚餐时间","每周吃夜宵次数","夜宵通常吃的食物"],["食物的冷热偏好","食物的口味偏好","平均每周吃生蔬菜几次"],
["每周吃生蔬菜的频次类型","平均每天吃水果次数","吃水果的时间段"],["平时吃水果的频次","一餐吃几碗饭","吃几成饱"],
["吃饭速度","饮食特点","常吃的零食"],["有无服用营养保健品","营养保健品品牌名","营养保健品产品名"],
["服用营养保健品频次","忌口过敏食物",""]
["早餐习惯", "早餐吃的食物", "午餐习惯"],
["晚餐习惯", "正餐中素菜占比", "最常吃的肉类"],
["晚餐时间", "每周吃夜宵次数", "夜宵通常吃的食物"],
["食物的冷热偏好", "食物的口味偏好", "平均每周吃生蔬菜几次"],
["每周吃生蔬菜的频次类型", "平均每天吃水果次数", "吃水果的时间段"],
["平时吃水果的频次", "一餐吃几碗饭", "吃几成饱"],
["吃饭速度", "饮食特点", "常吃的零食"],
["有无服用营养保健品", "营养保健品品牌名", "营养保健品产品名"],
["服用营养保健品频次", "忌口过敏食物", ""],
],
[
["每天的饮水量","喜欢喝什么水","喝水习惯"],["常喝的饮品的每周频次","是否喝酒","喝酒种类"],["对应酒的量","是否抽烟","抽烟频次和烟龄"],
["是否经常抽二手烟","工作行业","工作性质"],["排便次数","排便时间段","排便的形状"],["排便的气味","排便的速度","排便的颜色"]
["每天的饮水量", "喜欢喝什么水", "喝水习惯"],
["常喝的饮品的每周频次", "是否喝酒", "喝酒种类"],
["对应酒的量", "是否抽烟", "抽烟频次和烟龄"],
["是否经常抽二手烟", "工作行业", "工作性质"],
["排便次数", "排便时间段", "排便的形状"],
["排便的气味", "排便的速度", "排便的颜色"],
],
[
["每周运动次数", "每次运动的时长", "每天运动的时间"],
["运动","运动场地",""]
["运动", "运动场地", ""],
],
[
["睡觉时间", "睡眠质量", "是否有辅助入睡药物"],
["辅助睡眠类药物名称","是否经常熬夜","熬夜频次"]
["辅助睡眠类药物名称", "是否经常熬夜", "熬夜频次"],
],
[
["病史体征", "湿气数据", "气血数据"],
["家族疾病史", "手术史", "近期是否做过手术"],
["手术恢复情况", "是否长期服用药物", "长期服用的药物"],
["是否出现过过敏症状","过敏症状","过敏源"]
["是否出现过过敏症状", "过敏症状", "过敏源"],
],
[
["体检报告(1)","体检报告(2)","体检报告(3)"]
]
[["体检报告(1)", "体检报告(2)", "体检报告(3)"]],
],
// 健康评估属性
healthyValueData: [
[["createTime","name","phone"],["conditioningProject","sex","age"],["tall","weight","position"]],
[
["experience","difficulty","rebound"],["crux","",""]
["createTime", "name", "phone"],
["conditioningProject", "sex", "age"],
["tall", "weight", "position"],
],
[["condiment","cookingStyle","cookingStyleRate"],["washVegetablesStyle","",""]],
[
["breakfastType","breakfastFood","lunchType"],["dinner","vegetableRate","commonMeat"],
["dinnerTime","supperNum","supperFood"],["dietHotAndCold","dietFlavor","vegetablesNum"],
["vegetablesRateType","fruitsNum","fruitsTime"],["fruitsRate","riceNum","riceFull"],
["experience", "difficulty", "rebound"],
["crux", "", ""],
],
[
["condiment", "cookingStyle", "cookingStyleRate"],
["washVegetablesStyle", "", ""],
],
[
["breakfastType", "breakfastFood", "lunchType"],
["dinner", "vegetableRate", "commonMeat"],
["dinnerTime", "supperNum", "supperFood"],
["dietHotAndCold", "dietFlavor", "vegetablesNum"],
["vegetablesRateType", "fruitsNum", "fruitsTime"],
["fruitsRate", "riceNum", "riceFull"],
["eatingSpeed", "makeFoodType", "snacks"],
["healthProductsFlag", "healthProductsBrand", "healthProductsName"],
["healthProductsWeekRate","dishesIngredient",""]
["healthProductsWeekRate", "dishesIngredient", ""],
],
[
["waterNum","waterType","waterHabit"],["drinksNum","drinkWineFlag","drinkWineClassify"],["drinkWineAmount","smokeFlag","smokeRate"],
["secondSmoke","workIndustry","workType"],["defecationNum","defecationTime","defecationShape"],["defecationSmell","defecationSpeed","defecationColor"]
["waterNum", "waterType", "waterHabit"],
["drinksNum", "drinkWineFlag", "drinkWineClassify"],
["drinkWineAmount", "smokeFlag", "smokeRate"],
["secondSmoke", "workIndustry", "workType"],
["defecationNum", "defecationTime", "defecationShape"],
["defecationSmell", "defecationSpeed", "defecationColor"],
],
[
["motionNum","motionDuration","motionTime"],["motion","motionField",""]
["motionNum", "motionDuration", "motionTime"],
["motion", "motionField", ""],
],
[
["sleepTime", "sleepQuality", "sleepDrugFlag"],
["sleepDrug","stayupLateFlag","stayupLateWeekNum"]
["sleepDrug", "stayupLateFlag", "stayupLateWeekNum"],
],
[
["physicalSigns", "moistureDate", "bloodData"],
["familyIllnessHistory", "operationHistory", "nearOperationFlag"],
["recoveryeSituation", "longEatDrugFlag", "longEatDrugClassify"],
["allergyFlag","allergySituation","allergen"]
["allergyFlag", "allergySituation", "allergen"],
],
[
["medicalReport_one","medicalReport_two","medicalReport_three"]
]
[["medicalReport_one", "medicalReport_two", "medicalReport_three"]],
],
copyValue: "",
detailHealthy: null,
@ -246,6 +425,10 @@ export default {
showDialog(data) {
this.data = data;
this.title = `「${data.name}」客户健康评估信息`;
this.copyValue =
window.location.origin.replace("manage", "sign") +
"/subhealthyInvestigation/" +
this.data.encId;
this.getCustomerHealthyByCusId();
},
getCustomerHealthyByCusId() {
@ -260,7 +443,7 @@ export default {
this.guidanceList[0].guidanceValue = this.healthyData.guidance;
this.getDataListByHealthyMessage(res.data.customerHealthy);
} else {
this.getDataListBySignMessage(res.data.customerHealthy)
this.getDataListBySignMessage(res.data.customerHealthy);
}
}
//this.enc_id = res.data.enc_id;
@ -308,45 +491,79 @@ export default {
getDataListByHealthyMessage(healthy) {
let detailHealthy = this.dealHealthy(healthy);
//性别
detailHealthy.sex = detailHealthy.sex == 0 ? "男" : (detailHealthy.sex == 1 ? "女" : "未知");
detailHealthy.sex =
detailHealthy.sex == 0 ? "男" : detailHealthy.sex == 1 ? "女" : "未知";
detailHealthy.position = detailHealthy.position == 0 ? "南方" : "北方";
detailHealthy.rebound = detailHealthy.rebound == 0 ? "否" : "是";
detailHealthy.crux = detailHealthy.crux == 0 ? "否" : "是";
//调味品
detailHealthy.condiment += detailHealthy.otherCondiment ? ("，"+detailHealthy.otherCondiment) : "";
detailHealthy.condiment += detailHealthy.otherCondiment
? "，" + detailHealthy.otherCondiment
: "";
//烹饪
let cookingStyleRate = "";
if (detailHealthy.cookingStyleRate != null) {
detailHealthy.cookingStyleRate.split(",").forEach(function(item, index){
cookingStyleRate += (cookingStyleRate != "" ? "，" : "") + (healthyData["cookingStyleRateArray"][index])+item +"次";
detailHealthy.cookingStyleRate
.split(",")
.forEach(function (item, index) {
cookingStyleRate +=
(cookingStyleRate != "" ? "，" : "") +
healthyData["cookingStyleRateArray"][index] +
item +
"次";
});
}
detailHealthy.cookingStyleRate = cookingStyleRate;
//洗菜方式
detailHealthy.washVegetablesStyle += detailHealthy.otherWashVegetablesStyle ? ("，"+detailHealthy.otherWashVegetablesStyle) : "";
detailHealthy.washVegetablesStyle += detailHealthy.otherWashVegetablesStyle
? "，" + detailHealthy.otherWashVegetablesStyle
: "";
//素菜占比
detailHealthy.vegetableRate += "成";
let makeFoodTypeOption = healthyData["makeFoodTypeArray"].find(opt => opt.value == detailHealthy.makeFoodType+"");
detailHealthy.makeFoodType = makeFoodTypeOption ? makeFoodTypeOption.name : "";
let makeFoodTypeOption = healthyData["makeFoodTypeArray"].find(
(opt) => opt.value == detailHealthy.makeFoodType + ""
);
detailHealthy.makeFoodType = makeFoodTypeOption
? makeFoodTypeOption.name
: "";
//零食
detailHealthy.snacks += detailHealthy.otherSnacks ? ("，" + detailHealthy.otherSnacks) : "";
detailHealthy.healthProductsFlag = detailHealthy.healthProductsFlag == 1 ? "有" : "无";
detailHealthy.healthProductsWeekRate = detailHealthy.healthProductsDayRate+"次/天，"+detailHealthy.healthProductsWeekRate+"次/周";
detailHealthy.snacks += detailHealthy.otherSnacks
? "，" + detailHealthy.otherSnacks
: "";
detailHealthy.healthProductsFlag =
detailHealthy.healthProductsFlag == 1 ? "有" : "无";
detailHealthy.healthProductsWeekRate =
detailHealthy.healthProductsDayRate +
"次/天，" +
detailHealthy.healthProductsWeekRate +
"次/周";
detailHealthy.waterNum += "毫升";
//饮品
let drinksNumString = "";
if (detailHealthy.drinksNum != null) {
detailHealthy.drinksNum.split(",").forEach(function (item, index) {
drinksNumString += (drinksNumString != "" ? "，" : "") + (healthyData["drinksNumArray"][index])+item +"次";
drinksNumString +=
(drinksNumString != "" ? "，" : "") +
healthyData["drinksNumArray"][index] +
item +
"次";
});
}
detailHealthy.drinksNum = drinksNumString;
detailHealthy.drinkWineClassify += detailHealthy.otherWineClassify ? ("，"+detailHealthy.otherWineClassify) : "";
detailHealthy.drinkWineClassify += detailHealthy.otherWineClassify
? "，" + detailHealthy.otherWineClassify
: "";
let drinkWineAmountString = "";
if (detailHealthy.drinkWineAmount != null) {
detailHealthy.drinkWineAmount.split(",").forEach(function(item, index){
drinkWineAmountString += (drinkWineAmountString != "" ? "，" : "") + (healthyData["drinkWineAmountArray"][index])+item + healthyData["drinkWineAmountUnitArray"][index];
detailHealthy.drinkWineAmount
.split(",")
.forEach(function (item, index) {
drinkWineAmountString +=
(drinkWineAmountString != "" ? "，" : "") +
healthyData["drinkWineAmountArray"][index] +
item +
healthyData["drinkWineAmountUnitArray"][index];
});
}
detailHealthy.drinkWineAmount = drinkWineAmountString;
@ -355,7 +572,11 @@ export default {
let smokeRateString = "";
if (detailHealthy.smokeRate != null) {
detailHealthy.smokeRate.split(",").forEach(function (item, index) {
smokeRateString += (smokeRateString != "" ? "，" : "") + (healthyData["smokeRateArray"][index])+item + healthyData["smokeRateUnitArray"][index];
smokeRateString +=
(smokeRateString != "" ? "，" : "") +
healthyData["smokeRateArray"][index] +
item +
healthyData["smokeRateUnitArray"][index];
});
}
detailHealthy.smokeRate = smokeRateString;
@ -363,24 +584,42 @@ export default {
detailHealthy.motionDuration = detailHealthy.motionDuration + "分钟";
let motionStr = "";
if (detailHealthy.aerobicMotionClassify != null) {
detailHealthy.aerobicMotionClassify.split(",").forEach(function(item, index){
motionStr += item ? ((motionStr != "" ? "，" : "") + item) : "";
detailHealthy.aerobicMotionClassify
.split(",")
.forEach(function (item, index) {
motionStr += item ? (motionStr != "" ? "，" : "") + item : "";
});
}
if (detailHealthy.anaerobicMotionClassify != null) {
detailHealthy.anaerobicMotionClassify.split(",").forEach(function(item, index){
motionStr += item ? ((motionStr != "" ? "，" : "") + item) : "";
detailHealthy.anaerobicMotionClassify
.split(",")
.forEach(function (item, index) {
motionStr += item ? (motionStr != "" ? "，" : "") + item : "";
});
}
if (detailHealthy.anaerobicAerobicMotionClassify != null) {
detailHealthy.anaerobicAerobicMotionClassify.split(",").forEach(function(item, index){
motionStr += item ? ((motionStr != "" ? "，" : "") + item) : "";
detailHealthy.anaerobicAerobicMotionClassify
.split(",")
.forEach(function (item, index) {
motionStr += item ? (motionStr != "" ? "，" : "") + item : "";
});
}
detailHealthy.motion = this.trimComma(motionStr + (detailHealthy.otherMotionClassify ? ( "，"+ detailHealthy.otherMotionClassify) : ""));
detailHealthy.motionField = this.trimComma(detailHealthy.motionField + (detailHealthy.otherMotionField ? ("，"+detailHealthy.otherMotionField) : ""));
detailHealthy.sleepDrugFlag = detailHealthy.sleepDrugFlag == 1 ? "有" : "无";
detailHealthy.stayupLateFlag = detailHealthy.stayupLateFlag == 1 ? "有" : "无";
detailHealthy.motion = this.trimComma(
motionStr +
(detailHealthy.otherMotionClassify
? "，" + detailHealthy.otherMotionClassify
: "")
);
detailHealthy.motionField = this.trimComma(
detailHealthy.motionField +
(detailHealthy.otherMotionField
? "，" + detailHealthy.otherMotionField
: "")
);
detailHealthy.sleepDrugFlag =
detailHealthy.sleepDrugFlag == 1 ? "有" : "无";
detailHealthy.stayupLateFlag =
detailHealthy.stayupLateFlag == 1 ? "有" : "无";
detailHealthy.stayupLateWeekNum += "次/周";
let physicalSigns = this.getSignString(detailHealthy.signList);
/*if(detailHealthy.signList != null && detailHealthy.signList.length > 0){
@ -388,26 +627,80 @@ export default {
physicalSigns += "，" + sign.name;
})
}*/
physicalSigns += "，" + (detailHealthy.otherPhysicalSigns ? detailHealthy.otherPhysicalSigns : "");
physicalSigns +=
"，" +
(detailHealthy.otherPhysicalSigns
? detailHealthy.otherPhysicalSigns
: "");
detailHealthy.physicalSigns = this.trimComma(physicalSigns);
detailHealthy.familyIllnessHistory = this.trimComma(detailHealthy.familyIllnessHistory + "，"+ (detailHealthy.otherFamilyIllnessHistory ? detailHealthy.otherFamilyIllnessHistory : ""));
detailHealthy.operationHistory = this.trimComma(detailHealthy.operationHistory + "，"+ (detailHealthy.otherOperationHistory ? detailHealthy.otherOperationHistory : ""));
detailHealthy.nearOperationFlag = detailHealthy.nearOperationFlag == 1 ? "有" : "无";
detailHealthy.longEatDrugFlag = detailHealthy.longEatDrugFlag == 1 ? "有" : "无";
detailHealthy.longEatDrugClassify = this.trimComma(detailHealthy.longEatDrugClassify + "，" + (detailHealthy.otherLongEatDrugClassify ? detailHealthy.otherLongEatDrugClassify : ""));
detailHealthy.familyIllnessHistory = this.trimComma(
detailHealthy.familyIllnessHistory +
"，" +
(detailHealthy.otherFamilyIllnessHistory
? detailHealthy.otherFamilyIllnessHistory
: "")
);
detailHealthy.operationHistory = this.trimComma(
detailHealthy.operationHistory +
"，" +
(detailHealthy.otherOperationHistory
? detailHealthy.otherOperationHistory
: "")
);
detailHealthy.nearOperationFlag =
detailHealthy.nearOperationFlag == 1 ? "有" : "无";
detailHealthy.longEatDrugFlag =
detailHealthy.longEatDrugFlag == 1 ? "有" : "无";
detailHealthy.longEatDrugClassify = this.trimComma(
detailHealthy.longEatDrugClassify +
"，" +
(detailHealthy.otherLongEatDrugClassify
? detailHealthy.otherLongEatDrugClassify
: "")
);
detailHealthy.allergyFlag = detailHealthy.allergyFlag == 1 ? "有" : "无";
detailHealthy.allergen = this.trimComma(detailHealthy.allergen + "，" + (detailHealthy.otherAllergen ? detailHealthy.otherAllergen : ""));
let medicalReportPathArray = detailHealthy.medicalReport ? detailHealthy.medicalReport.split(",") : [];
let medicalReportNameArray = detailHealthy.medicalReportName ? detailHealthy.medicalReportName.split(",") : [];
detailHealthy.allergen = this.trimComma(
detailHealthy.allergen +
"，" +
(detailHealthy.otherAllergen ? detailHealthy.otherAllergen : "")
);
let medicalReportPathArray = detailHealthy.medicalReport
? detailHealthy.medicalReport.split(",")
: [];
let medicalReportNameArray = detailHealthy.medicalReportName
? detailHealthy.medicalReportName.split(",")
: [];
this.medicalReportPathArray = medicalReportPathArray;
detailHealthy.medicalReport_one = medicalReportPathArray.length > 0 ? (medicalReportNameArray.length > 0 ? medicalReportNameArray[0] : "体检报告（1）") : "";
detailHealthy.medicalReport_two = medicalReportPathArray.length > 1 ? (medicalReportNameArray.length > 1 ? medicalReportNameArray[1] : "体检报告（2）") : "";
detailHealthy.medicalReport_three = medicalReportPathArray.length > 2 ? (medicalReportNameArray.length > 2 ? medicalReportNameArray[2] : "体检报告（3）") : "";
detailHealthy.medicalReport_one =
medicalReportPathArray.length > 0
? medicalReportNameArray.length > 0
? medicalReportNameArray[0]
: "体检报告（1）"
: "";
detailHealthy.medicalReport_two =
medicalReportPathArray.length > 1
? medicalReportNameArray.length > 1
? medicalReportNameArray[1]
: "体检报告（2）"
: "";
detailHealthy.medicalReport_three =
medicalReportPathArray.length > 2
? medicalReportNameArray.length > 2
? medicalReportNameArray[2]
: "体检报告（3）"
: "";
this.detailHealthy = detailHealthy;
for (let i = 0; i < this.healthyTitleData.length; i++) {
let stepArray = [];
for (let j = 0; j < this.healthyTitleData[i].length; j++) {
stepArray[j] = ({"attr_name_one": this.healthyTitleData[i][j][0],"value_one": detailHealthy[this.healthyValueData[i][j][0]],"attr_name_two": this.healthyTitleData[i][j][1],"value_two": detailHealthy[this.healthyValueData[i][j][1]],"attr_name_three": this.healthyTitleData[i][j][2],"value_three": detailHealthy[this.healthyValueData[i][j][2]]});
stepArray[j] = {
attr_name_one: this.healthyTitleData[i][j][0],
value_one: detailHealthy[this.healthyValueData[i][j][0]],
attr_name_two: this.healthyTitleData[i][j][1],
value_two: detailHealthy[this.healthyValueData[i][j][1]],
attr_name_three: this.healthyTitleData[i][j][2],
value_three: detailHealthy[this.healthyValueData[i][j][2]],
};
}
this.dataList[i] = stepArray;
}
@ -416,7 +709,10 @@ export default {
dealHealthy(customerHealthy) {
let array = healthyData["needAttrName"];
for (let i = 0; i < array.length; i++) {
customerHealthy[array[i]] = this.getHealthyStringByArray(array[i]+"Array", customerHealthy[array[i]]);
customerHealthy[array[i]] = this.getHealthyStringByArray(
array[i] + "Array",
customerHealthy[array[i]]
);
}
return customerHealthy;
},
@ -425,11 +721,11 @@ export default {
var str = "";
if (valueArray != null && valueArray.split(",").length > 0) {
valueArray.split(",").forEach(function (item, index) {
let data = healthyData[key].find(opt => opt.value == item);
let data = healthyData[key].find((opt) => opt.value == item);
if (data != null) {
str += (str != "" ? "，" : "") + data.name;
}
})
});
}
return str;
},
@ -448,9 +744,14 @@ export default {
},
generateReport() {
let data = this.detailHealthy;
if(!this.guidanceList[0].guidanceValue || this.guidanceList[0].guidanceValue.length == 0){
if (
!this.guidanceList[0].guidanceValue ||
this.guidanceList[0].guidanceValue.length == 0
) {
this.$confirm("该客户还未添加减脂指导，是否确认下载报告?", "警告", {
confirmButtonText: "确定", cancelButtonText: "取消", type: "warning"
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return generateHealthyReport(data);
@ -459,7 +760,8 @@ export default {
if (response.code == 200 && response.path != null) {
this.download(response.path);
}
}).catch(function () {});
})
.catch(function () {});
} else {
generateHealthyReport(data).then((res) => {
if (res.code == 200 && res.path != null) {
@ -478,11 +780,10 @@ export default {
return str;
},
handleCopy() {
this.copyValue = window.location.origin.replace('manage', 'sign') + "/subhealthyInvestigation/"+this.data.encId;
const btnCopy = new Clipboard('.copyBtn');
new Clipboard(".copyBtn");
this.$message({
message: '拷贝成功',
type: 'success'
message: "拷贝成功",
type: "success",
});
},
/** 删除健康信息操作 */
@ -496,25 +797,36 @@ export default {
cancelButtonText: "取消",
type: "warning",
}
).then(function () {
)
.then(function () {
return delCustomerHealthy(ids);
}).then(() => {
})
.then(() => {
this.dataList = [];
this.msgSuccess("删除成功");
}).catch(function () {});
})
.catch(function () {});
},
handleEditHealthyClick() {
//console.log(JSON.stringify(this.healthyData));
this.$refs["physicalSignsEditDialog"].showDialog(this.data, this.healthyData);
this.$refs["physicalSignsEditDialog"].showDialog(
this.data,
this.healthyData
);
},
handleEditRemarkClick() {
this.$refs["physicalSignsRemarkDialog"].showDialog(this.data, this.healthyData);
this.$refs["physicalSignsRemarkDialog"].showDialog(
this.data,
this.healthyData
);
},
handleEditGuidanceClick() {
this.$refs["physicalSignsGuidanceDialog"].showDialog(this.data, this.healthyData);
}
}
this.$refs["physicalSignsGuidanceDialog"].showDialog(
this.data,
this.healthyData
);
},
},
};
</script>

51
stdiet-ui/src/store/modules/recipes.js
View File

@ -28,7 +28,9 @@ const oriState = {
startNum: 0,
endNum: 0,
reviewStatus: 0,
templateInfo: undefined
templateInfo: undefined,
copyData: undefined,
fontSize: 12
};
const mutations = {
@ -37,7 +39,10 @@ const mutations = {
obj => obj.id === payload.id
);
if (tarDishes) {
if (tarDishes.dishesId !== payload.dishesId) {
if (
payload.dishesId !== tarDishes.dishesId ||
payload.type !== undefined
) {
// 替换菜品
Object.keys(payload).forEach(key => {
if (key === "num") {
@ -55,6 +60,9 @@ const mutations = {
}
}
},
updateFontSize(state, payload) {
state.fontSize = payload.fontSize;
},
addRecipesDishes(state, payload) {
state.recipesData[payload.num].dishes.push(payload.data);
},
@ -282,6 +290,7 @@ const actions = {
// console.log(params);
},
async addDishes({ commit, state }, payload) {
console.log(payload);
const tarDishesList = state.recipesData[payload.num].dishes.filter(
obj => obj.type === payload.data.type
);
@ -367,27 +376,35 @@ const actions = {
);
if (tarDishes) {
const mTarDishes = JSON.parse(JSON.stringify(tarDishes));
const tarIgd = mTarDishes.igdList.find(obj => obj.id === payload.igdId);
let params = {
id: mTarDishes.id
};
if (payload.type !== undefined) {
// 修改餐类
params.type = payload.type;
} else {
// 修改食材
const tarIgd = mTarDishes.igdList.find(
obj => obj.id === payload.igdId
);
if (tarIgd) {
payload.weight && (tarIgd.weight = payload.weight);
payload.cusWeight && (tarIgd.cusWeight = payload.cusWeight);
payload.cusUnit && (tarIgd.cusUnit = payload.cusUnit);
const params = {
id: mTarDishes.id,
detail: mTarDishes.igdList.map(igd => ({
params.detail = mTarDishes.igdList.map(igd => ({
id: igd.id,
weight: igd.weight,
cus_unit: igd.cusUnit,
cus_weight: igd.cusWeight
}))
};
}));
}
}
const result = await updateDishesDetailApi(params);
if (result.code === 200) {
commit("updateRecipesDishesDetail", payload);
}
}
}
} else {
commit("updateRecipesDishesDetail", payload);
}
@ -408,7 +425,21 @@ const actions = {
commit("deleteSomeDayDishes", payload);
}
},
async deleteMenu({ commit }, payload) {}
async deleteMenu({ commit }, payload) {},
async setCopyData({ commit, state }, payload) {
return new Promise((res, rej) => {
const tarDishes = state.recipesData[payload.num].dishes.find(
obj => obj.id === payload.id
);
if (tarDishes) {
commit("updateStateData", { copyData: tarDishes });
res("复制成功");
} else {
rej("复制失败");
}
});
}
};
const getters = {

18
stdiet-ui/src/views/custom/contract/index.vue
View File

@ -187,7 +187,7 @@
prop="updateTime"
width="180"
/>
<el-table-column label="合同地址" align="center" prop="path" width="80">
<el-table-column label="合同地址" align="center" prop="path">
<template slot-scope="scope">
<el-button
type="text"
@ -197,6 +197,16 @@
:data-clipboard-text="copyValue"
>复制
</el-button>
<el-popover placement="top" trigger="click">
<VueQr :text="copyValue" :logoSrc="logo" />
<el-button
slot="reference"
icon="el-icon-picture-outline"
type="text"
@click="handleCopy(scope.row.path)"
>二维码</el-button
>
</el-popover>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="120" />
@ -320,9 +330,14 @@ import { addContract, delContract, listContract } from "@/api/custom/contract";
import Clipboard from "clipboard";
import { mapGetters } from "vuex";
import VueQr from "vue-qr";
const logo = require("@/assets/logo/logo_b.png");
export default {
name: "Contract",
components: {
VueQr,
},
data() {
const checkServePromise = (rule, value, callback) => {
if (this.form.projectId == 0 && !value) {
@ -331,6 +346,7 @@ export default {
callback();
};
return {
logo,
// 遮罩层
loading: true,
// 选中数组

45
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesAspectCom/index.vue
View File

@ -4,6 +4,22 @@
:style="`height: ${collapse ? 30 : 200}px`"
>
<div class="header">
<span class="font_size_style">
字体大小：
<el-select
v-model="mFontSize"
size="mini"
style="width: 80px"
@change="handleOnSizeChange"
>
<el-option
v-for="size in fontSizeOpts"
:key="size.value"
:label="size.label"
:value="size.value"
/>
</el-select>
</span>
<el-button size="mini" v-if="!recipesId" @click="handleOnBack"
>返回</el-button
>
@ -91,16 +107,32 @@ export default {
PieChart,
},
data() {
return {};
return {
mFontSize: 12,
fontSizeOpts: [
{ value: 12, label: "12" },
{ value: 14, label: "14" },
{ value: 16, label: "16" },
{ value: 18, label: "18" },
],
};
},
updated() {
// console.log(this.data);
},
props: ["collapse", "data"],
computed: {
...mapState(["recipesId", "reviewStatus", "healthyData"]),
...mapState(["recipesId", "reviewStatus", "healthyData", "fontSize"]),
},
watch: {
fontSize(val) {
this.mFontSize = val;
},
},
methods: {
handleOnSizeChange(fontSize) {
this.updateFontSize({ fontSize });
},
handleCollapseClick() {
this.$emit("update:collapse", !this.collapse);
},
@ -121,7 +153,7 @@ export default {
this.updateStateData({ recipesData: [] });
},
...mapActions(["saveRecipes", "updateReviewStatus"]),
...mapMutations(["updateStateData"]),
...mapMutations(["updateStateData", "updateFontSize"]),
},
};
</script>
@ -138,6 +170,13 @@ export default {
transition: all 0.3s;
transform-origin: center center;
}
.font_size_style {
display: inline-flex;
align-items: center;
font-size: 12px;
margin-right: 12px;
}
}
.content {

4
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
View File

@ -92,13 +92,14 @@ export default {
data.name
}」`;
this.id = data.id;
this.type = data.type;
} else if (type) {
this.title = `添加第${numDay}天${this.typeDict[type]}菜品`;
this.type = type;
}
this.visible = true;
this.$nextTick(() => {
this.$refs.dishesRef.getList({ type });
this.$refs.dishesRef.getList({ type: this.type });
});
},
handleOnClosed(done) {
@ -114,6 +115,7 @@ export default {
this.active = 1;
this.dishesTypeOptions = (this.type || data.type)
.split(",")
.sort((a, b) => a - b)
.reduce((arr, cur, idx) => {
if (idx === 0) {
this.selDishes.type = cur;

98
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/DishesSettingDialog/index.vue Normal file
View File

@ -0,0 +1,98 @@
<template>
<el-dialog
:title="title"
:visible.sync="visible"
width="320px"
:close-on-click-modal="false"
>
<div v-loading="loading" @click="handleClick" class="reuse_dialog_wrapper">
<div style="margin-bottom: 12px">餐类</div>
<el-radio-group v-model="type">
<el-radio
style="padding: 8px 0"
v-for="item in menuTypeOptions"
:key="item.dictValue"
:label="item.dictValue"
>
{{ item.dictLabel }}
</el-radio>
</el-radio-group>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submit">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { createNamespacedHelpers } from "vuex";
const { mapState } = createNamespacedHelpers("recipes");
import { getDishes } from "@/api/custom/dishes";
export default {
name: "DishesSettingDialog",
data() {
return {
visible: false,
loading: false,
data: undefined,
type: "",
menuTypeOptions: [],
title: "",
};
},
methods: {
handleClick(e) {
e.stopPropagation();
},
showDialog({ numDay, data }) {
if (!data) {
return;
}
this.data = data;
this.visible = true;
this.loading = true;
this.type = data.type;
this.title = `修改第${numDay}天「${data.name}」菜品`;
getDishes(data.dishesId).then((res) => {
if (res.code === 200) {
this.loading = false;
this.menuTypeOptions = res.data.type
.split(",")
.sort((a, b) => a - b)
.reduce((arr, cur) => {
const tarOpt = this.typeOptions.find(
(obj) => obj.dictValue === cur
);
if (tarOpt) {
arr.push(tarOpt);
}
return arr;
}, []);
}
});
},
cancel() {
this.visible = false;
this.data = undefined;
},
submit() {
this.visible = false;
this.$emit("onConfirm", { type: this.type, id: this.data.id });
},
},
computed: {
...mapState(["typeOptions"]),
},
};
</script>
<style lang="scss" scoped>
.reuse_dialog_wrapper {
.item {
margin-bottom: 12px;
}
.menu_type {
padding: 8px 16px;
}
}
</style>

8
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue
View File

@ -95,6 +95,14 @@ export default {
this.mUnit = value;
},
},
watch: {
weight(val) {
this.mWeight = val;
},
unit(val) {
this.mUnit = val;
},
},
computed: {
unitWeight() {
return (

20
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/ReuseDialog/index.vue
View File

@ -1,20 +0,0 @@
<template>
<el-dialog>
</el-dialog>
</template>
<script>
export default {
name: 'ReuseDialog',
data() {
return {
visible: false,
data: undefined
}
},
methods: {
showDialog() {
this.visible = true;
}
}
}
</script>

127
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
View File

@ -7,12 +7,28 @@
:cell-style="{ padding: '2px 0' }"
:header-cell-style="{ padding: '4px 0', height: 'unset' }"
size="mini"
:style="`outline: ${currentDay === num ? '1px solid #d96969' : 'none'}`"
header-row-class-name="recipes_header"
:cell-class-name="cellClassName"
:style="`outline: ${currentDay === num ? '1px solid #d53950' : 'none'}`"
>
<el-table-column prop="type" :width="100" align="center">
<template slot="header">
<div class="num_day" @click="handleOnResetCurrentDay">
<div>{{ `第${numDay}天` }}</div>
<el-popover placement="top" trigger="hover" v-if="!!copyData">
<div>
<el-button size="mini" type="primary" @click="handleOnPaste"
>粘贴</el-button
>
</div>
<div
slot="reference"
class="num_day"
@click="handleOnResetCurrentDay"
>
{{ `第${numDay}天` }}
</div>
</el-popover>
<div v-else>
{{ `第${numDay}天` }}
</div>
</template>
<template slot-scope="scope">
@ -44,6 +60,7 @@
<template slot-scope="scope">
<el-popover placement="right" trigger="hover" :title="scope.row.name">
<div>
<div style="margin-bottom: 8px">
<el-button
type="primary"
size="mini"
@ -62,6 +79,24 @@
>删除</el-button
>
</div>
<div>
<el-button
type="primary"
size="mini"
icon="el-icon-document-copy"
class="fun_button"
@click="handleOnCopy(scope.row)"
>复制</el-button
>
<el-button
size="mini"
icon="el-icon-document-copy"
class="fun_button"
@click="handleOnSetting(scope.row)"
>修改餐类</el-button
>
</div>
</div>
<span class="num_day" slot="reference">{{ scope.row.name }}</span>
</el-popover>
</template>
@ -172,7 +207,13 @@
</el-table-column>
<el-table-column label="做法" prop="methods" />
</el-table>
<!-- 添加菜品抽屉 -->
<AddDishesDrawer ref="drawerRef" @onConfirm="handleOnDishesConfirm" />
<!-- 菜品复用菜单 -->
<DishesSettingDialog
ref="settingDialogRef"
@onConfirm="handleOnSettingConfirm"
/>
</div>
</template>
<script>
@ -187,6 +228,8 @@ const {
import EditableText from "./EditableText";
import EditableUnit from "./EditableUnit";
import AddDishesDrawer from "./AddDishesDrawer";
import DishesSettingDialog from "./DishesSettingDialog";
import VueScrollTo from "vue-scrollto";
export default {
name: "RecipesCom",
@ -213,6 +256,7 @@ export default {
EditableText,
EditableUnit,
AddDishesDrawer,
DishesSettingDialog,
},
mounted() {
// console.log(this.data);
@ -313,12 +357,23 @@ export default {
return mData;
},
...mapGetters(["typeDict"]),
...mapState(["currentDay"]),
...mapState(["currentDay", "copyData", "fontSize"]),
},
methods: {
cellClassName({ row, column, rowIndex, columnIndex }) {
// console.log({ row, column, rowIndex, columnIndex });
if (!columnIndex) {
return "recipes_first_col";
} else {
return `recipes_cell recipes_cell_${this.fontSize}`;
}
},
handleParentClick(e) {
// 校验某天
this.setCurrentDay({ currentDay: this.num });
VueScrollTo.scrollTo(`#recipes${this.num}`, 500, {
container: "#recipes_content",
});
},
spanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
@ -351,6 +406,27 @@ export default {
// console.log(data);
this.deleteDishes({ num: this.num, id: data.id });
},
handleOnCopy(data) {
// console.log(data);
this.setCopyData({ num: this.num, id: data.id })
.then((msg) => {
this.$message.success(msg);
})
.catch((err) => {
this.$message.error(err);
});
},
handleOnPaste() {
// console.log(this.copyData);
if (this.copyData) {
this.addDishes({
num: this.num,
data: this.copyData,
}).catch((err) => {
this.$message.error(err);
});
}
},
handleOnWeightChange(data, weight) {
// console.log({ data, weight });
this.updateDishes({
@ -390,6 +466,16 @@ export default {
});
}
},
handleOnSetting(data) {
this.$refs.settingDialogRef.showDialog({ numDay: this.numDay, data });
},
handleOnSettingConfirm({ type, id }) {
this.updateDishes({
num: this.num,
id,
type,
});
},
handleOnMenuTypeClick(data) {
this.$refs.drawerRef.showDrawer({ type: data.type, numDay: this.numDay });
},
@ -398,6 +484,7 @@ export default {
"addDishes",
"deleteDishes",
"replaceDishes",
"setCopyData",
]),
...mapMutations(["setCurrentDay", "resetCurrentDay"]),
},
@ -419,4 +506,36 @@ export default {
font-size: 12px;
padding: 4px 8px;
}
.recipes_header {
& > th {
background: #d53950 !important;
color: white !important;
font-weight: bold;
}
}
.recipes_first_col {
background: #d53950 !important;
color: white !important;
font-weight: bold;
}
.recipes_cell {
font-weight: bold;
color: #595959;
}
.recipes_cell_12 {
font-size: 12px;
}
.recipes_cell_14 {
font-size: 14px;
}
.recipes_cell_16 {
font-size: 16px;
}
.recipes_cell_18 {
font-size: 18px;
}
</style>