任务和试卷调整

src/views/contestDataManage/contestSubjectManage/AddEditPaper.vue

@@ -7,6 +7,16 @@
       <el-form-item label="试卷描述:" prop="desc">
         <el-input v-model="formModel.desc" type="textarea" style="width:350px;" />
       </el-form-item>
+      <el-form-item label="组别:" prop="group">
+        <el-select v-model="formModel.group" placeholder="请选择" style="width:350px;">
+          <el-option
+            v-for="item in groupOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="所属赛季:" prop="seasonId">
         <el-select v-model="formModel.seasonId" placeholder="请选择" style="width:350px;">
           <el-option
@@ -39,9 +49,17 @@ export default {
                 name: '', // 试卷名称
                 desc: '', // 任务描述
                 seasonId: '', // 所属赛季id
+                group:'', // 高职和中职
                 supportCopy:false // 是否支持拷贝
             },
             seasonOptions:[],
+            groupOption:[{
+                value: 'ZZ',
+                label: '中职'
+            }, {
+                value: 'GZ',
+                label: '高职'
+            }],
             loading: false
         };
     },
@@ -54,6 +72,9 @@ export default {
                 desc: [
                     { required: true, message: '请输入试卷描述', trigger: 'blur' }
                 ],
+                group: [
+                    { required: true, message: '请选择试卷所属赛季', trigger: 'blur' }
+                ],
                 seasonId: [
                     { required: true, message: '请选择试卷所属赛季', trigger: 'blur' }
                 ]
@@ -75,12 +96,14 @@ export default {
                 this.formModel.name = row.name;
                 this.formModel.desc = row.desc;
                 this.formModel.seasonId = row.seasonId;
+                this.formModel.group = row.group;
                 this.formModel.supportCopy = row.supportCopy;
             } else {
                 this.formModel = {
                     id: '',
                     name: '',
                     desc: '',
+                    group:'',
                     seasonId: ''
                 };
             }

src/views/contestDataManage/contestSubjectManage/ContestSubjectManage.vue

@@ -37,6 +37,17 @@ export default {
                     name: {
                         type: 'text',
                         label: '试卷名称:'
+                    },
+                    seasonName: {
+                        type: 'text',
+                        label: '赛季名称:'
+                    },
+                    group: {
+                        type: 'select',
+                        label: '组 别',
+                        config: {
+                            data: [{label: '高职', value: 'GZ'}, {label: '中职', value: 'ZZ'}]
+                        }
                     }
                 }
             },
@@ -53,6 +64,13 @@ export default {
                         title: '试卷描述',
                         prop: 'desc'
                     },
+                    {
+                        title: '组别',
+                        prop: 'group',
+                        type: 'tag',
+                        columnValue: (row) => { return row.group === 'GZ' ? '高职' : '中职'; },
+                        tagType: (row) => { return ''; }
+                    },
                     {
                         title: '所属赛季',
                         prop: 'seasonName'

src/views/contestDataManage/contestTaskManage/AddEditTask.vue

@@ -47,12 +47,6 @@ export default {
                 ],
                 desc: [
                     { required: true, message: '请输入任务描述', trigger: 'blur' }
-                ],
-                content: [
-                    { required: true, message: '请输入考核内容', trigger: 'blur' }
-                ],
-                standards: [
-                    { required: true, message: '请输入评价标准', trigger: 'blur' }
                 ]
             };
             return crules;