src/views/dictionary/template/components/CriterionQuestionForm.vue

@@ -68,13 +68,7 @@
         <el-input v-model="form.QuestionEnName" />
       </el-form-item>
       <el-divider content-position="left">公有属性</el-divider>
-      <el-form-item 
+      <el-form-item v-if="form.Type !== 'group'" label="问题分组">
-        v-if="form.Type !== 'group'" 
-        label="问题分组"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-select
           v-model="form.GroupId"
           clearable
@@ -219,10 +213,6 @@
           form.Type === 'number'
         "
         label="是否裁判问题"
-        prop="IsJudgeQuestion"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
       >
         <el-radio-group
           v-model="form.IsJudgeQuestion"
@@ -262,20 +252,13 @@
           <el-option
             v-for="item in $d.ExportResult"
             :key="`ExportResult${item.value}`"
-            :label="item.label"
+            :label="item.value"
-            :value="item.value">
+            :value="item.label">
           </el-option>
         </el-select>
       </el-form-item>
       
-      <el-form-item 
+      <el-form-item label="限制编辑" v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'upload' || form.Type === 'number' || form.Type === 'screenshot'">
-        label="限制编辑" 
-        v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'upload' || form.Type === 'number' || form.Type === 'screenshot'"
-        prop="LimitEdit"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group v-model="form.LimitEdit">
           <el-radio
             v-for="item of $d.LimitEdit"
@@ -285,13 +268,7 @@
           >
         </el-radio-group>
       </el-form-item>
-      <el-form-item 
+      <el-form-item label="全局阅片是否显示">
-        label="全局阅片是否显示"
-        prop="GlobalReadingShowType"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group v-model="form.GlobalReadingShowType">
           <el-radio
             v-for="item of $d.GlobalReadingShowType"
@@ -315,13 +292,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item 
+      <el-form-item label="是否在阅片页面显示">
-        label="是否在阅片页面显示"
-        prop="IsShowInDicom"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group v-model="form.IsShowInDicom">
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -337,13 +308,7 @@
       >
         <el-input v-model="form.Remark" />
       </el-form-item>
-      <el-form-item 
+      <el-form-item label="序号" prop="ShowOrder">
-        label="序号" 
-        prop="ShowOrder"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-input-number
           v-model="form.ShowOrder"
           controls-position="right"

src/views/dictionary/template/components/TableQsForm.vue

@@ -144,14 +144,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item 
+      <el-form-item label="限制编辑" v-if="form.Type !== 'summary'">
-        label="限制编辑" 
-        v-if="form.Type !== 'summary'"
-        prop="LimitEdit"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group v-model="form.LimitEdit">
           <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
@@ -178,13 +171,7 @@
       >
         <el-input v-model="form.Remark" />
       </el-form-item>
-      <el-form-item 
+      <el-form-item label="序号" prop="ShowOrder">
-        label="序号" 
-        prop="ShowOrder"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-input-number
           v-model="form.ShowOrder"
           controls-position="right"

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

@@ -90,10 +90,6 @@
       <el-form-item
         v-if="form.Type !== 'group'"
         :label="$t('trials:readingUnit:qsList:title:groupName')"
-        prop="GroupId"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
       >
         <el-select
           v-model="form.GroupId"
@@ -207,14 +203,8 @@
         </el-select>
       </el-form-item>
       <!-- 是否裁判问题 -->
-      <el-form-item 
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'number'|| form.Type === 'class'"
-        v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'number'|| form.Type === 'class'"
+                    :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')">
-        :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
-        prop="IsJudgeQuestion"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group
           v-model="form.IsJudgeQuestion"
           @change="((val)=>{isJudgeQuestionChange(val, form)})"
@@ -252,20 +242,13 @@
           <el-option
             v-for="item in $d.ExportResult"
             :key="`ExportResult${item.value}`"
-            :label="item.label"
+            :label="item.value"
-            :value="item.value">
+            :value="item.label">
           </el-option>
         </el-select>
       </el-form-item>
       <!-- 限制显示 -->
-      <el-form-item 
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:LimitShow')" v-if="form.Type !== 'group'">
-        :label="$t('trials:readingUnit:qsList:title:LimitShow')" 
-        v-if="form.Type !== 'group'"
-        prop="LimitShow"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group v-model="form.LimitShow" @change="(v) => {
           if (v !== 0) {
              form.LimitEdit = v
@@ -275,26 +258,13 @@
         </el-radio-group>
       </el-form-item>
       <!-- 限制编辑 -->
-      <el-form-item 
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="!(form.Type === 'group' || form.Type === 'summary' || form.Type === 'table' || form.Type === 'basicTable')">
-        :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
-        v-if="!(form.Type === 'group' || form.Type === 'summary' || form.Type === 'table' || form.Type === 'basicTable')"
-        prop="LimitEdit"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group v-model="form.LimitEdit" :disabled="form.LimitShow !== 0">
           <el-radio v-for="item of $d.LimitEdit" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 全局阅片是否显示 -->
-      <el-form-item 
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')">
-        :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
-        prop="GlobalReadingShowType"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group v-model="form.GlobalReadingShowType">
           <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{
               item.label
@@ -303,11 +273,7 @@
         </el-radio-group>
       </el-form-item>
       <!-- 是否在影像页面显示 -->
-      <el-form-item 
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShowInDicom')" v-if="form.ShowQuestion !== 2">
-        :label="$t('trials:readingUnit:qsList:title:isShowInDicom')" 
-        v-if="form.ShowQuestion !== 2"
-        prop="ShowQuestion"
-      >
         <el-radio-group v-model="form.IsShowInDicom">
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -328,13 +294,7 @@
         />
       </el-form-item>
       <!-- 序号 -->
-      <el-form-item 
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
-        :label="$t('trials:readingUnit:qsList:title:order')" 
-        prop="ShowOrder"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-input-number
           v-model="form.ShowOrder"
           controls-position="right"

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

@@ -152,25 +152,13 @@
         </el-select>
       </el-form-item>
       <!-- 限制编辑 -->
-      <el-form-item 
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="form.Type !== 'summary'">
-        :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
-        v-if="form.Type !== 'summary'"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-radio-group v-model="form.LimitEdit">
           <el-radio v-for="item of $d.LimitEdit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 是否复制前值 -->
-      <el-form-item 
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:PrecopyValue')" v-if="form.Type !== 'summary'">
-        :label="$t('trials:readingUnit:qsList:title:PrecopyValue')" 
-        v-if="form.Type !== 'summary'"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-switch
           v-model="form.IsCopy"
         />
@@ -185,13 +173,7 @@
         />
       </el-form-item>
       <!-- 序号 -->
-      <el-form-item 
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
-        :label="$t('trials:readingUnit:qsList:title:order')" 
-        prop="ShowOrder"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
         <el-input-number
           v-model="form.ShowOrder"
           controls-position="right"