From abe80eafdceb14044306af9e98d3ed13ef73b60d Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 3 Jun 2024 15:39:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=AE=9E=E6=96=BD=E9=99=84=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=8F=8A?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD=E3=80=81=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/project-demand/index.js | 15 --
.../project-demand/summary}/index.js | 0
src/api/project-manage/attachment.js | 7 +
src/api/project-manage/index.js | 36 +--
src/components/SearchFilesByTag.vue | 2 +-
.../project-demand/requirement/upload.vue | 133 -----------
src/views/project-demand/summary/add.vue | 2 +-
.../summary/components/FileUpload.vue | 75 ------
src/views/project-demand/summary/detail.vue | 1 -
src/views/project-demand/summary/index.vue | 4 -
src/views/project-demand/summary/upload.vue | 135 -----------
.../project-management/filing/attachment.vue | 19 +-
.../filing/attachment45.vue | 214 ------------------
.../filing/attachment56.vue | 94 --------
.../project-management/filing/detail.vue | 112 ---------
.../project-management/filing/upload.vue | 33 ++-
.../implementation/attachment.vue | 55 +++--
.../implementation/upload.vue | 47 ++--
.../project-management/initiation/detail.vue | 123 ----------
.../project-management/initiation/upload.vue | 133 -----------
src/views/system/user/index.vue | 10 +-
21 files changed, 86 insertions(+), 1164 deletions(-)
rename src/{views/project-demand/summary/api => api/project-demand/summary}/index.js (100%)
delete mode 100644 src/views/project-demand/requirement/upload.vue
delete mode 100644 src/views/project-demand/summary/components/FileUpload.vue
delete mode 100644 src/views/project-demand/summary/upload.vue
delete mode 100644 src/views/project-management/filing/attachment45.vue
delete mode 100644 src/views/project-management/filing/attachment56.vue
delete mode 100644 src/views/project-management/filing/detail.vue
delete mode 100644 src/views/project-management/initiation/detail.vue
delete mode 100644 src/views/project-management/initiation/upload.vue
diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js
index 9a5a163..928514b 100644
--- a/src/api/project-demand/index.js
+++ b/src/api/project-demand/index.js
@@ -82,18 +82,3 @@ export const deleteDemand = (id) => {
method: "delete"
});
};
-//需求征集附件列表(归档)
-export const getRequirementAttachment = (params) => {
- return request({
- url: '/workflow/mosr/requirement/attachments',
- method: "get",
- params:params
- });
-};
-export const uploadRequirementAttachment= (data) => {
- return request({
- url: '/workflow/mosr/requirement/upload',
- method: "post",
- data: data
- });
-};
diff --git a/src/views/project-demand/summary/api/index.js b/src/api/project-demand/summary/index.js
similarity index 100%
rename from src/views/project-demand/summary/api/index.js
rename to src/api/project-demand/summary/index.js
diff --git a/src/api/project-manage/attachment.js b/src/api/project-manage/attachment.js
index 3e72a02..6a53b27 100644
--- a/src/api/project-manage/attachment.js
+++ b/src/api/project-manage/attachment.js
@@ -8,3 +8,10 @@ export const searchFileList = (params) => {
params: params
});
};
+export const uploadFileList = (data) => {
+ return request({
+ url: '/workflow/mosr/attachment/upload',
+ method: "post",
+ data: data
+ });
+};
diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js
index 6798704..578f1a1 100644
--- a/src/api/project-manage/index.js
+++ b/src/api/project-manage/index.js
@@ -34,13 +34,6 @@ 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({
@@ -69,20 +62,7 @@ export const getProjectCheckProcess = (projectId) => {
method: "get"
});
};
-export const getImplementationAttachment = (params) => {
- return request({
- url: '/workflow/mosr/project/implementation/attachments',
- method: "get",
- params:params
- });
-};
-export const uploadAttachment= (data) => {
- return request({
- url: '/workflow/mosr/project/implementation/upload',
- method: "post",
- data: data
- });
-};
+
export const addLedger = (data) => {
return request({
url: '/workflow/mosr/expense/ledger',
@@ -125,17 +105,3 @@ export const getProjectConclusionProcess = () => {
method: "get"
});
};
-export const getFilingAttachment = (params) => {
- return request({
- url: '/workflow/mosr/project/filing/attachments',
- method: "get",
- params:params
- });
-};
-export const uploadFilingAttachment= (data) => {
- return request({
- url: '/workflow/mosr/project/filing/upload',
- method: "post",
- data: data
- });
-};
diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue
index 0588f42..e6aef7c 100644
--- a/src/components/SearchFilesByTag.vue
+++ b/src/components/SearchFilesByTag.vue
@@ -61,7 +61,7 @@ const tableConfig = reactive({
},
{
prop: 'tag',
- label: '自定义标签',
+ label: '标签',
align: 'center'
},
{
diff --git a/src/views/project-demand/requirement/upload.vue b/src/views/project-demand/requirement/upload.vue
deleted file mode 100644
index 7757650..0000000
--- a/src/views/project-demand/requirement/upload.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提交
-
-
-
-
-
-
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index a025c92..a0abb5f 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -247,7 +247,7 @@
-
-
\ No newline at end of file
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index fa087af..f1e0abe 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -48,7 +48,6 @@ const getInfo = async (state) => {
processStore.passList.value = data.passList;
nextTick(() => {
summaryProcessViewer.value = true
- console.log('data.formPermMap["fileList"]',data.formPermMap["fileList"])
if (data.formPermMap["fileList"]) {
fileListShow.value = data.formPermMap["fileList"].perm
}
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 6b5d455..b3b055c 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -4,11 +4,7 @@
-
-
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index 180ba65..0baf0f1 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -132,27 +132,14 @@ const upload = () => {
})
} else {
router.push({
- name: switchUpload(activeName.value),
+ name: 'Filing/upload',
query: {
- id: route.query.id
+ id: route.query.id,
+ name: activeName.value
}
})
}
}
-const switchUpload = (index) => {
- switch (index) {
- case '00':
- return 'Requirement/upload';
- case '10':
- return 'Summary/upload';
- case '20':
- return 'Initiation/upload';
- case '40':
- return 'Implementation/upload';
- case '50':
- return 'Filing/upload';
- }
-}
diff --git a/src/views/project-management/filing/attachment56.vue b/src/views/project-management/filing/attachment56.vue
deleted file mode 100644
index 6acfb93..0000000
--- a/src/views/project-management/filing/attachment56.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/project-management/filing/detail.vue b/src/views/project-management/filing/detail.vue
deleted file mode 100644
index f044112..0000000
--- a/src/views/project-management/filing/detail.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index 0d18040..0e89e8f 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -1,10 +1,4 @@
-
-
-
-
-
-
@@ -23,7 +17,7 @@
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
deleted file mode 100644
index 5e32348..0000000
--- a/src/views/project-management/initiation/detail.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/project-management/initiation/upload.vue b/src/views/project-management/initiation/upload.vue
deleted file mode 100644
index 2e75d87..0000000
--- a/src/views/project-management/initiation/upload.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提交
-
-
-
-
-
-
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 9c40ebc..5c18142 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -131,7 +131,7 @@ const tableConfig = reactive({
handleDel(row)}>删除 :
null
}
-
+
)
}
@@ -166,7 +166,7 @@ const search = (val) => {
const handleAdd = () => {
router.push({
- path: '/system/useradd',
+ name: 'Useradd',
query: {
isAdd: 1
}
@@ -175,7 +175,7 @@ const handleAdd = () => {
const handleEdit = (row) => {
router.push({
- path: '/system/useredit',
+ name: 'Useredit',
query: {
id: row.userId,
userType: row.userType
@@ -189,7 +189,7 @@ const handleDel = (row) => {
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(async res => {
- // const { code } = await
+ // const { code } = await
}).catch(()=>{})
}
@@ -203,4 +203,4 @@ const headBtnClick = (key) => {
\ No newline at end of file
+