Merge pull request 'master' (#220) from master into prod

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

src/api/project-manage/index.js

@@ -0,0 +1,88 @@
+import request from '@/utils/request.js'
+//项目立项
+export const getApplyProcess = () => {
+  return request({
+    url: '/workflow/mosr/project/approval/initiation/process',
+    method: "post"
+  });
+};
+export const projectApply = (data) => {
+  return request({
+    url: '/workflow/mosr/project/approval/initiation/apply',
+    method: "post",
+    data: data
+  });
+};
+export const getApplyDetail = (ProjectId) => {
+  return request({
+    url: `/workflow/mosr/project/approval/info/${ProjectId}`,
+    method: "get"
+  });
+};
+
+export const resubmitApply = (data) => {
+  return request({
+    url: '/workflow/mosr/project/approval/initiation/resubmit',
+    method: "post",
+    data: data
+  });
+};
+//项目实施
+export const getCheckDetail = (projectId) => {
+  return request({
+    url: `/workflow/mosr/project/implementation/info/${projectId}`,
+    method: "get"
+  });
+};
+export const resubmitCheck = (data) => {
+  return request({
+    url: '/workflow/mosr/project/implementation/resubmit',
+    method: "post",
+    data: data
+  });
+};
+
+export const projectCheck = (data) => {
+  return request({
+    url: '/workflow/mosr/project/implementation/initiation/check',
+    method: "post",
+    data: data
+  });
+};
+export const getProjectCheckProcess = (data) => {
+  return request({
+    url: '/workflow/mosr/project/implementation/process',
+    method: "post",
+    data: data
+  });
+};
+
+//项目归档
+export const getConclusionDetail = (ProjectId) => {
+  return request({
+    url: `/workflow/mosr/project/filing/info/${ProjectId}`,
+    method: "get"
+  });
+};
+export const resubmitConclusion = (data) => {
+  return request({
+    url: '/workflow/mosr/project/filing/resubmit',
+    method: "post",
+    data: data
+  });
+};
+
+export const projectConclusion = (data) => {
+  return request({
+    url: '/workflow/mosr/project/filing/project/entry',
+    method: "post",
+    data: data
+  });
+};
+export const getProjectConclusionProcess = (data) => {
+  return request({
+    url: '/workflow/mosr/project/filing/process',
+    method: "post",
+    data: data
+  });
+};

src/assets/styles/index.scss

@@ -378,7 +378,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 .scale {
   margin-top: 10px;
   z-index: 666;
-  position: absolute;
+  position: static;
   //top: -20px;
 }
 

src/components/AttachmentUpload.vue

@@ -0,0 +1,192 @@
+<template>
+  <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item :label="label" prop="attachment">
+          <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
+            <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 18px">
+              {{ singleFile?.originalFileName }}
+            </el-button>
+            <el-button type="danger" link @click="deleteOtherFile(singleFile,1)">删除</el-button>
+          </template>
+          <template v-else-if="!preview||JSON.stringify(singleFile) === '{}'||singleFile==null">
+            <file-upload @getFile="getAttachment" :showFileList="showFileList" :maxSize="0" @delete="deleteAttachment"/>
+          </template>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="其他文件">
+          <el-card style="width: 100%">
+            <file-upload @getFile="getOtherFile"/>
+            <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+                     :data="allFileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-card>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script setup lang="jsx">
+import FileUpload from '@/components/FileUpload.vue'
+import {deleteFile, downloadFile} from "../api/project-demand";
+import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
+
+const emit = defineEmits(["getAttachment", "getOtherFile"])
+const formData = ref({})
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    // {
+    //   prop: 'oper',
+    //   label: '操作',
+    //   align: 'center',
+    //   showOverflowTooltip: false,
+    //   currentRender: ({row, index}) => {
+    //     return (
+    //         <div>
+    //           <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+    //           <el-button type="primary" size="large" link onClick={() => deleteOtherFile(row)}>删除</el-button>
+    //         </div>
+    //     )
+    //   }
+    // }
+  ]
+})
+const rules = reactive({
+  attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
+})
+const applyForm = ref()
+const singleFile = ref()
+const allFileList = ref([])
+const props = defineProps({
+  showFileList: {
+    type: Boolean,
+    default: false
+  }, label: {
+    type: String,
+    default: '项目附件'
+  }, showTable: {
+    type: Boolean,
+    default: true
+  }, preview: {
+    type: Boolean,
+    default: false
+  }, otherFileList: {
+    type: Array,
+    default: []
+  }, formData: {
+    type: Array,
+    default: []
+  }
+})
+watch(() => props.showTable, (newVal) => {
+  props.showTable = newVal
+}, {deep: true})
+watch(() => props.otherFileList, (newVal) => {
+  newVal.forEach(item => {
+    allFileList.value.push(item)
+  })
+}, {deep: true})
+watch(() => props.formData.fileList, (newVal) => {
+  if (props.preview) {
+    newVal.forEach(item => {
+      allFileList.value.push(item)
+    })
+  }
+}, {deep: true})
+watch(() => props.formData.singleFile, (newVal) => {
+  // singleFile.value = {}
+  singleFile.value = newVal
+}, {deep: true})
+const getAttachment = (val) => {
+  emit('getAttachment', val)
+}
+const getOtherFile = (val) => {
+  emit('getOtherFile', val)
+}
+const deleteAttachment = (val) => {
+  deleteFile(val).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success("删除成功");
+    }
+  });
+}
+const deleteOtherFile = (row, type) => {
+  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteFile(row.fileId).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        if (type === 1) {
+          singleFile.value = {}
+        } else {
+          props.otherFileList.splice(props.otherFileList.findIndex((item) => item.id === row.fileId), 1);
+        }
+      }
+    });
+  }).catch(() => {
+    ElNotification({
+      title: '提示',
+      message: "用户取消删除! ",
+      type: 'warning'
+    })
+  })
+}
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
+defineExpose({
+  validate() {
+    return applyForm.value.validate()
+  },
+  clearValidate() {
+    return applyForm.value.clearValidate()
+  },
+  allFileList,
+  singleFile
+})
+</script>
+
+<style scoped>
+
+</style>

src/components/DetailComponent/ApprovalDetail.vue

@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
+    <!-- <AttachmentUpload></AttachmentUpload> -->
+    <el-form :model="formData" label-width="auto">
+      <el-form-item label="其他文件">
+        <el-table :data="formData.fileList" style="width: 100%">
+          <el-table-column label="序号" type="index" width="80"></el-table-column>
+          <el-table-column label="文件名称" prop="originalFileName"></el-table-column>
+          <el-table-column label="标签" prop="tag"></el-table-column>
+          <el-table-column label="文件大小" prop="size">
+            <template #default="{row}">
+              {{ parseInt(row.size / 1024) + 'KB' }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+    </el-form>
+    <div class="approval-record">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="process">
+          <operation-render v-if="processViewer" :operation-list="data.operationList"
+                            :state="data.state"/>
+          <process-diagram-viewer v-if="processViewer" :id-name="type"/>
+        </div>
+    </div>
+    <Opinion: v-if="data.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import { computed, markRaw, reactive, ref, watchEffect } from 'vue';
+import AttachmentUpload from '../AttachmentUpload.vue';
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import Opinion from './Opinion.vue';
+import fvTable from '@/fvcomponents/fvTable/index.vue'
+import { ElLoading } from 'element-plus';
+import {deleteFile, downloadFile} from "@/api/project-demand";
+
+const props = defineProps({
+  formData: {
+    type: Object,
+    default: {}
+  },
+  data: {
+    type: Array,
+    default: []
+  },
+  processViewer: {
+    type: Boolean,
+    default: false
+  },
+  companyOption: {
+    type: Array,
+    default: []
+  },
+
+  // approval 立项, execute 实施, 归档 archivist
+  type: {
+    type: String,
+    default: 'approval'
+  }
+})
+
+const form = ref()
+
+const localData = reactive({
+  fileList: props.formData.fileList,
+  singleFile: props.formData.singleFile
+})
+
+const schema = computed(()=>{
+  let arr
+
+  if(props.type == 'approval') {
+    arr = [
+      {
+        label: '前置流程',
+        prop: 'preProcess',
+        colProps: {
+          span: 24
+        }
+      },
+      {
+        label: '项目立项附件',
+        prop: 'singleFile',
+        colProps: {
+          span: 24
+        },
+        component: ()=>(
+          <div>
+            {
+              props.formData.singleFile?.originalFileName ?
+              <span
+                style={{color: '#409EFF', cursor: 'pointer'}}
+                onClick={()=>handleDownload(props.formData.singleFile)}
+              >
+                {props.formData.singleFile?.originalFileName}
+              </span> :
+              <span>{'--'}</span>
+            }
+          </div>
+
+        )
+      },
+    ]
+  } else if(props.type == 'execute') {
+    arr = [
+      {
+        label: '前置流程',
+        prop: 'preProcess',
+        colProps: {
+          span: 24
+        }
+      },
+      {
+        label: '项目验收附件',
+        prop: 'singleFile',
+        colProps: {
+          span: 24
+        }
+      },
+    ]
+  } else {
+    arr = [
+      {
+        label: '项目归档附件',
+        prop: 'singleFile',
+        colProps: {
+          span: 24
+        }
+      },
+    ]
+  }
+  return arr
+})
+
+const handleDownload = (row) => {
+  const loading = ElLoading.service({fullscreen: true})
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+    loading.close()
+  })
+}
+
+watchEffect(()=>{
+  Object.keys(props.formData).length && (form.value.setValues(props.formData))
+})
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/components/DetailComponent/CollectionDetail.vue

@@ -0,0 +1,178 @@
+<template>
+  <div v-loading="loading">
+    <el-form :model="formData" ref="form" label-width="auto">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="名称">
+            <span>{{ formData.requirementName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属公司">
+            <span>{{ formData.companyIds }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="征集类型">
+            <span>{{ formData.collectType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="截止时间">
+            <span>{{ formData.deadline }}</span>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="征集说明"></baseTitle>
+        <el-col :span="24">
+          <el-form-item>
+            <el-card style="width: 100%">
+              <div v-html="formData.collectExplain">
+              </div>
+            </el-card>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="附件列表"></baseTitle>
+        <el-col :span="24">
+          <el-form-item>
+            <fvTable style="width: 100%;max-height: 200px" v-if="processViewer" :tableConfig="tableConfig"
+                     :data="formData.fileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <div v-if="formData.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="auditOpinion">
+              <el-input
+                  v-model="formData.auditOpinion"
+                  :rows="3"
+                  type="textarea"
+                  placeholder="请输入审核意见"
+              />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="approval-record">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="process">
+          <operation-render v-if="processViewer" :operation-list="data.operationList"
+                            :state="data.state"/>
+          <process-diagram-viewer v-if="processViewer" id-name="collectionProcess"/>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
+import {matterTree} from '@/utils/matterTree.js';
+import {downloadFile} from "@/api/project-demand";
+
+const emit = defineEmits(['getInfo',"update:formData"])
+const form = ref()
+const showTable = ref(false)
+const companyNameArray = ref([])
+
+const props = defineProps({
+  formData: {
+    type: Array,
+    default: []
+  },
+  data: {
+    type: Array,
+    default: []
+  },
+  processViewer: {
+    type: Boolean,
+    default: false
+  },
+  companyOption: {
+    type: Array,
+    default: []
+  }, loading: {
+    type: Boolean,
+    default: false
+  }
+})
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+        )
+      }
+    }
+  ]
+})
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
+const getDataSourceOptionItem = (val) => {
+  if (val instanceof Array) {
+    val.forEach(item => {
+      matterTree(companyNameArray.value, props.companyOption, item)
+    })
+  }
+  let uniqueArr = Array.from(new Set(companyNameArray.value));
+  return uniqueArr.join('，');
+}
+
+watch(() => props.loading, (newVal) => {
+  props.loading = newVal
+}, {deep: true})
+
+watch(() => props.companyOption, (newVal) => {
+  props.companyOption = newVal
+}, {deep: true})
+watch(() => props.formData, (newVal) => {
+  if(newVal!=null){
+    props.formData.companyIds = getDataSourceOptionItem(newVal.companyIds)
+  }
+}, {deep: true})
+watch(() => props.processViewer, (newVal) => {
+  props.processViewer = newVal
+}, {deep: true})
+</script>
+
+<style scoped>
+
+</style>

src/components/DetailComponent/Opinion.vue

@@ -0,0 +1,80 @@
+<template>
+  <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
+  <div class="oper">
+    <el-button type="danger" @click="handleReject">驳回</el-button>
+    <el-button type="primary" @click="handleAgree">同意</el-button>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import { ElLoading, ElNotification } from 'element-plus';
+import { agreeTask, rejectTask} from "@/api/project-demand/index.js";
+
+const props = defineProps({
+  taskId: {
+    type: String,
+    default: ''
+  },
+  formData: {
+    type: Object,
+    default: {}
+  }
+})
+
+const form = ref()
+const schema = computed(()=>{
+  return [
+    {
+      label: '审核意见',
+      prop: 'auditOpinion',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入审核意见',
+        type: 'textarea',
+        maxlength: 140
+      }
+    }
+  ]
+})
+
+// {
+//   "auditOpinion": "统一",
+//   "formData": {"formData":""},
+//   "taskId": "156e69b7-15eb-11ef-a152-f268fc747b04"
+// }
+// 驳回
+const handleReject = async () => {
+  const values = form.value.getValues()
+  if(!values.auditOpinion) {
+    ElNotification({
+      title: '提示',
+      message: '请填写审核意见',
+      type: 'warning'
+    })
+    return
+  }
+  const params = {
+    // taskId: props.taskId,
+    // formData: props.formData,
+    // ...values
+  }
+  const res = await rejectTask(params)
+}
+
+const handleAgree = async () => {
+  const values = form.value.getValues()
+  const params = {
+    taskId: props.taskId,
+    formData: props.formData,
+    ...values
+  }
+  const res = await agreeTask(params)
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/components/DetailComponent/SummaryDetail.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="detail-block" v-loading="loading">
+    <el-form :model="localFormData" ref="summaryForm" :rules="rules">
+      <el-row gutter="50">
+        <el-col :span="12">
+          <el-form-item label="名称" prop="projectName">
+            <span>{{ localFormData.projectName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="专项资金" prop="specialFund">
+            <span>{{ localFormData.specialFund }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开始时间" prop="startTime">
+            <span>{{ localFormData.startTime }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结束时间" prop="endTime">
+            <span>{{ formData.endTime }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属公司" prop="affiliatedCompanyId">
+            <span>{{ localFormData.affiliatedCompanyId }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目类型" prop="projectType">
+            <span>{{ localFormData.projectType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="研发主体" prop="rdSubject">
+            <span>{{ localFormData.rdSubject }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="出资类型" prop="investmentType">
+            <span>{{ localFormData.investmentType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目影响" prop="projectImpact">
+            <span>{{ localFormData.projectImpact }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属业务板块" prop="businessSegment">
+            <span>{{ localFormData.businessSegment }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <span>{{ localFormData.resultForm }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="预期技术标准制定" prop="technicalStandard">
+            <span>{{ localFormData.technicalStandard }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch">
+            <span>{{ localFormData.industryUniversityResearch }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开展政府申报" prop="governmentDeclaration">
+            <span>{{ localFormData.governmentDeclaration }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="知识产权状况" prop="intellectualProperty">
+            <span>{{ localFormData.intellectualProperty }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="发明专利(项)" prop="inventionPatent">
+            <span>{{ localFormData.inventionPatent }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实用性新型专利(项)" prop="newPatent">
+            <span>{{ localFormData.newPatent }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="软件著作权(项)" prop="softwareCopyright">
+            <span>{{ localFormData.softwareCopyright }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="著作权(项)" prop="copyright">
+            <span>{{ localFormData.copyright }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="其他(项)" prop="other">
+            <span>{{ localFormData.other }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="经济概算(万元)" prop="economicEstimate">
+            <span>{{ localFormData.economicEstimate }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
+            <span>{{ localFormData.specialFundAmount }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="现有业务描述" prop="serviceDescription">
+            <span>{{ localFormData.serviceDescription }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="研发项目关键内容描述" prop="contentDescription">
+            <span>{{ localFormData.contentDescription }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="需求上报申请书">
+            <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">
+              {{ localFormData.singleFile?.originalFileName }}
+            </el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="需求上报附件">
+            <fvTable style="width: 100%;max-height: 400px;" v-if="processViewer" :tableConfig="tableConfig"
+                     :data="localFormData.fileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <div v-if="data.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="auditOpinion">
+              <el-input
+                  v-model="localFormData.auditOpinion"
+                  :rows="3"
+                  type="textarea"
+                  placeholder="请输入审核意见"
+              />
+            </el-form-item>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="approval-record">
+        <baseTitle title="审批记录"></baseTitle>
+        <div class="process">
+          <operation-render v-if="processViewer" :operation-list="data.operationList"
+                            :state="data.state"/>
+          <process-diagram-viewer  v-if="processViewer" id-name="summaryProcess"/>
+        </div>
+      </div>
+      <div class="oper-page-btn" v-if="data.state === '1' && data.taskId">
+        <el-button @click="handleReject(summaryForm)">驳回</el-button>
+        <el-button color="#DED0B2" @click="handleAgree">同意</el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {downloadFile} from "@/api/project-demand";
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
+import {ElMessage, ElNotification} from "element-plus";
+import {agreeTask, rejectTask} from "@/api/project-demand";
+import {useTagsView} from '@/stores/tagsview.js'
+
+const tagsViewStore = useTagsView()
+const props = defineProps({
+  formData: {
+    type: Object,
+    default: {}
+  },
+  data: {
+    type: Object,
+    default: {}
+  },
+  processViewer: {
+    type: Boolean,
+    default: false
+  }, loading: {
+    type: Boolean,
+    default: false
+  }
+})
+const localFormData = ref({})
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+        )
+      }
+    }
+  ]
+})
+const router = useRouter()
+const summaryForm = ref()
+const rules = reactive({
+  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+})
+const handleReject = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    let approve = {
+      taskId: props.data.taskId,
+      auditOpinion: localFormData.value.auditOpinion,
+    }
+    rejectTask(approve).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push({
+          name: 'Summary'
+        })
+      }
+    })
+  })
+}
+const handleAgree = () => {
+  let approve = {
+    taskId: props.data.taskId,
+    auditOpinion: localFormData.value.auditOpinion,
+    formData: localFormData.value
+  }
+  agreeTask(approve).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Summary'
+      })
+    }
+  })
+}
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
+
+watch(
+    () => props.formData,
+    (val) => {
+      console.log(val, 'ssss');
+    }
+)
+watch(() => props.processViewer, (newVal) => {
+  props.processViewer = newVal
+}, {deep: true})
+watch(() => props.loading, (newVal) => {
+  props.loading = newVal
+}, {deep: true})
+
+watchEffect(() => {
+  Object.keys(props.formData).length && (localFormData.value = props.formData)
+})
+</script>
+
+<style scoped>
+:deep(.el-table--fit) {
+  height: auto !important;
+}
+
+.detail-block {
+  overflow-x: hidden;
+  overflow-y: auto;
+  padding-bottom: 20px;
+}
+
+</style>

src/components/FileUpload.vue

@@ -11,13 +11,15 @@
              :before-upload="beforeUpload"
              :on-success="handleUploadSuccess"
              :on-error="uploadError"
+             :before-remove="beforeRemove"
+             :on-remove="handleRemove"
   >
     <el-button color="#DED0B2" :loading="loading">上传文件</el-button>
   </el-upload>
 </template>
 
 <script setup>
-import {ElMessage} from "element-plus";
+import {ElMessage,ElMessageBox} from "element-plus";
 import {getToken} from '@/utils/auth'
 const baseURL = import.meta.env.VITE_BASE_URL
 const uploadFileUrl = ref(baseURL + "/workflow/process/file/upload")
@@ -45,7 +47,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(["input", "getFile"])
+const emit = defineEmits(["input", "getFile","delete"])
 const fileList = ref([])
 const _value = computed({
   get() {
@@ -55,7 +57,17 @@ const _value = computed({
     emit("input", val);
   }
 })
+const beforeRemove = (file, fileList) => {
+  return ElMessageBox.confirm(`确认删除名称为${file.name}的文件吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => true)
+}
 
+const handleRemove = (file, fileList) => {
+  emit("delete",file.response.data.id)
+}
 const beforeUpload = (file) => {
   // const FileExt = file.name.replace(/.+\./, "");
   // if (['zip', 'rar', 'pdf', 'doc', 'docx', 'xlsx'].indexOf(FileExt.toLowerCase()) === -1) {
@@ -94,4 +106,7 @@ a {
   font-size: 14px;
   color: #2a99ff;
 }
+:deep(.el-upload-list) {
+  width: 400px;
+}
 </style>

src/components/NameCircle.vue

@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <slot name="pre"></slot>
+    <div class="user-audit">
+      <div class="circle-user">
+        <Tooltip :content="user.name" placement="bottom-start" width="45"/>
+        <div v-if="user.icon"
+             class="el-timeline-item__node" :style="{
+                      backgroundColor: user.color
+                    }">
+          <el-icon v-if="user.icon" size="15" :class="user.class">
+            <component :is="user.icon"/>
+          </el-icon>
+        </div>
+      </div>
+      <div class="username" v-if="user.auditOpinion">
+        <div style="margin-bottom: 10px;color: #909399">{{user.operationTime}}</div>
+        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="140" :lines="true"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import {Loading, Close, CircleCheckFilled, MoreFilled} from '@element-plus/icons-vue'
+import {defineProps} from "vue";
+
+const props = defineProps({
+  row: {
+    type: Number,
+    default: 1
+  },
+  hoverTip: {
+    type: Boolean,
+    default: false
+  },
+  user: {
+    type: Object,
+    default: {}
+  },
+  mode: {
+    type: String,
+    default: 'design'
+  }
+})
+
+const init = () => {
+  // for (let user of props.userInfo) {
+  initUser(props.user)
+  // }
+}
+
+const initUser = (user) => {
+  let state = user.state
+  //创建节点
+  if (state === 'CREATE') {
+    user["icon"] = CircleCheckFilled
+    user["color"] = "#0bbd87"
+  }
+  //审批通过
+  if (state === 'AGREE' || state === 'AUTO_PASS') {
+    user["icon"] = CircleCheckFilled
+    user["color"] = "#0bbd87"
+  }
+  //审批处理中
+  if (state === 'RUNNING') {
+    user["icon"] = Loading
+    user["color"] = "#f78f5f"
+    user["class"] = 'is-loading'
+  }
+  //拒绝后评论
+  if (state === 'REFUSE') {
+    user["icon"] = Close
+    user["color"] = "#f56c6c"
+  }
+  if (state === 'PASS') {
+    user["icon"] = MoreFilled
+    user["color"] = "#c0c4cc"
+  }
+  return user;
+}
+
+init()
+</script>
+
+<style scoped lang="scss">
+.user-audit {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .circle-user {
+    width: 50px;
+    height: 50px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 50%;
+    border: 1px solid #ACACAC;
+    position: relative;
+
+    .el-timeline-item__node {
+      position: absolute;
+      bottom: 0;
+      right: 1px;
+    }
+  }
+
+  .username {
+    //width: 90px;
+    margin-top: 10px;
+    background: #f5f5f5;
+    padding: 5px;
+
+    .el-tooltip__trigger {
+      width: 90px;
+      text-align: center;
+      //padding-top: 2px;
+      //text-align: center;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden
+    }
+  }
+}
+</style>

src/components/PopoverDelete.vue

@@ -9,7 +9,7 @@
       @cancel="handleCancel"
   >
     <template #reference>
-      <el-button :type="btnType" size="mini"  :disabled="isDisabled" :icon="btnIcon" :plain="isPlain" :link="link">
+      <el-button :type="btnType" size="mini" :disabled="isDisabled" :icon="btnIcon" :plain="isPlain" :link="link">
         {{ btnText }}
       </el-button>
     </template>
@@ -24,7 +24,7 @@ const props = defineProps({
   },
   btnType: {
     type: String,
-    default: 'text'
+    default: 'danger'
   },
   type: {
     type: String,

src/components/Tooltip.vue

@@ -0,0 +1,49 @@
+<template>
+  <el-tooltip
+      effect="dark"
+      :content="props.content"
+      placement="bottom-start"
+      :disabled="isShow"
+  >
+    <div :class="lines?'content-lines':'content'" :style="{width: props.width+'px'}" @mouseover="isShowTooltip">
+      <span ref="contentRef">
+        <slot name="content">{{ props.content }}</slot>
+      </span>
+    </div>
+  </el-tooltip>
+</template>
+<script setup>
+const props = defineProps({
+  content: {
+    type: String,
+    default: ''
+  }, width: {
+    type: String,
+    default: ''
+  }, lines: {
+    type: Boolean,
+    default: false
+  }
+})
+const contentRef = ref()
+const isShow = ref(false)
+const isShowTooltip = () => {
+  isShow.value = props.width > contentRef.value.offsetWidth;
+}
+</script>
+<style>
+.content {
+  width: 45px;
+  text-align: center;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.content-lines{
+  overflow:hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+</style>

src/components/steps/api/index.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+export const getBaseInfoApi = (projectId) => {
+  return request({
+    url: '/workflow/details/info/'+projectId,
+    method: 'get',
+  })
+}
+
+export const getMapProjectStateInfo = (projectId, state) => {
+  return request({
+    url: `/workflow/details/${projectId}/${state}`,
+    method: 'get'
+  })
+}

src/components/steps/index.vue

@@ -0,0 +1,256 @@
+<template>
+  <baseTitle title="基础信息"></baseTitle>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
+  <baseTitle title="各流程信息"></baseTitle>
+  <div class="steps-box">
+    <el-steps :active="localActive" finish-status="success">
+      <el-step
+        v-for="(item, index) in localSteps"
+        :key="item.key"
+        :title="item.title"
+        :class="stepClass(index)"
+        @click="handleStep(item.key, index)"
+
+      />
+    </el-steps>
+  </div>
+
+  <!-- 步骤内容 -->
+  <div>
+    <slot name="content" :localActive="localActive"></slot>
+    <!-- <template v-for="(item, index) in stepList" :key="item.key">
+      <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />
+    </template> -->
+  </div>
+</template>
+
+<script setup lang="jsx">
+import { ElLoading, ElNotification } from 'element-plus';
+import { computed, reactive, ref, watchEffect } from 'vue';
+import { useRoute } from 'vue-router';
+import { getBaseInfoApi } from './api';
+
+const props = defineProps({
+  // 步骤对应内容list
+  stepList: {
+    type: Array,
+    default: []
+  },
+  // 当前显示步骤
+  active: {
+    type: Number,
+    default: '0'
+  },
+  // 已完成的工作流步骤
+  stepSuccess: {
+    type: Array,
+    default: ['00']
+  }
+})
+
+const route = useRoute()
+
+const emits = defineEmits(['stepChange', 'setDetail'])
+
+const localData = reactive({
+
+})
+
+const localActive = ref(0) // 当前激活步骤
+
+const localSteps = ref([
+  {
+    title: '需求征集',
+    key: 'collect',
+  },
+  {
+    title: '需求上报',
+    key: 'report',
+  },
+  {
+    title: '项目立项',
+    key: 'approve',
+  },
+  {
+    title: '项目实施',
+    key: 'execute',
+  },
+  {
+    title: '项目归档',
+    key: 'archivist',
+  },
+  // {
+  //   title: '项目结项',
+  //   key: 'end',
+  // },
+])
+
+const baseForm = ref()
+
+const schema = computed(()=>{
+  return [
+    {
+      label: '所属公司',
+      prop: 'affiliatedCompany',
+      colProps: {
+        span: 12
+      }
+      // component:
+    },
+    {
+      label: '征集类型',
+      prop: 'collectType',
+      colProps: {
+        span: 12
+      }
+      // component:
+    },
+    {
+      label: '截止时间',
+      prop: 'deadline',
+      colProps: {
+        span: 12
+      }
+      // component:
+    },
+    {
+      label: '需求名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 12
+      }
+      // component:
+    },
+  ]
+})
+
+const localStepSuccess = ref([])
+
+// 格式化详情步骤条
+const formatProcedure = (data) => {
+  let arr = []
+  if(data instanceof Array) {
+    data.forEach(item=>{
+      switch (item) {
+        case '00': arr.push(0)
+          break
+        case '10': arr.push(1)
+          break
+        case '20': arr.push(2)
+          break
+        // case '30': arr.push(3)
+        //   break
+        case '40': arr.push(3)
+          break
+        case '50': arr.push(4)
+          break
+      }
+    })
+  }
+  return arr
+}
+
+// 反向格式化
+const formatReProcedure = (data) => {
+  let arr = []
+  if(data instanceof Array) {
+    data.forEach(item=>{
+      switch (item) {
+        case 0: arr.push('00')
+          break
+        case 1: arr.push('10')
+          break
+        case 2: arr.push('20')
+          break
+        // case 3: arr.push('30')
+        //   break
+        case 3: arr.push('40')
+          break
+        case 4: arr.push('50')
+          break
+      }
+    })
+  }
+}
+
+const formatActive = (val) => {
+  let active = ''
+  val == 0 && (active = '00')
+  val == 1 && (active = '10')
+  val == 2 && (active = '20')
+  // val == 3 && (active = '30')
+  val == 3 && (active = '40')
+  val == 4 && (active = '50')
+  return active
+}
+
+const stepClass = (val) => {
+  if (localStepSuccess.value.includes(val)) {
+    return 'step-success'
+  }
+  return 'step-error'
+}
+
+const handleStep = (key, index) => {
+  if (localStepSuccess.value.includes(index)) {
+    let active = ''
+    localActive.value = index
+    switch(index) {
+      case 0: active = '00'
+        break
+      case 1: active = '10'
+        break
+      case 2: active = '20'
+        break
+      // case 3: active = '30'
+      //   break
+      case 3: active = '40'
+        break
+      case 4: active = '50'
+        break
+    }
+    emits('stepChange', { key, active })
+    return
+  }
+  ElNotification({
+    title: '提示',
+    message: '不能查看未完成的工作流信息',
+    type: 'warning'
+  })
+}
+
+const getBaseInfo = async () => {
+  const loading = ElLoading.service({fullscreen: true})
+  try {
+    const { code, data } = await getBaseInfoApi(route.query.projectId)
+    localStepSuccess.value = formatProcedure(data.procedure)
+    baseForm.value.setValues(data)
+    console.log(formatActive(localActive.value), 'formatActive(localActive.value)');
+    emits('setDetail', formatActive(localActive.value))
+    loading.close()
+  } catch {
+    loading.close()
+  }
+}
+
+getBaseInfo()
+
+watchEffect(() => {
+  console.log(props.active, 'props.active');
+  localActive.value = props.active
+})
+</script>
+
+<style lang="scss" scoped>
+.steps-box {
+  padding: 10px 0;
+}
+
+.step-success {
+  cursor: pointer;
+}
+
+.step-error {
+  cursor: not-allowed;
+}
+</style>

src/utils/matterTree.js

@@ -0,0 +1,13 @@
+export const matterTree = (array,data, id) => {
+  if (id) {
+    for (let i = 0; i < data.length; i++) {
+      if (data[i].value == id) {
+        array.push(data[i].label);
+      }
+      if (data[i].children && data[i].children.length > 0) {
+        matterTree(data[i].children)
+      }
+    }
+    return array;
+  }
+}

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

@@ -36,7 +36,7 @@
     <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300"
              v-if="showTinymce"/>
     <baseTitle title="申请文件"></baseTitle>
-    <file-upload ref="uploadFile" @getFile="getFile"/>
+    <file-upload @getFile="getFile"/>
     <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig" :data="formData.fileList"
              :isSettingCol="false" :pagination="false">
       <template #empty>
@@ -61,10 +61,17 @@
 <script setup lang="jsx">
 import {useAuthStore} from '@/stores/userstore.js'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile} from "@/api/project-demand/index.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'
@@ -138,7 +145,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
             <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
             </div>
         )
@@ -146,10 +153,20 @@ const tableConfig = reactive({
     }
   ]
 })
+
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
 const compositeParam = (item) => {
-  let tag=''
-  if(!formData.value.collectType&&router.currentRoute.value.name==='Collection/add'){
-    tag='需求征集'
+  let tag = ''
+  if (!formData.value.collectType && router.currentRoute.value.name === 'Collection/add') {
+    tag = '需求征集'
   }
   return {
     fileId: item.id,
@@ -176,28 +193,43 @@ 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=()=>{
+const submitParam = (item) => {
+  let files = []
+  item.fileList.forEach(item => {
+    let obj = {
+      fileId: item.fileId,
+    }
+    files.push(obj)
+  })
   return {
-    collectExplain: formData.value.collectExplain,
-    collectType: formData.value.collectType,
-    companyIds: formData.value.companyIds,
-    deadline: formData.value.deadline,
-    requirementId: formData.value.requirementId?formData.value.requirementId:0,
-    requirementName: formData.value.requirementName,
-    files: formData.value.fileList,
+    collectExplain: item.collectExplain,
+    collectType: item.collectType,
+    companyIds: item.companyIds,
+    deadline: item.deadline,
+    requirementId: item.requirementId ? item.requirementId : 0,
+    requirementName: item.requirementName,
+    fileList: files,
     deploymentId: processInstanceData.value.deploymentId
   }
 }
@@ -205,7 +237,7 @@ const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    let res = await addRequirement(submitParam())
+    let res = await addRequirement(submitParam(formData.value))
     if (res.code === 1000) {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
@@ -218,7 +250,7 @@ const handleSubmit = async (instance) => {
   })
 }
 const handleResubmit = () => {
-  resubmit(submitParam()).then(res => {
+  resubmit(submitParam(formData.value)).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="detail-block">
+  <div class="detail-block" v-loading="loading">
     <el-form :model="formData" ref="demandForm" label-width="auto" :rules="rules">
       <baseTitle title="需求征集详情"></baseTitle>
       <el-row>
@@ -80,13 +80,14 @@ import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo, agreeTask, rejectTask,downloadFile} from "@/api/project-demand/index.js";
 import {getSubCompOpt} from '@/api/user/user.js'
 import {ElMessage} from "element-plus";
-import {useRouter} from "vue-router";
 import {useTagsView} from '@/stores/tagsview.js'
+import {matterTree} from '@/utils/matterTree.js';
 
 const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
 const form = ref();
+const loading = ref(false)
 const demandForm = ref()
 const processStore = useProcessStore()
 const companyOption = ref([])
@@ -180,24 +181,10 @@ const getCompanyOption = async () => {
   companyOption.value = res.data
 }
 
-const matterTree = (data, id) => {
-  if (id) {
-    for (let i = 0; i < data.length; i++) {
-      if (data[i].value == id) {
-        companyNameArray.value.push(data[i].label);
-      }
-      if (data[i].children && data[i].children.length > 0) {
-        matterTree(data[i].children)
-      }
-    }
-    return companyNameArray.value;
-  }
-}
-
 const getDataSourceOptionItem = (val) => {
   if (val !== undefined) {
     val.forEach(item => {
-      matterTree(companyOption.value, item)
+      matterTree(companyNameArray.value,companyOption.value, item)
     })
   }
   return companyNameArray.value.join('，');
@@ -216,6 +203,7 @@ const init = async () => {
   if (!route.query.id) return;
   await getCompanyOption()
   getInfo(route.query.id).then(res => {
+    loading.value=false
     let data = res.data
     formData.value = data.formData;
     data.formData.companyIds = getDataSourceOptionItem(data.formData.companyIds)
@@ -232,7 +220,10 @@ const init = async () => {
     })
   })
 }
-init()
+onMounted(async () => {
+  loading.value=true
+  await init()
+})
 </script>
 
 <style lang="scss" scoped>

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

@@ -87,8 +87,6 @@ const tableConfig = reactive({
         let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
         if (row.state === '3' || row.state === '2') {
           btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        } else if (row.state === '4') {
-          btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>

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

@@ -1,182 +1,494 @@
 <template>
-  <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 class="detail-block" v-loading="loading">
+    <baseTitle title="需求上报"></baseTitle>
+    <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="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="affiliatedCompanyId">
+            <el-select v-model="formData.affiliatedCompanyId" placeholder="请选择所属公司" clearable filterable>
+              <el-option
+                  v-for="item in companyOption"
+                  :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="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="rdSubject">
+            <el-input v-model="formData.rdSubject" placeholder="请输入研发主体" clearable></el-input>
+          </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="12">
+          <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
+            <el-input v-model="formData.specialFundAmount" clearable></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>
+    <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
+                      @getAttachment="getAttachment"
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Summary/edit'"/>
+    <!--  <fvForm :schema="schame" @getInstance="getInstance"></fvForm>-->
+    <div class="approval-record">
+      <baseTitle title="流程"></baseTitle>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      <!--      <div class="process" id="approvalRecord">-->
+      <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
+      <!--      </div>-->
     </div>
+    <div class="oper-page-btn">
+      <el-button type="primary" @click="staging">存为草稿</el-button>
+      <el-button type="primary" @click="handleSubmit(summaryForm)">发布</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit">重新发布</el-button>
+    </div>
+  </div>
 </template>
 
 <script setup lang="jsx">
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import { markRaw } from 'vue';
-import FileUpload from './components/FileUpload.vue';
-
-const localData = reactive({
-  form: null
+import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "./api";
+import {ElMessage, ElNotification} from "element-plus";
+import {useTagsView} from '@/stores/tagsview.js'
+import {useCacheStore} from '@/stores/cache.js'
+import {useProcessStore} from '@/stores/processStore.js';
+import {getSubCompOpt} from "@/api/user/user";
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+const cacheStore = useCacheStore()
+const processStore = useProcessStore()
+const router = useRouter()
+const route = useRoute()
+const attachment = ref()
+const name=ref(router.currentRoute.value.name)
+const loading = ref(false)
+const processDiagramViewer = ref(false)
+const tagsViewStore = useTagsView()
+const companyOption = ref([])
+const summaryForm = ref()
+const deploymentId = ref()
+const showTable = ref(true)
+const otherFileList = ref([])
+const file = ref({})
+const formData = ref({})
+const rules = reactive({
+  projectName: [{required: true, message: '请输入名称', trigger: 'blur'}],
+  specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
+  startTime: [{required: true, message: '请选择开始时间', trigger: 'blur'}],
+  rdSubject: [{required: true, message: '请输入研发主体', trigger: 'blur'}],
+  affiliatedCompanyId: [{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(()=>{
-  let arr = [
-    {
-      label: '名称',
-      prop: 'name',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '开始时间',
-      prop: 'startTime',
-      component: 'el-date-picker',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'company',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '项目类型',
-      prop: 'projectType',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '结束时间',
-      prop: 'endTime',
-      component: 'el-date-picker',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '出资类型',
-      prop: 'monenyType',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '项目影响',
-      prop: 'projectEffect',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '所属业务板块',
-      prop: 'ywbank',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '预期成果形式',
-      prop: 'yuqichengg',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '预期技术标准制定',
-      prop: 'yuqizhidingbiaozhu',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '产学研联合',
-      prop: 'chanxue',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '开展政府申报',
-      prop: 'zhengfushenbao',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '知识产权状况',
-      prop: 'zhishichanquan',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '现有业务描述',
-      prop: 'yewudes',
-      component: 'el-input',
-      props: {
-        type: 'textarea'
-      },
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '研发项目关键内容描述',
-      prop: 'contentnesss',
-      component: 'el-input',
-      props: {
-        type: 'textarea'
-      },
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '',
-      prop: 'fileList',
-      component: markRaw(FileUpload),
-      props: {
-        url: '',
-        tip: '上传txt文件'
-      },
-      colProps: {
-        span: 24
+const compositeParam = (item, type) => {
+  let tag = ''
+  if ( name.value=== 'Summary/add'||name.value === 'Summary/edit') {
+    tag = '需求上报'
+  }
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    tag: tag
+  }
+}
+const getEditOtherFile=(val)=>{
+  console.log('getEditOtherFile',val)
+}
+const getAttachment = (val) => {
+  console.log('上传文件getAttachment', val)
+  file.value = compositeParam(val)
+}
+const getOtherFile = (val) => {
+  console.log('上传文件getOtherFile', val)
+  showTable.value = false
+  let fileObj = compositeParam(val)
+  otherFileList.value.push(fileObj)
+  nextTick(() => {
+    showTable.value = true
+  })
+}
+const getFileParam = (item) => {
+  return {
+    fileId: item.fileId
+  }
+}
+const handleSubmit = async (instance) => {
+  // if (!instance) return
+  // instance.validate(async (valid, fields) => {
+  // if(JSON.stringify(file.value) == "{}"){
+  //     attachment.value.validate()
+  //   } else {
+  //     attachment.value.clearValidate()
+  //   }
+  //   if (!valid) return
+  let singleFile = {}
+  if (file.value.fileId !== undefined) {
+    singleFile = {
+      fileId: file.value.fileId
+    }
+  }
+  let otherFiles = []
+  otherFileList.value.forEach(item => {
+    otherFiles.push(getFileParam(item))
+  })
+  let params = {
+    "specialFund": "2",
+    "projectName": "重新提交全流程测试2024520",
+    "startTime": "2024-05-24 00:00:00",
+    "endTime": "2024-05-29 00:00:00",
+    "projectType": "3",
+    "investmentType": "3",
+    "businessSegment": "2",
+    "technicalStandard": "2",
+    "governmentDeclaration": "2",
+    "inventionPatent": "3",
+    "newPatent": "3",
+    "economicEstimate": "3",
+    "other": "3",
+    "copyright": "3",
+    "softwareCopyright": "3",
+    "industryUniversityResearch": "2",
+    "intellectualProperty": "00",
+    "resultForm": "3",
+    "projectImpact": "3",
+    "rdSubject": "3",
+    "affiliatedCompanyId": formData.value.affiliatedCompanyId,
+    "serviceDescription": "3",
+    "contentDescription": "3",
+    "specialFundAmount": "3",
+    deploymentId: deploymentId.value,
+    "singleFile": singleFile,
+    "files": otherFiles,
+    "requirementId":route.query.id
+  }
+  // ...formData.value,
+  //   deploymentId: deploymentId.value,
+  //   fileList: files,
+  //   requirementId:102
+  // }
+  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 handleResubmit = () => {
+  let singleFile = {}
+  let otherFiles = []
+  let fileArray
+  if(name.value === 'Summary/edit'){
+    singleFile = {
+      fileId: attachment.value.singleFile.fileId
+    }
+    fileArray=attachment.value.allFileList
+  }else {
+    if (file.value.fileId !== undefined) {
+      singleFile = {
+        fileId: file.value.fileId
       }
     }
-  ]
-  return arr
+    fileArray=otherFileList.value
+  }
+  fileArray.forEach(item => {
+    otherFiles.push(getFileParam(item))
+  })
+  //todo requirementId
+  let params={
+    ...formData.value,
+    deploymentId: deploymentId.value,
+    fileList: otherFiles,
+    singleFile: singleFile,
+    requirementId: route.query.id
+  }
+  console.log('重新提交params',params)
+  resubmitReported(params).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Summary'
+      })
+    }
+  })
+}
+const getDetailInfo = async () => {
+  getDetail(route.query.projectId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      formData.value = res.data.formData
+      loading.value=false
+    }
+  })
+}
+const init = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+  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
+      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
+      })
+    }
+  })
+}
+onMounted(async () => {
+  await init()
+  if (route.query.projectId) {
+    loading.value=true
+    await getDetailInfo()
+  }
 })
-
-const getInstance = (e) => {
-  localData.form = e
+const staging = async () => {
+}
+</script>
+<style lang="scss" scoped>
+.detail-block {
+  overflow: hidden;
+  padding-bottom: 30px;
 }
 
-const handleSubmit = async () => {}
+:deep(.el-table--fit) {
+  height: auto !important;
+}
 
-const staging = async () => {}
-</script>
+</style>

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

@@ -9,4 +9,32 @@ export const fileUp = (url, data) => {
       'Content-Type': 'multipart/form-data'
     }
   })
-}
+}
+
+export const requirementReported = (data) => {
+  return request({
+    url: '/workflow/mosr/requirement/collect/reported',
+    method: "post",
+    data: data
+  });
+};
+export const getProcessInfo = () => {
+  return request({
+    url: '/workflow/mosr/requirement/collect/process',
+    method: "post"
+  });
+};
+export const getDetail = (projectId) => {
+  return request({
+    url: `/workflow/mosr/requirement/collect/info/${projectId}`,
+    method: "get"
+  });
+};
+
+export const resubmitReported = (data) => {
+  return request({
+    url: '/workflow/mosr/requirement/collect/resubmit',
+    method: "post",
+    data: data
+  });
+};

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

@@ -0,0 +1,78 @@
+<template>
+  <steps :active="active" @setDetail="setDetail" @stepChange="stepChange">
+    <template #content>
+      <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
+                         :processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/>
+      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
+                      :processViewer="summaryProcessViewer" :loading="loading"/>
+      <ApprovalDetail v-show="showActive == '20'" :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"></ApprovalDetail>
+
+    </template>
+  </steps>
+  <opinion v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"></opinion>
+</template>
+
+<script setup lang="jsx">
+import SummaryDetail from '@/components/DetailComponent/SummaryDetail.vue';
+import {useProcessStore} from '@/stores/processStore.js';
+import {getMapProjectStateInfo} from '@/components/steps/api';
+import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
+import {getSubCompOpt} from "@/api/user/user";
+import {ElNotification} from "element-plus";
+
+const route = useRoute()
+const companyOption = ref([])
+const commonForm = ref({})
+const summaryData = ref({})
+const summaryProcessViewer = ref(true)
+const loading = ref(false)
+const processStore = useProcessStore()
+const active = ref(route.query.state)
+const showActive = ref()
+const getCompanyOption = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
+const getInfo = async (state) => {
+  const projectId = route.query.projectId
+  if(showActive == '00'){
+    await getCompanyOption()
+  }
+  summaryProcessViewer.value = false
+  loading.value = true
+  const {code, data,msg} = await getMapProjectStateInfo(projectId, state)
+  ElNotification({
+    title: '提示',
+    message: msg,
+    type: code === 1000 ? 'success' : 'error'
+  })
+  if(code===1000){
+    summaryData.value = data;
+    loading.value = false
+    console.log('data-====================',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(() => {
+      summaryProcessViewer.value = true
+    })
+  }
+}
+
+const setDetail = (active) => {
+  showActive.value = active
+  getInfo(active)
+}
+
+const stepChange = (data) => {
+  showActive.value = data.active
+  getInfo(data.active)
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -4,22 +4,20 @@
 </template>
 
 <script setup lang="jsx">
-import { reactive, ref, shallowRef } from 'vue';
+import {reactive, ref, shallowRef} from 'vue';
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import { useRouter } from 'vue-router';
+import {useRouter} from 'vue-router';
 
-const localData = reactive({
+const localData = reactive({})
 
-})
-
-const tableIns= ref()
+const tableIns = ref()
 const router = useRouter()
 
 
 const searchConfig = reactive([
   {
     label: '名称',
-    prop: 'name',
+    prop: 'requirementName',
     props: {
       placeholder: '请输入'
     },
@@ -49,7 +47,7 @@ const searchConfig = reactive([
   },
   {
     label: '起止时间',
-    prop: 'time',
+    prop: 'startTime',
     component: 'el-date-picker',
     props: {},
     colProps: {}
@@ -75,13 +73,13 @@ const tableConfig = reactive({
       prop: 'selection'
     },
     {
-      prop: 'name',
+      prop: 'requirementName',
       label: '名称',
       align: 'center'
     },
     {
-      prop: 'company',
-      label: '所属公司',
+      prop: 'undertaker',
+      label: '承办单位',
       align: 'center'
     },
     {
@@ -90,56 +88,75 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'productMainBody',
+      prop: 'rdSubject',
       label: '研发主体',
       align: 'center'
     },
     {
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       label: '项目影响',
       align: 'center'
     },
     {
-      prop: 'survey',
-      label: '经营概况',
-      align: 'center'
-    },
-    {
-      prop: 'time',
+      prop: 'startTime',
       label: '起止时间',
       align: 'center'
     },
     {
-      prop: 'status',
-      label: '发布状态',
-      align: 'center'
+      prop: 'state',
+      label: '状态',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'demand_collection'} value={row.state}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'oper',
       label: '操作',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
+        if (row.state === '3') {
+          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+        } else if (row.state === '0') {
+          btn.push({label: '上报', func: () => handleAdd(row), type: 'primary'})
+        }
         return (
-          <div>
-            <el-button type={'primary'} link onClick={()=>{}} >详情</el-button>
-            <el-button type={'primary'} link onClick={()=>{}} >上报</el-button>
-          </div>
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        // v-perm={item.auth}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
         )
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/requirement/collect',
   params: {},
   btns: [
-    {name: '新增上报', key: 'add', type: 'primary', auth: ''},
-    {name: '年度计划导出', key: '_export', type: 'primary', auth: ''},
-    {name: '经费预算生成', key: 'preMonty', type: 'primary', auth: ''},
+    {name: '年度计划导出', key: '_export', color: '#DED0B2', auth: ''},
+    {name: '经费预算生成', key: 'preMonty', color: '#DED0B2', auth: ''},
   ]
 })
 
 const search = (val) => {
   let obj = {...val}
-  if(obj.time) {
+  if (obj.time) {
     obj.startTime = obj.time[0]
     obj.endTime = obj.time[1]
     delete obj.dateValue
@@ -148,17 +165,31 @@ const search = (val) => {
   tableIns.value.refresh()
 }
 
-const headBtnClick = (key) => {
-  switch(key) {
-    case 'add': handleAdd()
-      break;
-  }
-}
-
-const handleAdd = () => {
+const handleAdd = (row) => {
   router.push({
     name: 'Summary/add',
-    query: {}
+    query: {
+      id:row.requirementId
+    }
+  })
+}
+const handleEdit = (row) => {
+  router.push({
+    name: 'Summary/edit',
+    query: {
+      id:row.requirementId,
+      projectId:row.projectId
+    }
+  })
+}
+const handleDetail = (row) => {
+  router.push({
+    name: 'Summary/detail',
+    query: {
+      id:row.requirementId,
+      projectId: row.projectId,
+      state: row.state
+    }
   })
 }
 </script>

src/views/project-management/filing/attachment.vue

@@ -0,0 +1,83 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <el-card style="width: 100%">
+    <file-upload @getFile="getOtherFile" :showFileList="true"/>
+    <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
+             :data="otherFileList" :isSettingCol="false" :pagination="false">
+      <template #empty>
+        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+      </template>
+    </fvTable>
+  </el-card>
+</template>
+
+<script setup lang="jsx">
+import {downloadFile} from "@/api/project-demand";
+
+const searchConfig = reactive([
+  {
+    label: '关键词',
+    prop: 'collectType',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入',
+      clearable: true,
+      filterable: true,
+    }
+  }
+])
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'originalFileName',
+      label: '附件名称',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '自定义标签',
+      align: 'center'
+    },
+    {
+      prop: 'tag',
+      label: '内置标签',
+      align: 'center'
+    },
+    {
+      prop: 'tag',
+      label: '上传时间',
+      align: 'center'
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+const showTable=ref(true)
+const otherFileList = ref([])
+const getOtherFile = () => {
+
+}
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href=URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/project-management/filing/conclusion.vue

@@ -0,0 +1,260 @@
+<template>
+  <div class="apply-block">
+    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
+      <baseTitle title="项目结项"></baseTitle>
+      <AttachmentUpload ref="attachment" label="项目结项附件" :showTable="showTable" :otherFileList="otherFileList"
+                        @getAttachment="getAttachment"
+                        @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Filing/edit'"/>
+      <div class="approval-record">
+        <baseTitle title="流程"></baseTitle>
+        <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      </div>
+    </el-form>
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {useTagsView} from '@/stores/tagsview.js'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import {downloadFile} from "@/api/project-demand";
+import {ElNotification} from "element-plus";
+import {useProcessStore} from '@/stores/processStore.js';
+import {getProjectConclusionProcess, projectConclusion,getConclusionDetail, resubmitConclusion} from "@/api/project-manage";
+const router = useRouter()
+const route = useRoute()
+const tagsViewStore = useTagsView()
+const formData = ref({})
+const rules = reactive({
+  attachment: [{required: true, message: '请上传项目结项附件', trigger: 'blur'}],
+})
+const attachment = ref()
+const name=ref(router.currentRoute.value.name)
+const loading = ref(false)
+const file = ref({})
+const applyForm = ref()
+const deploymentId = ref()
+const showTable = ref(true)
+const otherFileList = ref([])
+const processInstanceData = ref()
+const processDiagramViewer = ref(true)
+const processStore = useProcessStore()
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    // {
+    //   prop: 'oper',
+    //   label: '操作',
+    //   align: 'center',
+    //   currentRender: ({row, index}) => {
+    //     return (
+    //         <div>
+    //           <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+    //           <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
+    //         </div>
+    //     )
+    //   }
+    // }
+  ]
+})
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href = URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
+const compositeParam = (item) => {
+  let tag = ''
+  if (name.value === 'Filing/conclusion'||name.value === 'Filing/edit') {
+    tag = '项目结项'
+  }
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    tag: tag
+  }
+}
+const getAttachment = (val) => {
+  console.log('上传文件getAttachment', val)
+  file.value=compositeParam(val)
+}
+const getOtherFile = (val) => {
+  console.log('上传文件getOtherFile', val)
+  showTable.value = false
+  let fileObj = compositeParam(val)
+  otherFileList.value.push(fileObj)
+  nextTick(() => {
+    showTable.value = true
+  })
+}
+
+const getFileParam = (item) => {
+  return {
+    fileId: item.fileId
+  }
+}
+const handleSubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    if(JSON.stringify(file.value) === "{}"){
+      attachment.value.validate()
+    } else {
+      attachment.value.clearValidate()
+    }
+    if (!valid) return
+    let files = []
+    let singleFile={}
+    if(file.value.fileId!==undefined){
+      singleFile = {
+        fileId: file.value.fileId
+      }
+    }
+    otherFileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    let params = {
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      fileList: files,
+      singleFile: singleFile,
+      projectId:route.query.projectId,
+    }
+    console.log('params', params)
+    let res = await projectConclusion(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: 'Filing'
+      })
+    }
+  })
+}
+const handleResubmit = () => {
+  let singleFile = {}
+  let otherFiles = []
+  let fileArray
+  if (JSON.stringify(file.value) === "{}"||attachment.value.singleFile===null) {
+    attachment.value.validate()
+  } else {
+    attachment.value.clearValidate()
+  }
+  if(attachment.value.singleFile!==null&&name.value === 'Filing/edit'){
+    singleFile = {
+      fileId: attachment.value.singleFile.fileId
+    }
+    fileArray=attachment.value.allFileList
+  }else {
+    if (file.value.fileId !== undefined) {
+      singleFile = {
+        fileId: file.value.fileId
+      }
+    }
+    fileArray=otherFileList.value
+  }
+  fileArray.forEach(item => {
+    otherFiles.push(getFileParam(item))
+  })
+  //todo requirementId
+  let params={
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: otherFiles,
+    singleFile: singleFile,
+    projectId:route.query.projectId,
+  }
+  console.log('重新提交params',params)
+  resubmitConclusion(params).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Filing'
+      })
+    }
+  })
+}
+const getDetailInfo = async () => {
+  getConclusionDetail(route.query.projectId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      formData.value = res.data.formData
+      loading.value=false
+    }
+  })
+}
+const init =  () => {
+  getProjectConclusionProcess().then(res => {
+    processDiagramViewer.value = false
+    if (res.code === 1000) {
+      let data = res.data
+      deploymentId.value=data.deploymentId
+      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
+      })
+    }
+  })
+}
+onMounted(async () => {
+  await init()
+  if (name.value === 'Filing/edit') {
+    loading.value=true
+    await getDetailInfo()
+  }
+})
+</script>
+
+<style scoped>
+
+</style>

src/views/project-management/filing/detail.vue

@@ -0,0 +1,112 @@
+<template>
+  <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
+    <template #content>
+      <collection-detail 
+        :formData="collectionData.formData" 
+        :data="collectionData"
+        :processViewer="commonProvessViewer"
+        :companyOption="companyOption"
+        @getInfo="getDemandCollectionInfo"
+        v-show="showActive == '00'"
+      />
+      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" :processViewer="commonProvessViewer"/>
+      <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
+      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
+      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
+
+    </template>
+  </steps>
+</template>
+
+<script setup lang="jsx">
+import {getInfo} from "@/api/project-demand/index.js";
+import {getSubCompOpt} from '@/api/user/user.js'
+import {useProcessStore} from '@/stores/processStore.js';
+import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
+import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
+import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
+import { getMapProjectStateInfo } from '@/components/steps/api';
+import { ElLoading } from "element-plus";
+
+const activeName = ref('first')
+const handleClick = (tab, event) => {
+  console.log(tab, event)
+  if(tab.index.value === 0){
+
+  }
+}
+
+
+
+const getCompanyOption = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
+
+
+const commonForm = ref({})
+const commonProvessViewer = ref(true)
+
+const getAllInfo = async (state) => {
+  const loading = ElLoading.service({fullscreen: true})
+  try {
+    state == '00' && ( await getCompanyOption() )
+    commonProvessViewer.value = false
+    const { data, code } = await getMapProjectStateInfo(route.query.projectId, state)
+    if(state == '00') {
+      collectionData.value = data;
+    } else if(state == '10') {
+      summaryData.value = data;
+    }
+    commonForm.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(() => {
+      // summaryProcessViewer.value = true
+      commonProvessViewer.value = true
+    })
+    loading.close()
+  } catch {
+    loading.close()
+  }
+  
+}
+
+const showActive = ref()
+
+const setDetail = (active) => {
+  showActive.value = active
+  getAllInfo(active)
+}
+
+const stepChange = (data) => {
+  showActive.value = data.active
+  getAllInfo(data.active)
+}
+</script>
+
+<style scoped lang="scss">
+.detail-block{
+  padding-top: 15px;
+  :deep(.el-tabs__nav-scroll){
+    width: 100%;
+    display: flex;
+    .el-tabs__nav{
+      display: flex;
+      flex: 1;
+      .el-tabs__item{
+        flex: 1;
+        font-size: 16px;
+      }
+      .is-active{
+        color: black;
+        background-color: #DED0B2;
+      }
+    }
+  }
+}
+</style>

src/views/project-management/filing/index.vue

@@ -93,12 +93,12 @@ const tableIns = ref()
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'name',
+      prop: 'projectName',
       label: '名称',
       align: 'center'
     },
     {
-      prop: 'company',
+      prop: 'affiliatedCompany',
       label: '所属公司',
       align: 'center'
     },
@@ -108,31 +108,37 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'productMainBody',
+      prop: 'rdSubject',
       label: '研发主体',
       align: 'center'
     },
     {
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       label: '项目影响',
       align: 'center'
     },
     {
-      prop: 'survey',
-      label: '经营概况',
+      prop: 'economicEstimate',
+      label: '经济概况',
       align: 'center'
     },
     {
-      prop: 'time',
+      prop: 'startTime',
       label: '起止时间',
       align: 'center'
     },
     {
-      prop: 'status',
+      prop: 'state',
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
+      currentRender: ({row, index}) =>{
+        if (row.state !== null) {
+          return (<Tag dictType={'project_initiation'} value={row.state}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'oper',
@@ -141,11 +147,12 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
-        if (row.state === '3') {
+        // if (row.state === '3') {
           btn.push({label: '附件', func: () => handleCheck(row), type: 'primary'})
-        } else if (row.state === '4') {
-          btn.push({label: '结项', func: () => handleStandingBook(row), type: 'primary'})
-        }
+        // } else if (row.state === '4') {
+          btn.push({label: '结项', func: () => handleConclusion(row), type: 'primary'})
+          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+        // }
         return (
             <div style={{width: '100%'}}>
               {
@@ -165,7 +172,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/project/filing',
   params: {},
 })
 
@@ -176,11 +183,28 @@ const search = (val) => {
 
 const handleDetail = (row) => {
   router.push({
-    name:'Implementation/detail',
+    name:'Filing/detail',
     query: {
       id: row.requirementId
     }
   })
 }
-
+const handleConclusion = (row) => {
+  router.push({
+    name:'Filing/conclusion',
+    query: {
+      id: row.requirementId,
+      projectId: row.projectId
+    }
+  })
+}
+const handleEdit = (row) => {
+  router.push({
+    name:'Filing/edit',
+    query: {
+      id: row.requirementId,
+      projectId: row.projectId
+    }
+  })
+}
 </script>

src/views/project-management/implementation/account.vue

@@ -1,6 +1,6 @@
 <template>
   <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig">
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
     <template #empty>
       <el-empty description="暂无数据"/>
     </template>
@@ -79,10 +79,23 @@ const tableConfig = reactive({
   api: '',
   params: {},
   btns: [
-    {name: '上传费用', key: '_export', color: '#DED0B2',auth: ''}
+    {name: '上传费用', key: 'add', color: '#DED0B2',auth: ''}
   ]
 })
-
+const router = useRouter()
+const headBtnClick = (key) => {
+  switch (key) {
+    case 'add':
+      handleUploadFee()
+      break;
+  }
+}
+const handleUploadFee = () => {
+  router.push({
+    name: 'Implementation/uploadFee',
+    query: {}
+  })
+}
 </script>
 
 <style scoped>

src/views/project-management/implementation/attachment.vue

@@ -14,6 +14,7 @@
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {shallowRef} from "vue";
+import {downloadFile} from "@/api/project-demand";
 
 const searchConfig = reactive([
   {
@@ -59,7 +60,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
             <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
             </div>
         )
@@ -71,6 +72,15 @@ const showTable=ref(true)
 const otherFileList = ref([])
 const getOtherFile = () => {
 
+}
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href=URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
 }
 </script>
 

src/views/project-management/implementation/check.vue

@@ -1,136 +1,225 @@
 <template>
   <div class="apply-block">
     <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
-      <baseTitle title="项目立项申请"></baseTitle>
+      <baseTitle title="项目验收"></baseTitle>
       <el-row>
         <el-col :span="12">
           <el-form-item label="前置流程">
             <el-input v-model="formData.requirementName" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="项目验收附件" prop="attachment">
-            <file-upload @getFile="getAttachment" :showFileList="true"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="其他文件">
-            <el-card style="width: 100%">
-              <file-upload @getFile="getOtherFile" :showFileList="true"/>
-              <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
-                       :data="otherFileList" :isSettingCol="false" :pagination="false">
-                <template #empty>
-                  <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-                </template>
-              </fvTable>
-            </el-card>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
+    <AttachmentUpload ref="attachment" label="项目验收附件" :showTable="showTable" :otherFileList="otherFileList"
+                      @getAttachment="getAttachment"
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Implementation/edit'"/>
+    <div class="approval-record">
+      <baseTitle title="流程"></baseTitle>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+    </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit(applyForm)">重新提交</el-button>
     </div>
   </div>
 </template>
 
 <script setup lang="jsx">
-import FileUpload from "@/components/FileUpload.vue";
-
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import {getProjectCheckProcess, projectCheck,getCheckDetail,resubmitCheck} from "@/api/project-manage";
+import {ElNotification} from "element-plus";
+import {useProcessStore} from '@/stores/processStore.js';
+import {useTagsView} from '@/stores/tagsview.js'
+const tagsViewStore = useTagsView()
+const router = useRouter()
+const route = useRoute()
+const attachment = ref()
+const name=ref(router.currentRoute.value.name)
+const loading = ref(false)
 const formData = ref({})
-const rules = reactive({
-  attachment: [{required: true, message: '请上传项目立项附件', trigger: 'blur'}],
-})
-const fileList = ref(null)
+const file = ref({})
 const applyForm = ref()
+const deploymentId = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
-              <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
-            </div>
-        )
-      }
-    }
-  ]
-})
-
+const processInstanceData = ref()
+const processDiagramViewer = ref(true)
+const processStore = useProcessStore()
 const compositeParam = (item) => {
+  let tag=''
+  if(name.value==='Implementation/check'||name.value === 'Implementation/edit'){
+    tag='项目验收'
+  }
   return {
     fileId: item.id,
     size: item.size,
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    processNodeTag: null,
-    tag: formData.value.collectType
+    tag: tag
   }
 }
 const getAttachment = (val) => {
-  console.log('上传文件', val)
+  console.log('上传文件getAttachment', val)
+  file.value=compositeParam(val)
+}
+const getOtherFile = (val) => {
+  console.log('上传文件getOtherFile', val)
   showTable.value = false
+  let fileObj = compositeParam(val)
+  otherFileList.value.push(fileObj)
   nextTick(() => {
     showTable.value = true
   })
-  let fileObj = {}
-  let newFileArray = []
-  if (route.query.isAdd === undefined) {
-    val.forEach(item => {
-      fileObj = compositeParam(item)
-      newFileArray.push(fileObj)
-      formData.value.fileList.push(fileObj)
-    })
-    fileList.value = formData.value.fileList
-  } else {
-    val.forEach(item => {
-      fileObj = compositeParam(item)
-      newFileArray.push(fileObj)
-    })
-    formData.value.fileList = newFileArray
-    fileList.value = newFileArray
-  }
 }
-const getOtherFile = () => {
 
+const getFileParam = (item) => {
+  return {
+    fileId: item.fileId
+  }
 }
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-
+    if(JSON.stringify(file.value) === "{}"){
+      attachment.value.validate()
+    }else {
+      attachment.value.clearValidate()
+    }
+    if (!valid) return
+    let files = []
+    let singleFile={}
+    let fileArray
+    if(name.value === 'Implementation/edit'){
+      singleFile = {
+        fileId: attachment.value.singleFile.fileId
+      }
+      fileArray=attachment.value.allFileList
+    }else {
+      if (file.value.fileId !== undefined) {
+        singleFile = {
+          fileId: file.value.fileId
+        }
+      }
+      fileArray=otherFileList.value
+    }
+    fileArray.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    let params = {
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      fileList: files,
+      singleFile: singleFile,
+      projectId:route.query.projectId,
+    }
+    console.log('params-提交',params)
+    let res = await projectCheck(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: 'Implementation'
+      })
+    }
   })
 }
+const handleResubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    let singleFile = {}
+    let otherFiles = []
+    let fileArray
+    if (JSON.stringify(file.value) === "{}"||attachment.value.singleFile===null) {
+      attachment.value.validate()
+    } else {
+      attachment.value.clearValidate()
+    }
+    if (attachment.value.singleFile!==null&&name.value === 'Implementation/edit') {
+      singleFile = {
+        fileId: attachment.value.singleFile.fileId
+      }
+      fileArray = attachment.value.allFileList
+    } else {
+      if (file.value.fileId !== undefined) {
+        singleFile = {
+          fileId: file.value.fileId
+        }
+      }
+      fileArray = otherFileList.value
+    }
+    fileArray.forEach(item => {
+      otherFiles.push(getFileParam(item))
+    })
+    //todo requirementId
+    let params = {
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      fileList: otherFiles,
+      singleFile: singleFile,
+      projectId: route.query.projectId,
+    }
+    console.log('重新提交params', params)
+    resubmitCheck(params).then(res => {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: res.code === 1000 ? 'success' : 'error'
+      })
+      if (res.code === 1000) {
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push({
+          name: 'Implementation'
+        })
+      }
+    })
+  })
+}
+const getDetailInfo = async () => {
+  getCheckDetail(route.query.projectId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      formData.value = res.data.formData
+      loading.value=false
+    }
+  })
+}
+const init =  () => {
+  getProjectCheckProcess().then(res => {
+    processDiagramViewer.value = false
+    if (res.code === 1000) {
+      let data = res.data
+      deploymentId.value=data.deploymentId
+      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
+      })
+    }
+  })
+}
+onMounted(async () => {
+  await init()
+  if (name.value === 'Implementation/edit'){
+    loading.value=true
+    await getDetailInfo()
+  }
+})
 </script>
 
 <style scoped>

src/views/project-management/implementation/detail.vue

@@ -1,29 +1,103 @@
 <template>
-<div class="detail-block">
-  <el-tabs
-      v-model="activeName"
-      type="card"
-      class="demo-tabs"
-      @tab-click="handleClick"
-  >
-    <el-tab-pane label="需求征集" name="first">
+  <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
+    <template #content>
+      <collection-detail
+        :formData="collectionData.formData"
+        :data="collectionData"
+        :processViewer="commonProvessViewer"
+        :companyOption="companyOption"
+        @getInfo="getDemandCollectionInfo"
+        v-show="showActive == '00'"
+      />
+      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" :processViewer="commonProvessViewer"/>
+      <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
+      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
 
-    </el-tab-pane>
-    <el-tab-pane label="需求上报" name="second"></el-tab-pane>
-    <el-tab-pane label="项目立项" name="third" ></el-tab-pane>
-    <el-tab-pane label="项目实施" name="third" :disabled="true"></el-tab-pane>
-  </el-tabs>
-</div>
+    </template>
+  </steps>
+  <opinion v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"/>
 </template>
 
 <script setup lang="jsx">
-const activeName = ref('first')
+import {getInfo} from "@/api/project-demand/index.js";
+import {getSubCompOpt} from '@/api/user/user.js'
+import {useProcessStore} from '@/stores/processStore.js';
+import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
+import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
+import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
+import { getMapProjectStateInfo } from '@/components/steps/api';
+import { ElLoading } from "element-plus";
+import Opinion from "@/components/DetailComponent/Opinion.vue";
+
+// const activeName = ref('first')
 const handleClick = (tab, event) => {
   console.log(tab, event)
   if(tab.index.value === 0){
 
   }
 }
+
+
+const route = useRoute()
+const activeName = ref('first')
+const collectionData = ref({})
+const summaryData = ref({})
+const collectionProcessViewer = ref(true)
+const summaryProcessViewer = ref(true)
+const processStore = useProcessStore()
+const companyOption = ref([])
+const rules = reactive({
+  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+})
+const getCompanyOption = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
+
+
+const commonForm = ref({})
+const commonProvessViewer = ref(true)
+
+const getAllInfo = async (state) => {
+  const loading = ElLoading.service({fullscreen: true})
+  try {
+    state == '00' && ( await getCompanyOption() )
+    commonProvessViewer.value = false
+    const { data, code } = await getMapProjectStateInfo(route.query.projectId, state)
+    if(state == '00') {
+      collectionData.value = data;
+    } else if(state == '10') {
+      summaryData.value = data;
+    }
+    commonForm.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(() => {
+      // summaryProcessViewer.value = true
+      commonProvessViewer.value = true
+    })
+    loading.close()
+  } catch {
+    loading.close()
+  }
+
+}
+
+const showActive = ref()
+
+const setDetail = (active) => {
+  showActive.value = active
+  getAllInfo(active)
+}
+
+const stepChange = (data) => {
+  showActive.value = data.active
+  getAllInfo(data.active)
+}
 </script>
 
 <style scoped lang="scss">

src/views/project-management/implementation/index.vue

@@ -15,7 +15,7 @@ const router = useRouter()
 const searchConfig = reactive([
   {
     label: '名称',
-    prop: 'requirementName',
+    prop: 'projectName',
     component: 'el-input',
     props: {
       placeholder: '请输入名称查询',
@@ -26,7 +26,7 @@ const searchConfig = reactive([
   },
   {
     label: '项目类型',
-    prop: 'collectType',
+    prop: 'projectType',
     component: shallowRef(fvSelect),
     props: {
       placeholder: '请选择项目类型',
@@ -36,7 +36,7 @@ const searchConfig = reactive([
   },
   {
     label: '项目影响',
-    prop: 'projectEffect',
+    prop: 'projectImpact',
     component: shallowRef(fvSelect),
     props: {
       placeholder: '请选择项目影响',
@@ -47,7 +47,7 @@ const searchConfig = reactive([
   },
   {
     label: '研发主体',
-    prop: 'collectType',
+    prop: 'rdSubject',
     component: shallowRef(fvSelect),
     props: {
       placeholder: '请选择研发主体',
@@ -58,7 +58,7 @@ const searchConfig = reactive([
 
   {
     label: '起止时间',
-    prop: 'time',
+    prop: 'startTime',
     component: 'el-date-picker',
     props: {
       placeholder: '请选择起止时间',
@@ -97,12 +97,12 @@ const tableConfig = reactive({
       prop: 'selection'
     },
     {
-      prop: 'name',
+      prop: 'projectName',
       label: '名称',
       align: 'center'
     },
     {
-      prop: 'company',
+      prop: 'affiliatedCompany',
       label: '所属公司',
       align: 'center'
     },
@@ -112,31 +112,37 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'productMainBody',
+      prop: 'rdSubject',
       label: '研发主体',
       align: 'center'
     },
     {
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       label: '项目影响',
       align: 'center'
     },
     {
-      prop: 'survey',
-      label: '经营概况',
+      prop: 'economicEstimate',
+      label: '经济概况',
       align: 'center'
     },
     {
-      prop: 'time',
+      prop: 'startTime',
       label: '起止时间',
       align: 'center'
     },
     {
-      prop: 'status',
+      prop: 'state',
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
+      currentRender: ({row, index}) =>{
+        if (row.state !== null) {
+          return (<Tag dictType={'project_initiation'} value={row.state}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'oper',
@@ -145,13 +151,15 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
-        if (row.state === '3') {
-          btn.push({label: '验收', func: () => handleCheck(row), type: 'primary'})
-        } else if (row.state === '4') {
-          btn.push({label: '台账', func: () => handleStandingBook(row), type: 'primary'})
-          btn.push({label: '附件', func: () => handleAttachment(row), type: 'primary'})
-          btn.push({label: '分摊', func: () => handleShare(row), type: 'primary'})
-        }
+        // if (row.state === '3') {
+          btn.push(
+              {label: '验收', func: () => handleCheck(row), type: 'primary'},
+              {label: '编辑', func: () => handleEdit(row), type: 'primary'},
+              {label: '台账', func: () => handleStandingBook(row), type: 'primary'},
+              {label: '附件', func: () => handleAttachment(row), type: 'primary'},
+              {label: '查看分摊', func: () => handleShare(row), type: 'primary'}
+          )
+        // }
         return (
             <div style={{width: '100%'}}>
               {
@@ -171,10 +179,10 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/project/implementation',
   params: {},
   btns: [
-    {name: '生成分摊报表', key: '_export', color: '#DED0B2',auth: ''}
+    {name: '生成分摊报表', key: '_export', color: '#DED0B2', auth: ''}
   ]
 })
 
@@ -185,11 +193,53 @@ const search = (val) => {
 
 const handleDetail = (row) => {
   router.push({
-    name:'Implementation/detail',
+    name: 'Implementation/detail',
+    query: {
+      id: row.requirementId,
+      projectId: row.projectId
+    }
+  })
+}
+const handleCheck = (row) => {
+  router.push({
+    name: 'Implementation/check',
+    query: {
+      id: row.requirementId,
+      projectId: row.projectId
+    }
+  })
+}
+const handleEdit = (row) => {
+  router.push({
+    name: 'Implementation/edit',
+    query: {
+      id: row.requirementId,
+      projectId: row.projectId
+    }
+  })
+}
+const handleStandingBook = (row) => {
+  router.push({
+    name: 'Implementation/account',
+    query: {
+      id: row.requirementId
+    }
+  })
+}
+const handleAttachment = (row) => {
+  router.push({
+    name: 'Implementation/attachment',
+    query: {
+      id: row.requirementId
+    }
+  })
+}
+const handleShare = (row) => {
+  router.push({
+    name: 'Implementation/share',
     query: {
       id: row.requirementId
     }
   })
 }
-
 </script>

src/views/project-management/implementation/uploadFee.vue

@@ -0,0 +1,84 @@
+<template>
+  <el-form :model="formData" ref="demandForm" label-width="auto">
+    <baseTitle title="上传费用"></baseTitle>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="项目名称">
+          <span>{{ formData.requirementName }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目负责人">
+          <span>{{ formData.companyIds }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目开始时间">
+          <span>{{ formData.collectType }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目预计持续时间">
+          <span>{{ formData.deadline }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目开展方式">
+          <span>{{ formData.deadline }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目预算">
+          <span>{{ formData.deadline }}</span>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+  <el-table :data="tableData" style="width: 100%">
+    <el-table-column prop="date" label="时间" width="180" >
+      <template #default="scope">
+      <el-input v-model="scope.row.uqName" placeholder="请输入时间" clearable>
+      </el-input>
+      </template>
+    </el-table-column>
+    <el-table-column prop="name" label="项目费用" width="180" />
+    <el-table-column prop="address" label="研发阶段" />
+    <el-table-column prop="address" label="摘要" />
+    <el-table-column prop="address" label="税后余额(元)" />
+    <el-table-column prop="address" label="操作" >
+      <template #default="scope">
+        <el-button type="primary" size="mini" @click="handleDelete(scope.row)" link>删除</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script setup lang="jsx">
+const formData = ref({})
+const tableData = [
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-02',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-04',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-01',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+]
+</script>
+
+<style scoped>
+
+</style>

src/views/project-management/initiation/apply.vue

@@ -8,40 +8,40 @@
             <el-input v-model="formData.requirementName" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="项目立项附件" prop="attachment">
-            <file-upload @getFile="getAttachment" :showFileList="true"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="其他文件">
-            <el-card style="width: 100%">
-              <file-upload @getFile="getOtherFile" :showFileList="true"/>
-              <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
-                       :data="otherFileList" :isSettingCol="false" :pagination="false">
-                <template #empty>
-                  <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-                </template>
-              </fvTable>
-            </el-card>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
+    <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
+                      @getAttachment="getAttachment"
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Initiation/edit'"/>
+    <div class="approval-record">
+      <baseTitle title="流程"></baseTitle>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+    </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
     </div>
   </div>
 </template>
 
 <script setup lang="jsx">
-import FileUpload from "@/components/FileUpload.vue";
+import {useTagsView} from '@/stores/tagsview.js'
+import {ElMessage, ElNotification} from "element-plus";
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import {getApplyProcess, projectApply,resubmitApply,getApplyDetail} from "@/api/project-manage";
+import {useProcessStore} from '@/stores/processStore.js';
 
+const tagsViewStore = useTagsView()
+const router = useRouter()
+const route = useRoute()
 const formData = ref({})
 const rules = reactive({
   attachment: [{required: true, message: '请上传项目立项附件', trigger: 'blur'}],
 })
-const fileList = ref(null)
+const processStore = useProcessStore()
+const deploymentId = ref()
+const attachment = ref()
+const file = ref({})
 const applyForm = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
@@ -70,67 +70,184 @@ const tableConfig = reactive({
       align: 'center',
       currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
-              <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
-            </div>
-        )
-      }
-    }
+    // {
+    //   prop: 'oper',
+    //   label: '操作',
+    //   align: 'center',
+    //   currentRender: ({row, index}) => {
+    //     return (
+    //         <div>
+    //           <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+    //           <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
+    //         </div>
+    //     )
+    //   }
+    // }
   ]
 })
-
+const loading = ref(false)
+const processInstanceData = ref()
+const processDiagramViewer = ref(true)
+const name=ref(router.currentRoute.value.name)
 const compositeParam = (item) => {
+  let tag = ''
+  if (name.value === 'Initiation/apply'||name.value === 'Initiation/edit') {
+    tag = '项目立项申请'
+  }
   return {
     fileId: item.id,
     size: item.size,
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    processNodeTag: null,
-    tag: formData.value.collectType
+    tag:tag
   }
 }
 const getAttachment = (val) => {
-  console.log('上传文件', val)
+  console.log('上传文件getAttachment', val)
+  file.value=compositeParam(val)
+}
+const getOtherFile = (val) => {
+  console.log('上传文件getOtherFile', val)
   showTable.value = false
+  let fileObj = compositeParam(val)
+  otherFileList.value.push(fileObj)
   nextTick(() => {
     showTable.value = true
   })
-  let fileObj = {}
-  let newFileArray = []
-  if (route.query.isAdd === undefined) {
-    val.forEach(item => {
-      fileObj = compositeParam(item)
-      newFileArray.push(fileObj)
-      formData.value.fileList.push(fileObj)
-    })
-    fileList.value = formData.value.fileList
-  } else {
-    val.forEach(item => {
-      fileObj = compositeParam(item)
-      newFileArray.push(fileObj)
-    })
-    formData.value.fileList = newFileArray
-    fileList.value = newFileArray
-  }
 }
-const getOtherFile = () => {
-
+const getFileParam = (item) => {
+  return {
+    fileId: item.fileId
+  }
 }
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
+    if(JSON.stringify(file.value) === "{}"){
+      attachment.value.validate()
+    }else {
+      attachment.value.clearValidate()
+    }
     if (!valid) return
-
+    let files = []
+    let singleFile={}
+    if(file.value.fileId!==undefined){
+      singleFile = {
+        fileId: file.value.fileId
+      }
+    }
+    otherFileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    let params = {
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      fileList: files,
+      singleFile: singleFile,
+      projectId:route.query.projectId,
+    }
+    console.log('params',params)
+    let res = await projectApply(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: 'Initiation'
+      })
+    }
   })
 }
+const handleResubmit =async () => {
+  let files = []
+  let singleFile={}
+  let fileArray
+  if (JSON.stringify(file.value) === "{}"||attachment.value.singleFile===null) {
+    attachment.value.validate()
+  } else {
+    attachment.value.clearValidate()
+  }
+  if(attachment.value.singleFile!==null&&name.value === 'Initiation/edit'){
+    singleFile = {
+      fileId: attachment.value.singleFile.fileId
+    }
+    fileArray=attachment.value.allFileList
+  }else {
+    if (file.value.fileId !== undefined) {
+      singleFile = {
+        fileId: file.value.fileId
+      }
+    }
+    fileArray=otherFileList.value
+  }
+  fileArray.forEach(item => {
+    files.push(getFileParam(item))
+  })
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: files,
+    singleFile: singleFile,
+    projectId:route.query.projectId,
+  }
+  console.log('params',params)
+  let res = await resubmitApply(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: 'Initiation'
+    })
+  }
+}
+const getDetailInfo = async () => {
+  getApplyDetail(route.query.projectId).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      formData.value = res.data.formData
+      loading.value=false
+    }
+  })
+}
+const init =  () => {
+  getApplyProcess().then(res => {
+    processDiagramViewer.value = false
+    if (res.code === 1000) {
+      let data = res.data
+      deploymentId.value=data.deploymentId
+      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
+      })
+    }
+  })
+}
+init()
+onMounted(async () => {
+  await init()
+  if (name.value === 'Initiation/edit') {
+    loading.value=true
+    await getDetailInfo()
+  }
+})
 </script>
 
 <style scoped>

src/views/project-management/initiation/detail.vue

@@ -1,48 +1,173 @@
 <template>
-<div class="detail-block">
-  <el-tabs
-      v-model="activeName"
-      type="card"
-      class="demo-tabs"
-      @tab-click="handleClick"
-  >
-    <el-tab-pane label="需求征集" name="first">
+  <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
+    <template #content>
+      <collection-detail
+        :formData="collectionData.formData"
+        :data="collectionData"
+        :processViewer="commonProvessViewer"
+        :companyOption="companyOption"
+        @getInfo="getDemandCollectionInfo"
+        v-show="showActive == '00'"
+      />
+      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" :processViewer="commonProvessViewer"/>
+      <ApprovalDetail v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer"></ApprovalDetail>
 
-    </el-tab-pane>
-    <el-tab-pane label="需求上报" name="second"></el-tab-pane>
-    <el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
-  </el-tabs>
-</div>
+    </template>
+  </steps>
+  <opinion v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"/>
 </template>
 
 <script setup lang="jsx">
+import {getInfo} from "@/api/project-demand/index.js";
+import {getSubCompOpt} from '@/api/user/user.js'
+import {useProcessStore} from '@/stores/processStore.js';
+import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
+import {downloadFile} from "@/api/project-demand";
+import SummaryDetail from "@/components/DetailComponent/SummaryDetail.vue";
+import ApprovalDetail from "@/components/DetailComponent/ApprovalDetail.vue";
+import { getMapProjectStateInfo } from '@/components/steps/api';
+import { ElLoading } from "element-plus";
+import Opinion from "@/components/DetailComponent/Opinion.vue";
+
+const route = useRoute()
 const activeName = ref('first')
+const collectionData = ref({})
+const summaryData = ref({})
+const collectionProcessViewer = ref(true)
+const summaryProcessViewer = ref(true)
+const processStore = useProcessStore()
+const companyOption = ref([])
+const rules = reactive({
+  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+})
+const getCompanyOption = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
+
+const getDemandCollectionInfo = async () => {
+  if (!route.query.id) return
+  await getCompanyOption()
+  collectionProcessViewer.value = false
+  getInfo(route.query.id).then(res => {
+    let data = res.data
+    collectionData.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(() => {
+      collectionProcessViewer.value = true
+    })
+  })
+}
+const getDemandSummaryInfo = async () => {
+  if (!route.query.id) return
+  // await getCompanyOption()
+  summaryProcessViewer.value = false
+  getInfo(route.query.id).then(res => {
+    let data = res.data
+    summaryData.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(() => {
+      summaryProcessViewer.value = true
+    })
+  })
+}
+
 const handleClick = (tab, event) => {
   console.log(tab, event)
-  if(tab.index.value === 0){
-
+  if (tab.props.name === 'first') {
+    getDemandCollectionInfo()
+  } else if (tab.props.name === 'second') {
+    getDemandSummaryInfo()
   }
 }
+// getDemandCollectionInfo()
+
+const commonForm = ref({})
+const commonProvessViewer = ref(true)
+
+const getAllInfo = async (state) => {
+  const loading = ElLoading.service({fullscreen: true})
+  try {
+    state == '00' && ( await getCompanyOption() )
+    commonProvessViewer.value = false
+    const { data, code } = await getMapProjectStateInfo(route.query.projectId, state)
+    if(state == '00') {
+      collectionData.value = data;
+    } else if(state == '10') {
+      summaryData.value = data;
+    }
+    console.log(data, 'data--22');
+    commonForm.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(() => {
+      // summaryProcessViewer.value = true
+      commonProvessViewer.value = true
+    })
+    loading.close()
+  } catch {
+    loading.close()
+  }
+
+}
+
+const showActive = ref()
+
+const setDetail = (active) => {
+  showActive.value = active
+  getAllInfo(active)
+}
+
+const stepChange = (data) => {
+  showActive.value = data.active
+  getAllInfo(data.active)
+}
 </script>
 
 <style scoped lang="scss">
-.detail-block{
+.detail-block {
   padding-top: 15px;
-  :deep(.el-tabs__nav-scroll){
+
+  :deep(.el-tabs__nav-scroll) {
     width: 100%;
     display: flex;
-    .el-tabs__nav{
+
+    .el-tabs__nav {
       display: flex;
       flex: 1;
-      .el-tabs__item{
+
+      .el-tabs__item {
         flex: 1;
         font-size: 16px;
       }
-      .is-active{
+
+      .is-active {
         color: black;
         background-color: #DED0B2;
       }
     }
   }
 }
+
+.approval-record {
+  padding-bottom: 30px;
+
+  .process {
+    position: relative;
+  }
+}
 </style>

src/views/project-management/initiation/index.vue

@@ -93,12 +93,12 @@ const tableIns = ref()
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'name',
+      prop: 'projectName',
       label: '名称',
       align: 'center'
     },
     {
-      prop: 'company',
+      prop: 'affiliatedCompanyId',
       label: '所属公司',
       align: 'center'
     },
@@ -108,31 +108,37 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'productMainBody',
+      prop: 'rdSubject',
       label: '研发主体',
       align: 'center'
     },
     {
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       label: '项目影响',
       align: 'center'
     },
     {
-      prop: 'survey',
-      label: '经营概况',
+      prop: 'economicEstimate',
+      label: '经济概况',
       align: 'center'
     },
     {
-      prop: 'time',
+      prop: 'startTime',
       label: '起止时间',
       align: 'center'
     },
     {
-      prop: 'status',
+      prop: 'state',
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
+      currentRender: ({row, index}) =>{
+        if (row.state !== null) {
+          return (<Tag dictType={'project_initiation'} value={row.state}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'oper',
@@ -143,7 +149,7 @@ const tableConfig = reactive({
         let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
         if (row.state === '3') {
           btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        } else if (row.state === '4') {
+        } else if (row.state === '0') {
           btn.push({label: '申请', func: () => handleApply(row), type: 'primary'})
         }
         return (
@@ -165,7 +171,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/project/approval',
   params: {},
 })
 
@@ -178,7 +184,9 @@ const handleDetail = (row) => {
   router.push({
     name:'Initiation/detail',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId,
+      state: 2
     }
   })
 }
@@ -186,7 +194,8 @@ const handleEdit = (row) => {
   router.push({
     name:'Initiation/edit',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId
     }
   })
 }
@@ -194,7 +203,8 @@ const handleApply = (row) => {
   router.push({
     name:'Initiation/apply',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId
     }
   })
 }

src/views/projectdemand/demandcollection/add.vue

@@ -1,314 +0,0 @@
-<template>
-  <div v-loading="loading" class="add-block">
-    <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
-      <div class="left-info">
-        <el-form-item label="名称" prop="requirementName">
-          <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="所属公司" prop="companyIds">
-          <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
-                          filterable clearable :check-strictly="true" multiple/>
-        </el-form-item>
-        <el-form-item label="征集类型" prop="collectType">
-          <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
-            <el-option
-                v-for="item in typeOption"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="截止时间" prop="deadline">
-          <el-config-provider>
-            <el-date-picker
-                v-model="formData.deadline"
-                type="datetime"
-                placeholder="截止时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
-            />
-          </el-config-provider>
-        </el-form-item>
-      </div>
-    </el-form>
-    <baseTitle title="征集说明"></baseTitle>
-    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300" v-if="showTinymce"/>
-    <baseTitle title="申请文件"></baseTitle>
-    <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig" :data="formData.fileList" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
-      <!--      <div class="process" id="approvalRecord">-->
-      <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
-      <!--      </div>-->
-    </div>
-    <div class="oper-page-btn">
-      <el-button color="#DED0B2" @click="handleSubmit(demandForm)">提交</el-button>
-      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
-      <el-button @click="handleBack">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {useAuthStore} from '@/stores/userstore.js'
-import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile} 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 {useRoute, useRouter} from 'vue-router'
-import {getSubCompOpt} from '@/api/user/user.js'
-import {useTagsView} from '@/stores/tagsview.js'
-
-const tagsViewStore = useTagsView()
-const authStore = useAuthStore()
-const router = useRouter()
-const route = useRoute()
-const demandForm = ref()
-const dateValue = ref()
-const formData = ref({
-  requirementName: '',
-  companyIds: '',
-  collectType: '',
-  deadline: '',
-  collectExplain: ''
-})
-const showTinymce = ref(false)
-const processDiagramViewer = ref(false)
-const typeOption = ref([
-  {
-    label: "需求征集",
-    value: '需求征集'
-  }
-])
-const companyOption = ref([])
-const form = ref(null)
-const fileList = ref(null)
-const loading = ref(false)
-const showTable = ref(false)
-const processStore = useProcessStore()
-const processInstanceData = ref()
-const rules = reactive({
-  requirementName: [{required: true, message: '请输入名称', trigger: 'blur'}],
-  companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
-  collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
-  deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
-})
-
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
-              <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
-            </div>
-        )
-      }
-    }
-  ]
-})
-const compositeParam=(item)=>{
-    return  {
-      fileId: item.id,
-      size: item.size,
-      originalFileName: item.originalFilename,
-      fileType: item.fileType,
-      url: item.url,
-      processNodeTag: null,
-      tag: formData.value.collectType,
-      userId: authStore.userinfo.userId
-    }
-}
-const getFile = (val) => {
-  console.log('上传文件',val)
-  showTable.value = false
-  nextTick(() => {
-    showTable.value = true
-  })
-  let fileObj = {}
-  let newFileArray = []
-  if (route.query.isAdd === undefined) {
-    val.forEach(item => {
-      fileObj =compositeParam(item)
-      newFileArray.push(fileObj)
-      formData.value.fileList.push(fileObj)
-    })
-    fileList.value = formData.value.fileList
-  } else {
-    val.forEach(item => {
-      fileObj =compositeParam(item)
-      newFileArray.push(fileObj)
-    })
-    formData.value.fileList = newFileArray
-    fileList.value = newFileArray
-  }
-
-}
-
-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
-    })
-  })
-}
-
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    let params = {
-      ...formData.value,
-      requirementId: 0,
-      files: fileList.value,
-      deploymentId: processInstanceData.value.deploymentId
-    }
-    let res = await addRequirement(params)
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Collection'
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const handleResubmit = () => {
-  resubmit({
-    ...formData.value,
-    files: fileList.value,
-    deploymentId: processInstanceData.value.deploymentId
-  }).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Collection'
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const getDetailInfo = async () => {
-  getFormInfo(route.query.id).then(res => {
-    if (res.code === 1000) {
-      console.log(res)
-      ElMessage.success(res.msg)
-      formData.value = res.data
-      showTinymce.value = false
-      nextTick(() => {
-        showTinymce.value = true
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-const handleBack = () => {
-  history.back()
-}
-const beforeRemove = (row) => {
-  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    handleRemove(row)
-  }).catch(() => {
-    ElMessage.warning("用户取消删除! ");
-  })
-}
-
-const handleRemove = (row) => {
-  deleteFile(row.fileId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success("删除成功");
-      fileList.value.splice(fileList.value.findIndex((item) => item.id === row.id), 1);
-    }
-  });
-};
-onMounted(async () => {
-  loading.value = true
-  await init()
-  if (route.query.id) {
-    await getDetailInfo()
-  }
-  nextTick(() => {
-    showTable.value = true
-  })
-  loading.value = false
-})
-
-</script>
-
-<style lang="scss" scoped>
-:deep(.el-empty__description){
-  margin-top: 0;
-}
-.add-block {
-  //display: flex;
-  //justify-content: space-between;
-  overflow-x: hidden;
-  overflow-y: auto;
-
-  a {
-    cursor: pointer;
-    font-size: 14px;
-    color: #2a99ff;
-  }
-
-  .approval-record {
-    position: relative;
-  }
-}
-</style>

src/views/projectdemand/demandcollection/detail.vue

@@ -1,264 +0,0 @@
-<template>
-  <div class="detail-block">
-    <el-form :model="formData" ref="demandForm" label-width="auto" :rules="rules">
-      <baseTitle title="需求征集详情"></baseTitle>
-      <div class="left-info">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="名称">
-              <span>{{ formData.requirementName }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所属公司">
-              <span>{{ formData.companyIds }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="征集类型">
-              <span>{{ formData.collectType }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="截止时间">
-              <span>{{ formData.deadline }}</span>
-            </el-form-item>
-          </el-col>
-          <baseTitle title="征集说明"></baseTitle>
-          <el-col :span="24">
-            <el-form-item>
-              <el-card style="width: 100%">
-                <div v-html="formData.collectExplain">
-                </div>
-              </el-card>
-            </el-form-item>
-          </el-col>
-          <baseTitle title="附件列表"></baseTitle>
-          <el-col :span="24">
-            <el-form-item>
-              <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig"
-                       :data="formData.fileList" :isSettingCol="false" :pagination="false">
-                <template #empty>
-                  <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-                </template>
-              </fvTable>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <div v-if="processInstanceData.taskId">
-              <baseTitle title="审核意见"></baseTitle>
-              <el-form-item prop="auditOpinion">
-                <el-input
-                    v-model="formData.auditOpinion"
-                    :rows="3"
-                    type="textarea"
-                    placeholder="请输入审核意见"
-                />
-              </el-form-item>
-            </div>
-          </el-col>
-        </el-row>
-      </div>
-      <div class="approval-record">
-        <baseTitle title="审批记录"></baseTitle>
-        <div class="process">
-          <operation-render v-if="processDiagramViewer" :operation-list="processInstanceData.operationList"
-                            :state="processInstanceData.state"/>
-          <process-diagram-viewer v-if="processDiagramViewer"/>
-        </div>
-      </div>
-    </el-form>
-    <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
-      <el-button @click="handleReject(demandForm)">驳回</el-button>
-      <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import OperationRender from '@/views/workflow/common/OperationRender.vue'
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import {useProcessStore} from '@/stores/processStore.js';
-import {getInfo, agreeTask, rejectTask} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
-import {ElMessage} from "element-plus";
-import {useRouter} from "vue-router";
-import {useTagsView} from '@/stores/tagsview.js'
-
-const tagsViewStore = useTagsView()
-const router = useRouter()
-const route = useRoute()
-const form = ref();
-const demandForm = ref()
-const processStore = useProcessStore()
-const companyOption = ref([])
-const processInstanceData = ref({})
-const showTable = ref(false)
-const processDiagramViewer = ref(false)
-const processTree = ref()
-const companyNameArray = ref([])
-const formData = ref({})
-const rules = reactive({
-  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
-})
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (<a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>)
-      }
-    }
-  ]
-})
-const handleSubmit = () => {
-  let approve = {
-    taskId: processInstanceData.value.taskId,
-    auditOpinion: formData.value.auditOpinion,
-    formData: formData.value
-  }
-  agreeTask(approve).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Collection'
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const handleReject = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    let approve = {
-      taskId: processInstanceData.value.taskId,
-      auditOpinion: formData.value.auditOpinion,
-    }
-    rejectTask(approve).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Collection'
-        })
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  })
-}
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
-
-const matterTree = (data, id) => {
-  if (id) {
-    for (let i = 0; i < data.length; i++) {
-      if (data[i].value == id) {
-        companyNameArray.value.push(data[i].label);
-      }
-      if (data[i].children && data[i].children.length > 0) {
-        matterTree(data[i].children)
-      }
-    }
-    return companyNameArray.value;
-  }
-}
-
-const getDataSourceOptionItem = (val) => {
-  if (val !== undefined) {
-    val.forEach(item => {
-      matterTree(companyOption.value, item)
-    })
-  }
-  return companyNameArray.value.join('，');
-}
-const init = async () => {
-  if (!route.query.id) return;
-  await getCompanyOption()
-  getInfo(route.query.id).then(res => {
-    let data = res.data
-    formData.value = data.formData;
-    data.formData.companyIds = getDataSourceOptionItem(data.formData.companyIds)
-    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
-      showTable.value = true
-    })
-  })
-}
-init()
-</script>
-
-<style lang="scss" scoped>
-:deep(.el-empty__description){
-  margin-top: 0;
-}
-.detail-block {
-  overflow: hidden;
-  padding-right: 10px;
-
-  .left-info {
-    .info {
-      display: flex;
-      flex-wrap: wrap;
-
-      > div {
-        width: 350px;
-        margin-bottom: 15px;
-        margin-right: 10px;
-
-        > span:first-child {
-          color: black;
-          font-size: 16px;
-          font-weight: bold;
-        }
-      }
-    }
-  }
-
-  .approval-record {
-    padding-bottom: 30px;
-
-    .process {
-      position: relative;
-    }
-  }
-}
-
-</style>

src/views/projectdemand/demandcollection/index.vue

@@ -1,157 +0,0 @@
-<template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
-    <template #empty>
-      <el-empty description="暂无数据"/>
-    </template>
-  </fvTable>
-</template>
-
-<script setup lang="jsx">
-import Tag from '@/components/Tag.vue'
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-
-const router = useRouter()
-const searchConfig = reactive([
-  {
-    label: '需求名称',
-    prop: 'requirementName',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入名称查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
-  {
-    label: '征集类型',
-    prop: 'collectType',
-    component: shallowRef(fvSelect),
-    props: {
-      placeholder: '请选择征集类型',
-      clearable: true,
-      filterable: true,
-      cacheKey: 'todo_type'
-    }
-  }
-])
-const tableIns = ref()
-const tableConfig = reactive({
-  columns: [
-    {
-      type: 'selection',
-      prop: 'selection'
-    },
-    {
-      prop: 'requirementName',
-      label: '需求名称',
-      align: 'center'
-    },
-    {
-      prop: 'collectType',
-      label: '征集类型',
-      align: 'center'
-    },
-    {
-      prop: 'approveName',
-      label: '审批人',
-      align: 'center'
-    },
-    {
-      prop: 'deadline',
-      label: '截止时间',
-      align: 'center'
-    },
-    {
-      prop: 'taskNode',
-      label: '当前节点',
-      align: 'center'
-    },
-    {
-      prop: 'state',
-      label: '状态',
-      align: 'center',
-      width: 200,
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'process_state'} value={row.state}/>)
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
-        if (row.state === '3' || row.state === '2') {
-          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-          btn.push({label: '删除', func: () => handleDelete(row), type: 'danger'})
-        } else if (row.state === '4') {
-          btn.push({label: '上报', func: () => handleReport(row), type: 'primary'})
-        }
-        return (
-            <div style={{width: '100%'}}>
-              {
-                btn.map(item => (
-                    <el-button
-                        type={item.type}
-                        // v-perm={item.auth}
-                        onClick={() => item.func()}
-                        link
-                    >
-                      {item.label}
-                    </el-button>
-                ))
-              }
-            </div>
-        )
-      }
-    }
-  ],
-  api: '/workflow/mosr/requirement',
-  btns: [
-    {name: '新增', key: 'add', color: '#DED0B2'},
-    {name: '导出', key: 'export', type: ''},
-  ],
-  params: {}
-})
-
-const search = (val) => {
-  tableConfig.params = {...val}
-  tableIns.value.refresh()
-}
-const handleAdd = () => {
-  router.push({
-    path: '/project/demand/collection/add',
-    query: {
-      isAdd: 1
-    }
-  })
-}
-const handleEdit = (row) => {
-  router.push({
-    path: '/project/demand/collection/edit',
-    query: {
-      id: row.requirementId
-    }
-  })
-}
-const handleDetail = (row) => {
-  router.push({
-    path: '/project/demand/collection/detail',
-    query: {
-      id: row.requirementId
-    }
-  })
-}
-const headBtnClick = (key) => {
-  switch (key) {
-    case 'add':
-      handleAdd()
-      break;
-    case 'export':
-      handleExport()
-      break;
-  }
-}
-</script>

src/views/projectdemand/demandsummary/add.vue

@@ -1,182 +0,0 @@
-<template>
-  <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>
-</template>
-
-<script setup lang="jsx">
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import { markRaw } from 'vue';
-import FileUpload from './components/FileUpload.vue';
-
-const localData = reactive({
-  form: null
-})
-
-const schame = computed(()=>{
-  let arr = [
-    {
-      label: '名称',
-      prop: 'name',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '开始时间',
-      prop: 'startTime',
-      component: 'el-date-picker',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'company',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '项目类型',
-      prop: 'projectType',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '结束时间',
-      prop: 'endTime',
-      component: 'el-date-picker',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '出资类型',
-      prop: 'monenyType',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '项目影响',
-      prop: 'projectEffect',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '所属业务板块',
-      prop: 'ywbank',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '预期成果形式',
-      prop: 'yuqichengg',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '预期技术标准制定',
-      prop: 'yuqizhidingbiaozhu',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '产学研联合',
-      prop: 'chanxue',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '开展政府申报',
-      prop: 'zhengfushenbao',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '知识产权状况',
-      prop: 'zhishichanquan',
-      component: markRaw(fvSelect),
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '现有业务描述',
-      prop: 'yewudes',
-      component: 'el-input',
-      props: {
-        type: 'textarea'
-      },
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '研发项目关键内容描述',
-      prop: 'contentnesss',
-      component: 'el-input',
-      props: {
-        type: 'textarea'
-      },
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '',
-      prop: 'fileList',
-      component: markRaw(FileUpload),
-      props: {
-        url: '',
-        tip: '上传txt文件'
-      },
-      colProps: {
-        span: 24
-      }
-    }
-  ]
-  return arr
-})
-
-const getInstance = (e) => {
-  localData.form = e
-}
-
-const handleSubmit = async () => {}
-
-const staging = async () => {}
-</script>

src/views/projectdemand/demandsummary/api/index.js

@@ -1,12 +0,0 @@
-import request from '@/utils/request'
-
-export const fileUp = (url, data) => {
-  return request({
-    url,
-    method: 'post',
-    data,
-    headers: {
-      'Content-Type': 'multipart/form-data'
-    }
-  })
-}

src/views/projectdemand/demandsummary/components/FileUpload.vue

@@ -1,75 +0,0 @@
-<template>
-  <el-upload
-    ref="uploadRef"
-    class="upload-demo"
-    v-bind="$attrs"
-    drag
-    :action="url"
-    multiple
-    :on-change="change"
-    :on-progress="progress"
-    :on-remove="remove"
-    :before-remove="beforeRemove"
-    v-model:file-list="fileList"
-    :http-request="uploadRequest"
-    style="width: 50%;"
-  >
-    <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-    <div class="el-upload__text">
-      拖拽上传/<em>点击上传</em>
-    </div>
-    <template #tip>
-      <div class="el-upload__tip">
-        {{ tip }}
-      </div>
-    </template>
-  </el-upload>
-</template>
-
-<script setup lang="jsx">
-import { reactive, ref } from 'vue';
-import { fileUp } from '../api';
-
-const props = defineProps({
-  url: {
-    type: String,
-    default: ''
-  },
-  tip: {
-    type: String,
-    default: ''
-  }
-})
-
-const fileList = ref([])
-const uploadRef = ref()
-
-const localData = reactive({
-
-})
-
-const change = (file, files) => {
-  console.log(file, 'file');
-}
-
-const progress = (UploadProgressEvent, UploadFile, UploadFiles) => {
-
-}
-
-const remove = (file, files) => {}
-
-const beforeRemove = (file, files) => {}
-
-const uploadRequest = (UploadRequestOptions) => {
-  console.log(UploadRequestOptions, 'UploadRequestOptions');
-  // UploadRequestOptions.data = {}
-  const formData = new FormData()
-  formData.append('file', UploadRequestOptions.file)
-  // formData.append('params', UploadRequestOptions.data)
-  fileUp(url, formData)
-}
-
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/projectdemand/demandsummary/index.vue

@@ -1,168 +0,0 @@
-<template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
-</template>
-
-<script setup lang="jsx">
-import { reactive, ref, shallowRef } from 'vue';
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import { useRouter } from 'vue-router';
-
-const localData = reactive({
-  
-})
-
-const tableIns= ref()
-const router = useRouter()
-
-
-const searchConfig = reactive([
-  {
-    label: '名称',
-    prop: 'name',
-    props: {
-      placeholder: '请输入'
-    },
-    component: 'el-input',
-    colProps: {}
-  },
-  {
-    label: '项目类型',
-    prop: 'projectType',
-    component: shallowRef(fvSelect),
-    props: {},
-    colProps: {}
-  },
-  {
-    label: '研发主体',
-    prop: 'productMainBody',
-    component: shallowRef(fvSelect),
-    props: {},
-    colProps: {}
-  },
-  {
-    label: '项目影响',
-    prop: 'projectEffect',
-    component: shallowRef(fvSelect),
-    props: {},
-    colProps: {}
-  },
-  {
-    label: '起止时间',
-    prop: 'time',
-    component: 'el-date-picker',
-    props: {},
-    colProps: {}
-  },
-  {
-    label: '最小金额',
-    prop: 'minMoney',
-    component: 'el-input',
-    colProps: {}
-  },
-  {
-    label: '最大金额',
-    prop: 'maxMoney',
-    component: 'el-input',
-    colProps: {}
-  },
-])
-
-const tableConfig = reactive({
-  columns: [
-    {
-      type: 'selection',
-      prop: 'selection'
-    },
-    {
-      prop: 'name',
-      label: '名称',
-      align: 'center'
-    },
-    {
-      prop: 'company',
-      label: '所属公司',
-      align: 'center'
-    },
-    {
-      prop: 'projectType',
-      label: '项目类型',
-      align: 'center'
-    },
-    {
-      prop: 'productMainBody',
-      label: '研发主体',
-      align: 'center'
-    },
-    {
-      prop: 'projectEffect',
-      label: '项目影响',
-      align: 'center'
-    },
-    {
-      prop: 'survey',
-      label: '经营概况',
-      align: 'center'
-    },
-    {
-      prop: 'time',
-      label: '起止时间',
-      align: 'center'
-    },
-    {
-      prop: 'status',
-      label: '发布状态',
-      align: 'center'
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-          <div>
-            <el-button type={'primary'} link onClick={()=>{}} >详情</el-button>
-            <el-button type={'primary'} link onClick={()=>{}} >上报</el-button>
-          </div>
-        )
-      }
-    }
-  ],
-  api: '',
-  params: {},
-  btns: [
-    {name: '新增上报', key: 'add', type: 'primary', auth: ''},
-    {name: '年度计划导出', key: '_export', type: 'primary', auth: ''},
-    {name: '经费预算生成', key: 'preMonty', type: 'primary', auth: ''},
-  ]
-}) 
-
-const search = (val) => {
-  let obj = {...val}
-  if(obj.time) {
-    obj.startTime = obj.time[0]
-    obj.endTime = obj.time[1]
-    delete obj.dateValue
-  }
-  tableConfig.params = obj
-  tableIns.value.refresh()
-}
-
-const headBtnClick = (key) => {
-  switch(key) {
-    case 'add': handleAdd()
-      break;
-  }
-}
-
-const handleAdd = () => {
-  router.push({
-    name: 'Demandsummaryadd',
-    query: {}
-  })
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/views/steps/step/Step1.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>
+    步骤1
+  </div>
+</template>
+
+<script setup>
+import { onMounted } from 'vue';
+
+onMounted(()=>{
+  console.log('步骤一挂载');
+})
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/steps/step/Step2.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>
+    步骤2
+  </div>
+</template>
+
+<script setup>
+import { onMounted } from 'vue';
+
+onMounted(()=>{
+  console.log('步骤一挂载');
+})
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/steps/step/Step3.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>
+    步骤1
+  </div>
+</template>
+
+<script setup>
+import { onMounted } from 'vue';
+
+onMounted(()=>{
+  console.log('步骤一挂载');
+})
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/steps/step/Step4.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>
+    步骤1
+  </div>
+</template>
+
+<script setup>
+import { onMounted } from 'vue';
+
+onMounted(()=>{
+  console.log('步骤一挂载');
+})
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/steps/step/Step5.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>
+    步骤1
+  </div>
+</template>
+
+<script setup>
+import { onMounted } from 'vue';
+
+onMounted(()=>{
+  console.log('步骤1-5挂载');
+})
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/steps/step/index.vue

@@ -0,0 +1,39 @@
+<template>
+  <steps :stepList="stepList" :stepSuccess="[0,1]"></steps>
+</template>
+
+<script setup lang="jsx">
+import { reactive, shallowRef } from 'vue';
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import Step1 from './Step1.vue'
+import Step2 from './Step2.vue'
+import Step3 from './Step3.vue'
+import Step4 from './Step4.vue'
+import Step5 from './Step5.vue'
+const stepList = reactive([
+  {
+    key: 'collect',
+    component: markRaw(Step1)
+  },
+  {
+    key: 'report',
+    component: markRaw(Step2)
+  },
+  {
+    key: 'approve',
+    component: markRaw(Step3)
+  },
+  {
+    key: 'execute',
+    component: markRaw(Step4)
+  },
+  {
+    key: 'archivist',
+    component: markRaw(Step5)
+  },
+])
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/workflow/common/OperationRender.vue

@@ -10,53 +10,15 @@
 
         <el-card>
           <div style="display: flex;">
+<!--            <avatar-ellipsis :row="3" v-if="operation.userInfo.length > 0" :user-info="operation.userInfo"/>-->
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
-              <!--              <el-avatar size="large" :src="user.avatar"></el-avatar>-->
-              <!--              <div v-if="!$slots.dot && operation.userInfo.length > 1"-->
-              <!--                   class="el-timeline-item__node" :style="{-->
-              <!--                      backgroundColor: user.color-->
-              <!--                    }">-->
-              <!--                <el-icon v-if="user.icon" :class="user.class">-->
-              <!--                  <component :is="user.icon"/>-->
-              <!--                </el-icon>-->
-              <!--              </div>-->
-              <!--              <el-tooltip effect="dark" :content="user.name" placement="bottom-start">-->
-              <!--                <span class="username">{{ user.name }}</span>-->
-              <!--              </el-tooltip>-->
-              <avatar-ellipsis :row="3" v-if="operation.userInfo.length > 0" :user-info="operation.userInfo"/>
-              <template v-if="user.auditOpinion">
-                <div class="username">
-                  <el-tooltip effect="dark" :content="user.auditOpinion" placement="bottom-start">
-                    <div>{{ user.auditOpinion }}</div>
-                  </el-tooltip>
-                </div>
-              </template>
+              <name-circle :user="user"/>
             </div>
             <div style="margin-left: 10px;">
               <div style="color: #c0bebe">{{ operation.operationName }}</div>
               <div style="font-size: 14px; font-weight: bold;">{{ operation.remark }}</div>
             </div>
           </div>
-          <!--          <template v-if="operation.comment">-->
-          <!--            <div style="margin-top: 10px;background:#f5f5f5;padding: 10px;">-->
-          <!--              <div>-->
-          <!--                {{ operation.comment.context }}-->
-          <!--              </div>-->
-          <!--              <div style="margin-top: 10px;"-->
-          <!--                   v-if="operation.comment.attachments && operation.comment.attachments.length > 0">-->
-          <!--                <template v-for="(item) in getAttachmentList(operation.comment.attachments,true)">-->
-          <!--                  <el-image-->
-          <!--                      style="width: 100px; height: 100px"-->
-          <!--                      :src="item.url"-->
-          <!--                      :preview-src-list="[item.url]">-->
-          <!--                  </el-image>-->
-          <!--                </template>-->
-          <!--                <div v-for="(file) in getAttachmentList(operation.comment.attachments,false)">-->
-          <!--                  <el-link style="color: #2a99ff" :href="file.url" icon="el-icon-document">{{ file.name }}</el-link>-->
-          <!--                </div>-->
-          <!--              </div>-->
-          <!--            </div>-->
-          <!--          </template>-->
         </el-card>
       </el-timeline-item>
       <el-timeline-item :color="timeline.color" :icon="timeline.icon" size="large">
@@ -71,6 +33,7 @@
 <script setup>
 import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
 import AvatarEllipsis from '../process/common/AvatarEllipsis.vue'
+import NameCircle from "@/components/NameCircle.vue";
 
 const props = defineProps({
   operationList: {
@@ -123,7 +86,7 @@ const init = () => {
       break
   }
   // let operationListNew = []
-  for (let i = 0; i < props.operationList.length; i++) {
+  for (let i = 0; i < props.operationList?.length; i++) {
     let operationNew = initOperationFun(props.operationList[i])
     let userList = []
     if (operationNew.userInfo) {
@@ -287,21 +250,6 @@ init()
   position: relative;
   margin-right: 5px;
 
-  .username {
-    width: 100px;
-    margin-top: 10px;
-    background: #f5f5f5;
-    padding: 10px;
-
-    .el-tooltip__trigger {
-      width: 90px;
-      //padding-top: 2px;
-      //text-align: center;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden
-    }
-  }
 }
 
 .el-timeline-item__node {

src/views/workflow/common/ProcessDiagramViewer.vue

@@ -8,8 +8,8 @@
   </div>
   <div style="margin-top: 40px">
     <div :style="'transform: scale('+ scale / 100 +');'">
-      <div id="previewProcess">
-        <process-tree :mode="mode" ref="processTreePreview" id-name="previewProcess"/>
+      <div :id="idName">
+        <process-tree :mode="mode" ref="processTreePreview" :id-name="idName"/>
       </div>
     </div>
   </div>
@@ -24,6 +24,9 @@ const props = defineProps({
   mode: {
     type: String,
     default: 'preview'
+  },idName:{
+    type:String,
+    default:'previewProcess'
   }
 })
 

src/views/workflow/process/common/AvatarEllipsis.vue

@@ -6,9 +6,8 @@
     <div style="display: flex;flex-wrap: wrap;">
       <div v-for="(user,index) in userInfo" :key="index" class="avatar_name">
         <div class="circle-user">
-          <el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">
-            <span class="item_name">{{ user.name }}</span>
-          </el-tooltip>
+          <Tooltip :content="user.name" placement="bottom-start" width="45">
+          </Tooltip>
         </div>
         <div v-if="user.icon"
              class="el-timeline-item__node" :style="{
@@ -47,6 +46,7 @@ const props = defineProps({
 })
 
 const init = () => {
+  console.log('props.userInfo',props.userInfo)
   for (let user of props.userInfo) {
     initUser(user)
   }
@@ -121,12 +121,4 @@ init()
   right: 1px;
 }
 
-.item_name {
-  width: 45px;
-  text-align: center;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  padding-top: 3px;
-}
 </style>