审批按钮优化
This commit is contained in:
@ -76,14 +76,14 @@ export const columns: BasicColumn[] = [
|
||||
sorter: true,
|
||||
},
|
||||
|
||||
{
|
||||
dataIndex: 'securityName',
|
||||
title: '密级',
|
||||
componentType: 'select',
|
||||
align: 'left',
|
||||
// {
|
||||
// dataIndex: 'securityName',
|
||||
// title: '密级',
|
||||
// componentType: 'select',
|
||||
// align: 'left',
|
||||
|
||||
sorter: true,
|
||||
},
|
||||
// sorter: true,
|
||||
// },
|
||||
|
||||
{
|
||||
dataIndex: 'urgencyName',
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8">
|
||||
<!-- <a-col :span="8">
|
||||
<a-form-item label="密级" name="securityCode">
|
||||
<a-select v-model:value="formState.securityCode" :disabled="isDisable" placeholder="请选择密级" style="width: 100%" allow-clear>
|
||||
<a-select-option v-for="item in optionSelect.securityCodeList" :key="item.code" :value="item.code">
|
||||
@ -31,7 +31,7 @@
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-col> -->
|
||||
<a-col :span="8">
|
||||
<a-form-item label="缓急" name="urgencyCode">
|
||||
<a-select v-model:value="formState.urgencyCode" :disabled="isDisable" placeholder="请选择缓急" style="width: 100%" allow-clear>
|
||||
@ -157,7 +157,7 @@
|
||||
urgencyCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
|
||||
empName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
|
||||
bDeptName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
|
||||
comName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
|
||||
comName: [{ required: false, message: "该项为必填项", trigger: 'change' }],
|
||||
dateAppro: [{ required: true, message: "该项为必填项", trigger: 'change' }],
|
||||
content: [{ required: true, message: "该项为必填项", trigger: 'change' }],
|
||||
|
||||
|
||||
@ -172,7 +172,6 @@
|
||||
formName: formName,
|
||||
formId:currentRoute.value.meta.formId,
|
||||
id: record.id,
|
||||
status
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@ -333,7 +332,7 @@
|
||||
onClick: btnEvent[button.code].bind(null, record),
|
||||
});
|
||||
}
|
||||
if (['edit', 'delete','update'].includes(button.code)) {
|
||||
if (['edit', 'delete'].includes(button.code)) {
|
||||
editAndDelBtn.push({
|
||||
icon: button?.icon,
|
||||
tooltip: button?.name,
|
||||
@ -342,11 +341,17 @@
|
||||
});
|
||||
}
|
||||
if (button.code === 'flowRecord') hasFlowRecord = true;
|
||||
if (record.approCode == 'YSP' && button.code== 'update') {
|
||||
let idx = actionsList.findIndex(v =>v.tooltip == '变更')
|
||||
idx<0 && actionsList.push({icon: button?.icon,
|
||||
tooltip: button?.name,
|
||||
onClick: btnEvent[button.code].bind(null, record),})
|
||||
}
|
||||
});
|
||||
if (record.workflowData?.enabled) {
|
||||
//与工作流有关联的表单
|
||||
if (record.workflowData.status) {
|
||||
actionsList.unshift(setIndexFlowStatus(record.workflowData))
|
||||
// actionsList.unshift(setIndexFlowStatus(record.workflowData))
|
||||
} else {
|
||||
actionsList = actionsList.concat(editAndDelBtn);
|
||||
}
|
||||
@ -356,10 +361,6 @@
|
||||
actionsList = actionsList.concat(editAndDelBtn);
|
||||
}
|
||||
}
|
||||
if (record.approCode !== 'YSP') {
|
||||
let idx = actionsList.findIndex(v =>v.tooltip == '变更')
|
||||
idx>-1 && actionsList.splice(idx, 1)
|
||||
}
|
||||
return actionsList;
|
||||
}
|
||||
function handleStartwork(record: Recordable) {
|
||||
|
||||
Reference in New Issue
Block a user