fix : 修复详情提交/重新提交功能

src/components/DetailComponent/ApprovalDetail.vue

@@ -20,7 +20,7 @@
     <div class="approval-record">
       <baseTitle title="审批记录"></baseTitle>
       <div class="process">
-        <operation-render v-if="processViewer" :operation-list="data.operationList"
+        <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
                           :state="data.state"/>
         <process-diagram-viewer v-if="processViewer" :id-name="idName?idName:type"/>
       </div>
@@ -40,8 +40,8 @@ const props = defineProps({
     default: {}
   },
   data: {
-    type: Array,
-    default: []
+    type: Object,
+    default: {}
   },
   processViewer: {
     type: Boolean,

src/components/DetailComponent/CollectionDetail.vue

@@ -59,7 +59,7 @@
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
-          <operation-render v-if="processViewer" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer" id-name="collectionProcess"/>
         </div>

src/components/DetailComponent/ProjectApply.vue

@@ -1,32 +1,32 @@
 <template>
   <div class="apply-block">
-    <el-form :model="formData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
+    <el-form :model="localFormData" ref="formRef" label-width="auto" :rules="rules" v-if="step!=='50'">
       <el-row>
         <el-col :span="12">
           <el-form-item label="前置流程">
-            <el-input v-model="formData.requirementName" clearable></el-input>
+            <el-input v-model="localFormData.requirementName" clearable></el-input>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <AttachmentUpload ref="attachment" :label="title+'附件'" :showTable="showTable" :otherFileList="otherFileList"
+    <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
+                      :otherFileList="otherFileList"
                       @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
-                      :preview="route.query.state==3"/>
-    <div v-if="route.query.state==3">
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
+                      :preview="mode == 'resubmit'"/>
+    <div v-if="mode === 'resubmit'">
       <baseTitle title="审批记录"></baseTitle>
       <div class="process">
-        <operation-render v-if="processDiagramViewer" :operation-list="data.operationList"
-                          :state="data.state"/>
+        <operation-render :operation-list="data.operationList" :state="data.state"/>
       </div>
     </div>
     <baseTitle title="流程"></baseTitle>
     <div class="approval-record">
-      <process-diagram-viewer mode="view" idName="projectApply" v-if="processDiagramViewer"/>
+      <process-diagram-viewer mode="view" :idName="title" v-if="processDiagramViewer"/>
     </div>
     <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="route.query.state==0" @click="handleSubmit">提交</el-button>
-      <el-button color="#DED0B2" v-else-if="route.query.state==3" @click="handleSubmit">重新提交</el-button>
+      <el-button color="#DED0B2" v-if="mode === 'submit'" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" v-else-if="mode === 'resubmit'" @click="handleSubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
@@ -40,14 +40,11 @@ import {
   getApplyProcess,
   projectApply,
   resubmitApply,
-  getApplyDetail,
   getProjectCheckProcess,
   projectCheck,
   resubmitCheck,
-  getCheckDetail,
   projectConclusion,
   resubmitConclusion,
-  getConclusionDetail,
   getProjectConclusionProcess
 } from "@/api/project-manage";
 import {useProcessStore} from '@/stores/processStore.js';
@@ -59,15 +56,23 @@ const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
     type: String,
-    default: '项目立项'
+    default: 'apply'
   },
   showTable: {
     type: Boolean,
     default: false
   },
+  mode: {
+    type: String,
+    default: "view"
+  },
   data: {
-    type: Array,
-    default: []
+    type: Object,
+    default: {}
+  },
+  formData: {
+    type: Object,
+    default: {}
   }
 })
 const rules = reactive({
@@ -76,16 +81,25 @@ const rules = reactive({
 const tagsViewStore = useTagsView()
 const processStore = useProcessStore()
 const otherFileList = ref([])
-const formData = ref({})
+const localFormData = ref({})
 const attachment = ref()
 const showTable = ref(true)
 const loading = ref(false)
 const processDiagramViewer = ref(false)
 const name = ref(router.currentRoute.value.name)
-const formRef = ref()
 const deploymentId = ref()
 const projectId = ref(route.query.projectId)
 const step = ref(route.query.step)
+const getTitleName = (type) => {
+  switch (type) {
+    case 'apply':
+      return '项目立项'
+    case 'check':
+      return '项目验收'
+    case 'filing':
+      return '项目归档'
+  }
+}
 const handleBack = () => {
   history.back()
 }
@@ -97,12 +111,12 @@ const compositeParam = (item) => {
     fileType: item.fileType,
     url: item.url,
     newFile: false,
-    tag: props.title
+    tag: getTitleName(props.title)
   }
 }
 const getAttachment = (val) => {
   console.log('上传文件getAttachment', val)
-  formData.value.singleFile = compositeParam(val)
+  localFormData.value.singleFile = compositeParam(val)
 }
 const getOtherFile = (val) => {
   console.log('上传文件getOtherFile', val)
@@ -119,23 +133,27 @@ const getFileParam = (item) => {
     tag: item.tag
   }
 }
-const handleSubmit =async () => {
+const handleSubmit = async () => {
   // if (!formRef.value) return
   // formRef.value.validate(async (valid) => {
   //   if (!valid) return
-    let files = []
-    if (route.query.state === '3') {
-      attachment.value.allFileList.forEach(item => {
-        files.push(getFileParam(item))
-      })
-    } else {
-      otherFileList.value.forEach(item => {
-        files.push(getFileParam(item))
-      })
-    }
-    // if (formData.value.singleFile !== undefined) {
-    //   formData.value.singleFile = getFileParam(formData.value.singleFile)
-    // }
+  let files = []
+  if (props.mode === 'resubmit') {
+    attachment.value.allFileList.forEach(item => {
+      files.push(getFileParam(item))
+    })
+  } else {
+    otherFileList.value.forEach(item => {
+      files.push(getFileParam(item))
+    })
+  }
+  // if (localFormData.value.singleFile !== undefined) {
+  //   localFormData.value.singleFile = getFileParam(localFormData.value.singleFile)
+  // }
+  console.log('attachment.value.singleFile',attachment.value,attachment.value.singleFile)
+  if(localFormData.value.singleFile){
+
+  }else {
     if (attachment.value.singleFile == null) {
       attachment.value.validate()
       ElNotification({
@@ -147,55 +165,57 @@ const handleSubmit =async () => {
     } else {
       attachment.value.clearValidate()
     }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: formData.value.singleFile,
-      projectId: projectId.value,
+  }
+
+  let params = {
+    deploymentId: deploymentId.value,
+    requirementId: route.query.id,
+    fileList: files,
+    singleFile: localFormData.value.singleFile,
+    projectId: projectId.value,
+  }
+  console.log('params', params)
+  let res
+  if (step.value === '20') {
+    if (props.mode === 'resubmit') {
+      res = await resubmitApply(params)
+    } else {
+      res = await projectApply(params)
     }
-    console.log('params', params)
-    let res
+  } else if (step.value === '40') {
+    if (props.mode === 'resubmit') {
+      res = await resubmitCheck(params)
+    } else {
+      res = await projectCheck(params)
+    }
+  } else if (step.value === '50') {
+    if (props.mode === 'resubmit') {
+      res = await resubmitConclusion(params)
+    } else {
+      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)
     if (step.value === '20') {
-      if (route.query.state === '3') {
-        res = await resubmitApply(params)
-      } else {
-        res = await projectApply(params)
-      }
+      await router.push({
+        name: 'Initiation'
+      })
     } else if (step.value === '40') {
-      if (route.query.state === '3') {
-        res = await resubmitCheck(params)
-      } else {
-        res = await projectCheck(params)
-      }
+      await router.push({
+        name: 'Implementation'
+      })
     } else if (step.value === '50') {
-      if (route.query.state === '3') {
-        res = await resubmitConclusion(params)
-      } else {
-        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)
-      if (step.value === '20') {
-        await router.push({
-          name: 'Initiation'
-        })
-      }else if (step.value === '40') {
-        await router.push({
-          name: 'Implementation'
-        })
-      }else if (step.value === '50') {
-        await router.push({
-          name: 'Filing'
-        })
-      }
+      await router.push({
+        name: 'Filing'
+      })
     }
+  }
   // })
 }
 const init = async () => {
@@ -207,7 +227,7 @@ const init = async () => {
     res = await getApplyProcess(id)
   } else if (step.value === '40') {
     res = await getProjectCheckProcess(id)
-  }else if (step.value === '50') {
+  } else if (step.value === '50') {
     res = await getProjectConclusionProcess(id)
   }
   if (res.code === 1000) {
@@ -230,35 +250,13 @@ const init = async () => {
     })
   }
 }
-const getDetailInfo = async () => {
-  let id = projectId.value
-  if (!id) return;
-  let res
-  loading.value = true
-  if (step.value === '20') {
-    res = await getApplyDetail(id)
-  } else if (step.value === '40') {
-    res = await getCheckDetail(id)
-  }else if (step.value === '50') {
-    res = await getConclusionDetail(id)
-  }
 
-  if (res.code === 1000) {
-    formData.value = res.data.formData
-    loading.value = false
-  }else {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: 'error'
-    })
-  }
-}
+watchEffect(() => {
+  return Object.keys(props.formData).length && (localFormData.value = props.formData)
+})
+
 onMounted(async () => {
   await init()
-  if (route.query.state == 3) {
-    await getDetailInfo()
-  }
 })
 </script>
 

src/components/DetailComponent/SummaryDetail.vue

@@ -153,7 +153,7 @@
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
-          <operation-render v-if="processViewer" :operation-list="data.operationList"
+          <operation-render v-if="processViewer && data.operationList && data.operationList.length > 0" :operation-list="data.operationList"
                             :state="data.state"/>
           <process-diagram-viewer v-if="processViewer" id-name="summaryProcess"/>
         </div>