diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index de4098d..9a5a163 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -90,3 +90,10 @@ export const getRequirementAttachment = (params) => {
params:params
});
};
+export const uploadRequirementAttachment= (data) => {
+ return request({
+ url: '/workflow/mosr/requirement/upload',
+ method: "post",
+ data: data
+ });
+};
diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js
index d746e48..0189260 100644
--- a/src/api/project-manage/index.js
+++ b/src/api/project-manage/index.js
@@ -34,6 +34,13 @@ export const getInitiationAttachment = (params) => {
params:params
});
};
+export const uploadInitiationAttachment= (data) => {
+ return request({
+ url: '/workflow/mosr/project/approval/upload',
+ method: "post",
+ data: data
+ });
+};
//项目实施
export const getCheckDetail = (projectId) => {
return request({
@@ -126,3 +133,10 @@ export const getFilingAttachment = (params) => {
params:params
});
};
+export const uploadFilingAttachment= (data) => {
+ return request({
+ url: '/workflow/mosr/project/filing/upload',
+ method: "post",
+ data: data
+ });
+};
diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 8709334..f5d791e 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -10,7 +10,7 @@
删除
-
+
@@ -63,20 +63,21 @@ const tableConfig = reactive({
align: 'center',
currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
},
- // {
- // prop: 'oper',
- // label: '操作',
- // align: 'center',
- // showOverflowTooltip: false,
- // currentRender: ({row, index}) => {
- // return (
- //
- // handleDownload(row)}>下载
- // deleteOtherFile(row)}>删除
- //
- // )
- // }
- // }
+ {
+ prop: 'oper',
+ label: '操作',
+ align: 'center',
+ showOverflowTooltip: false,
+ currentRender: ({row, index}) => {
+ return (
+
+ handleDownload(row)}>下载
+
+ )
+ }
+ }
+
+ // deleteOtherFile(row)}>删除
]
})
const rules = reactive({
@@ -84,6 +85,7 @@ const rules = reactive({
})
const applyForm = ref()
const singleFile = ref()
+const isSingleFile = ref(false)
const allFileList = ref([])
const props = defineProps({
showFileList: {
@@ -110,12 +112,17 @@ watch(() => props.showTable, (newVal) => {
props.showTable = newVal
}, {deep: true})
watch(() => props.otherFileList, (newVal) => {
- console.log('new',newVal)
- // newVal?.forEach(item => {
+ console.log('newotherFileList',newVal)
+ if (props.preview) {
+ newVal?.forEach(item => {
+ allFileList.value.push(item)
+ })
+ }else {
allFileList.value=newVal
- // })
+ }
}, {deep: true})
watch(() => props.formData.fileList, (newVal) => {
+ console.log('newVal-fileList',newVal)
if (props.preview) {
newVal?.forEach(item => {
allFileList.value.push(item)
@@ -127,6 +134,7 @@ watch(() => props.formData.singleFile, (newVal) => {
singleFile.value = newVal
}, {deep: true})
const getAttachment = (val) => {
+ isSingleFile.value=true
emit('getAttachment', val)
}
const getOtherFile = (val) => {
@@ -135,7 +143,12 @@ const getOtherFile = (val) => {
const deleteAttachment = (val) => {
deleteFile(val).then(res => {
if (res.code === 1000) {
- ElMessage.success("删除成功");
+ ElNotification({
+ title: '提示',
+ message:"删除成功",
+ type:'success'
+ })
+ isSingleFile.value=false
}
});
}
diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue
index d5f00b5..4e6738b 100644
--- a/src/components/DetailComponent/Opinion.vue
+++ b/src/components/DetailComponent/Opinion.vue
@@ -37,8 +37,7 @@ const schema = computed(() => {
props: {
placeholder: '请输入审核意见',
type: 'textarea',
- // maxlength: 140,
- rows:3
+ rows: 3
}
}
]
@@ -52,7 +51,13 @@ const back = () => {
router.push({name: 'Filing'})
break;
case 'Implementation/detail':
- router.push({name: 'Implementation'})
+ if (route.query.step === '20') {
+ router.push({name: 'Initiation'})
+ } else if (route.query.step === '40') {
+ router.push({name: 'Implementation'})
+ } else if (route.query.step === '50') {
+ router.push({name: 'Filing'})
+ }
break;
case 'Summary/detail':
router.push({name: 'Summary'})
diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 2d4b863..2a6a16d 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -4,7 +4,7 @@
:headers="headers"
:limit="maxSize"
with-credentials
- :multiple="maxSize > 0"
+ :multiple="multiple"
:data="uploadParams"
:show-file-list="showFileList"
:auto-upload="true"
@@ -19,8 +19,9 @@
@@ -108,6 +106,7 @@ a {
font-size: 14px;
color: #2a99ff;
}
+
:deep(.el-upload-list) {
width: 400px;
}
diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue
index 91565a4..a4908e4 100644
--- a/src/views/expense-management/share/index.vue
+++ b/src/views/expense-management/share/index.vue
@@ -89,21 +89,18 @@ const tableConfig = reactive({
if(row.buttons){
buttons = new Set(Array.from(row.buttons))
}
- // if (buttons.has("details")) {
+ if (buttons.has("details")) {
btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
- // }
- // if (buttons.has("edit")) {
+ }
+ if (buttons.has("edit")) {
btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
- // }
- // if (buttons.has("delete")) {
- // btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
- // }
- // if (buttons.has("report")) {
+ }
+ if (buttons.has("report")) {
btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
- // }
- // if (buttons.has("report")) {
+ }
+ if (buttons.has("report")) {
btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
- // }
+ }
return (
{
@@ -119,11 +116,11 @@ const tableConfig = reactive({
))
}
{
- // buttons.has("delete") ?
+ buttons.has("delete") ?
handleDelete(row)}/>
- // : ''
+ : ''
}
)
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 6c4e942..9ae3ca5 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -236,11 +236,6 @@ const init = async () => {
const resFund = await getFundOption()
specialFundOption.value = resFund.data
getWorkflowInfo().then(res => {
- ElNotification({
- title: '提示',
- message: res.msg,
- type: res.code === 1000 ? 'success' : 'error'
- })
if (res.code === 1000) {
let data = res.data
processInstanceData.value = data
@@ -256,7 +251,12 @@ const init = async () => {
nextTick(() => {
processDiagramViewer.value = true
})
- } else {
+ }else {
+ ElNotification({
+ title: '提示',
+ message: res.msg,
+ type: 'error'
+ })
}
})
}
@@ -367,7 +367,7 @@ onMounted(async () => {
margin-top: 0;
}
:deep(.el-table--fit ){
- height: 400px;
+ height: 600px;
}
.add-block {
//display: flex;
diff --git a/src/views/project-demand/requirement/detail.vue b/src/views/project-demand/requirement/detail.vue
index b97729c..783f02c 100644
--- a/src/views/project-demand/requirement/detail.vue
+++ b/src/views/project-demand/requirement/detail.vue
@@ -272,7 +272,9 @@ onMounted(async () => {
:deep(.el-empty__description) {
margin-top: 0;
}
-
+:deep(.el-table--fit ){
+ height: 600px;
+}
.detail-block {
overflow: hidden;
padding-right: 10px;
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 7d74176..962ea41 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -112,12 +112,9 @@ const tableConfig = reactive({
if (buttons.has("edit")) {
btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
}
- // if (buttons.has("delete")) {
- // btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
- // }
- // if (buttons.has("report")) {
+ if (buttons.has("report")) {
btn.push({label: '需求上报', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
- // }
+ }
return (
{
diff --git a/src/views/project-demand/requirement/upload.vue b/src/views/project-demand/requirement/upload.vue
index 6c0bff8..ca3f0ae 100644
--- a/src/views/project-demand/requirement/upload.vue
+++ b/src/views/project-demand/requirement/upload.vue
@@ -1,9 +1,142 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+