diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index da3e9b3..b664b8f 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -551,12 +551,13 @@ html, body, #app, .el-container, .el-aside, .el-main {
}
.approval-record {
+ padding-top: 10px;
padding-bottom: 30px;
position: relative;
.approval-title {
display: flex;
align-items: center;
- justify-content: space-between;
+ //justify-content: space-between;
.diagram {
display: flex;
@@ -564,6 +565,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
float: right;
.base-title {
+ margin-left: 10px;
margin-right: 10px;
}
diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 7827482..8b8b53f 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -1,8 +1,8 @@
-
+
-
+
{{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
@@ -12,22 +12,29 @@
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
@@ -50,12 +57,20 @@ const props = defineProps({
},
showTable: {
type: Boolean,
- default: true
+ default: false
+ },
+ showSingleTable: {
+ type: Boolean,
+ default: false
},
preview: {
type: Boolean,
default: false
},
+ singleList: {
+ type: Array,
+ default: []
+ },
otherFileList: {
type: Array,
default: []
@@ -63,6 +78,10 @@ const props = defineProps({
formData: {
type: Object,
default: {}
+ },
+ labelPosition: {
+ type: String,
+ default:''
}
})
const emit = defineEmits(["getAttachment", "getOtherFile"])
@@ -128,6 +147,68 @@ const tableConfig = reactive({
}
]
})
+const singleTableConfig = 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}) => {
+ let btn = []
+ btn.push({label: '下载', func: () => handleDownload(row), type: 'primary'})
+ // if (row.newFile) {
+ // btn.push({label: '删除', func: () => handleDelete(row), type: 'primary'})
+ // }
+ return (
+
+ {
+ btn.map(item => (
+
item.func()}
+ link
+ >
+ {item.label}
+
+ ))
+ }
+ {
+ row.newFile || props.preview || !props.preview ?
+
handleSingleDelete(row)}/>
+ : ''
+ }
+
+ )
+ }
+ }
+ ]
+})
const rules = reactive({
attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
})
@@ -135,9 +216,16 @@ const applyForm = ref()
const singleFile = ref(props.formData.singleFile)
const isSingleFile = ref(false)
const allFileList = ref([])
+const singleFileList = ref([])
+if(props.formData.fileList !== null && props.formData.fileList?.length > 0){
+ allFileList.value = props.formData.fileList
+}
watch(() => props.showTable, (newVal) => {
props.showTable = newVal
}, {deep: true})
+watch(() => props.showSingleTable, (newVal) => {
+ props.showSingleTable = newVal
+}, {deep: true})
watch(() => props.formData.fileList, (newVal) => {
// console.log('newVal-fileList', newVal)
if (props.preview) {
@@ -149,7 +237,7 @@ watch(() => props.formData.fileList, (newVal) => {
watch(() => props.otherFileList, (newVal) => {
// console.log('newotherFileList', newVal, props.formData)
if (props.preview) {
- if (props.formData.fileList === null || props.formData.fileList.length === 0) {
+ if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
allFileList.value = newVal
} else {
newVal?.forEach(item => {
@@ -160,6 +248,10 @@ watch(() => props.otherFileList, (newVal) => {
allFileList.value = newVal
}
}, {deep: true})
+watch(() => props.singleList, (newVal) => {
+ // console.log('singleFile', newVal)
+ singleFileList.value = newVal
+}, {deep: true})
watch(() => props.formData.singleFile, (newVal) => {
// console.log('singleFile', newVal)
singleFile.value = newVal
@@ -167,7 +259,7 @@ watch(() => props.formData.singleFile, (newVal) => {
watch(() => isSingleFile.value, (newVal) => {
isSingleFile.value = newVal
}, {deep: true})
-const handleDelete = (row) => {
+const handleDelete = (row,type) => {
deleteFile(row.fileId).then(res => {
ElNotification({
title: '提示',
@@ -175,11 +267,20 @@ const handleDelete = (row) => {
type: res.code === 1000 ? 'success' : 'error'
})
if (res.code === 1000) {
- allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
+ if(type==='single'){
+ singleFileList.value.splice(singleFileList.value.findIndex((item) => item.id === row.fileId), 1);
+ isSingleFile.value = false
+ }else {
+ allFileList.value.splice(allFileList.value.findIndex((item) => item.id === row.fileId), 1);
+ }
}
});
}
+const handleSingleDelete = (row) => {
+ handleDelete(row,'single')
+}
const getAttachment = (val) => {
+ console.log('getAttachment',val)
isSingleFile.value = true
emit('getAttachment', val)
}
diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 322fb4b..0c507bd 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -24,7 +24,7 @@
流程图
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index c02bd4e..b902362 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -69,7 +69,7 @@
流程图
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 516d763..fa88507 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -29,7 +29,7 @@
流程图
@@ -414,7 +414,6 @@ const init = async () => {
watchEffect(() => {
return Object.keys(props.formData).length && (localFormData.value = props.formData)
})
-
onMounted(async () => {
await init()
})
diff --git a/src/components/DetailComponent/SpecialFundDetail.vue b/src/components/DetailComponent/SpecialFundDetail.vue
index f9c0298..542b5ad 100644
--- a/src/components/DetailComponent/SpecialFundDetail.vue
+++ b/src/components/DetailComponent/SpecialFundDetail.vue
@@ -70,7 +70,7 @@
流程图
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index bf34c34..5b8fee4 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -166,7 +166,7 @@
流程图
diff --git a/src/components/Tag.vue b/src/components/Tag.vue
index 3447898..8bc4691 100644
--- a/src/components/Tag.vue
+++ b/src/components/Tag.vue
@@ -31,7 +31,6 @@ const props = defineProps({
const tagConfig = ref({})
const filterDict = (data, value) => {
- console.log("🚀 ~ filterDict ~ data:", data)
if (!data || value == null) return
if (data instanceof Array) {
if (value == true || value == false) {
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 9d2329c..055b107 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -114,11 +114,11 @@
-
diff --git a/src/views/expense-management/share/detail.vue b/src/views/expense-management/share/detail.vue
index 38d6ca5..730668a 100644
--- a/src/views/expense-management/share/detail.vue
+++ b/src/views/expense-management/share/detail.vue
@@ -39,7 +39,7 @@
流程图
diff --git a/src/views/expense-management/share/moblieDetail/index.vue b/src/views/expense-management/share/moblieDetail/index.vue
index 48e79b6..9ec4e0b 100644
--- a/src/views/expense-management/share/moblieDetail/index.vue
+++ b/src/views/expense-management/share/moblieDetail/index.vue
@@ -40,7 +40,7 @@
流程图
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 3ae6605..e93be62 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -86,11 +86,11 @@
-
+
@@ -160,7 +160,7 @@ const form = ref(null)
const expendClass = ref()
const fileList = ref([])
const loading = ref(false)
-const showTable = ref(true)
+const showTable = ref(false)
const processStore = useProcessStore()
const processInstanceData = ref()
const formPermMap = ref(new Map());
@@ -451,6 +451,7 @@ const handleDelete = (row) => {
})
if (res.code === 1000) {
formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
+ showTable.value = formData.value.fileList.length !== 0;
}
});
}
diff --git a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
index 74c0730..163e199 100644
--- a/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
+++ b/src/views/project-demand/requirement/moblieDetail/CollectionDetailMoblie.vue
@@ -68,7 +68,7 @@
流程图
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 33f2ddf..f401b4f 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -4,7 +4,7 @@
-
+
@@ -40,7 +40,7 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
+
是
@@ -140,7 +140,7 @@
-
+
{{ formData.specialFund }}
@@ -156,8 +156,8 @@
-
-
+
+
-
+
-
+
@@ -199,7 +199,7 @@
-
+
@@ -219,13 +219,13 @@
-
+
-
+
@@ -233,15 +233,15 @@
-
-
+
+
@@ -281,8 +281,10 @@ const companyOption = ref([])
const summaryForm = ref()
const deploymentId = ref()
const specialFundOption = ref([])
-const showTable = ref(true)
+const showTable = ref(false)
+const showSingleTable = ref(false)
const otherFileList = ref([])
+const singleList = ref([])
const formData = ref({
isSpecialFund: false,
industryUniversityResearch: '0',
@@ -363,7 +365,12 @@ const compositeParam = (item, type) => {
const getAttachment = (val) => {
// console.log('上传文件getAttachment', val)
+ showSingleTable.value=false
formData.value.singleFile = compositeParam(val)
+ singleList.value.push( compositeParam(val))
+ nextTick(() => {
+ showSingleTable.value = true
+ })
}
const getOtherFile = (val) => {
// console.log('上传文件getOtherFile', val)
@@ -374,6 +381,12 @@ const getOtherFile = (val) => {
showTable.value = true
})
}
+watch(() => otherFileList.value, (newVal) => {
+ showTable.value = newVal.length !== 0;
+}, {deep: true})
+watch(() => singleList.value, (newVal) => {
+ showSingleTable.value = newVal.length !== 0;
+}, {deep: true})
const getFileParam = (item) => {
if (item === undefined) return;
return {
@@ -455,7 +468,7 @@ const handleResubmit = debounce(() => {
...formData.value,
deploymentId: deploymentId.value,
fileList: otherFiles,
- requirementId: route.query.id ? route.query.id : '-1'
+ requirementId: route.query.requirementId ? route.query.requirementId : '-1'
}
// console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
resubmitReported(params).then(res => {
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index e6f7792..3c70964 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -304,7 +304,7 @@ const handleEdit = (row) => {
router.push({
name: 'Summary/edit',
query: {
- id: row.requirementId,
+ requirementId: row.requirementId,
projectId: row.projectId
}
})
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index c048100..166b7a3 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -13,11 +13,11 @@
@getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
:preview="name === 'Phase/edit'"/>
-
+
diff --git a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
index 3aca84c..61a64ab 100644
--- a/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/ApprovalDetailMoblie.vue
@@ -2,10 +2,10 @@
form = e">
- 流程图
diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
index ea949be..89f1b88 100644
--- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
@@ -68,7 +68,7 @@
流程图
diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
index a1e661d..b49ce38 100644
--- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
+++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue
@@ -17,7 +17,7 @@
diff --git a/src/views/project-management/mobledetail/ShareDetailMobile.vue b/src/views/project-management/mobledetail/ShareDetailMobile.vue
index d58d183..e6f79bb 100644
--- a/src/views/project-management/mobledetail/ShareDetailMobile.vue
+++ b/src/views/project-management/mobledetail/ShareDetailMobile.vue
@@ -40,7 +40,7 @@
流程图
diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
index 4257601..3de5857 100644
--- a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
+++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue
@@ -73,7 +73,7 @@
流程图
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index cbf239c..45cc9f8 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -162,7 +162,7 @@
流程图
diff --git a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
index 3aca84c..61a64ab 100644
--- a/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
+++ b/src/views/project-management/phaseDetailMoblie/ApprovalDetailMoblie.vue
@@ -2,10 +2,10 @@
form = e">
- 流程图
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index 9b990ea..bac3267 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -27,11 +27,11 @@