Merge pull request 'fix : 重新提交全流程初步完成' (#217) from dj into master

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

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"
@@ -13,6 +13,35 @@ export const projectApply = (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',
@@ -27,6 +56,22 @@ export const getProjectCheckProcess = (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',

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">
+          <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="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({})
@@ -112,11 +115,14 @@ watch(() => props.otherFileList, (newVal) => {
   })
 }, {deep: true})
 watch(() => props.formData.fileList, (newVal) => {
+  if (props.preview) {
     newVal.forEach(item => {
       allFileList.value.push(item)
     })
+  }
 }, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
+  // singleFile.value = {}
   singleFile.value = newVal
 }, {deep: true})
 const getAttachment = (val) => {
@@ -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("删除成功");
+        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) => {

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) => {
+watch(() => props.formData, (newVal) => {
-  props.formData.companyIds = getDataSourceOptionItem(newVal)
+  if(newVal!=null){
+    props.formData.companyIds = getDataSourceOptionItem(newVal.companyIds)
+  }
 }, {deep: true})
 watch(() => props.processViewer, (newVal) => {
   props.processViewer = newVal

src/components/DetailComponent/SummaryDetail.vue

@@ -23,8 +23,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="所属公司" prop="companyName">
+          <el-form-item label="所属公司" prop="affiliatedCompanyId">
-            <span>{{ localFormData.companyName }}</span>
+            <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>

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
   }
 }

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>

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":route.query.id
-    "requirementId": 102
   }
   // ...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 () => {
 }

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,7 +34,13 @@ const getInfo = async (state) => {
   await getCompanyOption()
   summaryProcessViewer.value = false
   loading.value = true
-  const {code, data} = await getMapProjectStateInfo(projectId, state)
+  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)
@@ -46,6 +53,7 @@ const getInfo = async (state) => {
       summaryProcessViewer.value = true
     })
   }
+}
 
 const setDetail = (active) => {
   showActive.value = active

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) == "{}"){
+    if(JSON.stringify(file.value) === "{}"){
-    //   applyForm.value.validate()
+      attachment.value.validate()
-    // } else {
+    } else {
-    //   applyForm.value.clearValidate()
+      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 => {
+  resubmitConclusion(params).then(res => {
-  //   ElNotification({
+    ElNotification({
-  //     title: '提示',
+      title: '提示',
-  //     message: res.msg,
+      message: res.msg,
-  //     type: res.code === 1000 ? 'success' : 'error'
+      type: res.code === 1000 ? 'success' : 'error'
-  //   })
+    })
-  //   if (res.code === 1000) {
+    if (res.code === 1000) {
-  //     tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-  //     router.push({
+      router.push({
-  //       name: 'Filing'
+        name: 'Filing'
-  //     })
+      })
-  //   }
+    }
-  // })
+  })
 }
 const getDetailInfo = async () => {
-  // getDetail(route.query.projectId).then(res => {
+  getConclusionDetail(route.query.projectId).then(res => {
-  //   ElNotification({
+    ElNotification({
-  //     title: '提示',
+      title: '提示',
-  //     message: res.msg,
+      message: res.msg,
-  //     type: res.code === 1000 ? 'success' : 'error'
+      type: res.code === 1000 ? 'success' : 'error'
-  //   })
+    })
-  //   if (res.code === 1000) {
+    if (res.code === 1000) {
-  //     formData.value = res.data.formData
+      formData.value = res.data.formData
-  //     loading.value=false
+      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>
 

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) == "{}"){
+    if(JSON.stringify(file.value) === "{}"){
-    //   applyForm.value.validate()
+      attachment.value.validate()
-    // }else {
+    }else {
-    //   applyForm.value.clearValidate()
+      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,11 +129,19 @@ const handleSubmit = (instance) => {
     }
   })
 }
-const handleResubmit = () => {
+const handleResubmit = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
     let singleFile = {}
     let otherFiles = []
     let fileArray
-  if(name.value === 'Implementation/edit'){
+    if (JSON.stringify(file.value) === "{}"||attachment.value.singleFile===null) {
+      attachment.value.validate()
+    } else {
+      attachment.value.clearValidate()
+    }
+    if (attachment.value.singleFile!==null&&name.value === 'Implementation/edit') {
       singleFile = {
         fileId: attachment.value.singleFile.fileId
       }
@@ -154,37 +161,38 @@ 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 => {
+    resubmitCheck(params).then(res => {
-  //   ElNotification({
+      ElNotification({
-  //     title: '提示',
+        title: '提示',
-  //     message: res.msg,
+        message: res.msg,
-  //     type: res.code === 1000 ? 'success' : 'error'
+        type: res.code === 1000 ? 'success' : 'error'
-  //   })
+      })
-  //   if (res.code === 1000) {
+      if (res.code === 1000) {
-  //     tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-  //     router.push({
+        router.push({
-  //       name: 'Implementation'
+          name: 'Implementation'
-  //     })
+        })
-  //   }
+      }
-  // })
+    })
+  })
 }
 const getDetailInfo = async () => {
-  // getDetail(route.query.projectId).then(res => {
+  getCheckDetail(route.query.projectId).then(res => {
-  //   ElNotification({
+    ElNotification({
-  //     title: '提示',
+      title: '提示',
-  //     message: res.msg,
+      message: res.msg,
-  //     type: res.code === 1000 ? 'success' : 'error'
+      type: res.code === 1000 ? 'success' : 'error'
-  //   })
+    })
-  //   if (res.code === 1000) {
+    if (res.code === 1000) {
-  //     formData.value = res.data.formData
+      formData.value = res.data.formData
-  //     loading.value=false
+      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>
 

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) == "{}"){
+    if(JSON.stringify(file.value) === "{}"){
-    //   applyForm.value.validate()
+      attachment.value.validate()
-    // }else {
+    }else {
-    //   applyForm.value.clearValidate()
+      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)
+  let res = await resubmitApply(params)
-  // ElNotification({
+  ElNotification({
-  //   title: '提示',
+    title: '提示',
-  //   message: res.msg,
+    message: res.msg,
-  //   type: res.code === 1000 ? 'success' : 'error'
+    type: res.code === 1000 ? 'success' : 'error'
-  // })
+  })
-  // if (res.code === 1000) {
+  if (res.code === 1000) {
-  //   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-  //   await router.push({
+    await router.push({
-  //     name: 'Initiation'
+      name: 'Initiation'
-  //   })
+    })
-  // }
+  }
 }
 const getDetailInfo = async () => {
-  // getDetail(route.query.projectId).then(res => {
+  getApplyDetail(route.query.projectId).then(res => {
-  //   ElNotification({
+    ElNotification({
-  //     title: '提示',
+      title: '提示',
-  //     message: res.msg,
+      message: res.msg,
-  //     type: res.code === 1000 ? 'success' : 'error'
+      type: res.code === 1000 ? 'success' : 'error'
-  //   })
+    })
-  //   if (res.code === 1000) {
+    if (res.code === 1000) {
-  //     formData.value = res.data.formData
+      formData.value = res.data.formData
-  //     loading.value=false
+      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>
 

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) {