diff --git a/src/views/ModelApproval/HandleDialog.vue b/src/views/ModelApproval/HandleDialog.vue
index 986f1fe..0268cd0 100644
--- a/src/views/ModelApproval/HandleDialog.vue
+++ b/src/views/ModelApproval/HandleDialog.vue
@@ -6,13 +6,14 @@ const props = defineProps({
required: true,
},
row: [Object],
+ templateList: [Array],
})
const emit = defineEmits(['closed', 'onSuccess'])
const dialogVisible = ref(false)
-const isAdd = computed(() => props.type === 'add')
+const isCancel = computed(() => props.type === 'cancel')
const isApprove = computed(() => props.type === 'approve')
const isReject = computed(() => props.type === 'reject')
const isApproval = computed(() => isApprove.value || isReject.value)
@@ -22,10 +23,8 @@ onMounted(() => {
})
const formRef = ref(null)
-const formField = ref({ enabled: true, params: [], remark: '' })
+const formField = ref({ remark: '' })
const formRules = reactive({
- name: [{ required: true, message: '不可为空', trigger: 'change' }],
- code: [{ required: true, message: '不可为空', trigger: 'change' }],
remark: [{ required: true, message: '备注不可为空', trigger: 'change' }],
})
@@ -37,13 +36,13 @@ function closed() {
const submitForm = async () => {
await formRef.value.validate()
-
+
if (isApproval.value) {
// 审批逻辑
const params = {
application_id: props.row.id,
action: isApprove.value ? 'approve' : 'reject',
- remark: formField.value.remark
+ remark: formField.value.remark,
}
loading.value = true
RPC.post('/template_access_review', params)
@@ -56,14 +55,13 @@ const submitForm = async () => {
loading.value = false
})
} else {
- // 原有的增删改逻辑
- const api = isAdd.value ? '/vendor/create' : '/vendor/update'
const params = {
- ...formField.value,
- id: isAdd.value ? null : props.row.id,
+ template_id: props.row.template_id,
+ user_id: props.row.user_id,
+ remark: formField.value.remark,
}
loading.value = true
- RPC.post(api, params)
+ RPC.post('/template_access_revoke', params)
.then((res) => {
ElMessage.success('操作成功')
emit('onSuccess')
@@ -74,18 +72,12 @@ const submitForm = async () => {
})
}
}
-
-if (!isAdd.value && !isApproval.value) {
- formField.value = {
- ...props.row,
- }
-}
{{ row?.reason }}
-
+
+
+
+
+
+ {{ row?.nickname || row?.user_id }}
+
+
+
+ {{
+ templateList?.find((item) => item.id === row.template_id)?.name || row.template_id
+ }}
+
+
+
diff --git a/src/views/ModelApproval/index.vue b/src/views/ModelApproval/index.vue
index 696db7e..4256d70 100644
--- a/src/views/ModelApproval/index.vue
+++ b/src/views/ModelApproval/index.vue
@@ -34,7 +34,11 @@
v-loading="loading"
header-row-class-name="table-header"
>
-
+
+
+ {{ row.nickname || row.user_id }}
+
+
@@ -46,30 +50,38 @@
申请中
已拒绝
已同意
+ 已撤回
-
同意
+
+ 撤回权限
+
-
- 拒绝
+ >
+ 拒绝
-
- -
+ --
@@ -89,6 +101,7 @@
:row="currentRow"
@closed="isShowDialog = false"
@on-success="getList"
+ :templateList="templateList"
/>