diff --git a/cds-fontend-2025.V1/src/assets/svg-icon/cancel.svg b/cds-fontend-2025.V1/src/assets/svg-icon/cancel.svg index ba47424..4ac30c1 100644 --- a/cds-fontend-2025.V1/src/assets/svg-icon/cancel.svg +++ b/cds-fontend-2025.V1/src/assets/svg-icon/cancel.svg @@ -1 +1 @@ - + diff --git a/cds-fontend-2025.V1/src/assets/svg-icon/look.svg b/cds-fontend-2025.V1/src/assets/svg-icon/look.svg new file mode 100644 index 0000000..417c4af --- /dev/null +++ b/cds-fontend-2025.V1/src/assets/svg-icon/look.svg @@ -0,0 +1 @@ + diff --git a/cds-fontend-2025.V1/src/components/workflow/form/flow_demo1/index.vue b/cds-fontend-2025.V1/src/components/workflow/form/flow_demo1/index.vue index dd1b169..13efddc 100644 --- a/cds-fontend-2025.V1/src/components/workflow/form/flow_demo1/index.vue +++ b/cds-fontend-2025.V1/src/components/workflow/form/flow_demo1/index.vue @@ -74,7 +74,7 @@ const model: Model = reactive(createDefaultModel()); function createDefaultModel(): Model { return { - flowCode: 'DemoDemo1', + flowCode: 'flow1DemoDemo1', applyCode: '', name: '', age: undefined, @@ -91,7 +91,7 @@ const modelDetail: ModelDetail = reactive(createDefaultModelDetail()); function createDefaultModelDetail(): ModelDetail { return { - flowCode: 'DemoDemo1', + flowCode: 'flow1DemoDemo1', applyCode: '', name: '', age: undefined, diff --git a/cds-fontend-2025.V1/src/service/api/workflow/task.ts b/cds-fontend-2025.V1/src/service/api/workflow/task.ts index 0f3c36f..efdfbf6 100644 --- a/cds-fontend-2025.V1/src/service/api/workflow/task.ts +++ b/cds-fontend-2025.V1/src/service/api/workflow/task.ts @@ -89,11 +89,18 @@ export function fetchGetTaskWaitList(data: Api.Workflow.TaskSearchParams) { } /** 获取可驳回节点 */ -export function fetchGetBackNode(definitionId: CommonType.IdType, nodeCode: string) { +/*export function fetchGetBackNode(definitionId: CommonType.IdType, nodeCode: string) { return request({ url: `/workflow/task/getBackTaskNode/${definitionId}/${nodeCode}`, method: 'get' }); +}*/ + +export function fetchGetBackNode(taskId: CommonType.IdType, nodeCode: string) { + return request({ + url: `/workflow/task/getBackTaskNode/${taskId}/${nodeCode}`, + method: 'get' + }); } /** 驳回任务 */ diff --git a/cds-fontend-2025.V1/src/views/flowDemo/demo-demo1/index.vue b/cds-fontend-2025.V1/src/views/flowDemo/demo-demo1/index.vue index be64e83..9b055ef 100644 --- a/cds-fontend-2025.V1/src/views/flowDemo/demo-demo1/index.vue +++ b/cds-fontend-2025.V1/src/views/flowDemo/demo-demo1/index.vue @@ -133,7 +133,7 @@ const { view(row.id!)} /> diff --git a/cds-fontend-2025.V1/src/views/workflow/leave/index.vue b/cds-fontend-2025.V1/src/views/workflow/leave/index.vue index 8fdd12d..6689ef6 100644 --- a/cds-fontend-2025.V1/src/views/workflow/leave/index.vue +++ b/cds-fontend-2025.V1/src/views/workflow/leave/index.vue @@ -124,7 +124,7 @@ const { view(row.id!)} /> diff --git a/cds-fontend-2025.V1/src/views/workflow/process-definition/index.vue b/cds-fontend-2025.V1/src/views/workflow/process-definition/index.vue index 7732440..1f3b47b 100644 --- a/cds-fontend-2025.V1/src/views/workflow/process-definition/index.vue +++ b/cds-fontend-2025.V1/src/views/workflow/process-definition/index.vue @@ -226,7 +226,7 @@ const { handlePreview(row.id)} /> diff --git a/cds-fontend-2025.V1/src/views/workflow/process-instance/index.vue b/cds-fontend-2025.V1/src/views/workflow/process-instance/index.vue index 3333625..0e9ce24 100644 --- a/cds-fontend-2025.V1/src/views/workflow/process-instance/index.vue +++ b/cds-fontend-2025.V1/src/views/workflow/process-instance/index.vue @@ -173,7 +173,7 @@ const operateColumns = ref[]>([ handlePreview(row)} /> diff --git a/cds-fontend-2025.V1/src/views/workflow/task/all-task-waiting/index.vue b/cds-fontend-2025.V1/src/views/workflow/task/all-task-waiting/index.vue index 99df066..b4f7525 100644 --- a/cds-fontend-2025.V1/src/views/workflow/task/all-task-waiting/index.vue +++ b/cds-fontend-2025.V1/src/views/workflow/task/all-task-waiting/index.vue @@ -112,7 +112,7 @@ const operateColumns = ref[]>([ handleView(row)} /> diff --git a/cds-fontend-2025.V1/src/views/workflow/task/my-document/index.vue b/cds-fontend-2025.V1/src/views/workflow/task/my-document/index.vue index 34af4d5..3ecc570 100644 --- a/cds-fontend-2025.V1/src/views/workflow/task/my-document/index.vue +++ b/cds-fontend-2025.V1/src/views/workflow/task/my-document/index.vue @@ -122,7 +122,7 @@ const { handleOpen(row, 'detail')} /> diff --git a/cds-fontend-2025.V1/src/views/workflow/task/task-copy/index.vue b/cds-fontend-2025.V1/src/views/workflow/task/task-copy/index.vue index a044376..44ee294 100644 --- a/cds-fontend-2025.V1/src/views/workflow/task/task-copy/index.vue +++ b/cds-fontend-2025.V1/src/views/workflow/task/task-copy/index.vue @@ -129,7 +129,7 @@ const { handleView(row)} /> diff --git a/cds-fontend-2025.V1/src/views/workflow/task/task-finish/index.vue b/cds-fontend-2025.V1/src/views/workflow/task/task-finish/index.vue index 6d9b2f0..ecda791 100644 --- a/cds-fontend-2025.V1/src/views/workflow/task/task-finish/index.vue +++ b/cds-fontend-2025.V1/src/views/workflow/task/task-finish/index.vue @@ -142,7 +142,7 @@ const { handleView(row)} />