diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 086cc14..6b6b4b8 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -38,6 +38,7 @@ // agree同意 refuse拒绝 reject驳回 revoke取消 const userInfo = useUserStore() +const decisionItem = ref('') // ---------------表单提交-------------------------------- // 表单对象 @@ -51,7 +52,8 @@ * @param type 审批类型 * @param taskId 任务id */ -function initDialog(type: string, taskId: string) { +function initDialog(type: string, taskId: string, decisionItemParam = '1') { + decisionItem.value = `${decisionItemParam}` formData.type = type formData.taskId = taskId formData.user = userInfo.name @@ -124,10 +126,10 @@ 同意 - + 驳回 - + 拒绝 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 086cc14..6b6b4b8 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -38,6 +38,7 @@ // agree同意 refuse拒绝 reject驳回 revoke取消 const userInfo = useUserStore() +const decisionItem = ref('') // ---------------表单提交-------------------------------- // 表单对象 @@ -51,7 +52,8 @@ * @param type 审批类型 * @param taskId 任务id */ -function initDialog(type: string, taskId: string) { +function initDialog(type: string, taskId: string, decisionItemParam = '1') { + decisionItem.value = `${decisionItemParam}` formData.type = type formData.taskId = taskId formData.user = userInfo.name @@ -124,10 +126,10 @@ 同意 - + 驳回 - + 拒绝 diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue index 9c4581f..b58d1d8 100644 --- a/src/components/NormalTable/index.vue +++ b/src/components/NormalTable/index.vue @@ -188,6 +188,7 @@ stripe :size="size" style="width: 100%;" + :row-key="(row) => { return row.id }" @selection-change="handleSelectionChange" @select="selectClick" @row-click="rowClick" @@ -199,7 +200,7 @@ - + - + - + - + - + - + - + - + - +