diff --git a/src/views/Finance/Commission/Comp/DialogPlan.vue b/src/views/Finance/Commission/Comp/DialogPlan.vue index efea956..385d75e 100644 --- a/src/views/Finance/Commission/Comp/DialogPlan.vue +++ b/src/views/Finance/Commission/Comp/DialogPlan.vue @@ -146,7 +146,23 @@ - + + + + + + + + + + + + + + + + + @@ -303,13 +319,15 @@ const resetForm = () => { rateRules: [], isDeductExtraPay: true, isDeductAfterSale: true, - calculateType: 1 + calculateType: 1, + jiedaiticheng: undefined, + quyuticheng: false } formRef.value?.resetFields() } function handleAddRules() { - formData.value.rules.push(formData.value.rules[0]) + formData.value.rules.push({ ...formData.value.rules[0] }) } const emit = defineEmits(['success']) diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue index 61c659b..b57eb8c 100644 --- a/src/views/Home/Salary/index.vue +++ b/src/views/Home/Salary/index.vue @@ -285,13 +285,15 @@ - 封存 + 封存 + 已封存 @@ -359,7 +361,7 @@ async function getList() { tableList.value = data.list.map((it, index) => ({ ...it, id: index + 1, - edit: it.isConfirm ? '2' : '0' + edit: it.status == 1 ? '2' : '0' })) } total.value = data.total