- 专利（{{ scope.row.inventionPatent ? scope.row.inventionPatent : 0 }}）项，
+ 专利（{{ scope.row.newPatent ? scope.row.newPatent : 0 }}）项，
软件著作权（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 技术标准（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 新产品（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 新工艺（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 新装置（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 新材料（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 计算机软件（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 论文论著（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 研究报告（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
- 商标（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，
+ 技术标准（{{ scope.row.technicalNorms ? scope.row.technicalNorms : 0 }}）项，
+ 新产品（{{ scope.row.newProduct ? scope.row.newProduct : 0 }}）项，
+ 新工艺（{{ scope.row.newProcess ? scope.row.newProcess : 0 }}）项，
+ 新装置（{{ scope.row.newDevice ? scope.row.newDevice : 0 }}）项，
+ 新材料（{{ scope.row.newMaterials ? scope.row.newMaterials : 0 }}）项，
+ 计算机软件（{{ scope.row.computerSoftware ? scope.row.computerSoftware : 0 }}）项，
+ 论文论著（{{ scope.row.thesis ? scope.row.thesis : 0 }}）项，
+ 研究报告（{{ scope.row.researchReport ? scope.row.researchReport : 0 }}）项，
+ 商标（{{ scope.row.trademark ? scope.row.trademark : 0 }}）项，
其他 {{ scope.row.other ? scope.row.other : 0 }}
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index b8c98a2..d6b2f94 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -277,81 +277,70 @@
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
@@ -494,11 +483,22 @@ const rules = reactive({
industryUniversityResearch: [{required: true, message: '请选择产学研联合', trigger: ['blur', 'change']}],
governmentDeclaration: [{required: true, message: '请选择开展政府申报', trigger: ['blur', 'change']}],
intellectualProperty: [{required: true, message: '请选择知识产权归属', trigger: ['blur', 'change']}],
- inventionPatent: [{required: true, message: '请输入发明专利数量', trigger: ['blur', 'change']}],
- // newPatent: [{required: true, message: '请输入实用性新型专利数量', trigger: ['blur', 'change']}],
+
+
+ newPatent: [{required: true, message: '请输入专利数量', trigger: ['blur', 'change']}],
+ technicalNorms: [{required: true, message: '请输入技术标准数量', trigger: ['blur', 'change']}],
softwareCopyright: [{required: true, message: '请输入软件著作权数量', trigger: ['blur', 'change']}],
- // copyright: [{required: true, message: '请输入著作权数量', trigger: ['blur', 'change']}],
- other: [{required: true, message: '请输入其他数量', trigger: ['blur', 'change']}],
+ newProduct: [{required: true, message: '请输入新产品数量', trigger: ['blur', 'change']}],
+ newProcess: [{required: true, message: '请输入新工艺数量', trigger: ['blur', 'change']}],
+ newMaterials: [{required: true, message: '请输入新材料数量', trigger: ['blur', 'change']}],
+ newDevice: [{required: true, message: '请输入新装备数量', trigger: ['blur', 'change']}],
+ computerSoftware: [{required: true, message: '请输入计算机软件数量', trigger: ['blur', 'change']}],
+ thesis: [{required: true, message: '请输入论文论著数量', trigger: ['blur', 'change']}],
+ researchReport: [{required: true, message: '请输入研究报告数量', trigger: ['blur', 'change']}],
+ trademark: [{required: true, message: '请输入商标数量', trigger: ['blur', 'change']}],
+ other: [{required: true, message: '请输入其他项数量', trigger: ['blur', 'change']}],
+
+
economicEstimate: [{required: true, message: '请输入预估经费预算', trigger: ['blur', 'change']}],
isSpecialFund: [{required: true, message: '请选择是否为专项资金', trigger: ['blur', 'change']}],
isWithinBudget: [{required: true, message: '请选择是否在预算内', trigger: ['blur', 'change']}],
@@ -798,7 +798,7 @@ const handleResubmit = debounce((instance) => {
fileList: otherFiles,
requirementId: route.query.id ? route.query.id : formData.value.requirementId ? formData.value.requirementId : '-1'
}
- // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
+ console.log('重新提交params', params)
resubmitReported(params).then(res => {
ElNotification({
title: '提示',
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index 3f2f6f2..b347164 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -279,7 +279,7 @@ const schema = computed(() => {
label: '实际经费预算',
prop: 'actualEconomicEstimate',
colProps: {
- span: 6
+ span: 24
},
component: () => (
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index 9f863c8..73d3395 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -17,77 +17,77 @@
-
- {{ localFormData.inventionPatent }}
+
+ {{ localFormData.newPatent }}
-
+
{{ localFormData.softwareCopyright }}
+
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.technicalNorms }}
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.newProduct }}
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.newProcess }}
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.newDevice }}
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.newMaterials }}
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.computerSoftware }}
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.thesis }}
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.researchReport }}
-
- {{ localFormData.softwareCopyright }}
+
+ {{ localFormData.trademark }}
-
+
- {{ localFormData.other }}
+ {{ localFormData.other }}
-