Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/project/components/projectEdit.vue

@@ -675,11 +675,11 @@ export default {
         knowledgeId: null,
         startDate: null,
         endDate: null,
-        projClass: null,
         jobTime: null,
         mainResearchAreas: null,
         address: null,
         subjectScope: null,
+        projClass: null,
         projAbstract: null,
         projKeywords: null,
         totalFunding: null,
@@ -721,8 +721,8 @@ export default {
         unitLinkFax: [{ required: true, message: '请填写传真', trigger: 'blur' },],
         projName: [{ required: true, message: '请填写项目名称', trigger: 'blur' },],
         knowledgeId: { required: true, message: '请选择学科代码', trigger: 'change' },
-        subjectScope: [{ required: true, message: '请填写选题范围', trigger: 'blur' },],
-        projClass: [{ required: true, message: '请填写项目类别', trigger: 'blur' },],
+        // subjectScope: [{ required: true, message: '请填写选题范围', trigger: 'blur' },], 
+        // projClass: [{ required: true, message: '请填写项目类别', trigger: 'blur' },],
         remark: [{ required: true, message: '请填写附注说明', trigger: 'blur' },],
         startDate: { required: true, message: '请选择项日开始时间', trigger: 'change' },
         endDate: { required: true, message: '请选择项目结束时间', trigger: 'change' },