diff --git a/src/views/system/CodeDataRuleTemplate/TenantAuditStepModal.vue b/src/views/system/CodeDataRuleTemplate/TenantAuditStepModal.vue index fad765dc..96b2cc4f 100644 --- a/src/views/system/CodeDataRuleTemplate/TenantAuditStepModal.vue +++ b/src/views/system/CodeDataRuleTemplate/TenantAuditStepModal.vue @@ -13,7 +13,7 @@ @@ -91,8 +91,6 @@ label: item.columnDescription, }) }) - console.log(ColumnViewschemas.value) - columnViewType.value = true } const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner( @@ -109,7 +107,9 @@ ...res.data, }) // feeField.value.SetData(res.data.details) - RefcolumnView.value.condition = JSON.parse(res.data.dataRules) + // RefcolumnView.value.condition = JSON.parse(res.data.dataRules) + RefcolumnView.value.init(JSON.parse(res.data.dataRules)) + columnViewType.value = true detailId.value = res.data.id } } else { @@ -118,10 +118,11 @@ customerName: props.customerName, customerId: props.customerId, }) + RefcolumnView.value.init(null) // feeField.value.SetData([]) // feeField.value.condition = '' } - RefcolumnView.value.init(null) + setModalProps({ loading: false }) }, ) diff --git a/src/views/system/CodeDataRuleTemplate/columns.tsx b/src/views/system/CodeDataRuleTemplate/columns.tsx index f251b5ea..88c221a6 100644 --- a/src/views/system/CodeDataRuleTemplate/columns.tsx +++ b/src/views/system/CodeDataRuleTemplate/columns.tsx @@ -12,6 +12,7 @@ if (res.succeeded) { columnViewData.push({ label: item.description, value: item.description, + ...item, }) }) }