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

修复图片导出问题

Browse Source
This commit is contained in:
huangdeliang 2021-08-06 14:52:53 +08:00
parent 34bc27681d
commit 5bbcc13821
2 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
stdiet-ui/src/components/TemplateDialog/index.vue
View File

@ -30,26 +30,26 @@
</el-select>
</el-form-item>
<el-form-item label="关键词" prop="keyWordArray" label-width="100px">
<el-select
v-model="form.keyWordArray"
multiple
filterable
clearable
allow-create
default-first-option
placeholder="请创建模板关键词，用于模板检索，按回车创建"
style="width:100%"
<el-select
v-model="form.keyWordArray"
multiple
filterable
clearable
allow-create
default-first-option
placeholder="请创建模板关键词，用于模板检索，按回车创建"
style="width: 100%"
>
<el-option
v-for="dict in keyOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
>
<el-option
v-for="dict in keyOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
>
</el-option>
</el-select>
</el-form-item>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark" label-width="100px">
<el-input
v-model="form.remark"
@ -80,7 +80,7 @@ export default {
nutritionistId: null,
remark: null,
keyWordArray: null,
keyWord: null
keyWord: null,
},
// 表单校验
rules: {
@ -93,16 +93,16 @@ export default {
],
},
visible: false,
keyOptions:[
keyOptions: [
{
dictLabel: "1-7",
dictValue: "1-7"
dictValue: "1-7",
},
{
dictLabel: "高血压",
dictValue: "高血压"
}
]
dictValue: "高血压",
},
],
};
},
computed: {
@ -120,7 +120,10 @@ export default {
this.reset();
if (data) {
this.title = "修改模板";
data.keyWordArray = (data.keyWord != null && data.keyWord != "") ? data.keyWord.split(",") : null;
data.keyWordArray =
data.keyWord != null && data.keyWord != ""
? data.keyWord.split(",")
: null;
this.form = data;
} else {
this.title = "创建模板";
@ -129,8 +132,11 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid && this.checkFormat(this.form.keyWordArray)) {
this.form.keyWord = (this.form.keyWordArray != null && this.form.keyWordArray.length > 0) ? this.form.keyWordArray.join(",") : null;
this.form.keyWord = this.form.keyWord.replace("，",",");
this.form.keyWord =
this.form.keyWordArray != null && this.form.keyWordArray.length > 0
? this.form.keyWordArray.join(",").replaceAll("，", ",")
: null;
// this.form.keyWord = (this.form.keyWord || "").replace("，", ",");
this.$emit("onConfirm", this.form);
this.visible = false;
}
@ -145,29 +151,33 @@ export default {
nutritionistId: null,
remark: null,
keyWordArray: null,
keyWord: null
keyWord: null,
};
this.resetForm("form");
},
cancel() {
this.visible = false;
},
checkFormat(keyWordArray){
checkFormat(keyWordArray) {
let flag = true;
let msg = "";
if(keyWordArray != null && keyWordArray.length > 0){
keyWordArray.forEach((item,index) => {
if(item.indexOf(",") != -1 || item.indexOf("，") != -1 || item.indexOf(" ") != -1){
msg = "关键词中不能含有逗号和空格";
flag = false;
}
});
if (keyWordArray != null && keyWordArray.length > 0) {
keyWordArray.forEach((item, index) => {
if (
item.indexOf(",") != -1 ||
item.indexOf("，") != -1 ||
item.indexOf(" ") != -1
) {
msg = "关键词中不能含有逗号和空格";
flag = false;
}
});
}
if(!flag){
this.msgError(msg);
if (!flag) {
this.msgError(msg);
}
return flag;
}
},
},
};
</script>

2
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue
View File

@ -252,7 +252,7 @@ export default {
}
const tmpNum = document.getElementById(`day_num_${idx}`);
if (tmpNum) {
tmpNum.innerText = `第${startNum + idx}天`;
tmpNum.innerText = `第${parseInt(startNum) + idx}天`;
}
});