geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-zhaoDN/workflow-update-lost' into 'dev'

Browse Source 
feat:框架代码 关于流程信息变更的代码更新

See merge request itc-framework/ma/2024/front!61
This commit is contained in:
890147
2025-04-21 02:16:57 +00:00
parent 3ba602e26d f3a6f35e40
commit bae3257764
11 changed files with 102 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/auditOpt/auditRecord/index.vue
View File

@ -3,7 +3,6 @@
<BasicTable @register="registerTable" ref="tableRef" @row-dbClick="dbClickRow">
<template #toolbar>
<template v-for="button in tableButtonConfig" :key="button.code">
<a-button v-if="button.isDefault" :type="button.type" @click="buttonClick(button.code)">
@ -394,4 +393,4 @@ function getActions(record: Recordable): ActionItem[] {
.hide {
display: none !important;
}
</style>
</style>

4
src/views/system/group/components/Form.vue
View File

@ -110,8 +110,8 @@
await systemFormRef.value.resetFields();
}
// 设置表单数据全部为Disabled 【查看】
async function setDisabledForm() {
data.formDataProps.schemas = changeSchemaDisabled(cloneDeep(data.formDataProps.schemas));
async function setDisabledForm(isDisabled) {
data.formDataProps.schemas = changeSchemaDisabled(cloneDeep(data.formDataProps.schemas), isDisabled);
}
// 获取行键值
function getRowKey() {

7
src/views/workflow/task/ProcessMonitor.vue
View File

@ -57,7 +57,11 @@
</BasicTable>
<!-- 查看 -->
<LookProcess ref="lookProcess" :taskId="taskId" :processId="processId" @close="reload"/>
<LookProcess ref="lookProcess"
:taskId="taskId"
:processId="processId"
:schemaId="schemaId"
@close="reload"/>
<!-- 指派审核人 -->
<ApproveProcessMonitorUser
v-if="data.approvedUserVisible"
@ -407,6 +411,7 @@
async function dbClickRow(record) {
processId.value = record.processId;
taskId.value = record.taskId;//改版 一个流程中可能有多个taskId 已不返回
schemaId.value = record.schemaId;
await nextTick()
await lookProcess.value.look();
}

1
src/views/workflow/task/components/ApprovalProcess.vue
View File

@ -13,6 +13,7 @@
:taskRecords="data.taskRecords"
:predecessorTasks="selectedPredecessorTasks"
:processId="props.processId"
:schemaId="props.schemaId"
position="top"
>
<FormInformation

30
src/views/workflow/task/components/LookProcess.vue
View File

@ -8,7 +8,7 @@
<a-button type="primary" class="clean-icon" @click.stop="close">{{ t('关闭') }}</a-button>
</template>
<template #full>
<LookTask v-if="visible" :taskId="props.taskId" :processId="props.processId" />
<LookTask v-if="visible" :taskId="props.taskId" :processId="props.processId" :schemaId="props.schemaId"/>
</template>
</ProcessLayout>
</span>
@ -22,20 +22,20 @@
import { onActivated, onMounted, ref } from 'vue';
import { useI18n } from '/@/hooks/web/useI18n';
const { t } = useI18n();
const props = defineProps({
processId: {
type: String,
default: ''
},
taskId: {
type: String,
default: ''
},
visible: {
type: Boolean,
default: false
},
})
const props = withDefaults(
defineProps<{
processId: string;
taskId: string;
schemaId: string;
visible?: boolean;
}>(),
{
processId: '',
taskId: '',
schemaId: '',
visible: false,
},
);
let emits = defineEmits(['close']);
let visible = ref(false);
let showLoading = ref(false);

1
src/views/workflow/task/components/WorkflowApprovalProcess.vue
View File

@ -10,6 +10,7 @@
:taskRecords="data.taskRecords"
:predecessorTasks="selectedPredecessorTasks"
:processId="props.processId"
:schemaId="props.schemaId"
position="top"
>
<FormInformation

31
src/views/workflow/task/components/flow/FormInformation.vue
View File

@ -19,8 +19,9 @@
:class="activeIndex == index ? 'form-name actived' : 'form-name'"
>
<span :class="item.validate ? 'dot' : 'dot validate'"></span>
<div class="icon-box"> <IconFontSymbol icon="formItem" /> </div
><span @click="changeActiveIndex(index)" v-show="showPanel">{{ item.formName }}</span>
<div class="icon-box">
<IconFontSymbol icon="formItem" />
</div><span @click="changeActiveIndex(index)" v-show="showPanel">{{ item.formName }}</span>
</div>
</div>
</div>
@ -38,25 +39,11 @@
<div id="approveExtendButton"></div>
<div id="approveRightButton"></div>
</div>
<div class="top-toolbar">
<SystemForm
class="form-box"
v-if="item.formType == FormType.SYSTEM"
:systemComponent="item.systemComponent"
:isViewProcess="props.disabled"
:formModel="item.formModel"
:workflowConfig="item"
:ref="setItemRef"
/>
<SimpleForm
v-else-if="item.formType == FormType.CUSTOM"
class="form-box"
:ref="setItemRef"
:formProps="item.formProps"
:formModel="item.formModel"
:isWorkFlow="true"
/>
</div>
<SystemForm class="form-box" v-if="item.formType == FormType.SYSTEM"
:systemComponent="item.systemComponent" :isViewProcess="props.disabled" :formModel="item.formModel"
:workflowConfig="item" :ref="setItemRef" />
<SimpleForm v-else-if="item.formType == FormType.CUSTOM" class="form-box testClass" :ref="setItemRef"
:formProps="item.formProps" :formModel="item.formModel" :isWorkFlow="true" />
</div>
</div>
</div>
@ -383,7 +370,7 @@
};
}
function handleCancel() {
function handleCancel() {
itemRefs.value[activeIndex.value].setDisabledForm(true);
forms.modes[activeIndex.value] = 'view';
itemRefs.value[activeIndex.value].setFieldsValue(forms.formModels[activeIndex.value]);

12
src/views/workflow/task/components/flow/LookTask.vue
View File

@ -1,5 +1,5 @@
<template>
<FlowPanel
<FlowPanel
v-if="visible"
:tab-position="position ? position : 'top'"
:xml="data.xml"
@ -7,7 +7,12 @@
:predecessorTasks="[]"
:processId="props.processId"
position="top"
>
:currentTaskInfo="data.currentTaskInfo"
:currentTaskAssigneeNames="data.currentTaskAssigneeNames"
:currentTaskAssignees="data.currentTaskAssignees"
:schemaId="props.schemaId"
:formDataId="data.formInfos[0].formData.id"
:formInfos="data.formInfos">
<FormInformation
:opinionsComponents="data.opinionsComponents"
:opinions="data.opinions"
@ -24,7 +29,7 @@
import { getApprovalProcess } from '/@/api/workflow/task';
import { onMounted, ref } from 'vue';
import userTaskItem from './../../hooks/userTaskItem';
let props = defineProps(['position', 'processId', 'taskId']);
let props = defineProps(['position', 'processId', 'taskId', 'schemaId']);
let visible = ref(false);
const { data, initProcessData } = userTaskItem();
onMounted(async () => {
@ -32,6 +37,7 @@
let res = await getApprovalProcess(props.taskId, props.processId);
initProcessData(res);
visible.value = true;
console.error('555555', data)
} catch (error) {}
});
</script>