Merge pull request 'feat : 需求上报界面初始化' (#201) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/201

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

@@ -1,27 +1,260 @@
 <template>
   <baseTitle title="需求上报"></baseTitle>
-  <fvForm :schema="schame" @getInstance="getInstance"></fvForm>
+  <el-form :model="formData" ref="summaryForm" :rules="rules">
+    <el-row gutter="50">
+      <el-col :span="12">
+        <el-form-item label="名称" prop="projectName">
+          <el-input v-model="formData.projectName" placeholder="请输入名称" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="专项资金" prop="specialFund">
+          <el-select v-model="formData.specialFund" placeholder="请选择专项资金" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="开始时间" prop="startTime">
+          <el-config-provider>
+            <el-date-picker
+                v-model="formData.startTime"
+                type="datetime"
+                placeholder="截止时间"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                style="width: 100%"
+            />
+          </el-config-provider>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="所属公司" prop="companyName">
+          <el-input v-model="formData.companyName" placeholder="请输入所属公司" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目类型" prop="projectType">
+          <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="结束时间" prop="endTime">
+          <el-config-provider>
+            <el-date-picker
+                v-model="formData.endTime"
+                type="datetime"
+                placeholder="截止时间"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                style="width: 100%"
+            />
+          </el-config-provider>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="出资类型" prop="investmentType">
+          <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目影响" prop="projectImpact">
+          <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="所属业务板块" prop="businessSegment">
+          <el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="预期成果形式" prop="resultForm">
+          <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="预期技术标准制定" prop="technicalStandard">
+          <el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="产学研联合" prop="industryUniversityResearch">
+          <el-select v-model="formData.industryUniversityResearch" placeholder="请选择产学研联合" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="开展政府申报" prop="governmentDeclaration">
+          <el-select v-model="formData.governmentDeclaration" placeholder="请选择开展政府申报" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="知识产权状况" prop="intellectualProperty">
+          <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
+            <el-option
+                v-for="item in cacheStore.getDict('todo_type')"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="发明专利(项)" prop="inventionPatent">
+          <el-input v-model="formData.inventionPatent" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="实用性新型专利(项)" prop="newPatent">
+          <el-input v-model="formData.newPatent" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="软件著作权(项)" prop="softwareCopyright">
+          <el-input v-model="formData.softwareCopyright" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="著作权(项)" prop="copyright">
+          <el-input v-model="formData.copyright" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="其他(项)" prop="other">
+          <el-input v-model="formData.other" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="经济概算(万元)" prop="economicEstimate">
+          <el-input v-model="formData.economicEstimate" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
+          <el-input v-model="formData.specialFundAmount" clearable :disabled="formData.specialFund===null"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="现有业务描述" prop="serviceDescription">
+          <el-input v-model="formData.serviceDescription" type="textarea" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="研发项目关键内容描述" prop="contentDescription">
+          <el-input v-model="formData.contentDescription" type="textarea" clearable></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+  <!--  <fvForm :schema="schame" @getInstance="getInstance"></fvForm>-->
   <div class="oper-page-btn">
-      <el-button type="primary" @click="staging">存为草稿</el-button>
-      <el-button type="primary" @click="handleSubmit">发布</el-button>
-    </div>
+    <el-button type="primary" @click="staging">存为草稿</el-button>
+    <el-button type="primary" @click="handleSubmit(summaryForm)">发布</el-button>
+  </div>
 </template>
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {markRaw} from 'vue';
 import FileUpload from './components/FileUpload.vue';
-import {requirementReported} from "./api";
+import {getProcessInfo, requirementReported} from "./api";
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
+import {useCacheStore} from '@/stores/cache.js'
 
+const cacheStore = useCacheStore()
 const router = useRouter()
 const tagsViewStore = useTagsView()
-const localData = reactive({
-  form: null
+const summaryForm = ref()
+const deploymentId = ref()
+const formData = ref({
+  specialFund:null
 })
-
-const schame = computed(()=>{
+const rules = reactive({
+  projectName: [{required: true, message: '请输入名称', trigger: 'blur'}],
+  specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
+  startTime: [{required: true, message: '请选择开始时间', trigger: 'blur'}],
+  companyName: [{required: true, message: '请输入所属公司', trigger: 'blur'}],
+  projectType: [{required: true, message: '请选择项目类型', trigger: 'blur'}],
+  endTime: [{required: true, message: '请选择结束时间', trigger: 'blur'}],
+  investmentType: [{required: true, message: '请选择出资类型', trigger: 'blur'}],
+  projectImpact: [{required: true, message: '请选择项目影响', trigger: 'blur'}],
+  businessSegment: [{required: true, message: '请选择所属业务板块', trigger: 'blur'}],
+  resultForm: [{required: true, message: '请选择预期成果形式', trigger: 'blur'}],
+  technicalStandard: [{required: true, message: '请选择预期技术标准制定', trigger: 'blur'}],
+  industryUniversityResearch: [{required: true, message: '请选择产学研联合', trigger: 'blur'}],
+  governmentDeclaration: [{required: true, message: '请选择开展政府申报', trigger: 'blur'}],
+  intellectualProperty: [{required: true, message: '请选择知识产权状况', trigger: 'blur'}],
+  inventionPatent: [{required: true, message: '请输入发明专利', trigger: 'blur'}],
+  newPatent: [{required: true, message: '请输入实用性新型专利', trigger: 'blur'}],
+  softwareCopyright: [{required: true, message: '请输入软件著作权', trigger: 'blur'}],
+  copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}],
+  other: [{required: true, message: '请输入其他', trigger: 'blur'}],
+  economicEstimate: [{required: true, message: '请输入经济概算', trigger: 'blur'}],
+  specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
+  serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
+  contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}],
+})
+const schame = computed(() => {
   return [
     {
       label: '名称',
@@ -34,9 +267,14 @@ const schame = computed(()=>{
     },
     {
       label: '专项资金',
-      prop: 'projectType',
+      prop: 'specialFund',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择专项资金',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -45,7 +283,10 @@ const schame = computed(()=>{
       label: '开始时间',
       prop: 'startTime',
       component: 'el-date-picker',
-      props: {},
+      props: {
+        type: 'datetime',
+        format: 'YYYY-MM-DD HH:mm:ss'
+      },
       colProps: {
         span: 12
       }
@@ -63,7 +304,12 @@ const schame = computed(()=>{
       label: '项目类型',
       prop: 'projectType',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -72,7 +318,10 @@ const schame = computed(()=>{
       label: '结束时间',
       prop: 'endTime',
       component: 'el-date-picker',
-      props: {},
+      props: {
+        type: 'datetime',
+        format: 'YYYY-MM-DD HH:mm:ss'
+      },
       colProps: {
         span: 12
       }
@@ -81,7 +330,12 @@ const schame = computed(()=>{
       label: '出资类型',
       prop: 'investmentType',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -90,7 +344,12 @@ const schame = computed(()=>{
       label: '项目影响',
       prop: 'projectImpact',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -99,7 +358,12 @@ const schame = computed(()=>{
       label: '所属业务板块',
       prop: 'businessSegment',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -108,7 +372,12 @@ const schame = computed(()=>{
       label: '预期成果形式',
       prop: 'resultForm',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -117,7 +386,12 @@ const schame = computed(()=>{
       label: '预期技术标准制定',
       prop: 'technicalStandard',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -126,7 +400,12 @@ const schame = computed(()=>{
       label: '产学研联合',
       prop: 'industryUniversityResearch',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -135,7 +414,12 @@ const schame = computed(()=>{
       label: '开展政府申报',
       prop: 'governmentDeclaration',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -144,7 +428,12 @@ const schame = computed(()=>{
       label: '知识产权状况',
       prop: 'intellectualProperty',
       component: markRaw(fvSelect),
-      props: {},
+      props: {
+        placeholder: '请选择项目类型',
+        clearable: true,
+        filterable: true,
+        cacheKey: 'todo_type'
+      },
       colProps: {
         span: 12
       }
@@ -202,7 +491,7 @@ const schame = computed(()=>{
       colProps: {
         span: 6
       }
-    },{
+    }, {
       label: '申请公司总部科技创新专项资金',
       prop: 'specialFundAmount',
       component: 'el-input',
@@ -234,44 +523,58 @@ const schame = computed(()=>{
       colProps: {
         span: 24
       }
-    },
-    {
-      label: '',
-      prop: 'fileList',
-      component: markRaw(FileUpload),
-      props: {
-        url: '',
-        tip: '上传txt文件'
-      },
-      colProps: {
-        span: 24
-      }
     }
+    // {
+    //   label: '',
+    //   prop: 'fileList',
+    //   component: markRaw(FileUpload),
+    //   props: {
+    //     url: '',
+    //     tip: '上传txt文件'
+    //   },
+    //   colProps: {
+    //     span: 24
+    //   }
+    // }
   ]
 })
 
-const getInstance = (e) => {
-  localData.form = e
-}
-
-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 handleSubmit = async (instance) => {
+  if (!instance) return
+  instance.validate(async (valid, fields) => {
+    if (!valid) return
+    let params = {
+      ...formData.value,
+      deploymentId: deploymentId.value
+    }
+    let res = await requirementReported(params)
+    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 init = async () => {
+  getProcessInfo().then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      let data = res.data
+      deploymentId.value = data.deploymentId
+    }
+  })
+}
+init()
+const staging = async () => {
 }
-
-const staging = async () => {}
 </script>

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

@@ -13,8 +13,14 @@ export const fileUp = (url, data) => {
 
 export const requirementReported = (data) => {
   return request({
-    url: '/workflow/mosr/requirement/reported',
+    url: '/workflow/mosr/requirement/collect/reported',
     method: "post",
     data: data
   });
 };
+export const getProcessInfo = () => {
+  return request({
+    url: '/workflow/mosr/requirement/collect/process',
+    method: "post"
+  });
+};

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

@@ -19,7 +19,7 @@ const router = useRouter()
 const searchConfig = reactive([
   {
     label: '名称',
-    prop: 'name',
+    prop: 'requirementName',
     props: {
       placeholder: '请输入'
     },
@@ -75,17 +75,17 @@ const tableConfig = reactive({
       prop: 'selection'
     },
     {
-      prop: 'name',
+      prop: 'requirementName',
       label: '名称',
       align: 'center'
     },
     {
-      prop: 'company',
+      prop: 'companyINames',
       label: '所属公司',
       align: 'center'
     },
     {
-      prop: 'projectType',
+      prop: 'collectType',
       label: '项目类型',
       align: 'center'
     },
@@ -105,7 +105,7 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'time',
+      prop: 'deadline',
       label: '起止时间',
       align: 'center'
     },