From 7869ff4e6afaf5e628712f49ffe7a6940540582c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 17 May 2024 21:26:15 +0800
Subject: [PATCH 01/36] =?UTF-8?q?feat=20:=20=E9=A1=B9=E7=9B=AE=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PopoverDelete.vue              |   4 +-
 .../project-management/filing/attachment.vue  |  72 ++++++++++
 .../project-management/filing/conclusion.vue  | 133 ++++++++++++++++++
 .../project-management/filing/detail.vue      |  50 +++++++
 4 files changed, 257 insertions(+), 2 deletions(-)
 create mode 100644 src/views/project-management/filing/attachment.vue
 create mode 100644 src/views/project-management/filing/conclusion.vue
 create mode 100644 src/views/project-management/filing/detail.vue

diff --git a/src/components/PopoverDelete.vue b/src/components/PopoverDelete.vue
index 8dbd829..4c04031 100644
--- a/src/components/PopoverDelete.vue
+++ b/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,
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
new file mode 100644
index 0000000..cb7a5cc
--- /dev/null
+++ b/src/views/project-management/filing/attachment.vue
@@ -0,0 +1,72 @@
+<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">
+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>
+              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+            </div>
+        )
+      }
+    }
+  ]
+})
+const showTable=ref(true)
+const otherFileList = ref([])
+const getOtherFile = () => {
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
new file mode 100644
index 0000000..d69bf9b
--- /dev/null
+++ b/src/views/project-management/filing/conclusion.vue
@@ -0,0 +1,133 @@
+<template>
+  <div class="apply-block">
+    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
+      <baseTitle title="项目结项"></baseTitle>
+      <el-row>
+        <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>
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import FileUpload from "@/components/FileUpload.vue";
+
+const formData = ref({})
+const rules = reactive({
+  attachment: [{required: true, message: '请上传项目结项附件', trigger: 'blur'}],
+})
+const fileList = ref(null)
+const applyForm = 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 compositeParam = (item) => {
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    processNodeTag: null,
+    tag: formData.value.collectType
+  }
+}
+const getAttachment = (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 getOtherFile = () => {
+
+}
+const handleSubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+
+  })
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-management/filing/detail.vue b/src/views/project-management/filing/detail.vue
new file mode 100644
index 0000000..30c9220
--- /dev/null
+++ b/src/views/project-management/filing/detail.vue
@@ -0,0 +1,50 @@
+<template>
+  <div class="detail-block">
+    <el-tabs
+        v-model="activeName"
+        type="card"
+        class="demo-tabs"
+        @tab-click="handleClick"
+    >
+      <el-tab-pane label="需求征集" name="first">
+
+      </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"></el-tab-pane>
+      <el-tab-pane label="项目归档" name="third" :disabled="true"></el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup lang="jsx">
+const activeName = ref('first')
+const handleClick = (tab, event) => {
+  console.log(tab, event)
+  if(tab.index.value === 0){
+
+  }
+}
+</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>

From f5c6680c664d896cf506ff4437def846fa588d69 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 17 May 2024 23:24:38 +0800
Subject: [PATCH 02/36] =?UTF-8?q?feat=20:=20=E6=96=B0=E5=A2=9E=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      | 170 ++++++++++++++++++
 src/utils/matterTree.js                       |  13 ++
 .../project-demand/collection/detail.vue      |  18 +-
 .../project-management/initiation/detail.vue  |  86 ++++++---
 4 files changed, 250 insertions(+), 37 deletions(-)
 create mode 100644 src/components/DetailComponent/CollectionDetail.vue
 create mode 100644 src/utils/matterTree.js

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
new file mode 100644
index 0000000..a6a3a26
--- /dev/null
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -0,0 +1,170 @@
+<template>
+  <div v-loading="loading">
+    <fvForm v-if="showForm" ref="form" :schema="schame">
+    </fvForm>
+    <baseTitle title="征集说明"></baseTitle>
+    <el-card style="width: 100%">
+      <div v-html="formData.collectExplain">
+      </div>
+    </el-card>
+    <baseTitle title="附件列表"></baseTitle>
+    <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>
+    <baseTitle title="审核意见"></baseTitle>
+    <el-form-item prop="auditOpinion">
+      <el-input
+          v-model="formData.auditOpinion"
+          :rows="3"
+          type="textarea"
+          placeholder="请输入审核意见"
+      />
+    </el-form-item>
+    <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"/>
+      </div>
+    </div>
+  </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';
+
+const emit = defineEmits(['getInfo'])
+const form = ref()
+const showForm = ref(true)
+const loading = ref(false)
+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: []
+  },
+})
+const schame = computed(() => {
+  return [
+    {
+      label: '名称',
+      prop: 'requirementName',
+      colProps: {
+        span: 12
+      }
+    },
+    {
+      label: '所属公司',
+      prop: 'companyIds',
+      colProps: {
+        span: 12
+      }
+    }, {
+      label: '征集类型',
+      prop: 'collectType',
+      colProps: {
+        span: 12
+      }
+    }, {
+      label: '截止时间',
+      prop: 'deadline',
+      colProps: {
+        span: 12
+      }
+    }
+  ]
+})
+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 init = (newVal) => {
+  newVal.companyIds = getDataSourceOptionItem(newVal.companyIds)
+  form.value.setValues(newVal)
+}
+const getInfo = () => {
+  emit('getInfo')
+}
+const getDataSourceOptionItem = (val) => {
+  if (val instanceof Array) {
+    val.forEach(item => {
+      matterTree(companyNameArray.value,props.companyOption, item)
+    })
+  }
+  return companyNameArray.value.join('，');
+}
+watch(() => props.companyOption, (newVal) => {
+  props.companyOption=newVal
+}, {deep: true})
+watch(() => props.formData, (newVal) => {
+  if (newVal) {
+    init(newVal)
+  }
+}, {deep: true})
+watch(() => props.processViewer, (newVal) => {
+  props.processViewer = newVal
+}, {deep: true})
+onMounted(() => {
+  loading.value = true
+  getInfo()
+  loading.value = false
+})
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/utils/matterTree.js b/src/utils/matterTree.js
new file mode 100644
index 0000000..24f791d
--- /dev/null
+++ b/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;
+  }
+}
diff --git a/src/views/project-demand/collection/detail.vue b/src/views/project-demand/collection/detail.vue
index 6a708f2..f0d3f5a 100644
--- a/src/views/project-demand/collection/detail.vue
+++ b/src/views/project-demand/collection/detail.vue
@@ -80,8 +80,8 @@ 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()
@@ -180,24 +180,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('，');
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index aeebf62..a6be3b1 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -1,48 +1,92 @@
 <template>
-<div class="detail-block">
-  <el-tabs
-      v-model="activeName"
-      type="card"
-      class="demo-tabs"
-      @tab-click="handleClick"
-  >
-    <el-tab-pane label="需求征集" name="first">
-
-    </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>
+  <div class="detail-block">
+    <el-tabs
+        v-model="activeName"
+        type="card"
+        class="demo-tabs"
+        @tab-click="handleClick"
+    >
+      <el-tab-pane label="需求征集" name="first">
+        <CollectionDetail :formData="collectionData.formData" :data="collectionData" :processViewer="processViewer" :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
+      </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>
 
 <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';
+
+const route = useRoute()
 const activeName = ref('first')
+const collectionData = ref({})
+const processViewer = ref(false)
+const processStore = useProcessStore()
+const companyOption = ref([])
+
+const getCompanyOption = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
+
+const getDemandCollectionInfo =async () => {
+  if (!route.query.id) return
+  await getCompanyOption()
+  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(() => {
+      processViewer.value = true
+    })
+  })
+}
 const handleClick = (tab, event) => {
   console.log(tab, event)
-  if(tab.index.value === 0){
-
+  if (tab.index.value === 0) {
+    getDemandCollectionInfo()
   }
 }
+getDemandCollectionInfo()
 </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>

From 0c070154e16a9d6550de9b454aeee9974d5c7c63 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 18 May 2024 17:12:51 +0800
Subject: [PATCH 03/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/initiation/detail.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index a6be3b1..261efd6 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -7,7 +7,8 @@
         @tab-click="handleClick"
     >
       <el-tab-pane label="需求征集" name="first">
-        <CollectionDetail :formData="collectionData.formData" :data="collectionData" :processViewer="processViewer" :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
+        <collection-detail :formData="collectionData.formData" :data="collectionData" :processViewer="processViewer"
+                          :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
       </el-tab-pane>
       <el-tab-pane label="需求上报" name="second"></el-tab-pane>
       <el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
@@ -19,6 +20,7 @@
 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";
 
 const route = useRoute()
 const activeName = ref('first')
@@ -32,7 +34,7 @@ const getCompanyOption = async () => {
   companyOption.value = res.data
 }
 
-const getDemandCollectionInfo =async () => {
+const getDemandCollectionInfo = async () => {
   if (!route.query.id) return
   await getCompanyOption()
   getInfo(route.query.id).then(res => {
@@ -82,6 +84,7 @@ getDemandCollectionInfo()
     }
   }
 }
+
 .approval-record {
   padding-bottom: 30px;
 

From 6009885c097db059330c5c91b680ca1ca7cf045b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 18 May 2024 17:32:58 +0800
Subject: [PATCH 04/36] =?UTF-8?q?fix=20:=20=E6=9B=BF=E6=8D=A2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/collection/add.vue        | 14 ++++++++++++--
 src/views/project-management/filing/attachment.vue | 13 ++++++++++++-
 src/views/project-management/filing/conclusion.vue | 13 +++++++++++--
 .../implementation/attachment.vue                  | 12 +++++++++++-
 src/views/projectdemand/demandcollection/add.vue   | 13 +++++++++++--
 .../projectdemand/demandcollection/detail.vue      | 14 +++++++++++---
 6 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index faa33f5..cb43141 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -61,7 +61,7 @@
 <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";
@@ -138,7 +138,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,6 +146,16 @@ 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'){
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index cb7a5cc..1ed9890 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -12,6 +12,8 @@
 </template>
 
 <script setup lang="jsx">
+import {downloadFile} from "@/api/project-demand";
+
 const searchConfig = reactive([
   {
     label: '关键词',
@@ -53,7 +55,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>
             </div>
         )
       }
@@ -64,6 +66,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>
 
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index d69bf9b..ad0a318 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -31,6 +31,7 @@
 
 <script setup lang="jsx">
 import FileUpload from "@/components/FileUpload.vue";
+import {downloadFile} from "@/api/project-demand";
 
 const formData = ref({})
 const rules = reactive({
@@ -72,7 +73,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>
         )
@@ -80,7 +81,15 @@ 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) => {
   return {
     fileId: item.id,
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 3063242..ffa73b0 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/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>
 
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index f29402c..da5f052 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -59,7 +59,7 @@
 <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";
@@ -135,7 +135,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>
         )
@@ -143,6 +143,15 @@ 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)=>{
     return  {
       fileId: item.id,
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 5e1eafc..bae96d1 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -79,12 +79,11 @@
 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 {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'
-
 const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
@@ -131,11 +130,20 @@ const tableConfig = reactive({
       label: '操作',
       align: 'center',
       currentRender: ({row, index}) => {
-        return (<a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>)
+        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 handleSubmit = () => {
   let approve = {
     taskId: processInstanceData.value.taskId,

From 0732acf8c795e6905502de3d63fd61410587c1b1 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 18 May 2024 19:54:58 +0800
Subject: [PATCH 05/36] =?UTF-8?q?feat=20:=20=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E7=BB=84=E4=BB=B6=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload.vue                 | 19 ++++++++-
 src/views/project-demand/collection/add.vue   | 20 +++++-----
 .../implementation/check.vue                  | 40 ++++++++-----------
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 76a8939..2ead4a1 100644
--- a/src/components/FileUpload.vue
+++ b/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>
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index cb43141..4b0d852 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/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>
@@ -199,15 +199,15 @@ const init = async () => {
     })
   })
 }
-const submitParam=()=>{
+const submitParam=(item)=>{
   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,
+    files: item.fileList,
     deploymentId: processInstanceData.value.deploymentId
   }
 }
@@ -215,7 +215,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)
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index af00dac..a8e88b1 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -10,13 +10,13 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="项目验收附件" prop="attachment">
-            <file-upload @getFile="getAttachment" :showFileList="true"/>
+            <file-upload @getFile="getAttachment" :showFileList="true" @delete="handleDelete"/>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="其他文件">
             <el-card style="width: 100%">
-              <file-upload @getFile="getOtherFile" :showFileList="true"/>
+              <file-upload @getFile="getOtherFile" :showFileList="false" />
               <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
                        :data="otherFileList" :isSettingCol="false" :pagination="false">
                 <template #empty>
@@ -36,6 +36,8 @@
 
 <script setup lang="jsx">
 import FileUpload from "@/components/FileUpload.vue";
+import {ElMessage} from "element-plus";
+import {deleteFile} from "@/api/project-demand";
 
 const formData = ref({})
 const rules = reactive({
@@ -99,30 +101,22 @@ const compositeParam = (item) => {
 }
 const getAttachment = (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
-  }
+  // showTable.value = false
+  // let fileObj = compositeParam(val)
+  // formData.value.fileList.push(fileObj)
+  // nextTick(() => {
+  //   showTable.value = true
+  // })
 }
 const getOtherFile = () => {
 
+}
+const handleDelete=(val)=>{
+  deleteFile(val).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success("删除成功");
+    }
+  });
 }
 const handleSubmit = (instance) => {
   if (!instance) return

From 716d18122fa5951c393c384965ce9e30c7cca040 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 18 May 2024 20:52:14 +0800
Subject: [PATCH 06/36] =?UTF-8?q?feat=20:=20=E5=B0=81=E8=A3=85=E5=B8=A6?=
 =?UTF-8?q?=E6=9C=89=E9=99=84=E4=BB=B6=E5=8F=8A=E5=85=B6=E4=BB=96=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=9A=84=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           | 115 ++++++++++++++++
 .../DetailComponent/CollectionDetail.vue      |   5 +-
 .../implementation/check.vue                  | 124 +++++++-----------
 3 files changed, 167 insertions(+), 77 deletions(-)
 create mode 100644 src/components/AttachmentUpload.vue

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
new file mode 100644
index 0000000..49aa5e9
--- /dev/null
+++ b/src/components/AttachmentUpload.vue
@@ -0,0 +1,115 @@
+<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">
+          <file-upload @getFile="getAttachment" :showFileList="showFileList" @delete="deleteFile"/>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="其他文件">
+          <el-card style="width: 100%">
+            <file-upload @getFile="getOtherFile" :showFileList="false"/>
+            <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>
+</template>
+
+<script setup lang="jsx">
+import FileUpload from '@/components/FileUpload.vue'
+const emit = defineEmits(["getAttachment", "getOtherFile", "deleteFile","deleteOtherFile","download"])
+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'}],
+})
+const props = defineProps({
+  showFileList: {
+    type: Boolean,
+    default:false
+  },label: {
+    type: String,
+    default:'项目附件'
+  },otherFileList: {
+    type: Array,
+    default:[]
+  },showTable: {
+    type: Boolean,
+    default:true
+  }
+})
+watch(() => props.showTable, (newVal) => {
+  props.showTable=newVal
+}, {deep: true})
+watch(() => props.otherFileList, (newVal) => {
+  props.otherFileList=newVal
+}, {deep: true})
+
+const getAttachment = (val) => {
+  emit('getAttachment',val)
+}
+const getOtherFile = (val) => {
+  emit('getOtherFile',val)
+}
+const deleteFile = (val) => {
+  emit('deleteFile',val)
+}
+const deleteOtherFile = (row) => {
+  emit('deleteOtherFile',row)
+}
+const handleDownload = (row) => {
+  emit('download',row)
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index a6a3a26..03a965b 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -39,7 +39,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {matterTree} from '@/utils/matterTree.js';
 
-const emit = defineEmits(['getInfo'])
+const emit = defineEmits(['getInfo','download'])
 const form = ref()
 const showForm = ref(true)
 const loading = ref(false)
@@ -139,6 +139,9 @@ const init = (newVal) => {
 const getInfo = () => {
   emit('getInfo')
 }
+const handleDownload = (row) => {
+  emit('download',row)
+}
 const getDataSourceOptionItem = (val) => {
   if (val instanceof Array) {
     val.forEach(item => {
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index a8e88b1..ee49e07 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -1,33 +1,18 @@
 <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" @delete="handleDelete"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="其他文件">
-            <el-card style="width: 100%">
-              <file-upload @getFile="getOtherFile" :showFileList="false" />
-              <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 label="项目验收附件" :showTable="showTable" :otherFileList="otherFileList"
+                      @deleteOtherFile="deleteOtherFile" @download="downloadOtherFile" @getAttachment="getAttachment"
+                      @getOtherFile="getOtherFile" :showFileList="true" @deleteFile="deleteAttachment"/>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
     </div>
@@ -35,59 +20,14 @@
 </template>
 
 <script setup lang="jsx">
-import FileUpload from "@/components/FileUpload.vue";
-import {ElMessage} from "element-plus";
-import {deleteFile} from "@/api/project-demand";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {deleteFile,downloadFile} from "@/api/project-demand";
 
 const formData = ref({})
-const rules = reactive({
-  attachment: [{required: true, message: '请上传项目立项附件', trigger: 'blur'}],
-})
 const fileList = ref(null)
 const applyForm = 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 compositeParam = (item) => {
   return {
     fileId: item.id,
@@ -100,24 +40,56 @@ const compositeParam = (item) => {
   }
 }
 const getAttachment = (val) => {
-  console.log('上传文件', val)
-  // showTable.value = false
-  // let fileObj = compositeParam(val)
-  // formData.value.fileList.push(fileObj)
-  // nextTick(() => {
-  //   showTable.value = true
-  // })
+  console.log('上传文件getAttachment', val)
+  showTable.value = false
+  let fileObj = compositeParam(val)
+  fileList.value.push(fileObj)
+  nextTick(() => {
+    showTable.value = true
+  })
 }
-const getOtherFile = () => {
-
+const getOtherFile = (val) => {
+  console.log('上传文件getOtherFile', val)
+  showTable.value = false
+  let fileObj = compositeParam(val)
+  otherFileList.value.push(fileObj)
+  nextTick(() => {
+    showTable.value = true
+  })
 }
-const handleDelete=(val)=>{
+const deleteAttachment = (val) => {
   deleteFile(val).then(res => {
     if (res.code === 1000) {
       ElMessage.success("删除成功");
     }
   });
 }
+const deleteOtherFile = (row) => {
+  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteFile(row.fileId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success("删除成功");
+        otherFileList.value.splice(otherFileList.value.findIndex((item) => item.id === row.fileId), 1);
+      }
+    });
+  }).catch(() => {
+    ElMessage.warning("用户取消删除! ");
+  })
+}
+
+const downloadOtherFile = (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 handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {

From e4e7444affec0d4eaa380557376558558fa03e6c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 18 May 2024 20:59:35 +0800
Subject: [PATCH 07/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=BE=81=E9=9B=86=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-management/initiation/detail.vue | 12 +++++++++++-
 src/views/project-management/initiation/index.vue  |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 261efd6..4659bd5 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -8,7 +8,7 @@
     >
       <el-tab-pane label="需求征集" name="first">
         <collection-detail :formData="collectionData.formData" :data="collectionData" :processViewer="processViewer"
-                          :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
+                          :companyOption="companyOption" @getInfo="getDemandCollectionInfo" @download="downloadDetailFile"/>
       </el-tab-pane>
       <el-tab-pane label="需求上报" name="second"></el-tab-pane>
       <el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
@@ -21,6 +21,7 @@ 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";
 
 const route = useRoute()
 const activeName = ref('first')
@@ -51,6 +52,15 @@ const getDemandCollectionInfo = async () => {
     })
   })
 }
+const downloadDetailFile = (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 handleClick = (tab, event) => {
   console.log(tab, event)
   if (tab.index.value === 0) {
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index c47dcbc..094c11e 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -165,7 +165,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/requirement',
   params: {},
 })
 

From b7ebd66729dc0393884a7b6f6a78b8767a27f575 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 18 May 2024 22:08:08 +0800
Subject: [PATCH 08/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           | 89 ++++++++++++-------
 .../implementation/check.vue                  | 52 ++---------
 .../implementation/index.vue                  |  2 +-
 3 files changed, 67 insertions(+), 76 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 49aa5e9..ae0fbd3 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-form-item :label="label" prop="attachment">
-          <file-upload @getFile="getAttachment" :showFileList="showFileList" @delete="deleteFile"/>
+          <file-upload @getFile="getAttachment" :showFileList="showFileList" @delete="deleteAttachment"/>
         </el-form-item>
       </el-col>
       <el-col :span="24">
@@ -25,7 +25,10 @@
 
 <script setup lang="jsx">
 import FileUpload from '@/components/FileUpload.vue'
-const emit = defineEmits(["getAttachment", "getOtherFile", "deleteFile","deleteOtherFile","download"])
+import {deleteFile, downloadFile} from "../api/project-demand";
+import {ElMessage, ElMessageBox} from "element-plus";
+
+const emit = defineEmits(["getAttachment", "getOtherFile"])
 const formData = ref({})
 const tableConfig = reactive({
   columns: [
@@ -52,20 +55,20 @@ const tableConfig = reactive({
       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>
-        )
-      }
-    }
+    // {
+    //   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({
@@ -74,39 +77,61 @@ const rules = reactive({
 const props = defineProps({
   showFileList: {
     type: Boolean,
-    default:false
-  },label: {
+    default: false
+  }, label: {
     type: String,
-    default:'项目附件'
+    default: '项目附件'
+  }, showTable: {
+    type: Boolean,
+    default: true
   },otherFileList: {
     type: Array,
-    default:[]
-  },showTable: {
-    type: Boolean,
-    default:true
+    default: []
   }
 })
 watch(() => props.showTable, (newVal) => {
-  props.showTable=newVal
+  props.showTable = newVal
 }, {deep: true})
 watch(() => props.otherFileList, (newVal) => {
-  props.otherFileList=newVal
+  props.otherFileList = newVal
 }, {deep: true})
-
 const getAttachment = (val) => {
-  emit('getAttachment',val)
+  emit('getAttachment', val)
 }
 const getOtherFile = (val) => {
-  emit('getOtherFile',val)
+  emit('getOtherFile', val)
 }
-const deleteFile = (val) => {
-  emit('deleteFile',val)
+const deleteAttachment = (val) => {
+  deleteFile(val).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success("删除成功");
+    }
+  });
 }
 const deleteOtherFile = (row) => {
-  emit('deleteOtherFile',row)
+  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteFile(row.fileId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success("删除成功");
+        otherFileList.value.splice(otherFileList.value.findIndex((item) => item.id === row.fileId), 1);
+      }
+    });
+  }).catch(() => {
+    ElMessage.warning("用户取消删除! ");
+  })
 }
 const handleDownload = (row) => {
-  emit('download',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>
 
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index ee49e07..edbf2f4 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -11,8 +11,8 @@
       </el-row>
     </el-form>
     <AttachmentUpload label="项目验收附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @deleteOtherFile="deleteOtherFile" @download="downloadOtherFile" @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" @deleteFile="deleteAttachment"/>
+                      @getAttachment="getAttachment"
+                      @getOtherFile="getOtherFile" :showFileList="true"/>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
     </div>
@@ -20,15 +20,16 @@
 </template>
 
 <script setup lang="jsx">
-import {ElMessage, ElMessageBox} from "element-plus";
-import {deleteFile,downloadFile} from "@/api/project-demand";
-
 const formData = ref({})
 const fileList = ref(null)
 const applyForm = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
 const compositeParam = (item) => {
+  let tag=''
+  if(!formData.value.collectType&&router.currentRoute.value.name==='Implementation/check'){
+    tag='项目实施'
+  }
   return {
     fileId: item.id,
     size: item.size,
@@ -36,17 +37,13 @@ const compositeParam = (item) => {
     fileType: item.fileType,
     url: item.url,
     processNodeTag: null,
-    tag: formData.value.collectType
+    tag: tag
   }
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  showTable.value = false
   let fileObj = compositeParam(val)
-  fileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
+  // fileList.value.push(fileObj)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
@@ -57,39 +54,8 @@ const getOtherFile = (val) => {
     showTable.value = true
   })
 }
-const deleteAttachment = (val) => {
-  deleteFile(val).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success("删除成功");
-    }
-  });
-}
-const deleteOtherFile = (row) => {
-  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    deleteFile(row.fileId).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success("删除成功");
-        otherFileList.value.splice(otherFileList.value.findIndex((item) => item.id === row.fileId), 1);
-      }
-    });
-  }).catch(() => {
-    ElMessage.warning("用户取消删除! ");
-  })
-}
 
-const downloadOtherFile = (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 handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 433f00c..167a4ba 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -150,7 +150,7 @@ const tableConfig = reactive({
         } 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'})
+          btn.push({label: '查看分摊', func: () => handleShare(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>

From c675b1ec483086ea922e47e1d839092d8a647ea6 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 18 May 2024 23:04:51 +0800
Subject: [PATCH 09/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8Dtooltip?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tooltip.vue                    | 40 +++++++++++++++++++
 .../process/common/AvatarEllipsis.vue         | 14 ++-----
 2 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 src/components/Tooltip.vue

diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue
new file mode 100644
index 0000000..3d50dc8
--- /dev/null
+++ b/src/components/Tooltip.vue
@@ -0,0 +1,40 @@
+<template>
+  <el-tooltip
+      effect="dark"
+      :content="props.content"
+      placement="bottom-start"
+      :disabled="isShow"
+  >
+    <div class="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: ''
+  }
+})
+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;
+  padding-top: 3px;
+}
+</style>
diff --git a/src/views/workflow/process/common/AvatarEllipsis.vue b/src/views/workflow/process/common/AvatarEllipsis.vue
index 78b6206..b71c2ae 100644
--- a/src/views/workflow/process/common/AvatarEllipsis.vue
+++ b/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>

From c96cbf8415f7c7834b5b17a0536890d2f25cfcdc Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 00:16:40 +0800
Subject: [PATCH 10/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NameCircle.vue                 | 125 +++++++++++++++++
 src/components/Tooltip.vue                    |   1 -
 src/views/project-demand/collection/add.vue   |  30 ++--
 src/views/project-demand/summary/add.vue      | 129 +++++++++++++++---
 src/views/project-demand/summary/api/index.js |  10 +-
 src/views/project-demand/summary/index.vue    |   2 +-
 src/views/workflow/common/OperationRender.vue |  58 +-------
 7 files changed, 269 insertions(+), 86 deletions(-)
 create mode 100644 src/components/NameCircle.vue

diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue
new file mode 100644
index 0000000..11bc4af
--- /dev/null
+++ b/src/components/NameCircle.vue
@@ -0,0 +1,125 @@
+<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>{{user.operationTime}}
+      <div class="username" v-if="user.auditOpinion">
+        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="90"/>
+      </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>
diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue
index 3d50dc8..b06b081 100644
--- a/src/components/Tooltip.vue
+++ b/src/components/Tooltip.vue
@@ -35,6 +35,5 @@ const isShowTooltip = () => {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  padding-top: 3px;
 }
 </style>
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index 4b0d852..03f594e 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -64,7 +64,7 @@ import {useProcessStore} from '@/stores/processStore.js';
 import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile,downloadFile} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElMessage, ElMessageBox} from "element-plus";
+import {ElMessage, ElMessageBox,ElNotification} from "element-plus";
 import {useRoute, useRouter} from 'vue-router'
 import {getSubCompOpt} from '@/api/user/user.js'
 import {useTagsView} from '@/stores/tagsview.js'
@@ -186,17 +186,25 @@ const init = async () => {
   const res = await getSubCompOpt()
   companyOption.value = res.data
   getWorkflowInfo().then(res => {
-    let data = res.data
-    processInstanceData.value = data
-    processStore.setDesign(data)
-    processStore.runningList.value = data.runningList;
-    processStore.endList.value = data.endList;
-    processStore.noTakeList.value = data.noTakeList;
-    processStore.refuseList.value = data.refuseList;
-    processStore.passList.value = data.passList;
-    nextTick(() => {
-      processDiagramViewer.value = true
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
     })
+    if(res.code === 1000){
+      let data = res.data
+      processInstanceData.value = data
+      processStore.setDesign(data)
+      processStore.runningList.value = data.runningList;
+      processStore.endList.value = data.endList;
+      processStore.noTakeList.value = data.noTakeList;
+      processStore.refuseList.value = data.refuseList;
+      processStore.passList.value = data.passList;
+      nextTick(() => {
+        processDiagramViewer.value = true
+      })
+    }else {
+    }
   })
 }
 const submitParam=(item)=>{
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 9591b33..e475340 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -1,4 +1,5 @@
 <template>
+  <baseTitle title="需求上报"></baseTitle>
   <fvForm :schema="schame" @getInstance="getInstance"></fvForm>
   <div class="oper-page-btn">
       <el-button type="primary" @click="staging">存为草稿</el-button>
@@ -8,24 +9,38 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import { markRaw } from 'vue';
+import {markRaw} from 'vue';
 import FileUpload from './components/FileUpload.vue';
+import {requirementReported} from "./api";
+import {ElNotification} from "element-plus";
+import {useTagsView} from '@/stores/tagsview.js'
 
+const router = useRouter()
+const tagsViewStore = useTagsView()
 const localData = reactive({
   form: null
 })
 
 const schame = computed(()=>{
-  let arr = [
+  return [
     {
       label: '名称',
-      prop: 'name',
+      prop: 'projectName',
       component: 'el-input',
       props: {},
       colProps: {
         span: 12
       }
     },
+    {
+      label: '专项资金',
+      prop: 'projectType',
+      component: markRaw(fvSelect),
+      props: {},
+      colProps: {
+        span: 12
+      }
+    },
     {
       label: '开始时间',
       prop: 'startTime',
@@ -37,7 +52,7 @@ const schame = computed(()=>{
     },
     {
       label: '所属公司',
-      prop: 'company',
+      prop: 'companyName',
       component: 'el-input',
       props: {},
       colProps: {
@@ -64,7 +79,7 @@ const schame = computed(()=>{
     },
     {
       label: '出资类型',
-      prop: 'monenyType',
+      prop: 'investmentType',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -73,7 +88,7 @@ const schame = computed(()=>{
     },
     {
       label: '项目影响',
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -82,7 +97,7 @@ const schame = computed(()=>{
     },
     {
       label: '所属业务板块',
-      prop: 'ywbank',
+      prop: 'businessSegment',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -91,7 +106,7 @@ const schame = computed(()=>{
     },
     {
       label: '预期成果形式',
-      prop: 'yuqichengg',
+      prop: 'resultForm',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -100,7 +115,7 @@ const schame = computed(()=>{
     },
     {
       label: '预期技术标准制定',
-      prop: 'yuqizhidingbiaozhu',
+      prop: 'technicalStandard',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -109,7 +124,7 @@ const schame = computed(()=>{
     },
     {
       label: '产学研联合',
-      prop: 'chanxue',
+      prop: 'industryUniversityResearch',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -118,7 +133,7 @@ const schame = computed(()=>{
     },
     {
       label: '开展政府申报',
-      prop: 'zhengfushenbao',
+      prop: 'governmentDeclaration',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
@@ -127,16 +142,80 @@ const schame = computed(()=>{
     },
     {
       label: '知识产权状况',
-      prop: 'zhishichanquan',
+      prop: 'intellectualProperty',
       component: markRaw(fvSelect),
       props: {},
       colProps: {
         span: 12
       }
     },
+
+    {
+      label: '发明专利',
+      prop: 'inventionPatent',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+    {
+      label: '实用性新型专利',
+      prop: 'newPatent',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+    {
+      label: '软件著作权',
+      prop: 'softwareCopyright',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+    {
+      label: '著作权',
+      prop: 'copyright',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+    {
+      label: '其他',
+      prop: 'other',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    }, {
+      label: '经济概算',
+      prop: 'economicEstimate',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },{
+      label: '申请公司总部科技创新专项资金',
+      prop: 'specialFundAmount',
+      component: 'el-input',
+      props: {},
+      colProps: {
+        span: 6
+      }
+    },
+
+
     {
       label: '现有业务描述',
-      prop: 'yewudes',
+      prop: 'serviceDescription',
       component: 'el-input',
       props: {
         type: 'textarea'
@@ -147,7 +226,7 @@ const schame = computed(()=>{
     },
     {
       label: '研发项目关键内容描述',
-      prop: 'contentnesss',
+      prop: 'contentDescription',
       component: 'el-input',
       props: {
         type: 'textarea'
@@ -169,14 +248,30 @@ const schame = computed(()=>{
       }
     }
   ]
-  return arr
 })
 
 const getInstance = (e) => {
   localData.form = e
 }
 
-const handleSubmit = async () => {}
+const handleSubmit = async () => {
+  // let params={
+  //   localData.form.getValues(),
+  //   files:[]
+  // }
+  let res = await requirementReported(localData.form.getValues())
+  ElNotification({
+    title: '提示',
+    message: res.msg,
+    type: res.code === 1000 ? 'success' : 'error'
+  })
+  if (res.code === 1000) {
+    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+    await router.push({
+      name: 'Summary'
+    })
+  }
+}
 
 const staging = async () => {}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/project-demand/summary/api/index.js b/src/views/project-demand/summary/api/index.js
index e7636c7..849a293 100644
--- a/src/views/project-demand/summary/api/index.js
+++ b/src/views/project-demand/summary/api/index.js
@@ -9,4 +9,12 @@ export const fileUp = (url, data) => {
       'Content-Type': 'multipart/form-data'
     }
   })
-}
\ No newline at end of file
+}
+
+export const requirementReported = (data) => {
+  return request({
+    url: '/workflow/mosr/requirement/reported',
+    method: "post",
+    data: data
+  });
+};
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 34bfa04..d2ad14e 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -128,7 +128,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/requirement/collect',
   params: {},
   btns: [
     {name: '新增上报', key: 'add', type: 'primary', auth: ''},
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index 960c0ec..1321f84 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/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: {
@@ -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 {

From 96e7ca1a67893db7d25d3560b4f07cf2b6b43953 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 02:03:52 +0800
Subject: [PATCH 11/36] =?UTF-8?q?feat=20:=20=E9=9C=80=E6=B1=82=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E7=95=8C=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue      | 417 +++++++++++++++---
 src/views/project-demand/summary/api/index.js |   8 +-
 src/views/project-demand/summary/index.vue    |  10 +-
 3 files changed, 372 insertions(+), 63 deletions(-)

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

From d432e54bc84c67d2f25120b97318c2e2bd9cb2bf Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 11:09:51 +0800
Subject: [PATCH 12/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/index.vue | 27 ++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 5121d79..7dc3c19 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -49,7 +49,7 @@ const searchConfig = reactive([
   },
   {
     label: '起止时间',
-    prop: 'time',
+    prop: 'startTime',
     component: 'el-date-picker',
     props: {},
     colProps: {}
@@ -80,22 +80,22 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'companyINames',
-      label: '所属公司',
+      prop: 'undertaker',
+      label: '承办单位',
       align: 'center'
     },
     {
-      prop: 'collectType',
+      prop: 'projectType',
       label: '项目类型',
       align: 'center'
     },
     {
-      prop: 'productMainBody',
+      prop: 'rdSubject',
       label: '研发主体',
       align: 'center'
     },
     {
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       label: '项目影响',
       align: 'center'
     },
@@ -105,24 +105,27 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'deadline',
+      prop: 'startTime',
       label: '起止时间',
       align: 'center'
     },
     {
-      prop: 'status',
-      label: '发布状态',
-      align: 'center'
+      prop: 'state',
+      label: '状态',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
     },
     {
       prop: 'oper',
       label: '操作',
       align: 'center',
+      showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         return (
           <div>
             <el-button type={'primary'} link onClick={()=>{}} >详情</el-button>
-            <el-button type={'primary'} link onClick={()=>{}} >上报</el-button>
+            <el-button type={'primary'} link onClick={()=>handleAdd()} >上报</el-button>
           </div>
         )
       }
@@ -131,7 +134,7 @@ const tableConfig = reactive({
   api: '/workflow/mosr/requirement/collect',
   params: {},
   btns: [
-    {name: '新增上报', key: 'add', type: 'primary', auth: ''},
+    // {name: '新增上报', key: 'add', type: 'primary', auth: ''},
     {name: '年度计划导出', key: '_export', type: 'primary', auth: ''},
     {name: '经费预算生成', key: 'preMonty', type: 'primary', auth: ''},
   ]

From 726c746a87f9c93cc706c0092c17975212009a1e Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 11:26:32 +0800
Subject: [PATCH 13/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue      |   2 +-
 src/views/project-demand/summary/add.vue | 320 +++--------------------
 2 files changed, 33 insertions(+), 289 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index ae0fbd3..0b49812 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -10,7 +10,7 @@
         <el-form-item label="其他文件">
           <el-card style="width: 100%">
             <file-upload @getFile="getOtherFile" :showFileList="false"/>
-            <fvTable style="width: 100%;max-height: 250px" v-if="showTable" :tableConfig="tableConfig"
+            <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
                      :data="otherFileList" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index bfa7431..5908921 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -1,4 +1,5 @@
 <template>
+  <div class="detail-block">
   <baseTitle title="需求上报"></baseTitle>
   <el-form :model="formData" ref="summaryForm" :rules="rules">
     <el-row gutter="50">
@@ -205,17 +206,18 @@
       </el-col>
     </el-row>
   </el-form>
+  <AttachmentUpload label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
+                    @getAttachment="getAttachment"
+                    @getOtherFile="getOtherFile" :showFileList="true"/>
   <!--  <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(summaryForm)">发布</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';
 import {getProcessInfo, requirementReported} from "./api";
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
@@ -226,6 +228,8 @@ const router = useRouter()
 const tagsViewStore = useTagsView()
 const summaryForm = ref()
 const deploymentId = ref()
+const showTable = ref(true)
+const otherFileList = ref([])
 const formData = ref({
   specialFund:null
 })
@@ -254,291 +258,20 @@ const rules = reactive({
   serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}],
 })
-const schame = computed(() => {
-  return [
-    {
-      label: '名称',
-      prop: 'projectName',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '专项资金',
-      prop: 'specialFund',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择专项资金',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '开始时间',
-      prop: 'startTime',
-      component: 'el-date-picker',
-      props: {
-        type: 'datetime',
-        format: 'YYYY-MM-DD HH:mm:ss'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'companyName',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '项目类型',
-      prop: 'projectType',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '结束时间',
-      prop: 'endTime',
-      component: 'el-date-picker',
-      props: {
-        type: 'datetime',
-        format: 'YYYY-MM-DD HH:mm:ss'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '出资类型',
-      prop: 'investmentType',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '项目影响',
-      prop: 'projectImpact',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '所属业务板块',
-      prop: 'businessSegment',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '预期成果形式',
-      prop: 'resultForm',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '预期技术标准制定',
-      prop: 'technicalStandard',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '产学研联合',
-      prop: 'industryUniversityResearch',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '开展政府申报',
-      prop: 'governmentDeclaration',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '知识产权状况',
-      prop: 'intellectualProperty',
-      component: markRaw(fvSelect),
-      props: {
-        placeholder: '请选择项目类型',
-        clearable: true,
-        filterable: true,
-        cacheKey: 'todo_type'
-      },
-      colProps: {
-        span: 12
-      }
-    },
-
-    {
-      label: '发明专利',
-      prop: 'inventionPatent',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 6
-      }
-    },
-    {
-      label: '实用性新型专利',
-      prop: 'newPatent',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 6
-      }
-    },
-    {
-      label: '软件著作权',
-      prop: 'softwareCopyright',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 6
-      }
-    },
-    {
-      label: '著作权',
-      prop: 'copyright',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 6
-      }
-    },
-    {
-      label: '其他',
-      prop: 'other',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 6
-      }
-    }, {
-      label: '经济概算',
-      prop: 'economicEstimate',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 6
-      }
-    }, {
-      label: '申请公司总部科技创新专项资金',
-      prop: 'specialFundAmount',
-      component: 'el-input',
-      props: {},
-      colProps: {
-        span: 6
-      }
-    },
-
-
-    {
-      label: '现有业务描述',
-      prop: 'serviceDescription',
-      component: 'el-input',
-      props: {
-        type: 'textarea'
-      },
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '研发项目关键内容描述',
-      prop: 'contentDescription',
-      component: 'el-input',
-      props: {
-        type: 'textarea'
-      },
-      colProps: {
-        span: 24
-      }
-    }
-    // {
-    //   label: '',
-    //   prop: 'fileList',
-    //   component: markRaw(FileUpload),
-    //   props: {
-    //     url: '',
-    //     tip: '上传txt文件'
-    //   },
-    //   colProps: {
-    //     span: 24
-    //   }
-    // }
-  ]
-})
-
+const getAttachment = (val) => {
+  console.log('上传文件getAttachment', val)
+  let fileObj = compositeParam(val)
+  // fileList.value.push(fileObj)
+}
+const getOtherFile = (val) => {
+  console.log('上传文件getOtherFile', val)
+  showTable.value = false
+  let fileObj = compositeParam(val)
+  otherFileList.value.push(fileObj)
+  nextTick(() => {
+    showTable.value = true
+  })
+}
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid, fields) => {
@@ -578,3 +311,14 @@ init()
 const staging = async () => {
 }
 </script>
+<style lang="scss" scoped>
+
+.detail-block {
+  overflow: hidden;
+  padding-bottom: 30px;
+}
+:deep(.el-table--fit){
+  height: auto!important;
+}
+
+</style>

From ff68ce96af46ed274267da2917a618345ed2b0c8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 11:40:37 +0800
Subject: [PATCH 14/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NameCircle.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue
index 11bc4af..ce06bb4 100644
--- a/src/components/NameCircle.vue
+++ b/src/components/NameCircle.vue
@@ -12,9 +12,10 @@
             <component :is="user.icon"/>
           </el-icon>
         </div>
-      </div>{{user.operationTime}}
+      </div>
       <div class="username" v-if="user.auditOpinion">
-        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="90"/>
+        <div style="margin-bottom: 10px;color: #909399">{{user.operationTime}}</div>
+        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="150"/>
       </div>
     </div>
   </div>

From 10bc0198663d79e38d2c37965267ab3a63329ae4 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 12:29:59 +0800
Subject: [PATCH 15/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue      |  13 +-
 src/views/project-demand/summary/add.vue | 484 ++++++++++++-----------
 2 files changed, 272 insertions(+), 225 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 0b49812..77c66a6 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -72,8 +72,9 @@ const tableConfig = reactive({
   ]
 })
 const rules = reactive({
-  attachment: [{required: true, message: '请上传附件', trigger: 'blur'}],
+  attachment: [{required: true, message: '请上传附件', trigger: ['blur','change']}],
 })
+const applyForm=ref()
 const props = defineProps({
   showFileList: {
     type: Boolean,
@@ -117,7 +118,7 @@ const deleteOtherFile = (row) => {
     deleteFile(row.fileId).then(res => {
       if (res.code === 1000) {
         ElMessage.success("删除成功");
-        otherFileList.value.splice(otherFileList.value.findIndex((item) => item.id === row.fileId), 1);
+        props.otherFileList.splice(props.otherFileList.findIndex((item) => item.id === row.fileId), 1);
       }
     });
   }).catch(() => {
@@ -133,6 +134,14 @@ const handleDownload = (row) => {
     a.click()
   })
 }
+defineExpose({
+  validate(){
+    return applyForm.value.validate()
+  },
+  clearValidate(){
+    return applyForm.value.clearValidate()
+  }
+})
 </script>
 
 <style scoped>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 5908921..6ab76ad 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -1,219 +1,219 @@
 <template>
   <div class="detail-block">
-  <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="companyName">
-          <el-input v-model="formData.companyName" placeholder="请输入所属公司" clearable></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="项目类型" prop="projectType">
-          <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="结束时间" prop="endTime">
-          <el-config-provider>
-            <el-date-picker
-                v-model="formData.endTime"
-                type="datetime"
-                placeholder="截止时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                style="width: 100%"
-            />
-          </el-config-provider>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="出资类型" prop="investmentType">
-          <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="项目影响" prop="projectImpact">
-          <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="所属业务板块" prop="businessSegment">
-          <el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="预期成果形式" prop="resultForm">
-          <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="预期技术标准制定" prop="technicalStandard">
-          <el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="产学研联合" prop="industryUniversityResearch">
-          <el-select v-model="formData.industryUniversityResearch" placeholder="请选择产学研联合" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="开展政府申报" prop="governmentDeclaration">
-          <el-select v-model="formData.governmentDeclaration" placeholder="请选择开展政府申报" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="知识产权状况" prop="intellectualProperty">
-          <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
-            <el-option
-                v-for="item in cacheStore.getDict('todo_type')"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="发明专利(项)" prop="inventionPatent">
-          <el-input v-model="formData.inventionPatent" clearable></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="实用性新型专利(项)" prop="newPatent">
-          <el-input v-model="formData.newPatent" clearable></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="软件著作权(项)" prop="softwareCopyright">
-          <el-input v-model="formData.softwareCopyright" clearable></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="著作权(项)" prop="copyright">
-          <el-input v-model="formData.copyright" clearable></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="其他(项)" prop="other">
-          <el-input v-model="formData.other" clearable></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="经济概算(万元)" prop="economicEstimate">
-          <el-input v-model="formData.economicEstimate" clearable></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
-          <el-input v-model="formData.specialFundAmount" clearable :disabled="formData.specialFund===null"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="现有业务描述" prop="serviceDescription">
-          <el-input v-model="formData.serviceDescription" type="textarea" clearable></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="研发项目关键内容描述" prop="contentDescription">
-          <el-input v-model="formData.contentDescription" type="textarea" clearable></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-  <AttachmentUpload label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
-                    @getAttachment="getAttachment"
-                    @getOtherFile="getOtherFile" :showFileList="true"/>
-  <!--  <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(summaryForm)">发布</el-button>
-  </div>
+    <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="companyName">
+            <el-input v-model="formData.companyName" placeholder="请输入所属公司" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目类型" prop="projectType">
+            <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结束时间" prop="endTime">
+            <el-config-provider>
+              <el-date-picker
+                  v-model="formData.endTime"
+                  type="datetime"
+                  placeholder="截止时间"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+              />
+            </el-config-provider>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="出资类型" prop="investmentType">
+            <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目影响" prop="projectImpact">
+            <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属业务板块" prop="businessSegment">
+            <el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="预期成果形式" prop="resultForm">
+            <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="预期技术标准制定" prop="technicalStandard">
+            <el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产学研联合" prop="industryUniversityResearch">
+            <el-select v-model="formData.industryUniversityResearch" placeholder="请选择产学研联合" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="开展政府申报" prop="governmentDeclaration">
+            <el-select v-model="formData.governmentDeclaration" placeholder="请选择开展政府申报" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="知识产权状况" prop="intellectualProperty">
+            <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('todo_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="发明专利(项)" prop="inventionPatent">
+            <el-input v-model="formData.inventionPatent" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实用性新型专利(项)" prop="newPatent">
+            <el-input v-model="formData.newPatent" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="软件著作权(项)" prop="softwareCopyright">
+            <el-input v-model="formData.softwareCopyright" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="著作权(项)" prop="copyright">
+            <el-input v-model="formData.copyright" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="其他(项)" prop="other">
+            <el-input v-model="formData.other" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="经济概算(万元)" prop="economicEstimate">
+            <el-input v-model="formData.economicEstimate" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
+            <el-input v-model="formData.specialFundAmount" clearable :disabled="formData.specialFund===null"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="现有业务描述" prop="serviceDescription">
+            <el-input v-model="formData.serviceDescription" type="textarea" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="研发项目关键内容描述" prop="contentDescription">
+            <el-input v-model="formData.contentDescription" type="textarea" clearable></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
+                      @getAttachment="getAttachment"
+                      @getOtherFile="getOtherFile" :showFileList="true"/>
+    <!--  <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(summaryForm)">发布</el-button>
+    </div>
   </div>
 </template>
 
@@ -227,11 +227,13 @@ const cacheStore = useCacheStore()
 const router = useRouter()
 const tagsViewStore = useTagsView()
 const summaryForm = ref()
+const attachment = ref()
 const deploymentId = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
+const fileList = ref([])
 const formData = ref({
-  specialFund:null
+  specialFund: null
 })
 const rules = reactive({
   projectName: [{required: true, message: '请输入名称', trigger: 'blur'}],
@@ -254,31 +256,66 @@ const rules = reactive({
   copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}],
   other: [{required: true, message: '请输入其他', trigger: 'blur'}],
   economicEstimate: [{required: true, message: '请输入经济概算', trigger: 'blur'}],
-  specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
+  // specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
   serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
-  contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}],
+  contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]
 })
+const compositeParam = (item, type) => {
+  let tag = ''
+  if (router.currentRoute.value.name === 'Summary/add') {
+    tag = '需求汇总'
+  }
+  return {
+    fileId: item.id,
+    size: item.size,
+    type: type,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    processNodeTag: null,
+    tag: tag
+  }
+}
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  let fileObj = compositeParam(val)
-  // fileList.value.push(fileObj)
+  let fileObj = compositeParam(val, 1)
+  fileList.value.push(fileObj)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
   showTable.value = false
-  let fileObj = compositeParam(val)
+  let fileObj = compositeParam(val, 2)
   otherFileList.value.push(fileObj)
   nextTick(() => {
     showTable.value = true
   })
 }
+const getFileParam = (item) => {
+  return {
+    fileId: item.fileId,
+    type: item.type
+  }
+}
 const handleSubmit = async (instance) => {
   if (!instance) return
   instance.validate(async (valid, fields) => {
+    if(fileList.value.length===0){
+      attachment.value.validate()
+    }else {
+      attachment.value.clearValidate()
+    }
     if (!valid) return
+    let files = []
+    fileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    otherFileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
     let params = {
       ...formData.value,
-      deploymentId: deploymentId.value
+      deploymentId: deploymentId.value,
+      files: files
     }
     let res = await requirementReported(params)
     ElNotification({
@@ -317,8 +354,9 @@ const staging = async () => {
   overflow: hidden;
   padding-bottom: 30px;
 }
-:deep(.el-table--fit){
-  height: auto!important;
+
+:deep(.el-table--fit) {
+  height: auto !important;
 }
 
 </style>

From 89d5c86d8b13609c0467c48e8815a816e6b03f81 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 13:18:03 +0800
Subject: [PATCH 16/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      | 142 ++++++------
 .../DetailComponent/SummaryDetail.vue         | 210 ++++++++++++++++++
 src/views/project-demand/collection/add.vue   |  36 ++-
 src/views/project-demand/summary/detail.vue   |  33 +++
 src/views/project-demand/summary/index.vue    |   8 +-
 .../project-management/initiation/detail.vue  |  47 ++--
 6 files changed, 383 insertions(+), 93 deletions(-)
 create mode 100644 src/components/DetailComponent/SummaryDetail.vue
 create mode 100644 src/views/project-demand/summary/detail.vue

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 03a965b..5bda21d 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -1,36 +1,70 @@
 <template>
   <div v-loading="loading">
-    <fvForm v-if="showForm" ref="form" :schema="schame">
-    </fvForm>
-    <baseTitle title="征集说明"></baseTitle>
-    <el-card style="width: 100%">
-      <div v-html="formData.collectExplain">
+    <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"/>
+        </div>
       </div>
-    </el-card>
-    <baseTitle title="附件列表"></baseTitle>
-    <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>
-    <baseTitle title="审核意见"></baseTitle>
-    <el-form-item prop="auditOpinion">
-      <el-input
-          v-model="formData.auditOpinion"
-          :rows="3"
-          type="textarea"
-          placeholder="请输入审核意见"
-      />
-    </el-form-item>
-    <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"/>
-      </div>
-    </div>
+    </el-form>
   </div>
 </template>
 
@@ -38,8 +72,9 @@
 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','download'])
+const emit = defineEmits(['getInfo'])
 const form = ref()
 const showForm = ref(true)
 const loading = ref(false)
@@ -64,36 +99,6 @@ const props = defineProps({
     default: []
   },
 })
-const schame = computed(() => {
-  return [
-    {
-      label: '名称',
-      prop: 'requirementName',
-      colProps: {
-        span: 12
-      }
-    },
-    {
-      label: '所属公司',
-      prop: 'companyIds',
-      colProps: {
-        span: 12
-      }
-    }, {
-      label: '征集类型',
-      prop: 'collectType',
-      colProps: {
-        span: 12
-      }
-    }, {
-      label: '截止时间',
-      prop: 'deadline',
-      colProps: {
-        span: 12
-      }
-    }
-  ]
-})
 const tableConfig = reactive({
   columns: [
     {
@@ -132,15 +137,17 @@ const tableConfig = reactive({
   ]
 })
 
-const init = (newVal) => {
-  newVal.companyIds = getDataSourceOptionItem(newVal.companyIds)
-  form.value.setValues(newVal)
-}
 const getInfo = () => {
   emit('getInfo')
 }
 const handleDownload = (row) => {
-  emit('download',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) {
@@ -155,7 +162,8 @@ watch(() => props.companyOption, (newVal) => {
 }, {deep: true})
 watch(() => props.formData, (newVal) => {
   if (newVal) {
-    init(newVal)
+    newVal.companyIds = getDataSourceOptionItem(newVal.companyIds)
+    props.formData=newVal
   }
 }, {deep: true})
 watch(() => props.processViewer, (newVal) => {
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
new file mode 100644
index 0000000..860ddb2
--- /dev/null
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -0,0 +1,210 @@
+<template>
+  <el-form :model="formData" ref="summaryForm">
+    <el-row gutter="50">
+      <el-col :span="12">
+        <el-form-item label="名称" prop="requirementName">
+          <span>{{ formData.requirementName }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="专项资金" prop="specialFund">
+          <span>{{ formData.specialFund }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="开始时间" prop="startTime">
+          <span>{{ formData.startTime }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="所属公司" prop="companyName">
+          <span>{{ formData.companyName }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目类型" prop="projectType">
+          <span>{{ formData.projectType }}</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="investmentType">
+          <span>{{ formData.investmentType }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="项目影响" prop="projectImpact">
+          <span>{{ formData.projectImpact }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="所属业务板块" prop="businessSegment">
+          <span>{{ formData.businessSegment }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="预期成果形式" prop="resultForm">
+          <span>{{ formData.resultForm }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="预期技术标准制定" prop="technicalStandard">
+          <span>{{ formData.technicalStandard }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="产学研联合" prop="industryUniversityResearch">
+          <span>{{ formData.industryUniversityResearch }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="开展政府申报" prop="governmentDeclaration">
+          <span>{{ formData.governmentDeclaration }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="知识产权状况" prop="intellectualProperty">
+          <span>{{ formData.intellectualProperty }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="发明专利(项)" prop="inventionPatent">
+          <span>{{ formData.inventionPatent }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="实用性新型专利(项)" prop="newPatent">
+          <span>{{ formData.newPatent }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="软件著作权(项)" prop="softwareCopyright">
+          <span>{{ formData.softwareCopyright }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="著作权(项)" prop="copyright">
+          <span>{{ formData.copyright }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="其他(项)" prop="other">
+          <span>{{ formData.other }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="经济概算(万元)" prop="economicEstimate">
+          <span>{{ formData.economicEstimate }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
+          <span>{{ formData.specialFundAmount }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="现有业务描述" prop="serviceDescription">
+          <span>{{ formData.serviceDescription }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="研发项目关键内容描述" prop="contentDescription">
+          <span>{{ formData.contentDescription }}</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="需求上报申请书">
+          <el-button type="primary" link @click="handleDownload(formData.fileList)">{{formData.fileList}}</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="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-row>
+  </el-form>
+
+</template>
+
+<script setup lang="jsx">
+import {downloadFile} from "@/api/project-demand";
+
+const props = defineProps({
+  formData: {
+    type: Array,
+    default: []
+  },
+  data: {
+    type: Array,
+    default: []
+  },
+  processViewer: {
+    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 = (fileList) => {
+  // 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>
+:deep(.el-table--fit) {
+  height: auto !important;
+}
+
+</style>
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index 03f594e..9b632ff 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -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,downloadFile} 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,ElNotification} 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'
@@ -151,15 +158,15 @@ const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
     let a = document.createElement('a')
-    a.href=URL.createObjectURL(blob)
+    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,
@@ -191,7 +198,7 @@ const init = async () => {
       message: res.msg,
       type: res.code === 1000 ? 'success' : 'error'
     })
-    if(res.code === 1000){
+    if (res.code === 1000) {
       let data = res.data
       processInstanceData.value = data
       processStore.setDesign(data)
@@ -203,19 +210,26 @@ const init = async () => {
       nextTick(() => {
         processDiagramViewer.value = true
       })
-    }else {
+    } else {
     }
   })
 }
-const submitParam=(item)=>{
+const submitParam = (item) => {
+  let files = []
+  item.fileList.forEach(item => {
+    let obj = {
+      fileId: item.fileId,
+    }
+    files.push(obj)
+  })
   return {
     collectExplain: item.collectExplain,
     collectType: item.collectType,
     companyIds: item.companyIds,
     deadline: item.deadline,
-    requirementId: item.requirementId?item.requirementId:0,
+    requirementId: item.requirementId ? item.requirementId : 0,
     requirementName: item.requirementName,
-    files: item.fileList,
+    files: files,
     deploymentId: processInstanceData.value.deploymentId
   }
 }
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
new file mode 100644
index 0000000..415f379
--- /dev/null
+++ b/src/views/project-demand/summary/detail.vue
@@ -0,0 +1,33 @@
+<template>
+  <summary-detail :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"/>
+
+</template>
+
+<script setup lang="jsx">
+import {getInfo} from "@/api/project-demand";
+
+const summaryData = ref({})
+const summaryProcessViewer = ref(false)
+const getDemandSummaryInfo = async () => {
+  if (!route.query.id) return
+  // await getCompanyOption()
+  getInfo(74).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
+    })
+  })
+}
+getDemandSummaryInfo()
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 7dc3c19..7de1892 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -124,7 +124,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
           <div>
-            <el-button type={'primary'} link onClick={()=>{}} >详情</el-button>
+            <el-button type={'primary'} link onClick={()=>handleDetail()} >详情</el-button>
             <el-button type={'primary'} link onClick={()=>handleAdd()} >上报</el-button>
           </div>
         )
@@ -164,6 +164,12 @@ const handleAdd = () => {
     query: {}
   })
 }
+const handleDetail = () => {
+  router.push({
+    name: 'Summary/detail',
+    query: {}
+  })
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 4659bd5..5937b3d 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -7,10 +7,13 @@
         @tab-click="handleClick"
     >
       <el-tab-pane label="需求征集" name="first">
-        <collection-detail :formData="collectionData.formData" :data="collectionData" :processViewer="processViewer"
-                          :companyOption="companyOption" @getInfo="getDemandCollectionInfo" @download="downloadDetailFile"/>
+        <collection-detail :formData="collectionData.formData" :data="collectionData"
+                           :processViewer="collectionProcessViewer"
+                           :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
+      </el-tab-pane>
+      <el-tab-pane label="需求上报" name="second">
+        <summary-detail :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"/>
       </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>
@@ -22,14 +25,19 @@ 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";
 
 const route = useRoute()
 const activeName = ref('first')
 const collectionData = ref({})
-const processViewer = ref(false)
+const summaryData = ref({})
+const collectionProcessViewer = ref(false)
+const summaryProcessViewer = ref(false)
 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
@@ -48,23 +56,34 @@ const getDemandCollectionInfo = async () => {
     processStore.refuseList.value = data.refuseList;
     processStore.passList.value = data.passList;
     nextTick(() => {
-      processViewer.value = true
+      collectionProcessViewer.value = true
     })
   })
 }
-const downloadDetailFile = (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 getDemandSummaryInfo = async () => {
+  if (!route.query.id) return
+  // await getCompanyOption()
+  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()

From 670c8a5653eee7ff0b2a4c4e3f5960ab357836c6 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 13:23:10 +0800
Subject: [PATCH 17/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/detail.vue   |  12 +-
 .../project-management/initiation/detail.vue  |   6 +-
 .../projectdemand/demandcollection/add.vue    | 323 ------------------
 .../projectdemand/demandcollection/detail.vue | 272 ---------------
 .../projectdemand/demandcollection/index.vue  | 157 ---------
 src/views/projectdemand/demandsummary/add.vue | 182 ----------
 .../projectdemand/demandsummary/api/index.js  |  12 -
 .../demandsummary/components/FileUpload.vue   |  75 ----
 .../projectdemand/demandsummary/index.vue     | 168 ---------
 9 files changed, 11 insertions(+), 1196 deletions(-)
 delete mode 100644 src/views/projectdemand/demandcollection/add.vue
 delete mode 100644 src/views/projectdemand/demandcollection/detail.vue
 delete mode 100644 src/views/projectdemand/demandcollection/index.vue
 delete mode 100644 src/views/projectdemand/demandsummary/add.vue
 delete mode 100644 src/views/projectdemand/demandsummary/api/index.js
 delete mode 100644 src/views/projectdemand/demandsummary/components/FileUpload.vue
 delete mode 100644 src/views/projectdemand/demandsummary/index.vue

diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 415f379..30d4f0e 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -1,17 +1,19 @@
 <template>
   <summary-detail :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"/>
-
 </template>
 
 <script setup lang="jsx">
 import {getInfo} from "@/api/project-demand";
-
+import {useProcessStore} from '@/stores/processStore.js';
+const route = useRoute()
 const summaryData = ref({})
-const summaryProcessViewer = ref(false)
+const summaryProcessViewer = ref(true)
+const processStore = useProcessStore()
 const getDemandSummaryInfo = async () => {
-  if (!route.query.id) return
+  // if (!route.query.id) return
   // await getCompanyOption()
-  getInfo(74).then(res => {
+  summaryProcessViewer.value = false
+  getInfo(101).then(res => {
     let data = res.data
     summaryData.value = data;
     processStore.setDesign(data)
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 5937b3d..20174a7 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -31,8 +31,8 @@ const route = useRoute()
 const activeName = ref('first')
 const collectionData = ref({})
 const summaryData = ref({})
-const collectionProcessViewer = ref(false)
-const summaryProcessViewer = ref(false)
+const collectionProcessViewer = ref(true)
+const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
 const companyOption = ref([])
 const rules = reactive({
@@ -46,6 +46,7 @@ const getCompanyOption = async () => {
 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;
@@ -63,6 +64,7 @@ const getDemandCollectionInfo = async () => {
 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;
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
deleted file mode 100644
index da5f052..0000000
--- a/src/views/projectdemand/demandcollection/add.vue
+++ /dev/null
@@ -1,323 +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,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 {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>
-              <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)=>{
-    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>
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
deleted file mode 100644
index bae96d1..0000000
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ /dev/null
@@ -1,272 +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,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'
-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 ( <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 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>
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
deleted file mode 100644
index 5096d8f..0000000
--- a/src/views/projectdemand/demandcollection/index.vue
+++ /dev/null
@@ -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>
diff --git a/src/views/projectdemand/demandsummary/add.vue b/src/views/projectdemand/demandsummary/add.vue
deleted file mode 100644
index 9591b33..0000000
--- a/src/views/projectdemand/demandsummary/add.vue
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/src/views/projectdemand/demandsummary/api/index.js b/src/views/projectdemand/demandsummary/api/index.js
deleted file mode 100644
index e7636c7..0000000
--- a/src/views/projectdemand/demandsummary/api/index.js
+++ /dev/null
@@ -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'
-    }
-  })
-}
\ No newline at end of file
diff --git a/src/views/projectdemand/demandsummary/components/FileUpload.vue b/src/views/projectdemand/demandsummary/components/FileUpload.vue
deleted file mode 100644
index 241e812..0000000
--- a/src/views/projectdemand/demandsummary/components/FileUpload.vue
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/src/views/projectdemand/demandsummary/index.vue b/src/views/projectdemand/demandsummary/index.vue
deleted file mode 100644
index be505a6..0000000
--- a/src/views/projectdemand/demandsummary/index.vue
+++ /dev/null
@@ -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>
\ No newline at end of file

From cb7f6e991979ed8f43774f534a82b27c689fc3b7 Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Sun, 19 May 2024 14:04:28 +0800
Subject: [PATCH 18/36] =?UTF-8?q?feat:=20=E8=AF=A6=E6=83=85=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=20=E5=AE=9E=E4=BE=8B=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/steps/index.vue | 105 +++++++++++++++++++++++++++++++++
 src/views/steps/step/Step1.vue |  17 ++++++
 src/views/steps/step/Step2.vue |  17 ++++++
 src/views/steps/step/Step3.vue |  17 ++++++
 src/views/steps/step/Step4.vue |  17 ++++++
 src/views/steps/step/Step5.vue |  17 ++++++
 src/views/steps/step/index.vue |  39 ++++++++++++
 7 files changed, 229 insertions(+)
 create mode 100644 src/components/steps/index.vue
 create mode 100644 src/views/steps/step/Step1.vue
 create mode 100644 src/views/steps/step/Step2.vue
 create mode 100644 src/views/steps/step/Step3.vue
 create mode 100644 src/views/steps/step/Step4.vue
 create mode 100644 src/views/steps/step/Step5.vue
 create mode 100644 src/views/steps/step/index.vue

diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
new file mode 100644
index 0000000..99ba53c
--- /dev/null
+++ b/src/components/steps/index.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="steps-box">
+    <el-steps :active="localActive">
+      <el-step 
+        v-for="(item, index) in localSteps"
+        :key="item.key"
+        :title="item.title"
+        :class="stepClass(index)"
+        @click="handleStep(item.key, index)"
+      ></el-step>
+    </el-steps>
+  </div>
+
+  <!-- 步骤内容 -->
+  <div>
+    <template v-for="(item, index) in stepList" :key="item.key" >
+      <component v-show="localActive == index" :is="item.component"/>
+    </template>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import { ElNotification } from 'element-plus';
+import { computed, ref, watchEffect } from 'vue';
+
+const props = defineProps({
+  // 步骤对应内容list
+  stepList: {
+    type: Array,
+    default: []
+  },
+  // 当前显示步骤
+  active: {
+    type: Number,
+    default: 0
+  },
+  // 已完成的工作流步骤
+  stepSuccess: {
+    type: Array,
+    default: [0]
+  }
+})
+
+const emits = defineEmits(['stepChange'])
+
+const localActive = ref(0) // 当前激活步骤
+const localSteps = ref([
+  {
+    title: '需求征集',
+    key: 'collect',
+  },
+  {
+    title: '需求上报',
+    key: 'report',
+  },
+  {
+    title: '项目立项',
+    key: 'approve',
+  },
+  {
+    title: '项目实施',
+    key: 'execute',
+  },
+  {
+    title: '项目归档',
+    key: 'archivist',
+  },
+])
+
+const stepClass = (val) => {
+  if(props.stepSuccess.includes(val)) {
+    return 'step-success'
+  }
+  return 'step-error'
+}
+
+const handleStep = (key, index) => {
+  if(props.stepSuccess.includes(index)) {
+    localActive.value = index
+    emits('stepChange', {key, active: index})
+    return
+  }
+  ElNotification({
+    title: '提示',
+    message: '不能查看未完成的工作流信息',
+    type: 'warning'
+  })
+}
+
+watchEffect(()=>{
+  localActive.value = props.active
+})
+</script>
+
+<style lang="scss" scoped>
+.steps-box{
+  padding: 10px 0;
+}
+.step-success {
+  cursor: pointer;
+}
+.step-error {
+  cursor: not-allowed;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/steps/step/Step1.vue b/src/views/steps/step/Step1.vue
new file mode 100644
index 0000000..6489d2e
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/steps/step/Step2.vue b/src/views/steps/step/Step2.vue
new file mode 100644
index 0000000..ab978ab
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/steps/step/Step3.vue b/src/views/steps/step/Step3.vue
new file mode 100644
index 0000000..6489d2e
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/steps/step/Step4.vue b/src/views/steps/step/Step4.vue
new file mode 100644
index 0000000..6489d2e
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/steps/step/Step5.vue b/src/views/steps/step/Step5.vue
new file mode 100644
index 0000000..18f3df9
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/views/steps/step/index.vue b/src/views/steps/step/index.vue
new file mode 100644
index 0000000..111cea2
--- /dev/null
+++ b/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>
\ No newline at end of file

From 3bd6df74ccdd9f4e2e748bb52781f381d31201b2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 15:27:22 +0800
Subject: [PATCH 19/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AE=B0=E5=BD=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NameCircle.vue |  2 +-
 src/components/Tooltip.vue    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue
index ce06bb4..eb79bbc 100644
--- a/src/components/NameCircle.vue
+++ b/src/components/NameCircle.vue
@@ -15,7 +15,7 @@
       </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="150"/>
+        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="150" :lines="true"/>
       </div>
     </div>
   </div>
diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue
index b06b081..2cddc67 100644
--- a/src/components/Tooltip.vue
+++ b/src/components/Tooltip.vue
@@ -5,7 +5,7 @@
       placement="bottom-start"
       :disabled="isShow"
   >
-    <div class="content" :style="{width: props.width+'px'}" @mouseover="isShowTooltip">
+    <div :class="lines?'content-lines':'content'" :style="{width: props.width+'px'}" @mouseover="isShowTooltip">
       <span ref="contentRef">
         <slot name="content">{{ props.content }}</slot>
       </span>
@@ -20,6 +20,9 @@ const props = defineProps({
   }, width: {
     type: String,
     default: ''
+  }, lines: {
+    type: Boolean,
+    default: false
   }
 })
 const contentRef = ref()
@@ -36,4 +39,11 @@ const isShowTooltip = () => {
   white-space: nowrap;
   overflow: hidden;
 }
+.content-lines{
+  overflow:hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
 </style>

From 5421145583ae38c848aecfac06030bf6a8d3cf62 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 16:19:53 +0800
Subject: [PATCH 20/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NameCircle.vue                 |  2 +-
 src/views/project-demand/collection/add.vue   |  2 +-
 src/views/project-demand/collection/index.vue |  2 --
 src/views/project-demand/summary/add.vue      | 12 +++++++++---
 src/views/project-demand/summary/api/index.js |  6 ++++++
 src/views/project-demand/summary/detail.vue   |  6 +++---
 src/views/project-demand/summary/index.vue    | 18 +++++++++++++-----
 7 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue
index eb79bbc..4cf79d8 100644
--- a/src/components/NameCircle.vue
+++ b/src/components/NameCircle.vue
@@ -15,7 +15,7 @@
       </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="150" :lines="true"/>
+        <Tooltip :content="user.auditOpinion" placement="bottom-start" width="140" :lines="true"/>
       </div>
     </div>
   </div>
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index 9b632ff..46c3d17 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -250,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)
diff --git a/src/views/project-demand/collection/index.vue b/src/views/project-demand/collection/index.vue
index a8ede61..1957aa4 100644
--- a/src/views/project-demand/collection/index.vue
+++ b/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%'}}>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 6ab76ad..52f8b6c 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -34,8 +34,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="所属公司" prop="companyName">
-            <el-input v-model="formData.companyName" placeholder="请输入所属公司" clearable></el-input>
+          <el-form-item label="所属公司" prop="affiliatedCompanyId">
+            <el-input v-model="formData.affiliatedCompanyId" placeholder="请输入所属公司" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -50,6 +50,11 @@
             </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="endTime">
             <el-config-provider>
@@ -315,7 +320,8 @@ const handleSubmit = async (instance) => {
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
-      files: files
+      files: files,
+      requirementId:102
     }
     let res = await requirementReported(params)
     ElNotification({
diff --git a/src/views/project-demand/summary/api/index.js b/src/views/project-demand/summary/api/index.js
index a0c5b30..98ea624 100644
--- a/src/views/project-demand/summary/api/index.js
+++ b/src/views/project-demand/summary/api/index.js
@@ -24,3 +24,9 @@ export const getProcessInfo = () => {
     method: "post"
   });
 };
+export const getDetail = (requirementId) => {
+  return request({
+    url: `/workflow/mosr/requirement/collect/info/${requirementId}`,
+    method: "get"
+  });
+};
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 30d4f0e..a8ef96f 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -3,17 +3,17 @@
 </template>
 
 <script setup lang="jsx">
-import {getInfo} from "@/api/project-demand";
 import {useProcessStore} from '@/stores/processStore.js';
+import {getDetail} from "./api";
 const route = useRoute()
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
 const getDemandSummaryInfo = async () => {
-  // if (!route.query.id) return
+  if (!route.query.id) return
   // await getCompanyOption()
   summaryProcessViewer.value = false
-  getInfo(101).then(res => {
+  getDetail(route.query.id).then(res => {
     let data = res.data
     summaryData.value = data;
     processStore.setDesign(data)
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 7de1892..a2533a6 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -114,7 +114,13 @@ const tableConfig = reactive({
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
+      currentRender: ({row, index}) => {
+        if(row.state!==null){
+          return (<Tag dictType={'demand_collection'} value={row.state}/>)
+        }else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'oper',
@@ -124,8 +130,8 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
           <div>
-            <el-button type={'primary'} link onClick={()=>handleDetail()} >详情</el-button>
-            <el-button type={'primary'} link onClick={()=>handleAdd()} >上报</el-button>
+            <el-button type={'primary'} link onClick={()=>handleDetail(row)} >详情</el-button>
+            <el-button type={'primary'} link onClick={()=>handleAdd(row)} >上报</el-button>
           </div>
         )
       }
@@ -164,10 +170,12 @@ const handleAdd = () => {
     query: {}
   })
 }
-const handleDetail = () => {
+const handleDetail = (row) => {
   router.push({
     name: 'Summary/detail',
-    query: {}
+    query: {
+      id:row.requirementId
+    }
   })
 }
 </script>

From 1fc0ae6ac037ca6ddc8e8aaf923055d29a088886 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 16:40:05 +0800
Subject: [PATCH 21/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AB=8B=E9=A1=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project-management/initiation/index.vue   | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 094c11e..939052b 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -93,12 +93,16 @@ const tableIns = ref()
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'name',
+      prop: 'requirementName',
       label: '名称',
       align: 'center'
     },
     {
-      prop: 'company',
+      prop: 'undertaker',
+      label: '承办单位',
+      align: 'center'
+    }, {
+      prop: 'affiliatedCompanyId',
       label: '所属公司',
       align: 'center'
     },
@@ -108,12 +112,12 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'productMainBody',
+      prop: 'rdSubject',
       label: '研发主体',
       align: 'center'
     },
     {
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       label: '项目影响',
       align: 'center'
     },
@@ -123,16 +127,16 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'time',
-      label: '起止时间',
+      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}) => (<Tag dictType={'project_initiation'} value={row.state}/>)
     },
     {
       prop: 'oper',
@@ -141,10 +145,11 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
-        if (row.state === '3') {
+        if (row.state === '4') {
           btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        } else if (row.state === '4') {
           btn.push({label: '申请', func: () => handleApply(row), type: 'primary'})
+        } else if (row.state === '4') {
+
         }
         return (
             <div style={{width: '100%'}}>
@@ -165,7 +170,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '/workflow/mosr/requirement',
+  api: '/workflow/mosr/project/approval',
   params: {},
 })
 

From 08a609e2a836cb4c02ed48ddf79110acda7f62d2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 18:00:48 +0800
Subject: [PATCH 22/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         |  23 +++-
 src/views/project-demand/summary/add.vue      | 114 +++++++++++-----
 src/views/project-demand/summary/index.vue    |  57 ++++----
 .../implementation/check.vue                  |  48 ++++++-
 .../implementation/index.vue                  |  53 ++++++--
 .../project-management/initiation/apply.vue   | 126 ++++++++++--------
 .../project-management/initiation/index.vue   |  26 ++--
 7 files changed, 291 insertions(+), 156 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 860ddb2..5946af3 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -16,6 +16,11 @@
           <span>{{ formData.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="companyName">
           <span>{{ formData.companyName }}</span>
@@ -26,11 +31,6 @@
           <span>{{ formData.projectType }}</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="investmentType">
           <span>{{ formData.investmentType }}</span>
@@ -132,13 +132,22 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <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>
 
 </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'
 const props = defineProps({
   formData: {
     type: Array,
@@ -153,6 +162,8 @@ const props = defineProps({
     default: false
   },
 })
+const processInstanceData = ref({})
+const processDiagramViewer = ref(false)
 const tableConfig = reactive({
   columns: [
     {
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 52f8b6c..145cfda 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -26,7 +26,20 @@
               <el-date-picker
                   v-model="formData.startTime"
                   type="datetime"
-                  placeholder="截止时间"
+                  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%"
               />
@@ -35,7 +48,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="所属公司" prop="affiliatedCompanyId">
-            <el-input v-model="formData.affiliatedCompanyId" placeholder="请输入所属公司" clearable></el-input>
+            <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">
@@ -55,19 +75,7 @@
             <el-input v-model="formData.rdSubject" placeholder="请输入研发主体" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="结束时间" prop="endTime">
-            <el-config-provider>
-              <el-date-picker
-                  v-model="formData.endTime"
-                  type="datetime"
-                  placeholder="截止时间"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                  style="width: 100%"
-              />
-            </el-config-provider>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="12">
           <el-form-item label="出资类型" prop="investmentType">
             <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
@@ -196,7 +204,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
-            <el-input v-model="formData.specialFundAmount" clearable :disabled="formData.specialFund===null"></el-input>
+            <el-input v-model="formData.specialFundAmount" clearable></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -227,10 +235,12 @@ import {getProcessInfo, requirementReported} from "./api";
 import {ElNotification} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useCacheStore} from '@/stores/cache.js'
+import {getSubCompOpt} from "../../../api/user/user";
 
 const cacheStore = useCacheStore()
 const router = useRouter()
 const tagsViewStore = useTagsView()
+const companyOption = ref([])
 const summaryForm = ref()
 const attachment = ref()
 const deploymentId = ref()
@@ -244,7 +254,8 @@ const rules = reactive({
   projectName: [{required: true, message: '请输入名称', trigger: 'blur'}],
   specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
   startTime: [{required: true, message: '请选择开始时间', trigger: 'blur'}],
-  companyName: [{required: true, message: '请输入所属公司', trigger: 'blur'}],
+  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'}],
@@ -261,14 +272,14 @@ const rules = reactive({
   copyright: [{required: true, message: '请输入著作权', trigger: 'blur'}],
   other: [{required: true, message: '请输入其他', trigger: 'blur'}],
   economicEstimate: [{required: true, message: '请输入经济概算', trigger: 'blur'}],
-  // specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
+  specialFundAmount: [{required: true, message: '请输入专项资金', trigger: 'blur'}],
   serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: 'blur'}],
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: 'blur'}]
 })
 const compositeParam = (item, type) => {
   let tag = ''
   if (router.currentRoute.value.name === 'Summary/add') {
-    tag = '需求汇总'
+    tag = '需求上报'
   }
   return {
     fileId: item.id,
@@ -302,14 +313,48 @@ const getFileParam = (item) => {
   }
 }
 const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid, fields) => {
-    if(fileList.value.length===0){
-      attachment.value.validate()
-    }else {
-      attachment.value.clearValidate()
-    }
-    if (!valid) return
+  let params = {
+    "specialFund": "2",
+    "projectName": "3",
+    "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": 93,
+    "serviceDescription": "3",
+    "contentDescription": "3",
+    "specialFundAmount": "3",
+    "deploymentId": "e75b2040-15b4-11ef-8cdf-f268fc747b04",
+    "files": [
+      {
+        "fileId": 207,
+        "type": 1
+      },
+    ],
+    "requirementId": 102
+  }
+  // if (!instance) return
+  // instance.validate(async (valid, fields) => {
+  //   if (fileList.value.length === 0) {
+  //     attachment.value.validate()
+  //   } else {
+  //     attachment.value.clearValidate()
+  //   }
+  //   if (!valid) return
     let files = []
     fileList.value.forEach(item => {
       files.push(getFileParam(item))
@@ -317,12 +362,11 @@ const handleSubmit = async (instance) => {
     otherFileList.value.forEach(item => {
       files.push(getFileParam(item))
     })
-    let params = {
-      ...formData.value,
-      deploymentId: deploymentId.value,
-      files: files,
-      requirementId:102
-    }
+    // ...formData.value,
+    //   deploymentId: deploymentId.value,
+    //   files: files,
+    //   requirementId:102
+    // }
     let res = await requirementReported(params)
     ElNotification({
       title: '提示',
@@ -335,9 +379,11 @@ const handleSubmit = async (instance) => {
         name: 'Summary'
       })
     }
-  })
+  // })
 }
 const init = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
   getProcessInfo().then(res => {
     ElNotification({
       title: '提示',
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index a2533a6..49a5cce 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -4,15 +4,13 @@
 </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()
 
 
@@ -99,11 +97,6 @@ const tableConfig = reactive({
       label: '项目影响',
       align: 'center'
     },
-    {
-      prop: 'survey',
-      label: '经营概况',
-      align: 'center'
-    },
     {
       prop: 'startTime',
       label: '起止时间',
@@ -115,9 +108,9 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if(row.state!==null){
+        if (row.state !== null) {
           return (<Tag dictType={'demand_collection'} value={row.state}/>)
-        }else {
+        } else {
           return '--'
         }
       }
@@ -128,11 +121,27 @@ const tableConfig = reactive({
       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={()=>handleDetail(row)} >详情</el-button>
-            <el-button type={'primary'} link onClick={()=>handleAdd(row)} >上报</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>
         )
       }
     }
@@ -140,15 +149,14 @@ const tableConfig = reactive({
   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
@@ -158,8 +166,9 @@ const search = (val) => {
 }
 
 const headBtnClick = (key) => {
-  switch(key) {
-    case 'add': handleAdd()
+  switch (key) {
+    case 'add':
+      handleAdd()
       break;
   }
 }
@@ -174,7 +183,7 @@ const handleDetail = (row) => {
   router.push({
     name: 'Summary/detail',
     query: {
-      id:row.requirementId
+      id: row.requirementId
     }
   })
 }
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index edbf2f4..f259f6a 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -27,8 +27,8 @@ const showTable = ref(true)
 const otherFileList = ref([])
 const compositeParam = (item) => {
   let tag=''
-  if(!formData.value.collectType&&router.currentRoute.value.name==='Implementation/check'){
-    tag='项目实施'
+  if(router.currentRoute.value.name==='Implementation/check'){
+    tag='项目验收'
   }
   return {
     fileId: item.id,
@@ -42,25 +42,59 @@ const compositeParam = (item) => {
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  let fileObj = compositeParam(val)
-  // fileList.value.push(fileObj)
+  let fileObj = compositeParam(val, 1)
+  fileList.value.push(fileObj)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
   showTable.value = false
-  let fileObj = compositeParam(val)
+  let fileObj = compositeParam(val, 2)
   otherFileList.value.push(fileObj)
   nextTick(() => {
     showTable.value = true
   })
 }
 
-
+const getFileParam = (item) => {
+  return {
+    fileId: item.fileId,
+    type: item.type
+  }
+}
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-
+    if(fileList.value.length===0){
+      applyForm.value.validate()
+    }else {
+      applyForm.value.clearValidate()
+    }
+    if (!valid) return
+    let files = []
+    fileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    otherFileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    let params = {
+      // deploymentId: deploymentId.value,
+      files: files
+    }
+    console.log('params',params)
+    // 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'
+    //   })
+    // }
   })
 }
 </script>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 167a4ba..5672499 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -121,11 +121,6 @@ const tableConfig = reactive({
       label: '项目影响',
       align: 'center'
     },
-    {
-      prop: 'survey',
-      label: '经营概况',
-      align: 'center'
-    },
     {
       prop: 'time',
       label: '起止时间',
@@ -146,11 +141,12 @@ const tableConfig = reactive({
       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'})
+          btn.push(
+              {label: '验收', func: () => handleCheck(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%'}}>
@@ -174,7 +170,7 @@ const tableConfig = reactive({
   api: '',
   params: {},
   btns: [
-    {name: '生成分摊报表', key: '_export', color: '#DED0B2',auth: ''}
+    {name: '生成分摊报表', key: '_export', color: '#DED0B2', auth: ''}
   ]
 })
 
@@ -185,11 +181,42 @@ const search = (val) => {
 
 const handleDetail = (row) => {
   router.push({
-    name:'Implementation/detail',
+    name: 'Implementation/detail',
+    query: {
+      id: row.requirementId
+    }
+  })
+}
+const handleCheck = (row) => {
+  router.push({
+    name: 'Implementation/check',
+    query: {
+      id: row.requirementId
+    }
+  })
+}
+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>
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index c0c9c01..4ceec9d 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -8,26 +8,11 @@
             <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"/>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
     </div>
@@ -35,13 +20,14 @@
 </template>
 
 <script setup lang="jsx">
-import FileUpload from "@/components/FileUpload.vue";
-
+import {useTagsView} from '@/stores/tagsview.js'
+const tagsViewStore = useTagsView()
+const router = useRouter()
 const formData = ref({})
 const rules = reactive({
   attachment: [{required: true, message: '请上传项目立项附件', trigger: 'blur'}],
 })
-const fileList = ref(null)
+const fileList = ref([])
 const applyForm = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
@@ -70,65 +56,91 @@ 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 compositeParam = (item) => {
+const compositeParam = (item, type) => {
+  let tag = ''
+  if (router.currentRoute.value.name === 'Initiation/apply') {
+    tag = '项目立项申请'
+  }
   return {
     fileId: item.id,
     size: item.size,
+    type: type,
     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)
+  let fileObj = compositeParam(val, 1)
+  fileList.value.push(fileObj)
+}
+const getOtherFile = (val) => {
+  console.log('上传文件getOtherFile', val)
   showTable.value = false
+  let fileObj = compositeParam(val, 2)
+  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,
+    type: item.type
+  }
 }
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
+    if(fileList.value.length===0){
+      applyForm.value.validate()
+    }else {
+      applyForm.value.clearValidate()
+    }
     if (!valid) return
-
+    let files = []
+    fileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    otherFileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    let params = {
+      // deploymentId: deploymentId.value,
+      files: files
+    }
+    console.log('params',params)
+    // 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'
+    //   })
+    // }
   })
 }
 </script>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 939052b..0b387f1 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -93,15 +93,11 @@ const tableIns = ref()
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'requirementName',
+      prop: 'projectName',
       label: '名称',
       align: 'center'
     },
     {
-      prop: 'undertaker',
-      label: '承办单位',
-      align: 'center'
-    }, {
       prop: 'affiliatedCompanyId',
       label: '所属公司',
       align: 'center'
@@ -121,14 +117,9 @@ const tableConfig = reactive({
       label: '项目影响',
       align: 'center'
     },
-    {
-      prop: 'survey',
-      label: '经营概况',
-      align: 'center'
-    },
     {
       prop: 'startTime',
-      label: '起始时间',
+      label: '起止时间',
       align: 'center'
     },
     {
@@ -136,7 +127,13 @@ const tableConfig = reactive({
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'project_initiation'} value={row.state}/>)
+      currentRender: ({row, index}) =>{
+        if (row.state !== null) {
+          return (<Tag dictType={'project_initiation'} value={row.state}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'oper',
@@ -145,11 +142,10 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
-        if (row.state === '4') {
+        if (row.state === '3') {
           btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+        } else if (row.state === '20') {
           btn.push({label: '申请', func: () => handleApply(row), type: 'primary'})
-        } else if (row.state === '4') {
-
         }
         return (
             <div style={{width: '100%'}}>

From 8155a4d16090eab3c20524ea1c4bfe89a17795da Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Sun, 19 May 2024 20:17:55 +0800
Subject: [PATCH 23/36] =?UTF-8?q?feat:=20=E9=9C=80=E6=B1=82=E4=B8=8A?=
 =?UTF-8?q?=E6=8A=A5=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         |  75 ++++---
 src/components/steps/api/index.js             |  15 ++
 src/components/steps/index.vue                | 185 ++++++++++++++++--
 src/views/project-demand/summary/detail.vue   |  61 +++++-
 src/views/project-demand/summary/index.vue    |   4 +-
 5 files changed, 289 insertions(+), 51 deletions(-)
 create mode 100644 src/components/steps/api/index.js

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 860ddb2..d011b57 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -1,130 +1,130 @@
 <template>
-  <el-form :model="formData" ref="summaryForm">
+  <el-form :model="localFormData" ref="summaryForm">
     <el-row gutter="50">
       <el-col :span="12">
         <el-form-item label="名称" prop="requirementName">
-          <span>{{ formData.requirementName }}</span>
+          <span>{{ localFormData.requirementId }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="专项资金" prop="specialFund">
-          <span>{{ formData.specialFund }}</span>
+          <span>{{ localFormData.specialFund }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="开始时间" prop="startTime">
-          <span>{{ formData.startTime }}</span>
+          <span>{{ localFormData.startTime }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="所属公司" prop="companyName">
-          <span>{{ formData.companyName }}</span>
+          <span>{{ localFormData.companyName }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="项目类型" prop="projectType">
-          <span>{{ formData.projectType }}</span>
+          <span>{{ localFormData.projectType }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="结束时间" prop="endTime">
-          <span>{{ formData.endTime }}</span>
+          <span>{{ localFormData.endTime }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="出资类型" prop="investmentType">
-          <span>{{ formData.investmentType }}</span>
+          <span>{{ localFormData.investmentType }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="项目影响" prop="projectImpact">
-          <span>{{ formData.projectImpact }}</span>
+          <span>{{ localFormData.projectImpact }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="所属业务板块" prop="businessSegment">
-          <span>{{ formData.businessSegment }}</span>
+          <span>{{ localFormData.businessSegment }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="预期成果形式" prop="resultForm">
-          <span>{{ formData.resultForm }}</span>
+          <span>{{ localFormData.resultForm }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="预期技术标准制定" prop="technicalStandard">
-          <span>{{ formData.technicalStandard }}</span>
+          <span>{{ localFormData.technicalStandard }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="产学研联合" prop="industryUniversityResearch">
-          <span>{{ formData.industryUniversityResearch }}</span>
+          <span>{{ localFormData.industryUniversityResearch }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="开展政府申报" prop="governmentDeclaration">
-          <span>{{ formData.governmentDeclaration }}</span>
+          <span>{{ localFormData.governmentDeclaration }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="知识产权状况" prop="intellectualProperty">
-          <span>{{ formData.intellectualProperty }}</span>
+          <span>{{ localFormData.intellectualProperty }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="6">
         <el-form-item label="发明专利(项)" prop="inventionPatent">
-          <span>{{ formData.inventionPatent }}</span>
+          <span>{{ localFormData.inventionPatent }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="6">
         <el-form-item label="实用性新型专利(项)" prop="newPatent">
-          <span>{{ formData.newPatent }}</span>
+          <span>{{ localFormData.newPatent }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="6">
         <el-form-item label="软件著作权(项)" prop="softwareCopyright">
-          <span>{{ formData.softwareCopyright }}</span>
+          <span>{{ localFormData.softwareCopyright }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="6">
         <el-form-item label="著作权(项)" prop="copyright">
-          <span>{{ formData.copyright }}</span>
+          <span>{{ localFormData.copyright }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="6">
         <el-form-item label="其他(项)" prop="other">
-          <span>{{ formData.other }}</span>
+          <span>{{ localFormData.other }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="6">
         <el-form-item label="经济概算(万元)" prop="economicEstimate">
-          <span>{{ formData.economicEstimate }}</span>
+          <span>{{ localFormData.economicEstimate }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="6">
         <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
-          <span>{{ formData.specialFundAmount }}</span>
+          <span>{{ localFormData.specialFundAmount }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="24">
         <el-form-item label="现有业务描述" prop="serviceDescription">
-          <span>{{ formData.serviceDescription }}</span>
+          <span>{{ localFormData.serviceDescription }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="24">
         <el-form-item label="研发项目关键内容描述" prop="contentDescription">
-          <span>{{ formData.contentDescription }}</span>
+          <span>{{ localFormData.contentDescription }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="24">
         <el-form-item label="需求上报申请书">
-          <el-button type="primary" link @click="handleDownload(formData.fileList)">{{formData.fileList}}</el-button>
+          <el-button type="primary" link @click="handleDownload(localFormData.fileList)">{{localFormData.fileList}}</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="formData.fileList" :isSettingCol="false" :pagination="false">
+                   :data="localFormData.fileList" :isSettingCol="false" :pagination="false">
             <template #empty>
               <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
             </template>
@@ -138,21 +138,25 @@
 
 <script setup lang="jsx">
 import {downloadFile} from "@/api/project-demand";
+import { watch, watchEffect } from "vue";
 
 const props = defineProps({
   formData: {
-    type: Array,
-    default: []
+    type: Object,
+    default: {}
   },
   data: {
-    type: Array,
-    default: []
+    type: Object,
+    default: {}
   },
   processViewer: {
     type: Boolean,
     default: false
   },
 })
+const localFormData = ref({})
+const summaryForm = ref()
+
 const tableConfig = reactive({
   columns: [
     {
@@ -200,6 +204,17 @@ const handleDownload = (fileList) => {
   //   a.click()
   // })
 }
+
+watch(
+  ()=>props.formData,
+  (val)=>{
+    console.log(val, 'ssss');
+  }
+)
+
+watchEffect(()=>{
+  Object.keys(props.formData).length && (localFormData.value = props.formData)
+})
 </script>
 
 <style scoped>
diff --git a/src/components/steps/api/index.js b/src/components/steps/api/index.js
new file mode 100644
index 0000000..a6d331c
--- /dev/null
+++ b/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'
+  })
+}
\ No newline at end of file
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 99ba53c..246a254 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -1,27 +1,34 @@
 <template>
+  <baseTitle title="基础信息"></baseTitle>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
+  <baseTitle title="各流程信息"></baseTitle>
   <div class="steps-box">
-    <el-steps :active="localActive">
+    <el-steps :active="localActive" finish-status="success">
       <el-step 
-        v-for="(item, index) in localSteps"
-        :key="item.key"
-        :title="item.title"
+        v-for="(item, index) in localSteps" 
+        :key="item.key" 
+        :title="item.title" 
         :class="stepClass(index)"
-        @click="handleStep(item.key, index)"
-      ></el-step>
+        @click="handleStep(item.key, index)" 
+        
+      />
     </el-steps>
   </div>
 
   <!-- 步骤内容 -->
   <div>
-    <template v-for="(item, index) in stepList" :key="item.key" >
-      <component v-show="localActive == index" :is="item.component"/>
-    </template>
+    <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 { ElNotification } from 'element-plus';
-import { computed, ref, watchEffect } from 'vue';
+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
@@ -37,13 +44,20 @@ const props = defineProps({
   // 已完成的工作流步骤
   stepSuccess: {
     type: Array,
-    default: [0]
+    default: ['00']
   }
 })
 
-const emits = defineEmits(['stepChange'])
+const route = useRoute()
+
+const emits = defineEmits(['stepChange', 'setDetail'])
+
+const localData = reactive({
+
+})
 
 const localActive = ref(0) // 当前激活步骤
+
 const localSteps = ref([
   {
     title: '需求征集',
@@ -67,17 +81,133 @@ const localSteps = ref([
   },
 ])
 
+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(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 4: arr.push('40')
+          break
+      }
+    })
+  }
+}
+
+const formatActive = (val) => {
+  console.log(val, 'val');
+  let active = ''
+  switch(val) {
+    case '0' || 0 : active = '00'
+      break
+    case '1' || 1 : active = '10'
+      break
+    case '2' || 2 : active = '20'
+      break
+    case '3' || 3 : active = '30'
+      break
+    case '4' || 4 : active = '40'
+      break
+  }
+  console.log(active, 'active--');
+  return active
+}
+
 const stepClass = (val) => {
-  if(props.stepSuccess.includes(val)) {
+  if (localStepSuccess.value.includes(val)) {
     return 'step-success'
   }
   return 'step-error'
 }
 
 const handleStep = (key, index) => {
-  if(props.stepSuccess.includes(index)) {
+  if (localStepSuccess.value.includes(index)) {
+    let active = ''
     localActive.value = index
-    emits('stepChange', {key, active: index})
+    switch(index) {
+      case 0: active = '00'
+        break
+      case 1: active = '10'
+        break
+      case 2: active = '20'
+        break
+      case 3: active = '30'
+        break
+      case 4: active = '40'
+        break
+    }
+    emits('stepChange', { key, active })
     return
   }
   ElNotification({
@@ -87,18 +217,37 @@ const handleStep = (key, index) => {
   })
 }
 
-watchEffect(()=>{
+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{
+.steps-box {
   padding: 10px 0;
 }
+
 .step-success {
   cursor: pointer;
 }
+
 .step-error {
   cursor: not-allowed;
 }
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index a8ef96f..7ffc6a0 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -1,14 +1,24 @@
 <template>
-  <summary-detail :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"/>
+  <steps :active="active" @setDetail="setDetail" @stepChange="stepChange">
+    <template #content>
+      <span v-show="showActive == '00'">需求征集</span>
+      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"/>
+    </template>
+  </steps>
 </template>
 
 <script setup lang="jsx">
+import SummaryDetail from '../../../components/DetailComponent/SummaryDetail.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 import {getDetail} from "./api";
+import { markRaw, reactive, ref, shallowRef } from 'vue';
+import { getMapProjectStateInfo } from '../../../components/steps/api';
 const route = useRoute()
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
+const active = route.query.state
+const showActive = ref()
 const getDemandSummaryInfo = async () => {
   if (!route.query.id) return
   // await getCompanyOption()
@@ -27,7 +37,54 @@ const getDemandSummaryInfo = async () => {
     })
   })
 }
-getDemandSummaryInfo()
+// getDemandSummaryInfo()
+
+const getInfo = async (state) => {
+  const projectId = route.query.projectId
+  const { code, data } = await getMapProjectStateInfo(projectId, state)
+  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(() => {
+    // stepList[1].props.formData = data.formData
+    // stepList[1].props.data = data
+    // stepList[1].props.processViewer = true
+    summaryProcessViewer.value = true
+  })
+}
+
+const setDetail = (active) => {
+  showActive.value = active
+  getInfo(active)
+}
+
+const stepChange = (data) => {
+  console.log(data)
+  showActive.value = data.active
+}
+
+const summaryDetailRef = ref()
+
+// const stepList = reactive([
+//   {
+//     key: 'collect',
+//     component: ()=>(<span>需求征集</span>)
+//   },
+//   {
+//     key: 'report',
+//     component: ()=>(<SummaryDetail ref={summaryDetailRef.value}></SummaryDetail>),
+//     props: {
+//       formData: summaryData.value.formData,
+//       data: summaryData.value,
+//       processViewer: summaryProcessViewer.value
+//     }
+//   }
+// ])
+
 </script>
 
 <style scoped>
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index a2533a6..3fa6eb3 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -174,7 +174,9 @@ const handleDetail = (row) => {
   router.push({
     name: 'Summary/detail',
     query: {
-      id:row.requirementId
+      id:row.requirementId,
+      projectId: row.projectId,
+      state: row.state
     }
   })
 }

From 1f4389eb5e149e0a7dd0723fcf75202bca877524 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 19 May 2024 20:39:54 +0800
Subject: [PATCH 24/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=94=B3=E8=AF=B7/=E9=AA=8C=E6=94=B6/=E7=BB=93?=
 =?UTF-8?q?=E9=A1=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-manage/index.js               |  43 +++++
 src/assets/styles/index.scss                  |   2 +-
 .../project-management/filing/conclusion.vue  | 159 +++++++++++-------
 src/views/project-management/filing/index.vue |  42 +++--
 .../implementation/account.vue                |  19 ++-
 .../implementation/check.vue                  |  66 ++++++--
 .../implementation/index.vue                  |  42 +++--
 .../implementation/uploadFee.vue              |  84 +++++++++
 .../project-management/initiation/apply.vue   |  64 +++++--
 .../project-management/initiation/index.vue   |  10 +-
 10 files changed, 409 insertions(+), 122 deletions(-)
 create mode 100644 src/api/project-manage/index.js
 create mode 100644 src/views/project-management/implementation/uploadFee.vue

diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js
new file mode 100644
index 0000000..4bc11b4
--- /dev/null
+++ b/src/api/project-manage/index.js
@@ -0,0 +1,43 @@
+import request from '@/utils/request.js'
+
+export const getProcessInfo = () => {
+  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 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 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
+  });
+};
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index d2f3ceb..4f3a807 100644
--- a/src/assets/styles/index.scss
+++ b/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;
 }
 
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index ad0a318..50ed9ab 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -2,26 +2,13 @@
   <div class="apply-block">
     <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
       <baseTitle title="项目结项"></baseTitle>
-      <el-row>
-        <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>
+      <AttachmentUpload label="项目结项附件" :showTable="showTable" :otherFileList="otherFileList"
+                        @getAttachment="getAttachment"
+                        @getOtherFile="getOtherFile" :showFileList="true"/>
+      <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>
@@ -30,17 +17,26 @@
 </template>
 
 <script setup lang="jsx">
-import FileUpload from "@/components/FileUpload.vue";
+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} from "@/api/project-manage";
 
 const formData = ref({})
 const rules = reactive({
   attachment: [{required: true, message: '请上传项目结项附件', trigger: 'blur'}],
 })
-const fileList = ref(null)
+const fileList = 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 router = useRouter()
+const route = useRoute()
 const tableConfig = reactive({
   columns: [
     {
@@ -66,31 +62,35 @@ const tableConfig = reactive({
       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>
-        )
-      }
-    }
+    // {
+    //   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.href = URL.createObjectURL(blob)
     a.download = row.originalFileName
     a.click()
   })
 }
 const compositeParam = (item) => {
+  let tag = ''
+  if (router.currentRoute.value.name === 'Filing/conclusion') {
+    tag = '项目结项'
+  }
   return {
     fileId: item.id,
     size: item.size,
@@ -98,43 +98,88 @@ const compositeParam = (item) => {
     fileType: item.fileType,
     url: item.url,
     processNodeTag: null,
-    tag: formData.value.collectType
+    tag: tag
   }
 }
 const getAttachment = (val) => {
-  console.log('上传文件', val)
+  console.log('上传文件getAttachment', val)
+  let fileObj = compositeParam(val, 1)
+  fileList.value.push(fileObj)
+}
+const getOtherFile = (val) => {
+  console.log('上传文件getOtherFile', val)
   showTable.value = false
+  let fileObj = compositeParam(val, 2)
+  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,
+    type: item.type
+  }
 }
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-
+    if (fileList.value.length === 0) {
+      applyForm.value.validate()
+    } else {
+      applyForm.value.clearValidate()
+    }
+    if (!valid) return
+    let files = []
+    fileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    otherFileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+    let params = {
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      files: files,
+      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 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
+      })
+    }
+  })
+}
+init()
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 8fb2d83..8181525 100644
--- a/src/views/project-management/filing/index.vue
+++ b/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',
@@ -140,11 +146,11 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'},{label: '结项', func: () => handleConclusion(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: () => handleConclusion(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>
@@ -165,7 +171,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/project/filing',
   params: {},
 })
 
@@ -176,11 +182,19 @@ 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
+    }
+  })
+}
 </script>
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 2ac081f..b971574 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/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>
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index f259f6a..57af453 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -13,6 +13,10 @@
     <AttachmentUpload label="项目验收附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
                       @getOtherFile="getOtherFile" :showFileList="true"/>
+    <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>
     </div>
@@ -20,11 +24,21 @@
 </template>
 
 <script setup lang="jsx">
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import {getProjectCheckProcess, projectCheck} from "@/api/project-manage";
+import { ElNotification} from "element-plus";
+import {useProcessStore} from '@/stores/processStore.js';
 const formData = ref({})
-const fileList = ref(null)
+const fileList = 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 router = useRouter()
+const route = useRoute()
 const compositeParam = (item) => {
   let tag=''
   if(router.currentRoute.value.name==='Implementation/check'){
@@ -79,24 +93,46 @@ const handleSubmit = (instance) => {
       files.push(getFileParam(item))
     })
     let params = {
-      // deploymentId: deploymentId.value,
-      files: files
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      files: files,
+      projectId:route.query.projectId,
     }
     console.log('params',params)
-    // 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'
-    //   })
-    // }
+    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 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
+      })
+    }
+  })
+}
+init()
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 5672499..7e47416 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/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,26 +112,37 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'productMainBody',
+      prop: 'rdSubject',
       label: '研发主体',
       align: 'center'
     },
     {
-      prop: 'projectEffect',
+      prop: 'projectImpact',
       label: '项目影响',
       align: 'center'
     },
     {
-      prop: 'time',
+      prop: 'economicEstimate',
+      label: '经济概况',
+      align: 'center'
+    },
+    {
+      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',
@@ -139,7 +150,7 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'},{label: '验收', func: () => handleCheck(row), type: 'primary'}]
         if (row.state === '3') {
           btn.push(
               {label: '验收', func: () => handleCheck(row), type: 'primary'},
@@ -167,7 +178,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/mosr/project/implementation',
   params: {},
   btns: [
     {name: '生成分摊报表', key: '_export', color: '#DED0B2', auth: ''}
@@ -191,7 +202,8 @@ const handleCheck = (row) => {
   router.push({
     name: 'Implementation/check',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId
     }
   })
 }
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
new file mode 100644
index 0000000..cc94c34
--- /dev/null
+++ b/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>
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index 4ceec9d..d3f4339 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -13,6 +13,10 @@
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
                       @getOtherFile="getOtherFile" :showFileList="true"/>
+    <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>
     </div>
@@ -21,12 +25,19 @@
 
 <script setup lang="jsx">
 import {useTagsView} from '@/stores/tagsview.js'
+import {ElNotification} from "element-plus";
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import {getProcessInfo,projectApply} 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 processStore = useProcessStore()
+const deploymentId = ref()
 const fileList = ref([])
 const applyForm = ref()
 const showTable = ref(true)
@@ -71,7 +82,8 @@ const tableConfig = reactive({
     // }
   ]
 })
-
+const processInstanceData = ref()
+const processDiagramViewer = ref(true)
 const compositeParam = (item, type) => {
   let tag = ''
   if (router.currentRoute.value.name === 'Initiation/apply') {
@@ -125,24 +137,46 @@ const handleSubmit = (instance) => {
       files.push(getFileParam(item))
     })
     let params = {
-      // deploymentId: deploymentId.value,
-      files: files
+      deploymentId: deploymentId.value,
+      requirementId: route.query.id,
+      files: files,
+      projectId:route.query.projectId,
     }
     console.log('params',params)
-    // 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'
-    //   })
-    // }
+    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 init =  () => {
+  getProcessInfo().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()
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 0b387f1..a196f72 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -117,6 +117,11 @@ const tableConfig = reactive({
       label: '项目影响',
       align: 'center'
     },
+    {
+      prop: 'economicEstimate',
+      label: '经济概况',
+      align: 'center'
+    },
     {
       prop: 'startTime',
       label: '起止时间',
@@ -144,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 === '20') {
+        } else if (row.state === '0') {
           btn.push({label: '申请', func: () => handleApply(row), type: 'primary'})
         }
         return (
@@ -195,7 +200,8 @@ const handleApply = (row) => {
   router.push({
     name:'Initiation/apply',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId
     }
   })
 }

From 3a4f9927c9dc0469fa1658eb6c7d7d9a7114774c Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Sun, 19 May 2024 23:07:32 +0800
Subject: [PATCH 25/36] feat: up detail

---
 .../DetailComponent/ApprovalDetail.vue        | 81 +++++++++++++++++++
 src/components/DetailComponent/Opinion.vue    | 80 ++++++++++++++++++
 src/components/steps/index.vue                | 31 ++++---
 .../project-management/initiation/detail.vue  | 68 +++++++++++++++-
 .../project-management/initiation/index.vue   |  3 +-
 5 files changed, 246 insertions(+), 17 deletions(-)
 create mode 100644 src/components/DetailComponent/ApprovalDetail.vue
 create mode 100644 src/components/DetailComponent/Opinion.vue

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
new file mode 100644
index 0000000..4748b36
--- /dev/null
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -0,0 +1,81 @@
+<template>
+  <div>
+    <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
+    <!-- <AttachmentUpload></AttachmentUpload> -->
+
+    <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"/>
+        </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'
+
+const props = defineProps({
+  formData: {
+    type: Object,
+    default: {}
+  },
+  data: {
+    type: Array,
+    default: []
+  },
+  processViewer: {
+    type: Boolean,
+    default: false
+  },
+  companyOption: {
+    type: Array,
+    default: []
+  },
+})
+
+const form = ref()
+
+const localData = reactive({
+  fileList: props.formData.fileList
+})
+
+const schema = computed(()=>{
+  return [
+    {
+      label: '前置流程',
+      prop: 'preProcess',
+      colProps: {
+        span: 24
+      }
+    },
+    {
+      label: '项目立项附件',
+      prop: 'singleFile',
+      colProps: {
+        span: 24
+      }
+    },
+    {
+      label: '其他文件',
+      prop: 'fileList',
+    }
+  ]
+})
+
+watchEffect(()=>{
+  Object.keys(props.formData).length && (form.value.setValues(props.formData))
+})
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue
new file mode 100644
index 0000000..9f6a03e
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 246a254..d9018a9 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -39,7 +39,7 @@ const props = defineProps({
   // 当前显示步骤
   active: {
     type: Number,
-    default: 0
+    default: '0'
   },
   // 已完成的工作流步骤
   stepSuccess: {
@@ -168,18 +168,23 @@ const formatReProcedure = (data) => {
 const formatActive = (val) => {
   console.log(val, 'val');
   let active = ''
-  switch(val) {
-    case '0' || 0 : active = '00'
-      break
-    case '1' || 1 : active = '10'
-      break
-    case '2' || 2 : active = '20'
-      break
-    case '3' || 3 : active = '30'
-      break
-    case '4' || 4 : active = '40'
-      break
-  }
+  // switch(val) {
+  //   case '0' : active = '00'
+  //     break
+  //   case '1' : active = '10'
+  //     break
+  //   case '2' : active = '20'
+  //     break
+  //   case '3' : active = '30'
+  //     break
+  //   case '4' : active = '40'
+  //     break
+  // }
+  val == 0 && (active = '00')
+  val == 1 && (active = '10')
+  val == 2 && (active = '20')
+  val == 3 && (active = '30')
+  val == 4 && (active = '40')
   console.log(active, 'active--');
   return active
 }
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 20174a7..19bc487 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="detail-block">
+  <!-- <div class="detail-block">
     <el-tabs
         v-model="activeName"
         type="card"
@@ -16,7 +16,22 @@
       </el-tab-pane>
       <el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
     </el-tabs>
-  </div>
+  </div> -->
+
+  <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>
+    </template>
+  </steps>
 </template>
 
 <script setup lang="jsx">
@@ -26,6 +41,9 @@ 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";
 
 const route = useRoute()
 const activeName = ref('first')
@@ -88,7 +106,51 @@ const handleClick = (tab, event) => {
     getDemandSummaryInfo()
   }
 }
-getDemandCollectionInfo()
+// 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;
+    }
+    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">
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 0b387f1..80bab5f 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -179,7 +179,8 @@ const handleDetail = (row) => {
   router.push({
     name:'Initiation/detail',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId
     }
   })
 }

From 9661cdbb2b924d4462836903a53017c2d422e809 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 20 May 2024 00:29:31 +0800
Subject: [PATCH 26/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=86=E8=8A=82=E5=8A=9F=E8=83=BD=E5=8F=8A=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           |  35 +++-
 src/components/steps/index.vue                |  23 +--
 src/views/project-demand/summary/add.vue      | 169 ++++++++++++------
 src/views/project-demand/summary/api/index.js |  12 +-
 src/views/project-demand/summary/detail.vue   |  41 ++---
 src/views/project-demand/summary/index.vue    |  36 ++--
 .../project-management/filing/conclusion.vue  |  31 ++--
 .../implementation/check.vue                  |  31 ++--
 .../project-management/initiation/apply.vue   |  46 +++--
 .../project-management/initiation/index.vue   |   1 +
 10 files changed, 268 insertions(+), 157 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 77c66a6..2c707d1 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -3,15 +3,20 @@
     <el-row>
       <el-col :span="24">
         <el-form-item :label="label" prop="attachment">
-          <file-upload @getFile="getAttachment" :showFileList="showFileList" @delete="deleteAttachment"/>
+          <template v-if="preview">
+            <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 18px">{{ singleFile?.originalFileName }}</el-button>
+          </template>
+          <template v-else>
+            <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" :showFileList="false"/>
+            <file-upload @getFile="getOtherFile"/>
             <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
-                     :data="otherFileList" :isSettingCol="false" :pagination="false">
+                     :data="allFileList" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
               </template>
@@ -75,6 +80,8 @@ 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,
@@ -85,16 +92,32 @@ const props = defineProps({
   }, 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) => {
-  props.otherFileList = newVal
+  newVal.forEach(item=>{
+    allFileList.value.push(item)
+  })
+}, {deep: true})
+watch(() => props.formData.fileList, (newVal) => {
+  newVal.forEach(item=>{
+    allFileList.value.push(item)
+  })
+}, {deep: true})
+watch(() => props.formData.singleFile, (newVal) => {
+  singleFile.value = newVal
 }, {deep: true})
 const getAttachment = (val) => {
   emit('getAttachment', val)
@@ -140,7 +163,9 @@ defineExpose({
   },
   clearValidate(){
     return applyForm.value.clearValidate()
-  }
+  },
+  allFileList,
+  singleFile
 })
 </script>
 
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 246a254..df22e3b 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -4,13 +4,13 @@
   <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" 
+      <el-step
+        v-for="(item, index) in localSteps"
+        :key="item.key"
+        :title="item.title"
         :class="stepClass(index)"
-        @click="handleStep(item.key, index)" 
-        
+        @click="handleStep(item.key, index)"
+
       />
     </el-steps>
   </div>
@@ -91,7 +91,7 @@ const schema = computed(()=>{
       colProps: {
         span: 12
       }
-      // component: 
+      // component:
     },
     {
       label: '征集类型',
@@ -99,7 +99,7 @@ const schema = computed(()=>{
       colProps: {
         span: 12
       }
-      // component: 
+      // component:
     },
     {
       label: '截止时间',
@@ -107,7 +107,7 @@ const schema = computed(()=>{
       colProps: {
         span: 12
       }
-      // component: 
+      // component:
     },
     {
       label: '需求名称',
@@ -115,7 +115,7 @@ const schema = computed(()=>{
       colProps: {
         span: 12
       }
-      // component: 
+      // component:
     },
   ]
 })
@@ -236,6 +236,7 @@ getBaseInfo()
 watchEffect(() => {
   console.log(props.active, 'props.active');
   localActive.value = props.active
+  getBaseInfo()
 })
 </script>
 
@@ -251,4 +252,4 @@ watchEffect(() => {
 .step-error {
   cursor: not-allowed;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 145cfda..b6c87a7 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -202,7 +202,7 @@
             <el-input v-model="formData.economicEstimate" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="12">
           <el-form-item label="其中申请公司总部科技创新专项资金(万元)" prop="specialFundAmount">
             <el-input v-model="formData.specialFundAmount" clearable></el-input>
           </el-form-item>
@@ -221,24 +221,27 @@
     </el-form>
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true"/>
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="router.currentRoute.value.name === 'Summary/edit'"/>
     <!--  <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(summaryForm)">发布</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit">重新发布</el-button>
     </div>
   </div>
 </template>
 
 <script setup lang="jsx">
-import {getProcessInfo, requirementReported} from "./api";
-import {ElNotification} from "element-plus";
+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 {getSubCompOpt} from "../../../api/user/user";
+import {getSubCompOpt} from "@/api/user/user";
 
 const cacheStore = useCacheStore()
 const router = useRouter()
+const route = useRoute()
+const name=ref(router.currentRoute.value.name)
 const tagsViewStore = useTagsView()
 const companyOption = ref([])
 const summaryForm = ref()
@@ -246,10 +249,8 @@ const attachment = ref()
 const deploymentId = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
-const fileList = ref([])
-const formData = ref({
-  specialFund: null
-})
+const file = ref({})
+const formData = ref({})
 const rules = reactive({
   projectName: [{required: true, message: '请输入名称', trigger: 'blur'}],
   specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
@@ -278,29 +279,29 @@ const rules = reactive({
 })
 const compositeParam = (item, type) => {
   let tag = ''
-  if (router.currentRoute.value.name === 'Summary/add') {
+  if ( name.value=== 'Summary/add'||name.value === 'Summary/edit') {
     tag = '需求上报'
   }
   return {
     fileId: item.id,
     size: item.size,
-    type: type,
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    processNodeTag: null,
     tag: tag
   }
 }
+const getEditOtherFile=(val)=>{
+  console.log('getEditOtherFile',val)
+}
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  let fileObj = compositeParam(val, 1)
-  fileList.value.push(fileObj)
+  file.value = compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
   showTable.value = false
-  let fileObj = compositeParam(val, 2)
+  let fileObj = compositeParam(val)
   otherFileList.value.push(fileObj)
   nextTick(() => {
     showTable.value = true
@@ -308,14 +309,31 @@ const getOtherFile = (val) => {
 }
 const getFileParam = (item) => {
   return {
-    fileId: item.fileId,
-    type: item.type
+    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": "3",
+    "projectName": "重新提交全流程测试",
     "startTime": "2024-05-24 00:00:00",
     "endTime": "2024-05-29 00:00:00",
     "projectType": "3",
@@ -338,65 +356,104 @@ const handleSubmit = async (instance) => {
     "serviceDescription": "3",
     "contentDescription": "3",
     "specialFundAmount": "3",
-    "deploymentId": "e75b2040-15b4-11ef-8cdf-f268fc747b04",
-    "files": [
-      {
-        "fileId": 207,
-        "type": 1
-      },
-    ],
+    deploymentId: deploymentId.value,
+    "singleFile": singleFile,
+    "files": otherFiles,
+    // "requirementId":route.query.id,
     "requirementId": 102
   }
-  // if (!instance) return
-  // instance.validate(async (valid, fields) => {
-  //   if (fileList.value.length === 0) {
-  //     attachment.value.validate()
-  //   } else {
-  //     attachment.value.clearValidate()
-  //   }
-  //   if (!valid) return
-    let files = []
-    fileList.value.forEach(item => {
-      files.push(getFileParam(item))
+  // ...formData.value,
+  //   deploymentId: deploymentId.value,
+  //   files: 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'
     })
-    otherFileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-    // ...formData.value,
-    //   deploymentId: deploymentId.value,
-    //   files: files,
-    //   requirementId:102
-    // }
-    let res = await requirementReported(params)
+  }
+  // })
+}
+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
+      }
+    }
+    fileArray=otherFileList.value
+  }
+  fileArray.forEach(item => {
+    otherFiles.push(getFileParam(item))
+  })
+  let params={
+    ...formData.value,
+    deploymentId: deploymentId.value,
+    files: otherFiles,
+    singleFile: singleFile,
+    requirementId: 102
+  }
+  console.log('重新提交params',params)
+  resubmitReported(params).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Summary'
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const getDetailInfo = async () => {
+  getDetail(route.query.projectId).then(res => {
     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'
-      })
+      formData.value = res.data.formData
     }
-  // })
+  })
 }
 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'
-    })
+    // ElNotification({
+    //   title: '提示',
+    //   message: res.msg,
+    //   type: res.code === 1000 ? 'success' : 'error'
+    // })
     if (res.code === 1000) {
       let data = res.data
       deploymentId.value = data.deploymentId
     }
   })
 }
-init()
+onMounted(async () => {
+  await init()
+  if (route.query.id) {
+    await getDetailInfo()
+  }
+})
 const staging = async () => {
 }
 </script>
diff --git a/src/views/project-demand/summary/api/index.js b/src/views/project-demand/summary/api/index.js
index 98ea624..26d0dba 100644
--- a/src/views/project-demand/summary/api/index.js
+++ b/src/views/project-demand/summary/api/index.js
@@ -24,9 +24,17 @@ export const getProcessInfo = () => {
     method: "post"
   });
 };
-export const getDetail = (requirementId) => {
+export const getDetail = (projectId) => {
   return request({
-    url: `/workflow/mosr/requirement/collect/info/${requirementId}`,
+    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
+  });
+};
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 7ffc6a0..a8f7c9a 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -1,47 +1,32 @@
 <template>
   <steps :active="active" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
-      <span v-show="showActive == '00'">需求征集</span>
-      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"/>
+      <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
+                         :processViewer="summaryProcessViewer" :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
+      <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
+                      :processViewer="summaryProcessViewer"/>
     </template>
   </steps>
 </template>
 
 <script setup lang="jsx">
-import SummaryDetail from '../../../components/DetailComponent/SummaryDetail.vue';
+import SummaryDetail from '@/components/DetailComponent/SummaryDetail.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 import {getDetail} from "./api";
-import { markRaw, reactive, ref, shallowRef } from 'vue';
-import { getMapProjectStateInfo } from '../../../components/steps/api';
+import {markRaw, reactive, ref, shallowRef} from 'vue';
+import {getMapProjectStateInfo} from '@/components/steps/api';
+import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
+
 const route = useRoute()
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
-const active = route.query.state
+const active = ref(route.query.state)
 const showActive = ref()
-const getDemandSummaryInfo = async () => {
-  if (!route.query.id) return
-  // await getCompanyOption()
-  summaryProcessViewer.value = false
-  getDetail(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
-    })
-  })
-}
-// getDemandSummaryInfo()
-
 const getInfo = async (state) => {
   const projectId = route.query.projectId
-  const { code, data } = await getMapProjectStateInfo(projectId, state)
+  const {code, data} = await getMapProjectStateInfo(projectId, state)
+  summaryProcessViewer.value = false
   summaryData.value = data;
   processStore.setDesign(data)
   processStore.runningList.value = data.runningList;
@@ -58,6 +43,7 @@ const getInfo = async (state) => {
 }
 
 const setDetail = (active) => {
+  console.log('active', active)
   showActive.value = active
   getInfo(active)
 }
@@ -65,6 +51,7 @@ const setDetail = (active) => {
 const stepChange = (data) => {
   console.log(data)
   showActive.value = data.active
+  getInfo(data.active)
 }
 
 const summaryDetailRef = ref()
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 1f887a0..3e289f8 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -121,12 +121,12 @@ const tableConfig = reactive({
       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'})
-        }
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'},{label: '编辑', func: () => handleEdit(row), type: 'primary'},{label: '上报', func: () => handleAdd(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 style={{width: '100%'}}>
               {
@@ -165,18 +165,22 @@ 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: {
+      isAdd: 1,
+      id:row.requirementId
+    }
+  })
+}
+const handleEdit = (row) => {
+  router.push({
+    name: 'Summary/edit',
+    query: {
+      id:row.requirementId,
+      projectId:row.projectId
+    }
   })
 }
 const handleDetail = (row) => {
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index 50ed9ab..99130e3 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -17,17 +17,19 @@
 </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 {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {getProjectConclusionProcess, projectConclusion} from "@/api/project-manage";
 
+const tagsViewStore = useTagsView()
 const formData = ref({})
 const rules = reactive({
   attachment: [{required: true, message: '请上传项目结项附件', trigger: 'blur'}],
 })
-const fileList = ref([])
+const file = ref({})
 const applyForm = ref()
 const deploymentId = ref()
 const showTable = ref(true)
@@ -103,13 +105,12 @@ const compositeParam = (item) => {
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  let fileObj = compositeParam(val, 1)
-  fileList.value.push(fileObj)
+  file.value=compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
   showTable.value = false
-  let fileObj = compositeParam(val, 2)
+  let fileObj = compositeParam(val)
   otherFileList.value.push(fileObj)
   nextTick(() => {
     showTable.value = true
@@ -126,16 +127,19 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    if (fileList.value.length === 0) {
-      applyForm.value.validate()
-    } else {
-      applyForm.value.clearValidate()
-    }
+    // if(JSON.stringify(file.value) == "{}"){
+    //   applyForm.value.validate()
+    // } else {
+    //   applyForm.value.clearValidate()
+    // }
     if (!valid) return
     let files = []
-    fileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
+    let singleFile={}
+    if(file.value.fileId!==undefined){
+      singleFile = {
+        fileId: file.value.fileId
+      }
+    }
     otherFileList.value.forEach(item => {
       files.push(getFileParam(item))
     })
@@ -143,6 +147,7 @@ const handleSubmit = (instance) => {
       deploymentId: deploymentId.value,
       requirementId: route.query.id,
       files: files,
+      singleFile: singleFile,
       projectId:route.query.projectId,
     }
     console.log('params', params)
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index 57af453..284736c 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -26,10 +26,12 @@
 <script setup lang="jsx">
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {getProjectCheckProcess, projectCheck} from "@/api/project-manage";
-import { ElNotification} from "element-plus";
+import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
+import {useTagsView} from '@/stores/tagsview.js'
+const tagsViewStore = useTagsView()
 const formData = ref({})
-const fileList = ref([])
+const file = ref({})
 const applyForm = ref()
 const deploymentId = ref()
 const showTable = ref(true)
@@ -56,13 +58,12 @@ const compositeParam = (item) => {
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  let fileObj = compositeParam(val, 1)
-  fileList.value.push(fileObj)
+  file.value=compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
   showTable.value = false
-  let fileObj = compositeParam(val, 2)
+  let fileObj = compositeParam(val)
   otherFileList.value.push(fileObj)
   nextTick(() => {
     showTable.value = true
@@ -79,16 +80,19 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    if(fileList.value.length===0){
-      applyForm.value.validate()
-    }else {
-      applyForm.value.clearValidate()
-    }
+    // if(JSON.stringify(file.value) == "{}"){
+    //   applyForm.value.validate()
+    // }else {
+    //   applyForm.value.clearValidate()
+    // }
     if (!valid) return
     let files = []
-    fileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
+    let singleFile={}
+    if(file.value.fileId!==undefined){
+      singleFile = {
+        fileId: file.value.fileId
+      }
+    }
     otherFileList.value.forEach(item => {
       files.push(getFileParam(item))
     })
@@ -96,6 +100,7 @@ const handleSubmit = (instance) => {
       deploymentId: deploymentId.value,
       requirementId: route.query.id,
       files: files,
+      singleFile: singleFile,
       projectId:route.query.projectId,
     }
     console.log('params',params)
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index d3f4339..2c02844 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -19,16 +19,18 @@
     </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 {useTagsView} from '@/stores/tagsview.js'
-import {ElNotification} from "element-plus";
+import {ElMessage, ElNotification} from "element-plus";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getProcessInfo,projectApply} from "@/api/project-manage";
+import {getProcessInfo, projectApply} from "@/api/project-manage";
 import {useProcessStore} from '@/stores/processStore.js';
+
 const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
@@ -38,7 +40,7 @@ const rules = reactive({
 })
 const processStore = useProcessStore()
 const deploymentId = ref()
-const fileList = ref([])
+const file = ref({})
 const applyForm = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
@@ -102,13 +104,12 @@ const compositeParam = (item, type) => {
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  let fileObj = compositeParam(val, 1)
-  fileList.value.push(fileObj)
+  file.value=compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
   showTable.value = false
-  let fileObj = compositeParam(val, 2)
+  let fileObj = compositeParam(val)
   otherFileList.value.push(fileObj)
   nextTick(() => {
     showTable.value = true
@@ -123,16 +124,19 @@ const getFileParam = (item) => {
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    if(fileList.value.length===0){
-      applyForm.value.validate()
-    }else {
-      applyForm.value.clearValidate()
-    }
+    // if(JSON.stringify(file.value) == "{}"){
+    //   applyForm.value.validate()
+    // }else {
+    //   applyForm.value.clearValidate()
+    // }
     if (!valid) return
     let files = []
-    fileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
+    let singleFile={}
+    if(file.value.fileId!==undefined){
+      singleFile = {
+        fileId: file.value.fileId
+      }
+    }
     otherFileList.value.forEach(item => {
       files.push(getFileParam(item))
     })
@@ -140,6 +144,7 @@ const handleSubmit = (instance) => {
       deploymentId: deploymentId.value,
       requirementId: route.query.id,
       files: files,
+      singleFile: singleFile,
       projectId:route.query.projectId,
     }
     console.log('params',params)
@@ -157,6 +162,19 @@ const handleSubmit = (instance) => {
     }
   })
 }
+const handleResubmit = () => {
+  resubmit(submitParam(formData.value)).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 init =  () => {
   getProcessInfo().then(res => {
     processDiagramViewer.value = false
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index a196f72..67a171b 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -200,6 +200,7 @@ const handleApply = (row) => {
   router.push({
     name:'Initiation/apply',
     query: {
+      isAdd: 1,
       id: row.requirementId,
       projectId: row.projectId
     }

From 1825b6c871ef0e2426c9b5a65f661446456121d9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 20 May 2024 00:44:37 +0800
Subject: [PATCH 27/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/steps/index.vue              |  1 -
 src/views/project-demand/summary/detail.vue | 37 +++++----------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 80a3a76..22142ca 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -241,7 +241,6 @@ getBaseInfo()
 watchEffect(() => {
   console.log(props.active, 'props.active');
   localActive.value = props.active
-  getBaseInfo()
 })
 </script>
 
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index a8f7c9a..a4f971c 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -2,7 +2,7 @@
   <steps :active="active" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
-                         :processViewer="summaryProcessViewer" :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
+                         :processViewer="summaryProcessViewer" :companyOption="companyOption" />
       <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
                       :processViewer="summaryProcessViewer"/>
     </template>
@@ -12,21 +12,26 @@
 <script setup lang="jsx">
 import SummaryDetail from '@/components/DetailComponent/SummaryDetail.vue';
 import {useProcessStore} from '@/stores/processStore.js';
-import {getDetail} from "./api";
-import {markRaw, reactive, ref, shallowRef} from 'vue';
 import {getMapProjectStateInfo} from '@/components/steps/api';
 import CollectionDetail from "@/components/DetailComponent/CollectionDetail.vue";
+import {getSubCompOpt} from "@/api/user/user";
 
 const route = useRoute()
+const companyOption = ref([])
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
 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
-  const {code, data} = await getMapProjectStateInfo(projectId, state)
+  await getCompanyOption()
   summaryProcessViewer.value = false
+  const {code, data} = await getMapProjectStateInfo(projectId, state)
   summaryData.value = data;
   processStore.setDesign(data)
   processStore.runningList.value = data.runningList;
@@ -35,43 +40,19 @@ const getInfo = async (state) => {
   processStore.refuseList.value = data.refuseList;
   processStore.passList.value = data.passList;
   nextTick(() => {
-    // stepList[1].props.formData = data.formData
-    // stepList[1].props.data = data
-    // stepList[1].props.processViewer = true
     summaryProcessViewer.value = true
   })
 }
 
 const setDetail = (active) => {
-  console.log('active', active)
   showActive.value = active
   getInfo(active)
 }
 
 const stepChange = (data) => {
-  console.log(data)
   showActive.value = data.active
   getInfo(data.active)
 }
-
-const summaryDetailRef = ref()
-
-// const stepList = reactive([
-//   {
-//     key: 'collect',
-//     component: ()=>(<span>需求征集</span>)
-//   },
-//   {
-//     key: 'report',
-//     component: ()=>(<SummaryDetail ref={summaryDetailRef.value}></SummaryDetail>),
-//     props: {
-//       formData: summaryData.value.formData,
-//       data: summaryData.value,
-//       processViewer: summaryProcessViewer.value
-//     }
-//   }
-// ])
-
 </script>
 
 <style scoped>

From 5c93eae4ce94d3ff463849e999562f23cadd6a49 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 20 May 2024 00:58:48 +0800
Subject: [PATCH 28/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         | 26 +++++++++----------
 src/views/project-demand/summary/add.vue      |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 3493915..9f376fe 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -123,7 +123,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="需求上报申请书">
-          <el-button type="primary" link @click="handleDownload(localFormData.fileList)">{{localFormData.fileList}}</el-button>
+          <el-button type="primary" link @click="handleDownload(localFormData.singleFile)">{{localFormData.singleFile?.originalFileName}}</el-button>
         </el-form-item>
       </el-col>
       <el-col :span="24">
@@ -140,9 +140,9 @@
     <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"/>
+        <operation-render v-if="processViewer" :operation-list="data.operationList"
+                          :state="data.state"/>
+        <process-diagram-viewer v-if="processViewer"/>
       </div>
     </div>
   </el-form>
@@ -168,8 +168,6 @@ const props = defineProps({
   },
 })
 const localFormData = ref({})
-const summaryForm = ref()
-
 const tableConfig = reactive({
   columns: [
     {
@@ -208,14 +206,14 @@ const tableConfig = reactive({
   ]
 })
 
-const handleDownload = (fileList) => {
-  // 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 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(
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index b6c87a7..1607123 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -450,7 +450,7 @@ const init = async () => {
 }
 onMounted(async () => {
   await init()
-  if (route.query.id) {
+  if (route.query.projectId) {
     await getDetailInfo()
   }
 })

From 1d772e14143dd19de5ea897cff2409a1c787c956 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 20 May 2024 11:05:29 +0800
Subject: [PATCH 29/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5/=E8=AF=A6=E6=83=85=E4=B8=8B?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      | 140 ++++++++----------
 .../DetailComponent/SummaryDetail.vue         |  93 +++++++++++-
 src/views/project-demand/summary/add.vue      |  21 ++-
 src/views/project-demand/summary/detail.vue   |   1 +
 4 files changed, 171 insertions(+), 84 deletions(-)

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 5bda21d..7feb567 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -1,71 +1,69 @@
 <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 :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>
-        </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"/>
         </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"/>
       </div>
-    </el-form>
-  </div>
+    </div>
+  </el-form>
 </template>
 
 <script setup lang="jsx">
@@ -137,9 +135,6 @@ const tableConfig = reactive({
   ]
 })
 
-const getInfo = () => {
-  emit('getInfo')
-}
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
@@ -152,28 +147,23 @@ const handleDownload = (row) => {
 const getDataSourceOptionItem = (val) => {
   if (val instanceof Array) {
     val.forEach(item => {
-      matterTree(companyNameArray.value,props.companyOption, item)
+      matterTree(companyNameArray.value, props.companyOption, item)
     })
   }
   return companyNameArray.value.join('，');
 }
 watch(() => props.companyOption, (newVal) => {
-  props.companyOption=newVal
+  props.companyOption = newVal
 }, {deep: true})
 watch(() => props.formData, (newVal) => {
   if (newVal) {
     newVal.companyIds = getDataSourceOptionItem(newVal.companyIds)
-    props.formData=newVal
+    props.formData = newVal
   }
 }, {deep: true})
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal
 }, {deep: true})
-onMounted(() => {
-  loading.value = true
-  getInfo()
-  loading.value = false
-})
 </script>
 
 <style scoped>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 9f376fe..54a1c0c 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -1,9 +1,10 @@
 <template>
-  <el-form :model="localFormData" ref="summaryForm">
+  <div class="detail-block">
+  <el-form :model="localFormData" ref="summaryForm" :rules="rules">
     <el-row gutter="50">
       <el-col :span="12">
-        <el-form-item label="名称" prop="requirementName">
-          <span>{{ localFormData.requirementId }}</span>
+        <el-form-item label="名称" prop="projectName">
+          <span>{{ localFormData.projectName }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -32,8 +33,8 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="结束时间" prop="endTime">
-          <span>{{ localFormData.endTime }}</span>
+        <el-form-item label="研发主体" prop="rdSubject">
+          <span>{{ localFormData.rdSubject }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -136,23 +137,44 @@
           </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"/>
       </div>
     </div>
-  </el-form>
 
+    <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,
@@ -205,7 +227,54 @@ const tableConfig = reactive({
     }
   ]
 })
-
+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])
@@ -222,6 +291,9 @@ watch(
     console.log(val, 'ssss');
   }
 )
+watch(() => props.processViewer, (newVal) => {
+  props.processViewer = newVal
+}, {deep: true})
 
 watchEffect(()=>{
   Object.keys(props.formData).length && (localFormData.value = props.formData)
@@ -232,5 +304,10 @@ watchEffect(()=>{
 :deep(.el-table--fit) {
   height: auto !important;
 }
+.detail-block{
+  overflow-x: hidden;
+  overflow-y: auto;
+  padding-bottom: 20px;
+}
 
 </style>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 1607123..7429fdf 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -223,6 +223,13 @@
                       @getAttachment="getAttachment"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="router.currentRoute.value.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>
@@ -236,12 +243,15 @@ import {getDetail, getProcessInfo, requirementReported, resubmitReported} from "
 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 name=ref(router.currentRoute.value.name)
+const processDiagramViewer = ref(false)
 const tagsViewStore = useTagsView()
 const companyOption = ref([])
 const summaryForm = ref()
@@ -445,6 +455,15 @@ const init = async () => {
     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
+      })
     }
   })
 }
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index a4f971c..ae3bdbc 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -33,6 +33,7 @@ const getInfo = async (state) => {
   summaryProcessViewer.value = false
   const {code, data} = await getMapProjectStateInfo(projectId, state)
   summaryData.value = data;
+  console.log('data',data)
   processStore.setDesign(data)
   processStore.runningList.value = data.runningList;
   processStore.endList.value = data.endList;

From f83ae8df514d552fbaaef86ebf9f7beb394f9d89 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 20 May 2024 11:45:53 +0800
Subject: [PATCH 30/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E5=8F=8A=E8=AF=A6=E6=83=85loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CollectionDetail.vue      | 151 ++++----
 .../DetailComponent/SummaryDetail.vue         | 350 +++++++++---------
 src/views/project-demand/summary/add.vue      |   7 +-
 src/views/project-demand/summary/detail.vue   |   8 +-
 4 files changed, 268 insertions(+), 248 deletions(-)

diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 7feb567..bbc1e2f 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -1,69 +1,71 @@
 <template>
-  <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="请输入审核意见"
-            />
+  <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"/>
         </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"/>
       </div>
-    </div>
-  </el-form>
+    </el-form>
+  </div>
 </template>
 
 <script setup lang="jsx">
@@ -72,10 +74,8 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {matterTree} from '@/utils/matterTree.js';
 import {downloadFile} from "@/api/project-demand";
 
-const emit = defineEmits(['getInfo'])
+const emit = defineEmits(['getInfo',"update:formData"])
 const form = ref()
-const showForm = ref(true)
-const loading = ref(false)
 const showTable = ref(false)
 const companyNameArray = ref([])
 
@@ -95,7 +95,10 @@ const props = defineProps({
   companyOption: {
     type: Array,
     default: []
-  },
+  }, loading: {
+    type: Boolean,
+    default: false
+  }
 })
 const tableConfig = reactive({
   columns: [
@@ -134,7 +137,6 @@ const tableConfig = reactive({
     }
   ]
 })
-
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
@@ -150,16 +152,19 @@ const getDataSourceOptionItem = (val) => {
       matterTree(companyNameArray.value, props.companyOption, item)
     })
   }
-  return companyNameArray.value.join('，');
+  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) {
-    newVal.companyIds = getDataSourceOptionItem(newVal.companyIds)
-    props.formData = newVal
-  }
+watch(() => props.formData.companyIds, (newVal) => {
+  props.formData.companyIds = getDataSourceOptionItem(newVal)
 }, {deep: true})
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 54a1c0c..3365874 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -1,169 +1,171 @@
 <template>
-  <div class="detail-block">
-  <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="companyName">
-          <span>{{ localFormData.companyName }}</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="请输入审核意见"
-            />
+  <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="companyName">
+            <span>{{ localFormData.companyName }}</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"/>
         </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"/>
       </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 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>
 
@@ -174,6 +176,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 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: {
@@ -187,7 +190,10 @@ const props = defineProps({
   processViewer: {
     type: Boolean,
     default: false
-  },
+  }, loading: {
+    type: Boolean,
+    default: false
+  }
 })
 const localFormData = ref({})
 const tableConfig = reactive({
@@ -228,7 +234,7 @@ const tableConfig = reactive({
   ]
 })
 const router = useRouter()
-const summaryForm=ref()
+const summaryForm = ref()
 const rules = reactive({
   auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
 })
@@ -279,23 +285,26 @@ const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
     let a = document.createElement('a')
-    a.href=URL.createObjectURL(blob)
+    a.href = URL.createObjectURL(blob)
     a.download = row.originalFileName
     a.click()
   })
 }
 
 watch(
-  ()=>props.formData,
-  (val)=>{
-    console.log(val, 'ssss');
-  }
+    () => 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(()=>{
+watchEffect(() => {
   Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
 </script>
@@ -304,7 +313,8 @@ watchEffect(()=>{
 :deep(.el-table--fit) {
   height: auto !important;
 }
-.detail-block{
+
+.detail-block {
   overflow-x: hidden;
   overflow-y: auto;
   padding-bottom: 20px;
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 7429fdf..f8f0ebf 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="detail-block">
+  <div class="detail-block" v-loading="loading">
     <baseTitle title="需求上报"></baseTitle>
     <el-form :model="formData" ref="summaryForm" :rules="rules">
       <el-row gutter="50">
@@ -251,6 +251,7 @@ const processStore = useProcessStore()
 const router = useRouter()
 const route = useRoute()
 const name=ref(router.currentRoute.value.name)
+const loading = ref(false)
 const processDiagramViewer = ref(false)
 const tagsViewStore = useTagsView()
 const companyOption = ref([])
@@ -440,6 +441,7 @@ const getDetailInfo = async () => {
     })
     if (res.code === 1000) {
       formData.value = res.data.formData
+      loading.value=false
     }
   })
 }
@@ -468,16 +470,17 @@ const init = async () => {
   })
 }
 onMounted(async () => {
+  loading.value=true
   await init()
   if (route.query.projectId) {
     await getDetailInfo()
   }
+
 })
 const staging = async () => {
 }
 </script>
 <style lang="scss" scoped>
-
 .detail-block {
   overflow: hidden;
   padding-bottom: 30px;
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index ae3bdbc..2b3f22c 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -2,9 +2,9 @@
   <steps :active="active" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
-                         :processViewer="summaryProcessViewer" :companyOption="companyOption" />
+                         :processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/>
       <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
-                      :processViewer="summaryProcessViewer"/>
+                      :processViewer="summaryProcessViewer" :loading="loading"/>
     </template>
   </steps>
 </template>
@@ -20,6 +20,7 @@ const route = useRoute()
 const companyOption = ref([])
 const summaryData = ref({})
 const summaryProcessViewer = ref(true)
+const loading = ref(false)
 const processStore = useProcessStore()
 const active = ref(route.query.state)
 const showActive = ref()
@@ -31,9 +32,10 @@ const getInfo = async (state) => {
   const projectId = route.query.projectId
   await getCompanyOption()
   summaryProcessViewer.value = false
+  loading.value = true
   const {code, data} = await getMapProjectStateInfo(projectId, state)
   summaryData.value = data;
-  console.log('data',data)
+  loading.value = false
   processStore.setDesign(data)
   processStore.runningList.value = data.runningList;
   processStore.endList.value = data.endList;

From e648faba6916666758b2a0a1232b8677037a1166 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 20 May 2024 17:56:38 +0800
Subject: [PATCH 31/36] =?UTF-8?q?fix=20:=20=E9=87=8D=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue      | 13 ++-
 src/views/project-demand/summary/index.vue    |  7 +-
 .../project-management/filing/conclusion.vue  | 84 ++++++++++++++--
 src/views/project-management/filing/index.vue | 18 +++-
 .../implementation/check.vue                  | 99 ++++++++++++++++---
 .../implementation/index.vue                  | 16 ++-
 .../project-management/initiation/apply.vue   | 83 ++++++++++++----
 .../project-management/initiation/index.vue   | 10 +-
 8 files changed, 270 insertions(+), 60 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index f8f0ebf..089ce6f 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -221,7 +221,7 @@
     </el-form>
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="router.currentRoute.value.name === 'Summary/edit'"/>
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Summary/edit'"/>
     <!--  <fvForm :schema="schame" @getInstance="getInstance"></fvForm>-->
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
@@ -250,13 +250,13 @@ 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 attachment = ref()
 const deploymentId = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
@@ -412,6 +412,7 @@ const handleResubmit = () => {
   fileArray.forEach(item => {
     otherFiles.push(getFileParam(item))
   })
+  //todo requirementId
   let params={
     ...formData.value,
     deploymentId: deploymentId.value,
@@ -421,14 +422,16 @@ const handleResubmit = () => {
   }
   console.log('重新提交params',params)
   resubmitReported(params).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
     if (res.code === 1000) {
-      ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
         name: 'Summary'
       })
-    } else {
-      ElMessage.error(res.msg)
     }
   })
 }
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 3e289f8..5fe891b 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -121,11 +121,11 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'},{label: '编辑', func: () => handleEdit(row), type: 'primary'},{label: '上报', func: () => handleAdd(row), type: 'primary'}]
+        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'}]
         // if (row.state === '3') {
-        //   btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
         // } else if (row.state === '0') {
-        //   btn.push({label: '上报', func: () => handleAdd(row), type: 'primary'})
+          btn.push({label: '上报', func: () => handleAdd(row), type: 'primary'})
         // }
         return (
             <div style={{width: '100%'}}>
@@ -169,7 +169,6 @@ const handleAdd = (row) => {
   router.push({
     name: 'Summary/add',
     query: {
-      isAdd: 1,
       id:row.requirementId
     }
   })
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index 99130e3..116ae89 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -2,9 +2,9 @@
   <div class="apply-block">
     <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
       <baseTitle title="项目结项"></baseTitle>
-      <AttachmentUpload label="项目结项附件" :showTable="showTable" :otherFileList="otherFileList"
+      <AttachmentUpload ref="attachment" label="项目结项附件" :showTable="showTable" :otherFileList="otherFileList"
                         @getAttachment="getAttachment"
-                        @getOtherFile="getOtherFile" :showFileList="true"/>
+                        @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"/>
@@ -12,6 +12,7 @@
     </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>
@@ -23,12 +24,16 @@ import {downloadFile} from "@/api/project-demand";
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {getProjectConclusionProcess, projectConclusion} 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()
@@ -37,8 +42,6 @@ const otherFileList = ref([])
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
 const processStore = useProcessStore()
-const router = useRouter()
-const route = useRoute()
 const tableConfig = reactive({
   columns: [
     {
@@ -90,7 +93,7 @@ const handleDownload = (row) => {
 }
 const compositeParam = (item) => {
   let tag = ''
-  if (router.currentRoute.value.name === 'Filing/conclusion') {
+  if (name.value === 'Filing/conclusion'||name.value === 'Filing/edit') {
     tag = '项目结项'
   }
   return {
@@ -99,7 +102,6 @@ const compositeParam = (item) => {
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    processNodeTag: null,
     tag: tag
   }
 }
@@ -119,8 +121,7 @@ const getOtherFile = (val) => {
 
 const getFileParam = (item) => {
   return {
-    fileId: item.fileId,
-    type: item.type
+    fileId: item.fileId
   }
 }
 const handleSubmit = (instance) => {
@@ -165,6 +166,62 @@ const handleSubmit = (instance) => {
     }
   })
 }
+const handleResubmit = () => {
+  let singleFile = {}
+  let otherFiles = []
+  let fileArray
+  if(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,
+    files: otherFiles,
+    singleFile: singleFile,
+    projectId:route.query.projectId,
+  }
+  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: 'Filing'
+  //     })
+  //   }
+  // })
+}
+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 =  () => {
   getProjectConclusionProcess().then(res => {
     processDiagramViewer.value = false
@@ -184,7 +241,14 @@ const init =  () => {
     }
   })
 }
-init()
+onMounted(async () => {
+  loading.value=true
+  await init()
+  if (route.query.projectId) {
+    await getDetailInfo()
+  }
+
+})
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 8181525..054ce9a 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -146,12 +146,13 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'},{label: '结项', func: () => handleConclusion(row), type: 'primary'}]
-        if (row.state === '3') {
+        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') {
+        // } 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%'}}>
               {
@@ -197,4 +198,13 @@ const handleConclusion = (row) => {
     }
   })
 }
+const handleEdit = (row) => {
+  router.push({
+    name:'Filing/edit',
+    query: {
+      id: row.requirementId,
+      projectId: row.projectId
+    }
+  })
+}
 </script>
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index 284736c..18fef17 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -10,15 +10,16 @@
         </el-col>
       </el-row>
     </el-form>
-    <AttachmentUpload label="项目验收附件" :showTable="showTable" :otherFileList="otherFileList"
+    <AttachmentUpload ref="attachment" label="项目验收附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true"/>
+                      @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">重新提交</el-button>
     </div>
   </div>
 </template>
@@ -29,7 +30,13 @@ import {getProjectCheckProcess, projectCheck} from "@/api/project-manage";
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
 import {useTagsView} from '@/stores/tagsview.js'
+import {getDetail, resubmitReported} from "../../project-demand/summary/api";
 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 file = ref({})
 const applyForm = ref()
@@ -39,11 +46,9 @@ const otherFileList = ref([])
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
 const processStore = useProcessStore()
-const router = useRouter()
-const route = useRoute()
 const compositeParam = (item) => {
   let tag=''
-  if(router.currentRoute.value.name==='Implementation/check'){
+  if(name.value==='Implementation/check'||name.value === 'Implementation/edit'){
     tag='项目验收'
   }
   return {
@@ -52,7 +57,6 @@ const compositeParam = (item) => {
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    processNodeTag: null,
     tag: tag
   }
 }
@@ -72,8 +76,7 @@ const getOtherFile = (val) => {
 
 const getFileParam = (item) => {
   return {
-    fileId: item.fileId,
-    type: item.type
+    fileId: item.fileId
   }
 }
 const handleSubmit = (instance) => {
@@ -88,12 +91,21 @@ const handleSubmit = (instance) => {
     if (!valid) return
     let files = []
     let singleFile={}
-    if(file.value.fileId!==undefined){
+    let fileArray
+    if(name.value === 'Implementation/edit'){
       singleFile = {
-        fileId: file.value.fileId
+        fileId: attachment.value.singleFile.fileId
       }
+      fileArray=attachment.value.allFileList
+    }else {
+      if (file.value.fileId !== undefined) {
+        singleFile = {
+          fileId: file.value.fileId
+        }
+      }
+      fileArray=otherFileList.value
     }
-    otherFileList.value.forEach(item => {
+    fileArray.forEach(item => {
       files.push(getFileParam(item))
     })
     let params = {
@@ -118,6 +130,62 @@ const handleSubmit = (instance) => {
     }
   })
 }
+const handleResubmit = () => {
+  let singleFile = {}
+  let otherFiles = []
+  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 => {
+    otherFiles.push(getFileParam(item))
+  })
+  //todo requirementId
+  let params={
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    files: otherFiles,
+    singleFile: singleFile,
+    projectId:route.query.projectId,
+  }
+  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: 'Implementation'
+  //     })
+  //   }
+  // })
+}
+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 =  () => {
   getProjectCheckProcess().then(res => {
     processDiagramViewer.value = false
@@ -137,7 +205,14 @@ const init =  () => {
     }
   })
 }
-init()
+onMounted(async () => {
+  loading.value=true
+  await init()
+  if (route.query.projectId) {
+    await getDetailInfo()
+  }
+
+})
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 7e47416..12e05ee 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -150,15 +150,16 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        let btn = [{label: '详情', func: () => handleDetail(row), type: 'primary'},{label: '验收', func: () => handleCheck(row), type: 'primary'}]
-        if (row.state === '3') {
+        let btn = [{label: '详情', func: () => handleDetail(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%'}}>
               {
@@ -207,6 +208,15 @@ const handleCheck = (row) => {
     }
   })
 }
+const handleEdit = (row) => {
+  router.push({
+    name: 'Implementation/edit',
+    query: {
+      id: row.requirementId,
+      projectId: row.projectId
+    }
+  })
+}
 const handleStandingBook = (row) => {
   router.push({
     name: 'Implementation/account',
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index 2c02844..e339f3a 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -12,7 +12,7 @@
     </el-form>
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true"/>
+                      @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"/>
@@ -40,6 +40,7 @@ const rules = reactive({
 })
 const processStore = useProcessStore()
 const deploymentId = ref()
+const attachment = ref()
 const file = ref({})
 const applyForm = ref()
 const showTable = ref(true)
@@ -84,21 +85,21 @@ const tableConfig = reactive({
     // }
   ]
 })
+const loading = ref(false)
 const processInstanceData = ref()
 const processDiagramViewer = ref(true)
-const compositeParam = (item, type) => {
+const name=ref(router.currentRoute.value.name)
+const compositeParam = (item) => {
   let tag = ''
-  if (router.currentRoute.value.name === 'Initiation/apply') {
+  if (name.value === 'Initiation/apply'||name.value === 'Initiation/edit') {
     tag = '项目立项申请'
   }
   return {
     fileId: item.id,
     size: item.size,
-    type: type,
     originalFileName: item.originalFilename,
     fileType: item.fileType,
     url: item.url,
-    processNodeTag: null,
     tag:tag
   }
 }
@@ -117,8 +118,7 @@ const getOtherFile = (val) => {
 }
 const getFileParam = (item) => {
   return {
-    fileId: item.fileId,
-    type: item.type
+    fileId: item.fileId
   }
 }
 const handleSubmit = (instance) => {
@@ -162,18 +162,59 @@ const handleSubmit = (instance) => {
     }
   })
 }
-const handleResubmit = () => {
-  resubmit(submitParam(formData.value)).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 handleResubmit =async () => {
+  let files = []
+  let singleFile={}
+  let fileArray
+  if(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,
+    files: files,
+    singleFile: singleFile,
+    projectId:route.query.projectId,
+  }
+  console.log('params',params)
+  // let res = await resubmit(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 () => {
+  // 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 =  () => {
   getProcessInfo().then(res => {
@@ -195,6 +236,14 @@ const init =  () => {
   })
 }
 init()
+onMounted(async () => {
+  loading.value=true
+  await init()
+  if (route.query.projectId) {
+    await getDetailInfo()
+  }
+
+})
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index b91fb17..cb1a719 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -147,11 +147,11 @@ 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: () => handleEdit(row), type: 'primary'})
-        } else if (row.state === '0') {
+        // } else if (row.state === '0') {
           btn.push({label: '申请', func: () => handleApply(row), type: 'primary'})
-        }
+        // }
         return (
             <div style={{width: '100%'}}>
               {
@@ -193,7 +193,8 @@ const handleEdit = (row) => {
   router.push({
     name:'Initiation/edit',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId
     }
   })
 }
@@ -201,7 +202,6 @@ const handleApply = (row) => {
   router.push({
     name:'Initiation/apply',
     query: {
-      isAdd: 1,
       id: row.requirementId,
       projectId: row.projectId
     }

From c97091db4ffb985dda910cde19218a2a1f40a1fa Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Mon, 20 May 2024 22:03:53 +0800
Subject: [PATCH 32/36] =?UTF-8?q?feat:=20=E4=B8=BB=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B6=E5=9F=BA=E6=9C=AC=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ApprovalDetail.vue        | 121 ++++++++++++++----
 src/components/steps/index.vue                |  41 +++---
 .../project-management/filing/detail.vue      |  92 ++++++++++---
 .../implementation/detail.vue                 | 102 ++++++++++++---
 .../implementation/index.vue                  |   3 +-
 .../project-management/initiation/detail.vue  |   1 +
 6 files changed, 285 insertions(+), 75 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 4748b36..be2fc96 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -2,7 +2,20 @@
   <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">
@@ -22,6 +35,8 @@ 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: {
@@ -40,37 +55,99 @@ const props = defineProps({
     type: Array,
     default: []
   },
+
+  // approval 立项, execute 实施, 归档 archivist
+  type: {
+    type: String,
+    default: 'approval'
+  }
 })
 
 const form = ref()
 
 const localData = reactive({
-  fileList: props.formData.fileList
+  fileList: props.formData.fileList,
+  singleFile: props.formData.singleFile
 })
 
 const schema = computed(()=>{
-  return [
-    {
-      label: '前置流程',
-      prop: 'preProcess',
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '项目立项附件',
-      prop: 'singleFile',
-      colProps: {
-        span: 24
-      }
-    },
-    {
-      label: '其他文件',
-      prop: 'fileList',
-    }
-  ]
+  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))
 })
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 22142ca..546904e 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -79,6 +79,10 @@ const localSteps = ref([
     title: '项目归档',
     key: 'archivist',
   },
+  // {
+  //   title: '项目结项',
+  //   key: 'end',
+  // },
 ])
 
 const baseForm = ref()
@@ -134,9 +138,11 @@ const formatProcedure = (data) => {
           break
         case '20': arr.push(2)
           break
-        case '30': arr.push(3)
+        // case '30': arr.push(3)
+        //   break
+        case '40': arr.push(3)
           break
-        case '40': arr.push(4)
+        case '50': arr.push(4)
           break
       }
     })
@@ -156,9 +162,11 @@ const formatReProcedure = (data) => {
           break
         case 2: arr.push('20')
           break
-        case 3: arr.push('30')
+        // case 3: arr.push('30')
+        //   break
+        case 3: arr.push('40')
           break
-        case 4: arr.push('40')
+        case 4: arr.push('50')
           break
       }
     })
@@ -166,26 +174,13 @@ const formatReProcedure = (data) => {
 }
 
 const formatActive = (val) => {
-  console.log(val, 'val');
   let active = ''
-  // switch(val) {
-  //   case '0' : active = '00'
-  //     break
-  //   case '1' : active = '10'
-  //     break
-  //   case '2' : active = '20'
-  //     break
-  //   case '3' : active = '30'
-  //     break
-  //   case '4' : active = '40'
-  //     break
-  // }
   val == 0 && (active = '00')
   val == 1 && (active = '10')
   val == 2 && (active = '20')
-  val == 3 && (active = '30')
-  val == 4 && (active = '40')
-  console.log(active, 'active--');
+  // val == 3 && (active = '30')
+  val == 3 && (active = '40')
+  val == 4 && (active = '50')
   return active
 }
 
@@ -207,9 +202,11 @@ const handleStep = (key, index) => {
         break
       case 2: active = '20'
         break
-      case 3: active = '30'
+      // case 3: active = '30'
+      //   break
+      case 3: active = '40'
         break
-      case 4: active = '40'
+      case 4: active = '50'
         break
     }
     emits('stepChange', { key, active })
diff --git a/src/views/project-management/filing/detail.vue b/src/views/project-management/filing/detail.vue
index 30c9220..f95826c 100644
--- a/src/views/project-management/filing/detail.vue
+++ b/src/views/project-management/filing/detail.vue
@@ -1,23 +1,33 @@
 <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>
+      <ApprovalDetail type="archivist" v-show="showActive == '50'" :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"></el-tab-pane>
-      <el-tab-pane label="项目归档" name="third" :disabled="true"></el-tab-pane>
-    </el-tabs>
-  </div>
+    </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)
@@ -25,6 +35,58 @@ const handleClick = (tab, event) => {
 
   }
 }
+
+
+
+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">
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 386dc31..0057b63 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,29 +1,101 @@
 <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>
 </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";
+
+// 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">
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 12e05ee..5e3eae9 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -195,7 +195,8 @@ const handleDetail = (row) => {
   router.push({
     name: 'Implementation/detail',
     query: {
-      id: row.requirementId
+      id: row.requirementId,
+      projectId: row.projectId
     }
   })
 }
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 19bc487..7de1bf3 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -122,6 +122,7 @@ const getAllInfo = async (state) => {
     } else if(state == '10') {
       summaryData.value = data;
     }
+    console.log(data, 'data--22');
     commonForm.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;

From 6c80652416a5babc03659d1bcc2f82799a7c1b46 Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Mon, 20 May 2024 22:18:17 +0800
Subject: [PATCH 33/36] feat: agree and reject

---
 src/views/project-management/implementation/detail.vue | 3 ++-
 src/views/project-management/initiation/detail.vue     | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 0057b63..27265ad 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -12,9 +12,10 @@
       <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>
-
+      
     </template>
   </steps>
+  <Opinion: v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
 </template>
 
 <script setup lang="jsx">
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 7de1bf3..5663c19 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -30,8 +30,10 @@
       />
       <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>
+      
     </template>
   </steps>
+  <Opinion: v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
 </template>
 
 <script setup lang="jsx">

From 3270aeef06be760007c423e7516db2ac8e9b5470 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 20 May 2024 23:01:53 +0800
Subject: [PATCH 34/36] =?UTF-8?q?fix=20:=20=E9=87=8D=E6=96=B0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=85=A8=E6=B5=81=E7=A8=8B=E5=88=9D=E6=AD=A5=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project-manage/index.js               |  59 +++++++-
 src/components/AttachmentUpload.vue           |  58 +++++---
 .../DetailComponent/CollectionDetail.vue      |   6 +-
 .../DetailComponent/SummaryDetail.vue         |   6 +-
 src/views/project-demand/collection/add.vue   |   2 +-
 .../project-demand/collection/detail.vue      |   9 +-
 src/views/project-demand/summary/add.vue      |  16 +--
 src/views/project-demand/summary/detail.vue   |  30 ++--
 .../project-management/filing/conclusion.vue  |  76 ++++++-----
 .../implementation/check.vue                  | 129 +++++++++---------
 .../project-management/initiation/apply.vue   |  76 ++++++-----
 src/views/workflow/common/OperationRender.vue |   2 +-
 12 files changed, 280 insertions(+), 189 deletions(-)

diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js
index 4bc11b4..815ff34 100644
--- a/src/api/project-manage/index.js
+++ b/src/api/project-manage/index.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request.js'
-
-export const getProcessInfo = () => {
+//项目立项
+export const getApplyProcess = () => {
   return request({
     url: '/workflow/mosr/project/approval/initiation/process',
     method: "post"
@@ -10,34 +10,79 @@ export const projectApply = (data) => {
   return request({
     url: '/workflow/mosr/project/approval/initiation/apply',
     method: "post",
-    data:data
+    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
+    data: data
   });
 };
 export const getProjectCheckProcess = (data) => {
   return request({
     url: '/workflow/mosr/project/implementation/process',
     method: "post",
-    data:data
+    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
+    data: data
   });
 };
 export const getProjectConclusionProcess = (data) => {
   return request({
     url: '/workflow/mosr/project/filing/process',
     method: "post",
-    data:data
+    data: data
   });
 };
diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 2c707d1..0b74133 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -3,10 +3,13 @@
     <el-row>
       <el-col :span="24">
         <el-form-item :label="label" prop="attachment">
-          <template v-if="preview">
-            <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 18px">{{ singleFile?.originalFileName }}</el-button>
+          <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>
+          <template v-else-if="!preview||JSON.stringify(singleFile) === '{}'||singleFile==null">
             <file-upload @getFile="getAttachment" :showFileList="showFileList" :maxSize="0" @delete="deleteAttachment"/>
           </template>
         </el-form-item>
@@ -31,7 +34,7 @@
 <script setup lang="jsx">
 import FileUpload from '@/components/FileUpload.vue'
 import {deleteFile, downloadFile} from "../api/project-demand";
-import {ElMessage, ElMessageBox} from "element-plus";
+import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
 
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const formData = ref({})
@@ -77,11 +80,11 @@ const tableConfig = reactive({
   ]
 })
 const rules = reactive({
-  attachment: [{required: true, message: '请上传附件', trigger: ['blur','change']}],
+  attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
 })
-const applyForm=ref()
-const singleFile=ref()
-const allFileList=ref([])
+const applyForm = ref()
+const singleFile = ref()
+const allFileList = ref([])
 const props = defineProps({
   showFileList: {
     type: Boolean,
@@ -95,10 +98,10 @@ const props = defineProps({
   }, preview: {
     type: Boolean,
     default: false
-  },otherFileList: {
+  }, otherFileList: {
     type: Array,
     default: []
-  },formData: {
+  }, formData: {
     type: Array,
     default: []
   }
@@ -107,16 +110,19 @@ watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
 watch(() => props.otherFileList, (newVal) => {
-  newVal.forEach(item=>{
+  newVal.forEach(item => {
     allFileList.value.push(item)
   })
 }, {deep: true})
 watch(() => props.formData.fileList, (newVal) => {
-  newVal.forEach(item=>{
-    allFileList.value.push(item)
-  })
+  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) => {
@@ -132,20 +138,32 @@ const deleteAttachment = (val) => {
     }
   });
 }
-const deleteOtherFile = (row) => {
+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) {
-        ElMessage.success("删除成功");
-        props.otherFileList.splice(props.otherFileList.findIndex((item) => item.id === row.fileId), 1);
+        if (type === 1) {
+          singleFile.value = {}
+        } else {
+          props.otherFileList.splice(props.otherFileList.findIndex((item) => item.id === row.fileId), 1);
+        }
       }
     });
   }).catch(() => {
-    ElMessage.warning("用户取消删除! ");
+    ElNotification({
+      title: '提示',
+      message: "用户取消删除! ",
+      type: 'warning'
+    })
   })
 }
 const handleDownload = (row) => {
@@ -158,10 +176,10 @@ const handleDownload = (row) => {
   })
 }
 defineExpose({
-  validate(){
+  validate() {
     return applyForm.value.validate()
   },
-  clearValidate(){
+  clearValidate() {
     return applyForm.value.clearValidate()
   },
   allFileList,
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index bbc1e2f..a9454f2 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -163,8 +163,10 @@ watch(() => props.loading, (newVal) => {
 watch(() => props.companyOption, (newVal) => {
   props.companyOption = newVal
 }, {deep: true})
-watch(() => props.formData.companyIds, (newVal) => {
-  props.formData.companyIds = getDataSourceOptionItem(newVal)
+watch(() => props.formData, (newVal) => {
+  if(newVal!=null){
+    props.formData.companyIds = getDataSourceOptionItem(newVal.companyIds)
+  }
 }, {deep: true})
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 3365874..9606dff 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -23,8 +23,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="所属公司" prop="companyName">
-            <span>{{ localFormData.companyName }}</span>
+          <el-form-item label="所属公司" prop="affiliatedCompanyId">
+            <span>{{ localFormData.affiliatedCompanyId }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -158,9 +158,9 @@
         <div class="process">
           <operation-render v-if="processViewer" :operation-list="data.operationList"
                             :state="data.state"/>
+          <process-diagram-viewer  v-if="processViewer"/>
         </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>
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index 46c3d17..bb9188d 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -229,7 +229,7 @@ const submitParam = (item) => {
     deadline: item.deadline,
     requirementId: item.requirementId ? item.requirementId : 0,
     requirementName: item.requirementName,
-    files: files,
+    fileList: files,
     deploymentId: processInstanceData.value.deploymentId
   }
 }
diff --git a/src/views/project-demand/collection/detail.vue b/src/views/project-demand/collection/detail.vue
index f0d3f5a..3ac3f10 100644
--- a/src/views/project-demand/collection/detail.vue
+++ b/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>
@@ -87,6 +87,7 @@ 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([])
@@ -202,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)
@@ -218,7 +220,10 @@ const init = async () => {
     })
   })
 }
-init()
+onMounted(async () => {
+  loading.value=true
+  await init()
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 089ce6f..6fc39a9 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -344,7 +344,7 @@ const handleSubmit = async (instance) => {
   })
   let params = {
     "specialFund": "2",
-    "projectName": "重新提交全流程测试",
+    "projectName": "重新提交全流程测试2024520",
     "startTime": "2024-05-24 00:00:00",
     "endTime": "2024-05-29 00:00:00",
     "projectType": "3",
@@ -363,19 +363,18 @@ const handleSubmit = async (instance) => {
     "resultForm": "3",
     "projectImpact": "3",
     "rdSubject": "3",
-    "affiliatedCompanyId": 93,
+    "affiliatedCompanyId": formData.value.affiliatedCompanyId,
     "serviceDescription": "3",
     "contentDescription": "3",
     "specialFundAmount": "3",
     deploymentId: deploymentId.value,
     "singleFile": singleFile,
     "files": otherFiles,
-    // "requirementId":route.query.id,
-    "requirementId": 102
+    "requirementId":route.query.id
   }
   // ...formData.value,
   //   deploymentId: deploymentId.value,
-  //   files: files,
+  //   fileList: files,
   //   requirementId:102
   // }
   let res = await requirementReported(params)
@@ -416,9 +415,9 @@ const handleResubmit = () => {
   let params={
     ...formData.value,
     deploymentId: deploymentId.value,
-    files: otherFiles,
+    fileList: otherFiles,
     singleFile: singleFile,
-    requirementId: 102
+    requirementId: route.query.id
   }
   console.log('重新提交params',params)
   resubmitReported(params).then(res => {
@@ -473,12 +472,11 @@ const init = async () => {
   })
 }
 onMounted(async () => {
-  loading.value=true
   await init()
   if (route.query.projectId) {
+    loading.value=true
     await getDetailInfo()
   }
-
 })
 const staging = async () => {
 }
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 2b3f22c..46dd605 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -15,6 +15,7 @@ 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([])
@@ -33,18 +34,25 @@ const getInfo = async (state) => {
   await getCompanyOption()
   summaryProcessViewer.value = false
   loading.value = true
-  const {code, data} = await getMapProjectStateInfo(projectId, state)
-  summaryData.value = data;
-  loading.value = false
-  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 {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
+    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) => {
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index 116ae89..a32402b 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -23,7 +23,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {downloadFile} from "@/api/project-demand";
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
-import {getProjectConclusionProcess, projectConclusion} from "@/api/project-manage";
+import {getProjectConclusionProcess, projectConclusion,getConclusionDetail, resubmitConclusion} from "@/api/project-manage";
 const router = useRouter()
 const route = useRoute()
 const tagsViewStore = useTagsView()
@@ -128,11 +128,11 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    // if(JSON.stringify(file.value) == "{}"){
-    //   applyForm.value.validate()
-    // } else {
-    //   applyForm.value.clearValidate()
-    // }
+    if(JSON.stringify(file.value) === "{}"){
+      attachment.value.validate()
+    } else {
+      attachment.value.clearValidate()
+    }
     if (!valid) return
     let files = []
     let singleFile={}
@@ -147,7 +147,7 @@ const handleSubmit = (instance) => {
     let params = {
       deploymentId: deploymentId.value,
       requirementId: route.query.id,
-      files: files,
+      fileList: files,
       singleFile: singleFile,
       projectId:route.query.projectId,
     }
@@ -170,7 +170,12 @@ const handleResubmit = () => {
   let singleFile = {}
   let otherFiles = []
   let fileArray
-  if(name.value === 'Filing/edit'){
+  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
     }
@@ -190,37 +195,37 @@ const handleResubmit = () => {
   let params={
     deploymentId: deploymentId.value,
     requirementId: route.query.id,
-    files: otherFiles,
+    fileList: otherFiles,
     singleFile: singleFile,
     projectId:route.query.projectId,
   }
   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: 'Filing'
-  //     })
-  //   }
-  // })
+  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 () => {
-  // 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
-  //   }
-  // })
+  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 => {
@@ -242,12 +247,11 @@ const init =  () => {
   })
 }
 onMounted(async () => {
-  loading.value=true
   await init()
-  if (route.query.projectId) {
+  if (name.value === 'Filing/edit') {
+    loading.value=true
     await getDetailInfo()
   }
-
 })
 </script>
 
diff --git a/src/views/project-management/implementation/check.vue b/src/views/project-management/implementation/check.vue
index 18fef17..a7824d6 100644
--- a/src/views/project-management/implementation/check.vue
+++ b/src/views/project-management/implementation/check.vue
@@ -19,18 +19,17 @@
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit(applyForm)">提交</el-button>
-      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit(applyForm)">重新提交</el-button>
     </div>
   </div>
 </template>
 
 <script setup lang="jsx">
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getProjectCheckProcess, projectCheck} from "@/api/project-manage";
+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'
-import {getDetail, resubmitReported} from "../../project-demand/summary/api";
 const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
@@ -83,11 +82,11 @@ const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
     if (!valid) return
-    // if(JSON.stringify(file.value) == "{}"){
-    //   applyForm.value.validate()
-    // }else {
-    //   applyForm.value.clearValidate()
-    // }
+    if(JSON.stringify(file.value) === "{}"){
+      attachment.value.validate()
+    }else {
+      attachment.value.clearValidate()
+    }
     if (!valid) return
     let files = []
     let singleFile={}
@@ -111,11 +110,11 @@ const handleSubmit = (instance) => {
     let params = {
       deploymentId: deploymentId.value,
       requirementId: route.query.id,
-      files: files,
+      fileList: files,
       singleFile: singleFile,
       projectId:route.query.projectId,
     }
-    console.log('params',params)
+    console.log('params-提交',params)
     let res = await projectCheck(params)
     ElNotification({
       title: '提示',
@@ -130,61 +129,70 @@ const handleSubmit = (instance) => {
     }
   })
 }
-const handleResubmit = () => {
-  let singleFile = {}
-  let otherFiles = []
-  let fileArray
-  if(name.value === 'Implementation/edit'){
-    singleFile = {
-      fileId: attachment.value.singleFile.fileId
+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()
     }
-    fileArray=attachment.value.allFileList
-  }else {
-    if (file.value.fileId !== undefined) {
+    if (attachment.value.singleFile!==null&&name.value === 'Implementation/edit') {
       singleFile = {
-        fileId: file.value.fileId
+        fileId: attachment.value.singleFile.fileId
       }
+      fileArray = attachment.value.allFileList
+    } else {
+      if (file.value.fileId !== undefined) {
+        singleFile = {
+          fileId: file.value.fileId
+        }
+      }
+      fileArray = otherFileList.value
     }
-    fileArray=otherFileList.value
-  }
-  fileArray.forEach(item => {
-    otherFiles.push(getFileParam(item))
+    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'
+        })
+      }
+    })
   })
-  //todo requirementId
-  let params={
-    deploymentId: deploymentId.value,
-    requirementId: route.query.id,
-    files: otherFiles,
-    singleFile: singleFile,
-    projectId:route.query.projectId,
-  }
-  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: 'Implementation'
-  //     })
-  //   }
-  // })
 }
 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
-  //   }
-  // })
+  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 => {
@@ -206,12 +214,11 @@ const init =  () => {
   })
 }
 onMounted(async () => {
-  loading.value=true
   await init()
-  if (route.query.projectId) {
+  if (name.value === 'Implementation/edit'){
+    loading.value=true
     await getDetailInfo()
   }
-
 })
 </script>
 
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index e339f3a..6c14d5c 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -28,7 +28,7 @@
 import {useTagsView} from '@/stores/tagsview.js'
 import {ElMessage, ElNotification} from "element-plus";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getProcessInfo, projectApply} from "@/api/project-manage";
+import {getApplyProcess, projectApply,resubmitApply,getApplyDetail} from "@/api/project-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 
 const tagsViewStore = useTagsView()
@@ -124,11 +124,11 @@ const getFileParam = (item) => {
 const handleSubmit = (instance) => {
   if (!instance) return
   instance.validate(async (valid) => {
-    // if(JSON.stringify(file.value) == "{}"){
-    //   applyForm.value.validate()
-    // }else {
-    //   applyForm.value.clearValidate()
-    // }
+    if(JSON.stringify(file.value) === "{}"){
+      attachment.value.validate()
+    }else {
+      attachment.value.clearValidate()
+    }
     if (!valid) return
     let files = []
     let singleFile={}
@@ -143,7 +143,7 @@ const handleSubmit = (instance) => {
     let params = {
       deploymentId: deploymentId.value,
       requirementId: route.query.id,
-      files: files,
+      fileList: files,
       singleFile: singleFile,
       projectId:route.query.projectId,
     }
@@ -166,7 +166,12 @@ const handleResubmit =async () => {
   let files = []
   let singleFile={}
   let fileArray
-  if(name.value === 'Initiation/edit'){
+  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
     }
@@ -185,39 +190,39 @@ const handleResubmit =async () => {
   let params = {
     deploymentId: deploymentId.value,
     requirementId: route.query.id,
-    files: files,
+    fileList: files,
     singleFile: singleFile,
     projectId:route.query.projectId,
   }
   console.log('params',params)
-  // let res = await resubmit(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'
-  //   })
-  // }
+  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 () => {
-  // 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
-  //   }
-  // })
+  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 =  () => {
-  getProcessInfo().then(res => {
+  getApplyProcess().then(res => {
     processDiagramViewer.value = false
     if (res.code === 1000) {
       let data = res.data
@@ -237,12 +242,11 @@ const init =  () => {
 }
 init()
 onMounted(async () => {
-  loading.value=true
   await init()
-  if (route.query.projectId) {
+  if (name.value === 'Initiation/edit') {
+    loading.value=true
     await getDetailInfo()
   }
-
 })
 </script>
 
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index 1321f84..fbfb469 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -86,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) {

From 9f4fe95e4d28ba2eca4ace07fc95505a6021ddf2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 21 May 2024 00:14:53 +0800
Subject: [PATCH 35/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E6=B8=B2=E6=9F=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ApprovalDetail.vue        | 10 +++----
 .../DetailComponent/CollectionDetail.vue      |  2 +-
 .../DetailComponent/SummaryDetail.vue         |  2 +-
 src/views/project-demand/summary/detail.vue   |  9 +++++-
 .../implementation/detail.vue                 | 11 +++----
 .../project-management/initiation/detail.vue  | 30 ++++---------------
 .../workflow/common/ProcessDiagramViewer.vue  |  7 +++--
 7 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index be2fc96..9e937f9 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -21,7 +21,7 @@
         <div class="process">
           <operation-render v-if="processViewer" :operation-list="data.operationList"
                             :state="data.state"/>
-          <process-diagram-viewer v-if="processViewer"/>
+          <process-diagram-viewer v-if="processViewer" :id-name="type"/>
         </div>
     </div>
     <Opinion: v-if="data.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
@@ -91,8 +91,8 @@ const schema = computed(()=>{
         component: ()=>(
           <div>
             {
-              props.formData.singleFile?.originalFileName ? 
-              <span 
+              props.formData.singleFile?.originalFileName ?
+              <span
                 style={{color: '#409EFF', cursor: 'pointer'}}
                 onClick={()=>handleDownload(props.formData.singleFile)}
               >
@@ -101,7 +101,7 @@ const schema = computed(()=>{
               <span>{'--'}</span>
             }
           </div>
-          
+
         )
       },
     ]
@@ -155,4 +155,4 @@ watchEffect(()=>{
 
 <style lang="scss" scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index a9454f2..f1fdfd4 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -61,7 +61,7 @@
         <div class="process">
           <operation-render v-if="processViewer" :operation-list="data.operationList"
                             :state="data.state"/>
-          <process-diagram-viewer v-if="processViewer"/>
+          <process-diagram-viewer v-if="processViewer" id-name="collectionProcess"/>
         </div>
       </div>
     </el-form>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 9606dff..e696307 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -158,7 +158,7 @@
         <div class="process">
           <operation-render v-if="processViewer" :operation-list="data.operationList"
                             :state="data.state"/>
-          <process-diagram-viewer  v-if="processViewer"/>
+          <process-diagram-viewer  v-if="processViewer" id-name="summaryProcess"/>
         </div>
       </div>
       <div class="oper-page-btn" v-if="data.state === '1' && data.taskId">
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 46dd605..3a973c8 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -5,8 +5,11 @@
                          :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">
@@ -19,6 +22,7 @@ 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)
@@ -31,7 +35,9 @@ const getCompanyOption = async () => {
 }
 const getInfo = async (state) => {
   const projectId = route.query.projectId
-  await getCompanyOption()
+  if(showActive == '00'){
+    await getCompanyOption()
+  }
   summaryProcessViewer.value = false
   loading.value = true
   const {code, data,msg} = await getMapProjectStateInfo(projectId, state)
@@ -43,6 +49,7 @@ const getInfo = async (state) => {
   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;
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 27265ad..8bfaacf 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,8 +1,8 @@
 <template>
   <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
-      <collection-detail 
-        :formData="collectionData.formData" 
+      <collection-detail
+        :formData="collectionData.formData"
         :data="collectionData"
         :processViewer="commonProvessViewer"
         :companyOption="companyOption"
@@ -12,10 +12,10 @@
       <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>
-      
+
     </template>
   </steps>
-  <Opinion: v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
+  <opinion v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"/>
 </template>
 
 <script setup lang="jsx">
@@ -27,6 +27,7 @@ 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) => {
@@ -83,7 +84,7 @@ const getAllInfo = async (state) => {
   } catch {
     loading.close()
   }
-  
+
 }
 
 const showActive = ref()
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index 5663c19..90a1c5d 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -1,27 +1,8 @@
 <template>
-  <!-- <div class="detail-block">
-    <el-tabs
-        v-model="activeName"
-        type="card"
-        class="demo-tabs"
-        @tab-click="handleClick"
-    >
-      <el-tab-pane label="需求征集" name="first">
-        <collection-detail :formData="collectionData.formData" :data="collectionData"
-                           :processViewer="collectionProcessViewer"
-                           :companyOption="companyOption" @getInfo="getDemandCollectionInfo"/>
-      </el-tab-pane>
-      <el-tab-pane label="需求上报" name="second">
-        <summary-detail :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer"/>
-      </el-tab-pane>
-      <el-tab-pane label="项目立项" name="third" :disabled="true"></el-tab-pane>
-    </el-tabs>
-  </div> -->
-
   <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
-      <collection-detail 
-        :formData="collectionData.formData" 
+      <collection-detail
+        :formData="collectionData.formData"
         :data="collectionData"
         :processViewer="commonProvessViewer"
         :companyOption="companyOption"
@@ -30,10 +11,10 @@
       />
       <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>
-      
+
     </template>
   </steps>
-  <Opinion: v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"></Opinion:>
+  <opinion v-if="commonForm.taskId" :formData="formData" :taskId="formData.taskId"/>
 </template>
 
 <script setup lang="jsx">
@@ -46,6 +27,7 @@ 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')
@@ -140,7 +122,7 @@ const getAllInfo = async (state) => {
   } catch {
     loading.close()
   }
-  
+
 }
 
 const showActive = ref()
diff --git a/src/views/workflow/common/ProcessDiagramViewer.vue b/src/views/workflow/common/ProcessDiagramViewer.vue
index 595e0c3..81269cb 100644
--- a/src/views/workflow/common/ProcessDiagramViewer.vue
+++ b/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'
   }
 })
 

From a4255c3157104110bf4a417ba824aa005e776edb Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 21 May 2024 00:21:24 +0800
Subject: [PATCH 36/36] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/index.vue        | 6 +++---
 src/views/project-management/initiation/index.vue | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 5fe891b..5a82315 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -122,11 +122,11 @@ 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: () => handleEdit(row), type: 'primary'})
-        // } else if (row.state === '0') {
+        } else if (row.state === '0') {
           btn.push({label: '上报', func: () => handleAdd(row), type: 'primary'})
-        // }
+        }
         return (
             <div style={{width: '100%'}}>
               {
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index cb1a719..30993ed 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -147,11 +147,11 @@ 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: () => handleEdit(row), type: 'primary'})
-        // } else if (row.state === '0') {
+        } else if (row.state === '0') {
           btn.push({label: '申请', func: () => handleApply(row), type: 'primary'})
-        // }
+        }
         return (
             <div style={{width: '100%'}}>
               {
@@ -185,7 +185,8 @@ const handleDetail = (row) => {
     name:'Initiation/detail',
     query: {
       id: row.requirementId,
-      projectId: row.projectId
+      projectId: row.projectId,
+      state: 2
     }
   })
 }