Browse Source

科研成果模块完善必填项

ljb 9 months ago
parent
commit
03a96cfe64

+ 23 - 2
src/option/achievement/otherAchivement.js

@@ -11,7 +11,7 @@ export default {
   addBtn: true,
   delBtn: true,
   searchLabelWidth: 140,
-  labelWidth: 140,
+  labelWidth: 110,
   menuWidth: 160,
   dialogClickModal: false,
   dialogWidth: 560,
@@ -112,6 +112,13 @@ export default {
       search: true,
       showOverflowTooltip: true,
       align: "center",
+      rules: [
+        {
+          required: true,
+          message: "请选择申请日期",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "授权日期",
@@ -123,6 +130,13 @@ export default {
       align: "center",
       search: true,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择授权日期",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "参与/主持",
@@ -142,7 +156,14 @@ export default {
           prop: 'xmId',
           width: 120,
           span: 24,
-          hide: true
+          hide: true,
+          rules: [
+            {
+              required: true,
+              message: "请选择项目",
+              trigger: "blur",
+            },
+          ],
         },
         {
           label: "研发项目名称",

+ 39 - 4
src/option/achievement/patentAchievement.js

@@ -62,7 +62,7 @@ export default {
       },
       rules: [
         {
-          required: false,
+          required: true,
           message: "请选择专利类型",
           trigger: "blur",
         },
@@ -84,7 +84,7 @@ export default {
       },
       rules: [
         {
-          required: false,
+          required: true,
           message: "请选择是否国防专利",
           trigger: "blur",
         },
@@ -106,7 +106,7 @@ export default {
       showOverflowTooltip: true,
       rules: [
         {
-          required: false,
+          required: true,
           message: "请选择国别",
           trigger: "blur",
         },
@@ -121,6 +121,13 @@ export default {
       align: "center",
       search: true,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请输入申请号/专利号",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "申请日",
@@ -133,6 +140,13 @@ export default {
       valueFormat: "yyyy-MM-dd",
       showOverflowTooltip: true,
       align: "center",
+      rules: [
+        {
+          required: true,
+          message: "请选择申请日",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "授权日",
@@ -144,6 +158,13 @@ export default {
       search: false,
       valueFormat: "yyyy-MM-DD",
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择授权日",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "申请单位",
@@ -199,6 +220,13 @@ export default {
         value: "dictKey",
       },
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择法律状态",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "关联研发项目情况",
@@ -210,7 +238,14 @@ export default {
           prop: 'xmId',
           width: 120,
           span: 12,
-          hide: true
+          hide: true,
+          rules: [
+            {
+              required: true,
+              message: "请选择研发项目名称",
+              trigger: "blur",
+            },
+          ],
         },
         {
           label: "研发项目名称",

+ 23 - 2
src/option/achievement/researchPaper.js

@@ -11,7 +11,7 @@ export default {
   addBtn: true,
   delBtn: true,
   searchLabelWidth: 140,
-  labelWidth: 140,
+  labelWidth: 110,
   menuWidth: 160,
   dialogClickModal: false,
   dialogWidth: 560,
@@ -75,6 +75,13 @@ export default {
       width: 90,
       align: 'center',
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择发表日期",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "期刊名称",
@@ -105,6 +112,13 @@ export default {
       },
       width: 80,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择期刊类型",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "期刊级别",
@@ -124,7 +138,14 @@ export default {
           prop: 'xmId',
           width: 120,
           span: 24,
-          hide: true
+          hide: true,
+          rules: [
+            {
+              required: true,
+              message: "请选择项目",
+              trigger: "blur",
+            },
+          ],
         },
         {
           label: "研发项目名称",

+ 24 - 3
src/option/achievement/softWorks.js

@@ -10,7 +10,7 @@ export default {
   selection: true,
   addBtn: true,
   delBtn: true,
-  labelWidth: 100,
+  labelWidth: 110,
   menuWidth: 140,
   dialogClickModal: false,
   dialogWidth: 520,
@@ -68,6 +68,13 @@ export default {
       search: true,
       align: "center",
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择开发完成时间",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "首次发布日期",
@@ -79,6 +86,13 @@ export default {
       align: "center",
       search: true,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择首次发布日期",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "登记批准日期",
@@ -107,7 +121,7 @@ export default {
       showOverflowTooltip: true,
       rules: [
         {
-          required: false,
+          required: true,
           message: "请选择取得方式",
           trigger: "change",
         },
@@ -123,7 +137,14 @@ export default {
           prop: 'xmId',
           width: 120,
           span: 24,
-          hide: true
+          hide: true,
+          rules: [
+            {
+              required: true,
+              message: "请选择项目",
+              trigger: "blur",
+            },
+          ],
         },
         {
           label: "研发项目名称",

+ 16 - 2
src/option/achievement/technicalStandard.js

@@ -11,7 +11,7 @@ export default {
   addBtn: true,
   delBtn: true,
   searchLabelWidth: 140,
-  labelWidth: 100,
+  labelWidth: 110,
   menuWidth: 160,
   dialogClickModal: false,
   dialogWidth: 500,
@@ -119,6 +119,13 @@ export default {
       search: true,
       span: 24,
       showOverflowTooltip: true,
+      rules: [
+        {
+          required: true,
+          message: "请选择状态",
+          trigger: "blur",
+        },
+      ],
     },
     {
       label: "参与/主持",
@@ -138,7 +145,14 @@ export default {
           prop: 'xmId',
           width: 120,
           span: 24,
-          hide: true
+          hide: true,
+          rules: [
+            {
+              required: true,
+              message: "请选择项目",
+              trigger: "blur",
+            },
+          ],
         },
         {
           label: "研发项目名称",

+ 13 - 13
src/option/projectManage/projectList.js

@@ -89,21 +89,21 @@ export default {
       display: false,
       children: [{
         label: '立项报告(份)',
-        prop: 'xmbg',
+        prop: 'lxbgCount',
         type: 'number',
         width: 90,
         align: 'center',
         showOverflowTooltip: true,
       }, {
         label: '阶段性报告(份)',
-        prop: 'jdxbg',
+        prop: 'jdxbgCount',
         type: 'number',
         width: 105,
         align: 'center',
         showOverflowTooltip: true,
       }, {
         label: '验收报告(份)',
-        prop: 'ysbg',
+        prop: 'ysbgCount',
         type: 'number',
         width: 90,
         align: 'center',
@@ -120,7 +120,7 @@ export default {
         display: false,
         children: [{
           label: '总预算(万元)',
-          prop: 'zys',
+          prop: 'xmysze',
           type: 'number',
           width: 90,
           align: 'center',
@@ -146,7 +146,7 @@ export default {
         display: false,
         children: [{
           label: '年度预算(万元)',
-          prop: 'ndys',
+          prop: 'xmyszeCurrentYear',
           type: 'number',
           width: 105,
           align: 'center',
@@ -171,14 +171,14 @@ export default {
         display: false,
         children: [{
           label: '发明专利',
-          prop: 'fmzl',
+          prop: 'fmzlCount',
           type: 'number',
           width: 70,
           align: 'center',
           showOverflowTooltip: true,
         }, {
           label: '实用新型专利',
-          prop: 'sysxzl',
+          prop: 'syxxzlCount',
           type: 'number',
           width: 100,
           align: 'center',
@@ -186,28 +186,28 @@ export default {
         }]
       }, {
         label: '软著',
-        prop: 'lz',
+        prop: 'rzCount',
         type: 'number',
         width: 50,
         align: 'center',
         showOverflowTooltip: true,
       }, {
         label: '标准',
-        prop: 'bz',
+        prop: 'bzCount',
         type: 'number',
         width: 50,
         align: 'center',
         showOverflowTooltip: true,
       }, {
         label: '论文',
-        prop: 'lw',
+        prop: 'lwCount',
         type: 'number',
         width: 50,
         align: 'center',
         showOverflowTooltip: true,
       }, {
         label: '其他',
-        prop: 'other',
+        prop: 'qtCount',
         type: 'number',
         width: 50,
         align: 'center',
@@ -215,8 +215,8 @@ export default {
       }]
     },
     {
-      label: '是否委外',
-      prop: 'sfww',
+      label: '委外支出金额(万元)',
+      prop: 'wwAmount',
       type: 'number',
       width: 70,
       align: 'center',