fix : 修复细节

src/views/project-demand/collection/add.vue

@@ -64,7 +64,7 @@ import {useProcessStore} from '@/stores/processStore.js';
 import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile,downloadFile} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElMessage, ElMessageBox} from "element-plus";
+import {ElMessage, ElMessageBox,ElNotification} from "element-plus";
 import {useRoute, useRouter} from 'vue-router'
 import {getSubCompOpt} from '@/api/user/user.js'
 import {useTagsView} from '@/stores/tagsview.js'
@@ -186,17 +186,25 @@ const init = async () => {
   const res = await getSubCompOpt()
   companyOption.value = res.data
   getWorkflowInfo().then(res => {
-    let data = res.data
-    processInstanceData.value = data
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      processDiagramViewer.value = true
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
     })
+    if(res.code === 1000){
+      let data = res.data
+      processInstanceData.value = data
+      processStore.setDesign(data)
+      processStore.runningList.value = data.runningList;
+      processStore.endList.value = data.endList;
+      processStore.noTakeList.value = data.noTakeList;
+      processStore.refuseList.value = data.refuseList;
+      processStore.passList.value = data.passList;
+      nextTick(() => {
+        processDiagramViewer.value = true
+      })
+    }else {
+    }
   })
 }
 const submitParam=(item)=>{

src/views/project-demand/summary/add.vue

@@ -1,4 +1,5 @@
 <template>
+  <baseTitle title="需求上报"></baseTitle>
   <fvForm :schema="schame" @getInstance="getInstance"></fvForm>
   <div class="oper-page-btn">
       <el-button type="primary" @click="staging">存为草稿</el-button>
@@ -8,24 +9,38 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import { markRaw } from 'vue';
+import {markRaw} from 'vue';
 import FileUpload from './components/FileUpload.vue';
+import {requirementReported} from "./api";
+import {ElNotification} from "element-plus";
+import {useTagsView} from '@/stores/tagsview.js'
 
+const router = useRouter()
+const tagsViewStore = useTagsView()
 const localData = reactive({
   form: null
 })
 
 const schame = computed(()=>{
-  let arr = [
+  return [
     {
       label: '名称',
-      prop: 'name',
+      prop: 'projectName',
       component: 'el-input',
       props: {},
       colProps: {
         span: 12
       }
     },
+    {
+      label: '专项资金',
+      prop: 'projectType',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
     {
       label: '开始时间',
       prop: 'startTime',
@@ -37,7 +52,7 @@ const schame = computed(()=>{
     },
     {
       label: '所属公司',
-      prop: 'company',
+      prop: 'companyName',
       component: 'el-input',
       props: {},
       colProps: {
@@ -64,7 +79,7 @@ const schame = computed(()=>{
     },
     {
       label: '出资类型',
-      prop: 'monenyType',
+      prop: 'investmentType',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -73,7 +88,7 @@ const schame = computed(()=>{
     },
     {
       label: '项目影响',
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -82,7 +97,7 @@ const schame = computed(()=>{
     },
     {
       label: '所属业务板块',
-      prop: 'ywbank',
+      prop: 'businessSegment',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -91,7 +106,7 @@ const schame = computed(()=>{
     },
     {
       label: '预期成果形式',
-      prop: 'yuqichengg',
+      prop: 'resultForm',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -100,7 +115,7 @@ const schame = computed(()=>{
     },
     {
       label: '预期技术标准制定',
-      prop: 'yuqizhidingbiaozhu',
+      prop: 'technicalStandard',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -109,7 +124,7 @@ const schame = computed(()=>{
     },
     {
       label: '产学研联合',
-      prop: 'chanxue',
+      prop: 'industryUniversityResearch',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -118,7 +133,7 @@ const schame = computed(()=>{
     },
     {
       label: '开展政府申报',
-      prop: 'zhengfushenbao',
+      prop: 'governmentDeclaration',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -127,16 +142,80 @@ const schame = computed(()=>{
     },
     {
       label: '知识产权状况',
-      prop: 'zhishichanquan',
+      prop: 'intellectualProperty',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
         span: 12
       }
     },
+
+    {
+      label: '发明专利',
+      prop: 'inventionPatent',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+    {
+      label: '实用性新型专利',
+      prop: 'newPatent',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+    {
+      label: '软件著作权',
+      prop: 'softwareCopyright',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+    {
+      label: '著作权',
+      prop: 'copyright',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+    {
+      label: '其他',
+      prop: 'other',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    }, {
+      label: '经济概算',
+      prop: 'economicEstimate',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },{
+      label: '申请公司总部科技创新专项资金',
+      prop: 'specialFundAmount',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+
+
     {
       label: '现有业务描述',
-      prop: 'yewudes',
+      prop: 'serviceDescription',
       component: 'el-input',
       props: {
         type: 'textarea'
@@ -147,7 +226,7 @@ const schame = computed(()=>{
     },
     {
       label: '研发项目关键内容描述',
-      prop: 'contentnesss',
+      prop: 'contentDescription',
       component: 'el-input',
       props: {
         type: 'textarea'
@@ -169,14 +248,30 @@ const schame = computed(()=>{
       }
     }
   ]
-  return arr
 })
 
 const getInstance = (e) => {
   localData.form = e
 }
 
-const handleSubmit = async () => {}
+const handleSubmit = async () => {
+  // let params={
+  //   localData.form.getValues(),
+  //   files:[]
+  // }
+  let res = await requirementReported(localData.form.getValues())
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  if (res.code === 1000) {
+    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+    await router.push({
+      name: 'Summary'
+    })
+  }
+}
 
 const staging = async () => {}
-</script>
+</script>

src/views/project-demand/summary/api/index.js

@@ -9,4 +9,12 @@ export const fileUp = (url, data) => {
       'Content-Type': 'multipart/form-data'
     }
   })
-}
+}
+
+export const requirementReported = (data) => {
+  return request({
+    url: '/workflow/mosr/requirement/reported',
+    method: "post",
+    data: data
+  });
+};

src/views/project-demand/summary/index.vue

@@ -128,7 +128,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/requirement/collect',
   params: {},
   btns: [
     {name: '新增上报', key: 'add', type: 'primary', auth: ''},