@@ -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 (
@@ -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 @@
-
+ @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" :preview="name === 'Filing/edit'"/>
@@ -12,6 +12,7 @@
提交
+ 重新提交
@@ -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()
+ }
+
+})