Merge pull request 'dd' (#464) from dd into master

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

src/components/AttachmentUpload.vue

@@ -82,6 +82,10 @@ const props = defineProps({
   labelPosition: {
     type: String,
     default: ''
+  },
+  tag: {
+    type: String,
+    default: ''
   }
 })
 const emit = defineEmits(["getAttachment", "getOtherFile"])
@@ -219,35 +223,36 @@ const isSingleFile = ref(false)
 const allFileList = ref([])
 const deleteFileVal = ref({})
 const singleFileList = ref([])
-if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
+// if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
-  allFileList.value = props.formData.fileList
+//   allFileList.value = props.formData.fileList
-}
+// }
 watch(() => props.showSingleTable, (newVal) => {
   props.showSingleTable = newVal
 }, {deep: true})
 watch(() => props.formData.fileList, (newVal) => {
-  // console.log('newVal-fileList', newVal)
+  console.log('newVal-fileList', newVal)
   if (props.preview) {
     newVal?.forEach(item => {
       allFileList.value.push(item)
     })
   }
-}, {deep: true})
+}, {immediate: true})
-watch(() => props.otherFileList, (newVal) => {
+// watch(() => props.otherFileList, (newVal) => {
-  // console.log('newotherFileList', newVal)
+//   props.otherFileList=newVal
-  if (props.preview) {
+  // if (props.preview) {
-    if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
+  //   console.log('newotherFileList', newVal,props.preview,props.formData.fileList)
-      allFileList.value = newVal
+  //   if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
-    } else {
+  //     allFileList.value = newVal
-      newVal?.forEach(item => {
+  //   } else {
-        allFileList.value.push(item)
+  //     console.log('props.otherFileList',props.otherFileList)
-      })
+  //     // props.otherFileList?.forEach(item => {
-    }
+  //     //   allFileList.value.push(item)
-  } else {
+  //     // })
-    allFileList.value = newVal
+  //   }
-  }
+  // } else {
-}, {deep: true})
+  //   allFileList.value = newVal
-
+  // }
+// }, {deep: true})
 watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
@@ -271,26 +276,42 @@ const handleDelete = (row, type) => {
     })
     if (res.code === 1000) {
       if (type === 'single') {
-        singleFileList.value.splice(singleFileList.value.findIndex((item) => item.id === row.fileId), 1);
+        singleFileList.value.splice(singleFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
         isSingleFile.value = false
       } else {
-        allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
+        allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
       }
     }
   });
 }
 const handleSingleDelete = (row) => {
-  console.log('row',row)
+  // console.log('row',row)
   // fileUploadRef.value.handleRemove(deleteFileVal.value.id)
   handleDelete(row, 'single')
 }
 const getAttachment = (val) => {
-  console.log('getAttachment', val)
+  // console.log('getAttachment', val)
   isSingleFile.value = true
   // deleteFileVal.value=val
   emit('getAttachment', val)
 }
+const compositeParam = (item) => {
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    newFile: true,
+    tag:props.tag
+  }
+}
 const getOtherFile = (val) => {
+  if (props.preview) {
+        allFileList.value.push(compositeParam(val))
+  } else {
+    allFileList.value = props.otherFileList
+  }
   emit('getOtherFile', val)
 }
 const deleteAttachment = (val) => {

src/components/DetailComponent/ProjectApply.vue

@@ -16,7 +16,7 @@
       </el-row>
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
-                      :otherFileList="otherFileList"
+                      :otherFileList="otherFileList" :tag="getTitleName(props.title)"
                       @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>

src/views/expense-management/share/add.vue

@@ -115,7 +115,7 @@
         <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData?.operationList"></baseTitle>
         <div v-else></div>
         <div style="display: flex;align-items: center;justify-content: flex-start;">
-          <div class="base-title">流程图</div>
+          <div class="base-title" style="margin-left: 10px">流程图</div>
           <el-switch
               v-model="changeDiagram"
               style="--el-switch-on-color:#BEA266 ; --el-switch-off-color:#cecdcd"
@@ -208,9 +208,20 @@ const researchOptions = ref([])
 const showPersonnelPicker = (row, index) => {
   currentRow.value = row
   currentIndex.value = index
-  userPicker.value.showUserPicker()
+  if(row.companyName){
+    let userObj = {
+      id: row.researchPersonnelId,
+      name: row.researchPersonnel,
+      companyName: row.companyName,
+    }
+    userList.value=[userObj]
+  }
+  nextTick(() => {
+    userPicker.value.showUserPicker()
+  })
 }
 const selected = (select) => {
+  console.log('select',select)
   if (!select || select.length === 0) {
     return
   }
@@ -220,7 +231,7 @@ const selected = (select) => {
       item.researchPersonnel = select[0].name
     }
   })
-  userList.value=select
+  // userList.value=select
 }
 const getResearchOptions = async () => {
   const res = await getResearchUser()
@@ -345,13 +356,18 @@ const handleResubmit = (instance) => {
         item.performance = null
       }
       newUsrAllocationsObj = {
+        allocationId: formData.value.allocationId,
+        id: item.id,
         projectId: item.projectId,
         projectName: item.projectName,
+        researchPersonnel: item.researchPersonnel,
         researchPersonnelId: item.researchPersonnelId,
         wagesPayable: item.wagesPayable,
         performance: item.performance,
         reserveFund: item.reserveFund,
         socialSecurity: item.socialSecurity,
+        time: item.time,
+        subtotal: item.subtotal,
         annuity: item.annuity,
         workday: item.workday,
         researchDuration: item.researchDuration,
@@ -370,9 +386,10 @@ const handleResubmit = (instance) => {
       allocationId: formData.value.allocationId,
       shareName: formData.value.shareName,
       apportionmentMonth: formData.value.apportionmentMonth,
-      usrAllocations: newUsrAllocationsObjArray,
+      usrAllocations:newUsrAllocationsObjArray,
       deploymentId: processInstanceData.value.deploymentId,
     }
+    console.log('params', params, formData.value.tableData)
     const {code, msg} = await editAllocation(params)
     ElNotification({
       title: '提示',
@@ -413,12 +430,6 @@ const getDetailList = async () => {
   if (code === 1000) {
     data.rows.forEach(item => {
       item.researchPersonnelId = Number(item.researchPersonnelId)
-      let userObj = {
-        id: item.researchPersonnelId,
-        name: item.researchPersonnel,
-        companyName: item.companyName,
-      }
-      userList.value.push(userObj)
     })
     formData.value.tableData = data.rows
     nextTick(() => {

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

@@ -234,7 +234,7 @@
     </el-form>
     <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="需求上报"
                       :preview="name === 'Summary/edit'"/>
     <div class="approval-record" style="margin-left: 70px">
       <div style="display: flex;align-items: center;justify-content: flex-start;">

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

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

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

@@ -1,239 +0,0 @@
-<template>
-  <div class="apply-block">
-    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
-      <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-row>
-    </el-form>
-    <AttachmentUpload ref="attachment" label="项目验收附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
-                      :preview="name === 'Implementation/edit'"/>
-    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
-    </div>
-    <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="name==='Implementation/check'" @click="handleSubmit(applyForm)">提交</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit(applyForm)">重新提交</el-button>
-      <el-button @click="handleBack">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getProjectCheckProcess, projectCheck, getCheckDetail, resubmitCheck} from "@/api/project-manage";
-import {ElNotification} from "element-plus";
-import {useProcessStore} from '@/stores/processStore.js';
-import {useTagsView} from '@/stores/tagsview.js'
-
-const tagsViewStore = useTagsView()
-const router = useRouter()
-const route = useRoute()
-const attachment = ref()
-const name = ref(router.currentRoute.value.name)
-const loading = ref(false)
-const formData = ref({})
-const applyForm = ref()
-const deploymentId = ref()
-const showTable = ref(true)
-const otherFileList = ref([])
-const processInstanceData = ref()
-const processDiagramViewer = ref(true)
-const processStore = useProcessStore()
-const handleBack = () => {
-  history.back()
-}
-const compositeParam = (item) => {
-  let tag = ''
-  if (name.value === 'Implementation/check' || name.value === 'Implementation/edit') {
-    tag = '项目验收'
-  }
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    newFile: false,
-    tag: tag
-  }
-}
-const getAttachment = (val) => {
-  console.log('上传文件getAttachment', val)
-  formData.value.singleFile = compositeParam(val)
-}
-const getOtherFile = (val) => {
-  console.log('上传文件getOtherFile', val)
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  otherFileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId,
-    tag: item.tag
-  }
-}
-const handleSubmit = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) {
-      ElNotification({
-        title: '提示',
-        message: '请完善数据,再提交!',
-        type: 'error'
-      })
-      return;
-    }
-    let files = []
-    otherFileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-    if (formData.value.singleFile !== undefined) {
-      formData.value.singleFile = getFileParam(formData.value.singleFile)
-    }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: formData.value.singleFile,
-      projectId: route.query.projectId,
-    }
-    if (!attachment.value.isSingleFile) {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    } else {
-      attachment.value.clearValidate()
-    }
-    console.log('params-提交', params)
-    let res = await projectCheck(params)
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Implementation'
-      })
-    }
-  })
-}
-const handleResubmit = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) {
-      ElNotification({
-        title: '提示',
-        message: '请完善数据,再提交!',
-        type: 'error'
-      })
-      return;
-    }
-    let otherFiles = []
-    if (name.value === 'Implementation/edit') {
-      attachment.value.allFileList?.forEach(item => {
-        otherFiles.push(getFileParam(item))
-      })
-    }
-    if (attachment.value.singleFile==null) {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    } else{
-      attachment.value.clearValidate()
-    }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: otherFiles,
-      singleFile: attachment.value.singleFile,
-      projectId: route.query.projectId,
-    }
-    console.log('重新提交params', params)
-    resubmitCheck(params).then(res => {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: res.code === 1000 ? 'success' : 'error'
-      })
-      if (res.code === 1000) {
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Implementation'
-        })
-      }
-    })
-  })
-}
-const getDetailInfo = async () => {
-  getCheckDetail(route.query.projectId).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      formData.value = res.data.formData
-      loading.value = false
-    }
-  })
-}
-const init = () => {
-  getProjectCheckProcess(route.query.projectId).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
-      })
-    } else {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: 'error'
-      })
-    }
-  })
-}
-onMounted(async () => {
-  await init()
-  if (name.value === 'Implementation/edit') {
-    loading.value = true
-    await getDetailInfo()
-  }
-})
-</script>
-
-<style scoped>
-
-</style>

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

@@ -10,7 +10,7 @@
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
     <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
                       @getAttachment="getAttachment"  :singleList="singleList" :showSingleTable="showSingleTable"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
+                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="阶段变更"
                       :preview="name === 'Phase/edit'"/>
     <div class="approval-record"  style="margin-left: 68px">
       <div style="display: flex;align-items: center;justify-content: flex-start;">

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

@@ -1,277 +0,0 @@
-<template>
-  <div class="apply-block">
-    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
-      <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-row>
-    </el-form>
-    <AttachmentUpload ref="attachment" label="项目立项附件" :showTable="showTable" :otherFileList="otherFileList"
-                      @getAttachment="getAttachment"
-                      @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
-                      :preview="name === 'Initiation/edit'"/>
-    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
-    </div>
-    <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="name==='Initiation/apply'" @click="handleSubmit(applyForm)">提交</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
-      <el-button @click="handleBack">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {useTagsView} from '@/stores/tagsview.js'
-import {ElNotification} from "element-plus";
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {getApplyProcess, projectApply, resubmitApply, getApplyDetail} from "@/api/project-manage";
-import {useProcessStore} from '@/stores/processStore.js';
-import {downloadFile} from "@/api/project-demand";
-
-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 attachment = ref()
-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 (
-            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-        )
-      }
-    }
-  ]
-})
-const loading = ref(false)
-const processInstanceData = ref()
-const processDiagramViewer = ref(true)
-const name = ref(router.currentRoute.value.name)
-const handleBack = () => {
-  history.back()
-}
-const handleDownload = (row) => {
-  downloadFile(row.fileId).then(res => {
-    const blob = new Blob([res])
-    let a = document.createElement('a')
-    a.href = URL.createObjectURL(blob)
-    a.download = row.originalFileName
-    a.click()
-  })
-}
-const compositeParam = (item) => {
-  let tag = ''
-  if (name.value === 'Initiation/apply' || name.value === 'Initiation/edit') {
-    tag = '项目立项'
-  }
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    newFile: false,
-    tag: tag
-  }
-}
-const getAttachment = (val) => {
-  console.log('上传文件getAttachment', val)
-  formData.value.singleFile = compositeParam(val)
-}
-const getOtherFile = (val) => {
-  console.log('上传文件getOtherFile', val)
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  otherFileList.value.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-const getFileParam = (item) => {
-  return {
-    fileId: item.fileId,
-    tag: item.tag
-  }
-}
-const handleSubmit = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) {
-      ElNotification({
-        title: '提示',
-        message: '请完善数据,再提交!',
-        type: 'error'
-      })
-      return;
-    }
-    let files = []
-    otherFileList.value.forEach(item => {
-      files.push(getFileParam(item))
-    })
-    if (formData.value.singleFile !== undefined) {
-      formData.value.singleFile = getFileParam(formData.value.singleFile)
-    }
-    let params = {
-      deploymentId: deploymentId.value,
-      requirementId: route.query.id,
-      fileList: files,
-      singleFile: formData.value.singleFile,
-      projectId: route.query.projectId,
-    }
-    if (!attachment.value.isSingleFile) {
-      attachment.value.validate()
-      ElNotification({
-        title: '提示',
-        message: '请上传附件',
-        type: 'error'
-      })
-      return;
-    } else {
-      attachment.value.clearValidate()
-    }
-    console.log('params', params)
-    let res = await projectApply(params)
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Initiation'
-      })
-    }
-  })
-}
-const handleResubmit = async () => {
-  let files = []
-  if (name.value === 'Initiation/edit') {
-    attachment.value.allFileList.forEach(item => {
-      files.push(getFileParam(item))
-    })
-  }
-  if (attachment.value.singleFile==null) {
-    attachment.value.validate()
-    ElNotification({
-      title: '提示',
-      message: '请上传附件',
-      type: 'error'
-    })
-    return;
-  } else{
-    attachment.value.clearValidate()
-  }
-  let params = {
-    deploymentId: deploymentId.value,
-    requirementId: route.query.id,
-    fileList: files,
-    singleFile: attachment.value.singleFile,
-    projectId: route.query.projectId,
-  }
-  console.log('params', params, attachment.value.isSingleFile)
-  let res = await resubmitApply(params)
-  ElNotification({
-    title: '提示',
-    message: res.msg,
-    type: res.code === 1000 ? 'success' : 'error'
-  })
-  if (res.code === 1000) {
-    tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-    await router.push({
-      name: 'Initiation'
-    })
-  }
-}
-const getDetailInfo = async () => {
-  getApplyDetail(route.query.projectId).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      formData.value = res.data.formData
-      loading.value = false
-    }
-  })
-}
-const init = () => {
-  getApplyProcess(route.query.projectId).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
-      })
-    } else {
-      ElNotification({
-        title: '提示',
-        message: res.msg,
-        type: 'error'
-      })
-    }
-  })
-}
-init()
-onMounted(async () => {
-  await init()
-  if (name.value === 'Initiation/edit') {
-    loading.value = true
-    await getDetailInfo()
-  }
-})
-</script>
-
-<style scoped>
-
-</style>

src/views/project-management/mobledetail/ProjectApplyMoblie.vue

@@ -16,7 +16,7 @@
       </el-row>
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
-                      :otherFileList="otherFileList"
+                      :otherFileList="otherFileList" :tag="getTitleName(props.title)"
                       @getAttachment="getAttachment" :labelPosition="'top'"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>