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

feat: 审批预选人(草稿)

Browse Source 
fix: 对于非主表字段不显示响应式布局相关配置项
This commit is contained in:
gaoyunqi
2024-03-01 18:18:27 +08:00
parent ad5c45a281
commit 9ed70d1dde
5 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/components/Designer/src/components/componentProperty/PropertyOption.vue
View File

@ -418,26 +418,28 @@
</template>
</a-input>
</a-form-item>
<!-- 响应式布局只对主表字段生效 -->
<template v-if="!data.isSubFormChild">
<a-form-item v-if="hasKey('responsive')" label="响应式">
<a-switch v-model:checked="data.options.responsive" />
</a-form-item>
<a-form-item v-if="hasKey('respNewRow') && data.options.responsive" label="独立成行">
<a-switch v-model:checked="data.options.respNewRow" />
</a-form-item>
<a-form-item v-if="hasKey('labelWidthMode')" label="宽度模式">
<a-radio-group v-model:value="data.options.labelWidthMode" button-style="solid" size="small">
<a-radio-button value="flex">{{ t('百分比') }}</a-radio-button>
<a-radio-button value="fix">{{ t('定宽') }}</a-radio-button>
</a-radio-group>
</a-form-item>
<a-form-item v-if="hasKey('labelWidthMode') && data.options.labelWidthMode === 'fix'" label="标签定宽">
<a-input-number v-model:value="data.options.labelFixWidth" :max="200" :min="40" addonAfter="px" />
</a-form-item>
</template>
<!-- 子表不需要span -->
<a-form-item v-if="hasKey('responsive')" label="响应式">
<a-switch v-model:checked="data.options.responsive" />
</a-form-item>
<a-form-item v-if="hasKey('respNewRow') && data.options.responsive" label="独立成行">
<a-switch v-model:checked="data.options.respNewRow" />
</a-form-item>
<a-form-item v-if="hasKey('labelWidthMode')" label="宽度模式">
<a-radio-group v-model:value="data.options.labelWidthMode" button-style="solid" size="small">
<a-radio-button value="flex">{{ t('百分比') }}</a-radio-button>
<a-radio-button value="fix">{{ t('定宽') }}</a-radio-button>
</a-radio-group>
</a-form-item>
<a-form-item v-if="hasKey('labelWidthMode') && data.options.labelWidthMode === 'fix'" label="标签定宽">
<a-input-number v-model:value="data.options.labelFixWidth" :max="200" :min="40" addonAfter="px" />
</a-form-item>
<a-form-item v-if="hasKey('span') && (!data.isSubFormChild || !data.isSingleFormChild)" label="标签宽度">
<a-input-number v-model:value="data.options.span" :max="24" :min="0" addonAfter="/ 24" @change="handleSpanChange" />
</a-form-item>

1
src/components/Form/src/components/SubFormV2.vue
View File

@ -428,7 +428,6 @@
};
const getComponentsProps = (componentProps, dataIndex, record, index) => {
console.log('getComponentsProps', cacheMap.get(dataIndex), componentProps.disabled);
if (!componentProps) return;
if (isFunction(componentProps)) {
componentProps =

29
src/components/SecondDev/OpinionDialog.vue
View File

@ -5,6 +5,9 @@
<a-form-item v-if="_action === 'agree'" label="下一节点" name="nextNodeName">
<span>{{ formState.nextNodeName }}</span>
</a-form-item>
<a-form-item v-if="_action === 'agree'" label="审批人">
<a-select v-model:value="formState.assignees" :options="nextAssignees" max-tag-count="responsive" mode="multiple" placeholder="请选择审批人"></a-select>
</a-form-item>
<a-form-item v-if="_action === 'reject'" label="退回至" name="rejectNode">
<a-select v-model:value="rejectNodeId">
<a-select-option v-for="(item, index) in rejectNodeList" :key="index" :value="item.activityId">{{ item.activityName }}</a-select-option>
@ -26,20 +29,23 @@
const isOpen = ref(false);
const rejectNodeList = ref([]);
const rejectNodeId = ref('');
const nextAssigneeName = ref(''); // 不可选审批人
const nextAssignees = ref([]);
let _action = ref('agree');
let _processId = '';
let _taskId = '';
let _nextNodes = [];
let _callback = null;
const formState = reactive({
nextNodeName: '',
opinion: '',
assignees: [],
opinionList: ['同意。', '请领导审批。']
});
function toggleDialog({ isClose, action, callback, processId, taskId } = {}) {
function toggleDialog({ isClose, action, callback, processId, taskId, nextNodes } = {}) {
if (isClose) {
isOpen.value = false;
return;
@ -49,8 +55,27 @@
_callback = callback;
_processId = processId;
_taskId = taskId;
_nextNodes = nextNodes;
formState.opinion = '';
dialogTitle.value = `审批`;
if (nextNodes && nextNodes.length === 1) {
// 下一个节点唯一时（可能有并行节点）
const nNode = nextNodes[0];
formState.nextNodeName = nNode.activityName;
if (nNode.chooseAssign) {
const selected = [];
nextAssignees.value = nNode.userList.map((item) => {
if (item.checked || nNode.userList.length === 1) {
// 只有一个人的时候必须选他
selected.push(item['F_UserId']);
}
return {
value: item['F_UserId'],
label: item['F_RealName']
};
});
}
}
if (action === 'reject') {
loadRejectNodeList();
}