From 30a8ceb4243d99f3985e4f0262c71cf485de72ed Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Mon, 27 May 2024 22:38:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E7=9C=8B=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index b4b96c7..6249b3a 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -166,7 +166,7 @@ const handleView = (row) => { name: 'Summary/detail', query: { id: row.targetId, - projectId: row.projectId, + projectId: row.targetId, state: row.state } }) @@ -175,7 +175,7 @@ const handleView = (row) => { name: 'Initiation/detail', query: { id: row.targetId, - projectId: row.projectId, + projectId: row.targetId, state: row.state } }) @@ -184,7 +184,7 @@ const handleView = (row) => { name: 'Implementation/detail', query: { id: row.targetId, - projectId: row.projectId, + projectId: row.targetId, state: row.state } }) @@ -193,7 +193,7 @@ const handleView = (row) => { name: 'Filing/detail', query: { id: row.targetId, - projectId: row.projectId, + projectId: row.targetId, state: row.state } }) From 554c7d2be7668d973bd62c7b379308bad1e45345 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Mon, 27 May 2024 23:10:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E7=9C=8B=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/index.vue | 33 ++----------------- .../implementation/detail.vue | 1 + 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index fddca86..fa6bd63 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -165,41 +165,14 @@ const handleView = (row) => { id: row.targetId } }) - } - else if(row.targetState=='10'&&row.targetId){ - router.push({ - name: 'Summary/detail', - query: { - id: row.targetId, - projectId: row.targetId, - state: row.state - } - }) - }else if(row.targetState=='20'&&row.targetId){ - router.push({ - name: 'Initiation/detail', - query: { - id: row.targetId, - projectId: row.targetId, - state: row.state - } - }) - }else if(row.targetState=='40'&&row.targetId){ + } else{ router.push({ name: 'Implementation/detail', query: { id: row.targetId, projectId: row.targetId, - state: row.state - } - }) - }else if(row.targetState=='50'&&row.targetId){ - router.push({ - name: 'Filing/detail', - query: { - id: row.targetId, - projectId: row.targetId, - state: row.state + state: row.state, + step: row.targetState } }) } diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue index 9422df4..210b912 100644 --- a/src/views/project-management/implementation/detail.vue +++ b/src/views/project-management/implementation/detail.vue @@ -50,6 +50,7 @@ const summaryProcessViewer = ref(true) const processStore = useProcessStore() const companyOption = ref([]) const cuurentStep = ref() +route.query.step == '10' && (cuurentStep.value = 1) route.query.step == '20' && (cuurentStep.value = 2) route.query.step == '40' && (cuurentStep.value = 3) route.query.step == '50' && (cuurentStep.value = 4) From 63e94af451ad0fe28a9f3f2d26661727c54aa6e1 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Tue, 28 May 2024 12:05:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=AE=9E=E6=96=BD=E4=B8=AD=E5=8A=9F=E8=83=BD=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/project-manage/index.js | 18 +- src/views/home/index.vue | 1 - src/views/project-demand/requirement/add.vue | 1 + .../project-demand/requirement/index.vue | 25 ++- src/views/project-demand/summary/add.vue | 3 +- src/views/project-demand/summary/index.vue | 1 + .../project-management/filing/conclusion.vue | 3 +- .../implementation/account.vue | 37 ++-- .../implementation/attachment.vue | 68 +++++-- .../implementation/check.vue | 3 +- .../implementation/index.vue | 26 +-- .../implementation/upload.vue | 57 ++++++ .../implementation/uploadFee.vue | 172 +++++++++++------- .../project-management/initiation/apply.vue | 3 +- 14 files changed, 294 insertions(+), 124 deletions(-) create mode 100644 src/views/project-management/implementation/upload.vue diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js index d4b0d08..03ea52b 100644 --- a/src/api/project-manage/index.js +++ b/src/api/project-manage/index.js @@ -55,7 +55,22 @@ export const getProjectCheckProcess = (projectId) => { method: "get" }); }; - +export const getImplementationAttachment = (projectId) => { + return request({ + url: '/workflow/mosr/project/implementation/tags', + method: "get", + params:{ + projectId:projectId + } + }); +}; +export const addLedger = (data) => { + return request({ + url: '/workflow/mosr/expense/ledger', + method: "post", + data: data + }); +}; //项目归档 export const getConclusionDetail = (ProjectId) => { return request({ @@ -84,3 +99,4 @@ export const getProjectConclusionProcess = () => { method: "get" }); }; + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index fa6bd63..d8fd861 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -169,7 +169,6 @@ const handleView = (row) => { router.push({ name: 'Implementation/detail', query: { - id: row.targetId, projectId: row.targetId, state: row.state, step: row.targetState diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index caa2ec4..68c2bfc 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -235,6 +235,7 @@ const submitParam = (item) => { item.fileList.forEach(item => { let obj = { fileId: item.fileId, + tag: item.tag } files.push(obj) }) diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue index ba4e8de..8bb7a27 100644 --- a/src/views/project-demand/requirement/index.vue +++ b/src/views/project-demand/requirement/index.vue @@ -11,7 +11,7 @@ import {useAuthStore} from '@/stores/userstore.js' import Tag from '@/components/Tag.vue' import fvSelect from '@/fvcomponents/fvSelect/index.vue' -import {ElMessage} from "element-plus"; +import {ElMessage, ElNotification} from "element-plus"; import {deleteDemand} from "@/api/project-demand"; const authStore = useAuthStore() @@ -140,20 +140,27 @@ const tableConfig = reactive({ params: {} }) -console.log('userInfo', userInfo.value.userName) - const search = (val) => { tableConfig.params = {...val} tableIns.value.refresh() } const handleAdd = () => { + try{ + router.push({ + name:'Requirement/add', + query: { + isAdd: 1 + } + }) + }catch (err){ + ElNotification({ + title: '提示', + message: '该用户无新增权限', + type: 'warning' + }) + } //新增 - router.push({ - name:'Requirement/add', - query: { - isAdd: 1 - } - }) + } const handleEdit = (row) => { router.push({ diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 44eca8b..0ad225a 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -316,7 +316,8 @@ const getOtherFile = (val) => { } const getFileParam = (item) => { return { - fileId: item.fileId + fileId: item.fileId, + tag: item.tag } } const handleSubmit = async (instance) => { diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index fad2ccc..f0a9542 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -123,6 +123,7 @@ const tableConfig = reactive({ currentRender: ({row, index}) => { let btn = [] let buttons = new Set(Array.from(row.buttons)) + console.log('buttons',buttons.has("details")) if (buttons.has("details")) { btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'}) } diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue index 06ee770..af87adb 100644 --- a/src/views/project-management/filing/conclusion.vue +++ b/src/views/project-management/filing/conclusion.vue @@ -121,7 +121,8 @@ const getOtherFile = (val) => { const getFileParam = (item) => { return { - fileId: item.fileId + fileId: item.fileId, + tag: item.tag } } const handleSubmit = (instance) => { diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index b971574..ccc8ca2 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -11,7 +11,7 @@ const searchConfig = reactive([ { label: '名称', - prop: 'requirementName', + prop: 'projectName', component: 'el-input', props: { placeholder: '请输入名称查询', @@ -22,7 +22,7 @@ const searchConfig = reactive([ }, { label: '项目费用', - prop: 'requirementName', + prop: 'projectCost', component: 'el-input', props: { placeholder: '请输入项目费用查询', @@ -33,7 +33,7 @@ const searchConfig = reactive([ }, { label: '起始时间', - prop: 'datetime', + prop: 'time', component: 'el-date-picker', props: { placeholder: '请选择起始时间', @@ -48,41 +48,48 @@ const tableConfig = reactive({ prop: 'name', type: 'index', label: '序号', - width:'80' + width:'80', + align: 'center' }, { - prop: 'name', + prop: 'projectName', + label: '项目名称', + align: 'center' + },{ + prop: 'time', label: '时间', align: 'center' }, { - prop: 'projectType', + prop: 'projectCost', label: '项目费用', align: 'center' }, { - prop: 'productMainBody', + prop: 'researchStage', label: '研发阶段', align: 'center' }, { - prop: 'projectEffect', + prop: 'digest', label: '摘要', align: 'center' }, { - prop: 'survey', + prop: 'afterTax', label: '税后余额(元)', align: 'center' } ], - api: '', + api: '/workflow/mosr/expense/ledger', params: {}, btns: [ {name: '上传费用', key: 'add', color: '#DED0B2',auth: ''} ] }) const router = useRouter() +const route = useRoute() +const tableIns=ref() const headBtnClick = (key) => { switch (key) { case 'add': @@ -93,9 +100,17 @@ const headBtnClick = (key) => { const handleUploadFee = () => { router.push({ name: 'Implementation/uploadFee', - query: {} + query: { + id:route.query.id + } }) } + +const search = (val) => { + console.log('val',val) + tableConfig.params = {...val} + tableIns.value.refresh() +} diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue index cc94c34..3c8fac6 100644 --- a/src/views/project-management/implementation/uploadFee.vue +++ b/src/views/project-management/implementation/uploadFee.vue @@ -1,84 +1,120 @@ - diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue index 71fe9d5..b35577b 100644 --- a/src/views/project-management/initiation/apply.vue +++ b/src/views/project-management/initiation/apply.vue @@ -118,7 +118,8 @@ const getOtherFile = (val) => { } const getFileParam = (item) => { return { - fileId: item.fileId + fileId: item.fileId, + tag: item.tag } } const handleSubmit = (instance) => {