From 3187f475f1c735fb53825bea81e7c6ca63a352ad Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 22 Sep 2025 16:29:35 +0800
Subject: [PATCH] 1

---
 .../dicoms/components/PCWG/QuestionForm.vue   | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
index 0826125..385b298 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
@@ -23,9 +23,8 @@
 
         </el-select>
       </el-form-item>
-      <el-form-item v-for="qs in questions" v-show="qs.ShowQuestion !== 2" :key="qs.Id" :label="`${qs.QuestionName}`" :title="qs.Remark"
-        :prop="qs.Id"
-        :rules="qs.QuestionMark === 11 ? [
+      <el-form-item v-for="qs in questions" v-show="qs.ShowQuestion !== 2" :key="qs.Id" :label="`${qs.QuestionName}`"
+        :title="qs.Remark" :prop="qs.Id" :rules="qs.QuestionMark === 11 ? [
           {
             required: (qs.IsRequired === 0 || (qs.IsRequired === 1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue))) && qs.Type !== 'group' && qs.Type !== 'summary',
             message: ['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
@@ -208,23 +207,21 @@ export default {
       const reg = /^(?:[1-9]|[1-9][0-9])$/
       if (!value) {
         callback(new Error(this.$t('common:ruleMessage:specify')))
-      } else if (!reg.test(value) || (parseInt(value) > 99 || parseInt(value) <= 0)) {
+      } else if (!reg.test(value) || (parseInt(value) > 99 || parseInt(value) < 0)) {
         callback(new Error(this.$t('trials:readingPGWC:warnning:msg1')))
       }
-      //   else if (parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber)) {
-      //   callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber))
-      // } 
-      else {
+      else if (!this.isBaseLineTask && parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber)) {
+        callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber))
+      } else {
         callback()
       }
     },
     limitInputValidator(rule, value, callback) {
       console.log(this.focusQs)
-      // if (this.focusQs && !this.isBaseLineTask && this.focusQs.QuestionMark === 11 && (parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber))) {
-      //   // '基线病灶初始数量为'
-      //   callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber))
-      // } else 
-      if (this.focusQs && this.focusQs.QuestionMark === 11 && (parseInt(value) > 99 || parseInt(value) <= 0)) {
+      if (this.focusQs && !this.isBaseLineTask && this.focusQs.QuestionMark === 11 && (parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber))) {
+        // '基线病灶初始数量为'
+        callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber))
+      } else if (this.focusQs && this.focusQs.QuestionMark === 11 && (parseInt(value) > 99 || parseInt(value) < 0)) {
         callback(new Error(this.$t('trials:readingPGWC:warnning:msg1')))
       } else {
         callback()