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

Merge branch 'uat'
continuous-integration/drone/push Build is passing Details

uat_us
DESKTOP-6C3NK6N\WXS 2024-07-31 11:18:22 +08:00
parent 7f8d08032c e81b7897e7
commit 275501db20
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/MFA/index.vue
View File

@ -201,4 +201,7 @@ export default {
margin-right: 5px; margin-right: 5px;
} }
} }
::v-deep .el-dialog__header{
font-weight: bold;
}
</style> </style>

11
src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
View File

@ -47,7 +47,7 @@
</el-form-item> </el-form-item>
<!-- 问题名称 --> <!-- 问题名称 -->
<el-form-item <el-form-item
v-if="(form.Type !== 'group' && !isLook) || (isLook && $i18n.locale !== 'en')" v-if="(form.Type !== 'group' && $i18n.locale !== 'en' )"
:label="$t('trials:readingUnit:qsList:title:qsName')" :label="$t('trials:readingUnit:qsList:title:qsName')"
prop="QuestionName" prop="QuestionName"
> >
@ -57,7 +57,7 @@
</el-form-item> </el-form-item>
<!-- 问题名称(En) --> <!-- 问题名称(En) -->
<el-form-item <el-form-item
v-if="(form.Type !== 'group' && !isLook) || (isLook && $i18n.locale !== 'zh')" v-if="(form.Type !== 'group' && $i18n.locale !== 'zh')"
:label="$t('trials:readingUnit:qsList:title:qsNameEn')" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
prop="QuestionEnName" prop="QuestionEnName"
> >
@ -813,6 +813,8 @@ export default {
], ],
QuestionName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}, QuestionName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
{max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}], {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
{max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
TypeValue: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}, TypeValue: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
{validator: validateTypeVal, trigger: ['blur', 'change']}, {validator: validateTypeVal, trigger: ['blur', 'change']},
{max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}], {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}],
@ -996,6 +998,11 @@ export default {
this.$refs.qsForm.validate(valid => { this.$refs.qsForm.validate(valid => {
if (!valid) return if (!valid) return
this.loading = true this.loading = true
if(this.form.QuestionName && !this.form.QuestionEnName){
this.form.QuestionEnName = this.form.QuestionName;
}else if(!this.form.QuestionName && this.form.QuestionEnName){
this.form.QuestionName = this.form.QuestionEnName;
}
var params = Object.assign({}, this.form) var params = Object.assign({}, this.form)
params.TrialId = this.$route.query.trialId params.TrialId = this.$route.query.trialId
params.ReadingCriterionPageId = this.data.ReadingCriterionPageId params.ReadingCriterionPageId = this.data.ReadingCriterionPageId

12
src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
View File

@ -35,7 +35,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="form.Type !== 'group'" v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
:label="$t('trials:readingUnit:qsList:title:qsName')" :label="$t('trials:readingUnit:qsList:title:qsName')"
prop="QuestionName" prop="QuestionName"
> >
@ -44,7 +44,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="form.Type !== 'group'" v-if="form.Type !== 'group'&& $i18n.locale !== 'zh'"
:label="$t('trials:readingUnit:qsList:title:qsNameEn')" :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
prop="QuestionEnName" prop="QuestionEnName"
> >
@ -575,7 +575,8 @@ export default {
], ],
QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
{ max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }], { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
{max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
{ validator: validateTypeVal, trigger: 'blur' }, { validator: validateTypeVal, trigger: 'blur' },
{ max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }], { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
@ -717,6 +718,11 @@ export default {
this.$refs.tableQsForm.validate(valid => { this.$refs.tableQsForm.validate(valid => {
if (!valid) return if (!valid) return
this.loading = true this.loading = true
if(this.form.QuestionName && !this.form.QuestionEnName){
this.form.QuestionEnName = this.form.QuestionName;
}else if(!this.form.QuestionName && this.form.QuestionEnName){
this.form.QuestionName = this.form.QuestionEnName;
}
var params = Object.assign({}, this.form) var params = Object.assign({}, this.form)
params.TrialId = this.$route.query.trialId params.TrialId = this.$route.query.trialId
params.ReadingQuestionId = this.readingQuestionId params.ReadingQuestionId = this.readingQuestionId