XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is passing Details

uat_us
wangxiaoshuang 2024-11-04 17:47:21 +08:00
parent b65b93a5ab 94d626a453
commit 03e390013e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/dictionary/template/components/CriterionFormItem.vue
View File

@ -17,10 +17,10 @@
style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
>
{{ question.QuestionName }}
</div>
</div>
<template v-else>
<el-form-item
v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion===0"
v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0"
:label="`${question.QuestionName}`"
:prop="question.Id"
:rules="[

4
src/views/dictionary/template/components/TableQsForm.vue
View File

@ -93,7 +93,7 @@
v-for="item of parentTriggerValOptions"
:key="item.id"
:label="item.label"
:value="item.value"
:value="String(item.value)"
/>
</el-select>
</el-form-item>
@ -142,7 +142,7 @@
v-for="item of reParentTriggerValOptions"
:key="item.id"
:label="item.label"
:value="item.value"
:value="String(item.value)"
/>
</el-select>
</el-form-item>