Merge branch 'oat_dev' into develop

This commit is contained in:
oat_dev 2024-04-09 17:11:02 +07:00
commit 7dd7b033a9

View file

@ -145,7 +145,7 @@ const groupSubOp = ref<DataOption[]>([
]);
const isEdit = ref<boolean>(false);
const rowIndex = ref<number | null>(null);
const rowIndex = ref<number>(0);
const modalGroupTarget = ref<boolean>(false);
const newModalGroupTarget = ref<boolean>(false);
const modalRelate = ref<boolean>(false);
@ -215,7 +215,11 @@ function onSubmitGroup() {
type: e.type,
amount: Number(e.amount),
}));
plannedGoals.value.push(...list);
if (isEdit.value) {
plannedGoals.value.splice(rowIndex.value, 1, ...list);
} else {
plannedGoals.value.push(...list);
}
store.formAddProject.plannedGoals = plannedGoals.value;
} else {
const data = [];
@ -229,7 +233,11 @@ function onSubmitGroup() {
type: e.type,
amount: Number(e.amount),
}));
actualGoals.value.push(...list);
if (isEdit.value) {
actualGoals.value.splice(rowIndex.value, 1, ...list);
} else {
actualGoals.value.push(...list);
}
store.formAddProject.actualGoals = actualGoals.value;
}
setTimeout(() => {
@ -438,7 +446,12 @@ onMounted(() => {
@click="
() => {
isEdit = true;
isTarget = 'planned';
rowIndex = props.rowIndex;
formGroupTarget.type = props.row.type;
formGroupTarget.groupTarget = props.row.groupTarget;
formGroupTarget.groupTargetSub = props.row.groupTargetSub;
formGroupTarget.amount = props.row.amount;
newModalGroupTarget = true;
}
"
@ -575,7 +588,12 @@ onMounted(() => {
@click="
() => {
isEdit = true;
isTarget = 'actual';
rowIndex = props.rowIndex;
formGroupTarget.type = props.row.type;
formGroupTarget.groupTarget = props.row.groupTarget;
formGroupTarget.groupTargetSub = props.row.groupTargetSub;
formGroupTarget.amount = props.row.amount;
modalGroupTarget = true;
}
"