diff --git a/index.html b/index.html index 264b8e9..7056f8c 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - 科研管理平台 +
diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js index 815ff34..d4b0d08 100644 --- a/src/api/project-manage/index.js +++ b/src/api/project-manage/index.js @@ -1,9 +1,9 @@ import request from '@/utils/request.js' //项目立项 -export const getApplyProcess = () => { +export const getApplyProcess = (projectId) => { return request({ - url: '/workflow/mosr/project/approval/initiation/process', - method: "post" + url: `/workflow/mosr/project/approval/initiation/process/${projectId}`, + method: "get" }); }; export const projectApply = (data) => { @@ -49,11 +49,10 @@ export const projectCheck = (data) => { data: data }); }; -export const getProjectCheckProcess = (data) => { +export const getProjectCheckProcess = (projectId) => { return request({ - url: '/workflow/mosr/project/implementation/process', - method: "post", - data: data + url: `/workflow/mosr/project/implementation/process/${projectId}`, + method: "get" }); }; @@ -79,10 +78,9 @@ export const projectConclusion = (data) => { data: data }); }; -export const getProjectConclusionProcess = (data) => { +export const getProjectConclusionProcess = () => { return request({ url: '/workflow/mosr/project/filing/process', - method: "post", - data: data + method: "get" }); }; diff --git a/src/api/workflow/process-definition.js b/src/api/workflow/process-definition.js index 98ca1bb..97a8924 100644 --- a/src/api/workflow/process-definition.js +++ b/src/api/workflow/process-definition.js @@ -60,3 +60,12 @@ export function addProcessDefinition(param) { data: param }) } + +export function getTypeOption() { + return request({ + url: "/workflow/process/definition/type/option", + method: "get", + }) +} + + diff --git a/src/api/workflow/process-user.js b/src/api/workflow/process-user.js index abbb07d..fd623f9 100644 --- a/src/api/workflow/process-user.js +++ b/src/api/workflow/process-user.js @@ -22,3 +22,10 @@ export function getDepartmentTree() { method: 'get' }) } +export function getMosrDept(params) { + return request({ + url: '/admin/mosr/user/choose', + method: 'get', + params:params + }) +} diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index 9e937f9..3407391 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -1,5 +1,5 @@ @@ -60,9 +60,14 @@ const props = defineProps({ type: { type: String, default: 'approval' + }, loading: { + type: Boolean, + default: false } }) - +watch(() => props.loading, (newVal) => { + props.loading = newVal +}, {deep: true}) const form = ref() const localData = reactive({ @@ -119,7 +124,22 @@ const schema = computed(()=>{ prop: 'singleFile', colProps: { span: 24 - } + }, + component: ()=>( +
+ { + props.formData.singleFile?.originalFileName ? + handleDownload(props.formData.singleFile)} + > + {props.formData.singleFile?.originalFileName} + : + {'--'} + } +
+ + ) }, ] } else { @@ -129,7 +149,22 @@ const schema = computed(()=>{ prop: 'singleFile', colProps: { span: 24 - } + }, + component: ()=>( +
+ { + props.formData.singleFile?.originalFileName ? + handleDownload(props.formData.singleFile)} + > + {props.formData.singleFile?.originalFileName} + : + {'--'} + } +
+ + ) }, ] } diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue index 9f6a03e..76e964a 100644 --- a/src/components/DetailComponent/Opinion.vue +++ b/src/components/DetailComponent/Opinion.vue @@ -1,15 +1,18 @@ \ No newline at end of file + diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index e696307..1d0cd33 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -161,10 +161,10 @@ -
- 驳回 - 同意 -
+ + + + @@ -294,7 +294,6 @@ const handleDownload = (row) => { watch( () => props.formData, (val) => { - console.log(val, 'ssss'); } ) watch(() => props.processViewer, (newVal) => { diff --git a/src/components/PopoverDelete.vue b/src/components/PopoverDelete.vue index 4c04031..1f9ac87 100644 --- a/src/components/PopoverDelete.vue +++ b/src/components/PopoverDelete.vue @@ -9,7 +9,7 @@ @cancel="handleCancel" > diff --git a/src/layout/navbar/Breadcrumb.vue b/src/layout/navbar/Breadcrumb.vue index a81e6e1..df7474a 100644 --- a/src/layout/navbar/Breadcrumb.vue +++ b/src/layout/navbar/Breadcrumb.vue @@ -12,13 +12,13 @@ diff --git a/src/layout/siderbar/index.vue b/src/layout/siderbar/index.vue index 1426c84..ef29c10 100644 --- a/src/layout/siderbar/index.vue +++ b/src/layout/siderbar/index.vue @@ -1,6 +1,7 @@