Front_Team/SPDM
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
lijing1
2026-03-04 16:29:34 +08:00
parent c82022730c 2caaf89fc9
commit 612628460c
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/enum/task.ts
View File

@@ -129,8 +129,18 @@ export const TasksStatusColor = {
export const disposeDisabledExeStatus = (
status: string,
option: { value: TASK_PROCESS_STATUS }
option: { value: TASK_PROCESS_STATUS },
taskInfo: any
) => {
// 审批未通过的 不能改成 已完成 、已关闭 、已闭环
if (
Number(taskInfo.approvalStatus) !== TASK_APPROVE_STATUS_ENUM.APPROVED &&
(option.value === TASK_PROCESS_STATUS.COMPLETED ||
option.value === TASK_PROCESS_STATUS.CLOSED_LOOP ||
option.value === TASK_PROCESS_STATUS.CLOSED)
) {
return true;
}
if (status === TASK_PROCESS_STATUS.COMPLETED) {
return true;
}

2
src/views/task/simulationTask/executeTask/index.vue
View File

@@ -136,7 +136,7 @@ const formLoad = () => {
return {
label: item.label,
value: item.value,
disabled: disposeDisabledExeStatus(editRow.value.exeStatus, item),
disabled: disposeDisabledExeStatus(editRow.value.exeStatus, item, editRow.value),
};
});
const achieveStatusList = TASK_CALCULATE_STATUS_OPTIONS.map((item: any) => {

2
src/views/task/simulationTask/mySend/index.vue
View File

@@ -266,7 +266,7 @@ const formLoad = () => {
return {
label: item.label,
value: item.value,
disabled: disposeDisabledExeStatus(editRow.value.exeStatus, item),
disabled: disposeDisabledExeStatus(editRow.value.exeStatus, item, editRow.value),
};
});
const achieveStatusList = TASK_CALCULATE_STATUS_OPTIONS.map((item: any) => {

14
src/views/task/simulationTask/newDemand/index.vue
View File

@@ -507,6 +507,7 @@ const changeSimulationType = (val: string) => {
};
const changeFun = async (val: any, type: string) => {
// console.log('val', val);
// const formData = tableFormRef.value.getFormDataFun();
// editFormInfo.value = { ...formData };
if (val.key === 'projectId') {
@@ -517,10 +518,15 @@ const changeFun = async (val: any, type: string) => {
nodeType = NODE_TYPE.PHASE;
nextKey = 'phaseId';
nodeId = val.data.projectId;
currentProjectUndertaker.value = '';
for (let index = 0; index < val.val.extras.length; index++) {
if (val.val.extras[index]?.propertyName === 'projectUndertaker') {
currentProjectUndertaker.value = val.val.extras[index].propertyValue;
if (enableConfigByTenant([TENANT_ENUM.LYRIC])) {
currentProjectUndertaker.value = '';
for (let index = 0; index < val.val.extras.length; index++) {
if (val.val.extras[index]?.propertyName === 'projectUndertaker') {
currentProjectUndertaker.value = val.val.extras[index].propertyValue;
}
if (val.val.extras[index]?.propertyName === 'produceLine') {
editFormInfo.value.produceLine = val.val.extras[index].propertyValue;
}
}
}
if (editFormInfo.value.simType) {