up

src/views/api/api/index.vue

@@ -128,11 +128,8 @@ const onApiDebug = (row: { apiId: number }) => {
 }
 
 async function onChangeStatus(row: { apiId: number; status: number }) {
-  const res = await updateApiStatus(row.apiId, row.status)
-  ElMessage.success({
-    message: res.msg,
-    center: true,
-  })
+  const { msg } = await updateApiStatus(row.apiId, row.status)
+  ElMessage.success(msg)
 }
 </script>
 

src/views/app_center/app_store/index.vue

@@ -57,12 +57,9 @@ const onAppPublish = () => {
 
 const onAppRemove = (data: any) => {
   ElMessageBox.confirm(`确认下架「${data.appTitle}」吗？`, '确认信息').then(async () => {
-    await updateApp({ appId: data.appId, ifStore: 0 })
+    const { msg } = await updateApp({ appId: data.appId, ifStore: 0 })
+    ElMessage.success(msg)
     await getData()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 

src/views/app_center/cat/components/AppCat.vue

@@ -44,19 +44,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createAppCat(state.formData)
+        const { msg } = await createAppCat(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateAppCat(state.formData)
+        const { msg } = await updateAppCat(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }

src/views/app_center/cat/index.vue

@@ -39,12 +39,9 @@ function onAppCatEdit(row: any) {
 
 function onAppCatDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.appCatTitle}」吗？`, '确认信息').then(async () => {
-    await deleteAppCatById(row.appCatId)
+    const { msg } = await deleteAppCatById(row.appCatId)
+    ElMessage.success(msg)
     await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 </script>

src/views/biz/biz/components/Biz.vue

@@ -5,6 +5,7 @@ meta:
 
 <script lang="ts" setup name="biz">
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { createBiz, getBizById, updateBiz } from '@/api/biz/bizApi'
 const emit = defineEmits(['success'])
 
@@ -43,12 +44,14 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createBiz(state.formData)
+        const { msg } = await createBiz(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateBiz(state.formData)
+        const { msg } = await updateBiz(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }

src/views/biz/biz/index.vue

@@ -100,12 +100,9 @@ const onBizEdit = (data: { bizId: number }) => {
 // 业务删除
 const onBizDelete = (data: any) => {
   ElMessageBox.confirm(`确认删除「${data.bizTitle}」吗？`, '确认信息').then(async () => {
-    await deleteBizById(data.bizId)
+    const { msg } = await deleteBizById(data.bizId)
+    ElMessage.success(msg)
     await getBizData()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   })
 }
 
@@ -178,12 +175,9 @@ const onObjectOAM = (row: any) => {
 const onObjectDelete = (row: any) => {
   const { bizId, objectId, objectTitle } = row
   ElMessageBox.confirm(`确认删除「${objectTitle}」吗？`, '确认信息').then(async () => {
-    await deleteObjectById(bizId, objectId)
+    const { msg } = await deleteObjectById(bizId, objectId)
+    ElMessage.success(msg)
     await getObjectData()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   })
 }
 </script>

src/views/biz/oam/components/ObjectOAM.vue

@@ -5,6 +5,7 @@ meta:
 
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { createObjectOAM, getObjectOAMById, updateObjectOAM } from '@/api/biz/bizObjectOAMApi'
 const emit = defineEmits(['success'])
 
@@ -64,12 +65,14 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createObjectOAM(state.formData)
+        const { msg } = await createObjectOAM(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateObjectOAM(state.formData)
+        const { msg } = await updateObjectOAM(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
@@ -137,22 +140,44 @@ defineExpose({
 
         <el-form-item label="类型" prop="oamType">
           <el-radio-group v-model="state.formData.oamType">
-            <el-radio :label="1">新增</el-radio>
-            <el-radio :label="2">修改</el-radio>
-            <el-radio :label="3">删除</el-radio>
-            <el-radio :label="4">部分更新</el-radio>
-            <el-radio :label="5">单笔查询</el-radio>
-            <el-radio :label="6">多笔查询</el-radio>
-            <el-radio :label="7">分页查询</el-radio>
+            <el-radio :label="1">
+              新增
+            </el-radio>
+            <el-radio :label="2">
+              修改
+            </el-radio>
+            <el-radio :label="3">
+              删除
+            </el-radio>
+            <el-radio :label="4">
+              部分更新
+            </el-radio>
+            <el-radio :label="5">
+              单笔查询
+            </el-radio>
+            <el-radio :label="6">
+              多笔查询
+            </el-radio>
+            <el-radio :label="7">
+              分页查询
+            </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item label="类型" prop="sqlType">
           <el-radio-group v-model="state.formData.sqlType">
-            <el-radio :label="1">DQL(数据查询)</el-radio>
-            <el-radio :label="2">DML(数据操纵)</el-radio>
-            <el-radio :label="3">DDL(数据定义)</el-radio>
-            <el-radio :label="4">DCL(数据控制)</el-radio>
+            <el-radio :label="1">
+              DQL(数据查询)
+            </el-radio>
+            <el-radio :label="2">
+              DML(数据操纵)
+            </el-radio>
+            <el-radio :label="3">
+              DDL(数据定义)
+            </el-radio>
+            <el-radio :label="4">
+              DCL(数据控制)
+            </el-radio>
           </el-radio-group>
         </el-form-item>
 

src/views/biz/oam/index.vue

@@ -147,12 +147,9 @@ const onObjectOAMEdit = () => {
 const onObjectOAMDelete = (data: { bizId: number; objectId: number; oamId: number; oamTitle: string }) => {
   const { bizId, objectId, oamId, oamTitle } = data
   ElMessageBox.confirm(`确认删除「${oamTitle}」吗？`, '确认信息').then(async () => {
-    await deleteObjectOAMById(bizId, objectId, oamId)
+    const { msg } = await deleteObjectOAMById(bizId, objectId, oamId)
+    ElMessage.success(msg)
     await getOAMTree()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   })
 }
 
@@ -161,7 +158,6 @@ const onSuccess = () => {
   getOAMTree()
 }
 
-const activeName = ref('first')
 // 返回列表页
 function goBack() {
   if (settingsStore.settings.tabbar.enable && settingsStore.settings.tabbar.mergeTabsBy !== 'activeMenu') {
@@ -230,7 +226,7 @@ function goBack() {
         </template>
 
         <div class="container">
-          <el-tabs v-model="activeName" class="demo-tabs">
+          <el-tabs class="demo-tabs">
             <el-tab-pane label="行为定义" name="first">
               <el-descriptions
                 :title="state.oam.oamTitle"

src/views/biz/oam_mapping/index.vue

@@ -119,16 +119,15 @@ function onMappingCancel(row: any, index: number) {
 async function onMappingSave(row: any) {
   row.isEdit = false
   if (state.actionType === 1) {
-    await createObjectOAMMapping(row)
+    const { msg } = await createObjectOAMMapping(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('新增成功')
-  }
-  else {
-    await updateObjectOAMMapping(row)
+  } else {
+    const { msg } = await updateObjectOAMMapping(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('修改成功')
   }
-  getData()
+  await getData()
 }
 
 onMounted(() => {

src/views/biz/oam_params/index.vue

@@ -42,7 +42,7 @@ const state = reactive({
   title: '',
   dialogVisible: false,
   loading: false,
-  conditions: {
+  search: {
     keywords: '',
     bizId: props.bizId,
     objectId: props.objectId,
@@ -68,7 +68,7 @@ const formRules = reactive<FormRules>({
 // 查询数据
 const getData = async () => {
   state.loading = true
-  const { bizId, objectId, oamId } = state.conditions
+  const { bizId, objectId, oamId } = state.search
   const { data } = await getObjectOAMParamsListByOamId(bizId, objectId, oamId)
   state.loading = false
   state.dataList = data
@@ -99,7 +99,7 @@ function onParamAdd() {
   state.dataList.push({
     bizId,
     objectId,
-    oamId: state.conditions.oamId,
+    oamId: state.search.oamId,
     paramId: 0,
     logicalOperator: 'AND',
     paramName: '', // 名称
@@ -121,11 +121,11 @@ function onParamEdit(row: any) {
 }
 
 async function onParamDelete(row: any) {
-  const { oamId } = state.conditions
+  const { oamId } = state.search
   const paramId = row.paramId
-  await deleteObjectOAMParamsById(bizId, objectId, oamId, paramId)
-  ElMessage.success('删除成功')
-  getData()
+  const { msg } = await deleteObjectOAMParamsById(bizId, objectId, oamId, paramId)
+  ElMessage.success(msg)
+  await getData()
 }
 
 function onParamCancel(row: any, index: number) {
@@ -139,28 +139,29 @@ function onParamCancel(row: any, index: number) {
 async function onParamSave(row: any) {
   row.isEdit = false
   if (state.actionType === 1) {
-    await createObjectOAMParams(row)
+    const { msg } = await createObjectOAMParams(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('新增成功')
   }
   else {
-    await updateObjectOAMParams(row)
+    const { msg } = await updateObjectOAMParams(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('修改成功')
   }
-  getData()
+  await getData()
 }
-defineExpose({
-  showData(oamId: number) {
-    state.conditions.oamId = oamId
-    getData()
-  },
-})
 
 onMounted(() => {
   nextTick(() => {
   })
 })
+
+defineExpose({
+  showData(oamId: number) {
+    state.search.oamId = oamId
+    getData()
+  },
+})
 </script>
 
 <template>

src/views/biz/oam_rule/components/ObjectAttrSelector.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup name="AppCatSelector">
 import { getObjectAttrListById } from '@/api/biz/bizObjectAttrApi'
 const props = withDefaults(defineProps<{
-  modelValue: number,
-  bizId: number,
-  objectId: number,
+  modelValue: number
+  bizId: number
+  objectId: number
 }>(), {
   modelValue: 0,
   bizId: 0,
@@ -34,6 +34,7 @@ const getData = async () => {
   state.loading = false
   state.dataList = data
 }
+
 onMounted(() => {
   getData ()
 })

src/views/biz/oam_rule/components/ObjectOAMRule.vue

@@ -5,6 +5,7 @@ meta:
 
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { createObjectOAMRule, getObjectOAMRuleById, updateObjectOAMRule } from '@/api/biz/bizObjectOAMRuleApi'
 import RuleSelector from '@/views/biz/oam/components/RuleSelector.vue'
 import ObjectAttrSelector from '@/views/biz/rule/components/ObjectAttrSelector.vue'
@@ -63,12 +64,14 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createObjectOAMRule(state.formData)
+        const { msg } = await createObjectOAMRule(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateObjectOAMRule(state.formData)
+        const { msg } = await updateObjectOAMRule(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }

src/views/biz/oam_rule/index.vue

@@ -37,7 +37,7 @@ const state = reactive({
   title: '',
   dialogVisible: false,
   loading: false,
-  conditions: {
+  search: {
     keywords: '',
     bizId: props.bizId,
     objectId: props.objectId,
@@ -63,7 +63,7 @@ const formRules = reactive<FormRules>({
 // 查询数据
 const getData = async () => {
   state.loading = true
-  const { bizId, objectId, oamId } = state.conditions
+  const { bizId, objectId, oamId } = state.search
   const { data } = await getObjectOAMRuleListByOamId(bizId, objectId, oamId)
   state.loading = false
   state.dataList = data
@@ -79,7 +79,7 @@ function onRuleAdd() {
   state.dataList.push({
     bizId,
     objectId,
-    oamId: state.conditions.oamId,
+    oamId: state.search.oamId,
     orId: 0,
     ruleId: 0,
     ruleTitle: '',
@@ -99,10 +99,10 @@ function onRuleEdit(row: any) {
 
 async function onRuleDelete(row: any) {
   const orId = row.orId
-  const { oamId } = state.conditions
-  await deleteObjectOAMRuleById(bizId, objectId, oamId, orId)
-  ElMessage.success('删除成功')
-  getData()
+  const { oamId } = state.search
+  const { msg } = await deleteObjectOAMRuleById(bizId, objectId, oamId, orId)
+  ElMessage.success(msg)
+  await getData()
 }
 
 function onRuleCancel(row: any, index: number) {
@@ -116,16 +116,16 @@ function onRuleCancel(row: any, index: number) {
 async function onRuleSave(row: any) {
   row.isEdit = false
   if (state.actionType === 1) {
-    await createObjectOAMRule(row)
+    const { msg } = await createObjectOAMRule(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('新增成功')
   }
   else {
-    await updateObjectOAMRule(row)
+    const { msg } = await updateObjectOAMRule(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('修改成功')
   }
-  getData()
+  await getData()
 }
 
 onMounted(() => {
@@ -136,7 +136,7 @@ onMounted(() => {
 
 defineExpose({
   showData(oamId: number) {
-    state.conditions.oamId = oamId
+    state.search.oamId = oamId
     getData()
   },
 })

src/views/biz/object/components/Object.vue

@@ -5,6 +5,7 @@ meta:
 
 <script lang="ts" setup name="bizObject">
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { createObject, getObjectById, updateObject } from '@/api/biz/bizObjectApi'
 const emit = defineEmits(['success'])
 
@@ -61,12 +62,14 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createObject(state.formData)
+        const { msg } = await createObject(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateObject(state.formData)
+        const { msg } = await updateObject(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }

src/views/biz/object/components/ObjectMapping.vue

@@ -51,9 +51,9 @@ function onObjectMappingAdd() {
 async function onObjectMappingDelete(row: any) {
   const { bizId, objectId } = state.search
   const mappingId = row.mappingId
-  await deleteObjectMappingById(bizId, objectId, mappingId)
-  ElMessage.success('删除成功')
-  getData()
+  const { msg } = await deleteObjectMappingById(bizId, objectId, mappingId)
+  ElMessage.success(msg)
+  await getData()
 }
 
 onMounted(() => {

src/views/biz/object/index.vue

@@ -4,7 +4,6 @@ meta:
 </route>
 
 <script lang="ts" setup name="bizObjectDetails">
-import type { TabsPaneContext } from 'element-plus'
 import BizObjectAttrListComponent from '../object_attr/index.vue'
 import BizObjectComponent from '@/views/biz/object/components/Object.vue'
 import { getObjectById } from '@/api/biz/bizObjectApi'
@@ -21,13 +20,12 @@ const objectId = parseInt(route.params.objectId.toString())
 
 const state = reactive({
   loading: false,
-  objectData: {
+  objectInfo: {
     objectTitle: '',
     objectCode: '',
     objectType: 0,
     comment: '',
   },
-  keywords: '',
   dialogState: 1,
   search: {
     bizId,
@@ -45,10 +43,10 @@ const getObjectData = async () => {
   state.loading = true
   const { data } = await getObjectById(bizId, objectId)
   state.loading = false
-  state.objectData.objectTitle = data.objectTitle
-  state.objectData.objectType = data.objectType
-  state.objectData.objectCode = data.objectCode
-  state.objectData.comment = data.comment
+  state.objectInfo.objectTitle = data.objectTitle
+  state.objectInfo.objectType = data.objectType
+  state.objectInfo.objectCode = data.objectCode
+  state.objectInfo.comment = data.comment
 }
 
 onMounted(() => {
@@ -77,7 +75,7 @@ function goBack() {
 
 <template>
   <div class="absolute-container">
-    <page-header :title="state.objectData.objectTitle">
+    <page-header :title="state.objectInfo.objectTitle">
       <el-button size="default" round @click="goBack">
         <template #icon>
           <el-icon>
@@ -93,7 +91,7 @@ function goBack() {
         <el-tabs v-model="activeTab">
           <el-tab-pane label="基本信息" name="first">
             <el-descriptions
-              :title="state.objectData.objectTitle"
+              :title="state.objectInfo.objectTitle"
               :column="1"
               size="small"
               border>
@@ -106,7 +104,7 @@ function goBack() {
                 label-class-name="el-description_label"
                 label="对象类型"
                 width="150px">
-                {{ state.objectData.objectType }}
+                {{ state.objectInfo.objectType }}
               </el-descriptions-item>
 
               <el-descriptions-item
@@ -114,7 +112,7 @@ function goBack() {
                 label-class-name="el-description_label"
                 width="150px"
                 label-align="right">
-                {{ state.objectData.objectCode }}
+                {{ state.objectInfo.objectCode }}
               </el-descriptions-item>
 
               <el-descriptions-item
@@ -122,9 +120,8 @@ function goBack() {
                 label-class-name="el-description_label"
                 width="150px"
                 label="说明">
-                {{ state.objectData.comment }}
+                {{ state.objectInfo.comment }}
               </el-descriptions-item>
-
             </el-descriptions>
           </el-tab-pane>
 

src/views/biz/object_attr/components/AttrList.vue

@@ -11,7 +11,7 @@ import {
   createObjectAttr,
   deleteObjectAttrById,
   getObjectAttrListById,
-  updateObjectAttr
+  updateObjectAttr,
 } from '@/api/biz/bizObjectAttrApi'
 const props = withDefaults(defineProps<{
   bizId: number
@@ -111,8 +111,8 @@ function onAttrEdit(row: any) {
 async function onAttrDelete(row: any) {
   const { bizId, objectId } = state.conditions
   const attrId = row.attrId
-  await deleteObjectAttrById(bizId, objectId, attrId)
-  ElMessage.success('删除成功')
+  const { msg } = await deleteObjectAttrById(bizId, objectId, attrId)
+  ElMessage.success(msg)
 }
 
 function onAttrCancel(row: any, index: number) {
@@ -126,14 +126,14 @@ function onAttrCancel(row: any, index: number) {
 async function onAttrSave(row: any) {
   row.isEdit = false
   if (state.actionType === 1) {
-    await createObjectAttr(row)
+    const { msg } = await createObjectAttr(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('新增成功')
   }
   else {
-    await updateObjectAttr(row)
+    const { msg } = await updateObjectAttr(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('修改成功')
   }
 }
 
@@ -148,14 +148,14 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createObjectAttr(state.attrs)
+        const { msg } = await createObjectAttr(state.attrs)
+        ElMessage.success(msg)
         state.dialogVisible = false
-        ElMessage.success('新增成功')
       }
       else {
-        await updateObjectAttr(state.attrs)
+        const { msg } = await updateObjectAttr(state.attrs)
+        ElMessage.success(msg)
         state.dialogVisible = false
-        ElMessage.success('修改成功')
       }
     }
   })

src/views/biz/object_attr/index.vue

@@ -113,9 +113,9 @@ function onAttrEdit(row: any) {
 async function onAttrDelete(row: any) {
   const { bizId, objectId } = state.conditions
   const attrId = row.attrId
-  await deleteObjectAttrById(bizId, objectId, attrId)
+  const { msg } = await deleteObjectAttrById(bizId, objectId, attrId)
+  ElMessage.success(msg)
   await getData()
-  ElMessage.success('删除成功')
 }
 
 function onAttrCancel(row: any, index: number) {
@@ -129,14 +129,14 @@ function onAttrCancel(row: any, index: number) {
 async function onAttrSave(row: any) {
   row.isEdit = false
   if (state.actionType === 1) {
-    await createObjectAttr(row)
+    const { msg } = await createObjectAttr(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('新增成功')
   }
   else {
-    await updateObjectAttr(row)
+    const { msg } = await updateObjectAttr(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('修改成功')
   }
   await getData()
 }

src/views/customer/components/Oc.vue

@@ -50,19 +50,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createOc(state.formData)
+        const { msg } = await createOc(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateOc(state.formData)
+        const { msg } = await updateOc(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }
@@ -96,7 +94,6 @@ defineExpose({
     state.dialogVisible = true
     getData(ocId)
   },
-
 })
 </script>
 

src/views/customer/components/OcAdmin.vue

@@ -48,19 +48,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createOcAdmin(state.formData)
+        const { msg } = await createOcAdmin(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateOcAdmin(state.formData)
+        const { msg } = await updateOcAdmin(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }

src/views/customer/ent/index.vue

@@ -16,6 +16,7 @@ const state = reactive({
   },
   // 列表数据
   dataList: [],
+  switch_state: false,
 })
 
 const ocRef = ref()
@@ -71,12 +72,14 @@ function onAdminEdit(row: any) {
 
 // 状态变更
 const onStatusChange = async (status: number, row: { ocId: number }) => {
-  await updateStatus(row.ocId, status)
+  const { msg } = await updateStatus(row.ocId, status)
+  ElMessage.success(msg)
 }
 
 // license状态变更
 const onLicStatusChange = async (status: number, row: { ocId: number }) => {
-  await updateLicStatus(row.ocId, status)
+  const { msg } = await updateLicStatus(row.ocId, status)
+  ElMessage.success(msg)
 }
 
 function onPasswordReset(row: { ocId: number; adminId: number; adminName: string }) {
@@ -146,7 +149,7 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
 
         <el-table-column label="管理员账号" header-align="center" align="center" width="150">
           <template #default="scope">
-            <div>
+            <div v-if="scope.row.isFixed !== 1">
               <el-tag v-if="scope.row.adminId > 0" @click="onAdminEdit(scope.row)">
                 {{ scope.row.adminName }}
               </el-tag>
@@ -157,35 +160,35 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           </template>
         </el-table-column>
 
-        <el-table-column align="center" label="License控制" width="120">
+        <el-table-column align="center" label="状态" width="120">
           <template #default="scope">
             <div v-if="scope.row.isFixed !== 1">
               <el-switch
                 v-model="scope.row.status"
                 :active-value="1"
-                :inactive-value="2"
+                :inactive-value="0"
                 :loading="scope.row.loading"
                 inline-prompt
                 active-text="启用"
                 inactive-text="禁用"
-                @change="(status) => onStatusChange(scope.row.status, scope.row)"
+                @change="() => onStatusChange(scope.row.status, scope.row)"
               />
             </div>
           </template>
         </el-table-column>
 
-        <el-table-column align="center" label="状态" width="120">
+        <el-table-column align="center" label="License控制" width="120">
           <template #default="scope">
-            <div v-if="scope.row.isFixed !== 1">
+            <div>
               <el-switch
-                v-model="scope.row.licStatus"
+                v-model="scope.row.ifLic"
                 :active-value="1"
-                :inactive-value="2"
+                :inactive-value="0"
                 :loading="scope.row.loading"
                 inline-prompt
                 active-text="启用"
                 inactive-text="禁用"
-                @change="(status) => onLicStatusChange(scope.row.status, scope.row)"
+                @change="() => onLicStatusChange(scope.row.status, scope.row)"
               />
             </div>
           </template>

src/views/customer/org/index.vue

@@ -71,22 +71,21 @@ function onAdminEdit(row: any) {
 
 // 状态变更
 const onStatusChange = async (status: number, row: { ocId: number }) => {
-  await updateStatus(row.ocId, status)
+  const { msg } = await updateStatus(row.ocId, status)
+  ElMessage.success(msg)
 }
 
 // license状态变更
 const onLicStatusChange = async (status: number, row: { ocId: number }) => {
-  await updateLicStatus(row.ocId, status)
+  const { msg } = await updateLicStatus(row.ocId, status)
+  ElMessage.success(msg)
 }
 
 function onPasswordReset(row: { ocId: number; adminId: number; adminName: string }) {
   ElMessageBox.confirm(`确认删除「${row.adminName}」吗？`, '确认信息').then(async () => {
     const { ocId, adminId } = row
-    await resetAdminPwd(ocId, adminId)
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
+    const { msg } = await resetAdminPwd(ocId, adminId)
+    ElMessage.success(msg)
   }).catch(() => {})
 }
 </script>
@@ -163,7 +162,7 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
               <el-switch
                 v-model="scope.row.status"
                 :active-value="1"
-                :inactive-value="2"
+                :inactive-value="0"
                 :loading="scope.row.loading"
                 inline-prompt
                 active-text="启用"
@@ -178,9 +177,9 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           <template #default="scope">
             <div v-if="scope.row.isFixed !== 1">
               <el-switch
-                v-model="scope.row.licStatus"
+                v-model="scope.row.ifLic"
                 :active-value="1"
-                :inactive-value="2"
+                :inactive-value="0"
                 :loading="scope.row.loading"
                 inline-prompt
                 active-text="启用"

src/views/customer/partner/index.vue

@@ -47,12 +47,9 @@ function onOcEdit(row: any) {
 
 function onOcDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.ocName}」吗？`, '确认信息').then(async () => {
-    await deleteOcById(row.ocId)
+    const { msg } = await deleteOcById(row.ocId)
+    ElMessage.success(msg)
     await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 
@@ -71,22 +68,21 @@ function onAdminEdit(row: any) {
 
 // 状态变更
 const onStatusChange = async (status: number, row: { ocId: number }) => {
-  await updateStatus(row.ocId, status)
+  const { msg } = await updateStatus(row.ocId, status)
+  ElMessage.success(msg)
 }
 
 // license状态变更
 const onLicStatusChange = async (status: number, row: { ocId: number }) => {
-  await updateLicStatus(row.ocId, status)
+  const { msg } = await updateLicStatus(row.ocId, status)
+  ElMessage.success(msg)
 }
 
 function onPasswordReset(row: { ocId: number; adminId: number; adminName: string }) {
   ElMessageBox.confirm(`确认删除「${row.adminName}」吗？`, '确认信息').then(async () => {
     const { ocId, adminId } = row
-    await resetAdminPwd(ocId, adminId)
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
+    const { msg } = await resetAdminPwd(ocId, adminId)
+    ElMessage.success(msg)
   }).catch(() => {})
 }
 </script>
@@ -161,14 +157,14 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           <template #default="scope">
             <div v-if="scope.row.isFixed !== 1">
               <el-switch
-                v-model="scope.row.status"
+                v-model="scope.row.ifLic"
                 :active-value="1"
-                :inactive-value="2"
+                :inactive-value="0"
                 :loading="scope.row.loading"
                 inline-prompt
                 active-text="启用"
                 inactive-text="禁用"
-                @change="(status) => onStatusChange(scope.row.status, scope.row)"
+                @change="(status) => onLicStatusChange(scope.row.status, scope.row)"
               />
             </div>
           </template>
@@ -178,14 +174,14 @@ function onPasswordReset(row: { ocId: number; adminId: number; adminName: string
           <template #default="scope">
             <div v-if="scope.row.isFixed !== 1">
               <el-switch
-                v-model="scope.row.licStatus"
+                v-model="scope.row.status"
                 :active-value="1"
-                :inactive-value="2"
+                :inactive-value="0"
                 :loading="scope.row.loading"
                 inline-prompt
                 active-text="启用"
                 inactive-text="禁用"
-                @change="(status) => onLicStatusChange(scope.row.status, scope.row)"
+                @change="(status) => onStatusChange(scope.row.status, scope.row)"
               />
             </div>
           </template>

src/views/database/type/components/DbType.vue

@@ -44,19 +44,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createDbType(state.formData)
+        const { msg } = await createDbType(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateDbType(state.formData)
+        const { msg } = await updateDbType(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }

src/views/database/type/index.vue

@@ -39,12 +39,9 @@ function onDbTypeEdit(row: any) {
 
 function onDbTypeDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.dbTypeTitle}」吗？`, '确认信息').then(async () => {
-    await deleteDbTypeById(row.dbTypeId)
+    const { msg } = await deleteDbTypeById(row.dbTypeId)
+    ElMessage.success(msg)
     await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 </script>

src/views/model/model/components/Model.vue

@@ -5,6 +5,7 @@ meta:
 
 <script lang="ts" setup name="Model">
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { createModel, getModelById, updateModel } from '@/api/model/modelApi'
 const emit = defineEmits(['success'])
 
@@ -43,12 +44,14 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createModel(state.formData)
+        const { msg } = await createModel(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateModel(state.formData)
+        const { msg } = await updateModel(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }

src/views/model/model/index.vue

@@ -101,12 +101,9 @@ const onModelEdit = (data: { modelId: number }) => {
 // 模型删除
 const onModelDelete = (data: any) => {
   ElMessageBox.confirm(`确认删除「${data.modelTitle}」吗？`, '确认信息').then(async () => {
-    await deleteModelById(data.modelId)
+    const { msg } = await deleteModelById(data.modelId)
+    ElMessage.success(msg)
     await getModelData()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   })
 }
 
@@ -181,12 +178,9 @@ const onObjectOAM = (row: any) => {
 const onObjectDelete = (row: any) => {
   const { modelId, objectId, objectTitle } = row
   ElMessageBox.confirm(`确认删除「${objectTitle}」吗？`, '确认信息').then(async () => {
-    await deleteObjectById(modelId, objectId)
+    const { msg } = await deleteObjectById(modelId, objectId)
+    ElMessage.success(msg)
     await getObjectData()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   })
 }
 </script>

src/views/model/oam/components/objectOAM.vue

@@ -5,6 +5,7 @@ meta:
 
 <script lang="ts" setup>
 import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { createObjectOAM, getObjectOAMById, updateObjectOAM } from '@/api/model/modelObjectOAMApi'
 const emit = defineEmits(['success'])
 
@@ -53,12 +54,14 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createObjectOAM(state.formData)
+        const { msg } = await createObjectOAM(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateObjectOAM(state.formData)
+        const { msg } = await updateObjectOAM(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
@@ -120,22 +123,44 @@ defineExpose({
 
         <el-form-item label="类型" prop="oamType">
           <el-radio-group v-model="state.formData.oamType">
-            <el-radio :label="1">基于Pk查询</el-radio>
-            <el-radio :label="2">多笔查询</el-radio>
-            <el-radio :label="3">分页查询</el-radio>
-            <el-radio :label="4">新增</el-radio>
-            <el-radio :label="5">修改</el-radio>
-            <el-radio :label="6">删除</el-radio>
-            <el-radio :label="7">非Pk单笔查询</el-radio>
+            <el-radio :label="1">
+              基于Pk查询
+            </el-radio>
+            <el-radio :label="2">
+              多笔查询
+            </el-radio>
+            <el-radio :label="3">
+              分页查询
+            </el-radio>
+            <el-radio :label="4">
+              新增
+            </el-radio>
+            <el-radio :label="5">
+              修改
+            </el-radio>
+            <el-radio :label="6">
+              删除
+            </el-radio>
+            <el-radio :label="7">
+              非Pk单笔查询
+            </el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item label="类型" prop="sqlType">
           <el-radio-group v-model="state.formData.sqlType">
-            <el-radio :label="1">DQL(数据查询)</el-radio>
-            <el-radio :label="2">DML(数据操纵)</el-radio>
-            <el-radio :label="3">DDL(数据定义)</el-radio>
-            <el-radio :label="4">DCL(数据控制)</el-radio>
+            <el-radio :label="1">
+              DQL(数据查询)
+            </el-radio>
+            <el-radio :label="2">
+              DML(数据操纵)
+            </el-radio>
+            <el-radio :label="3">
+              DDL(数据定义)
+            </el-radio>
+            <el-radio :label="4">
+              DCL(数据控制)
+            </el-radio>
           </el-radio-group>
         </el-form-item>
 

src/views/model/oam/index.vue

@@ -148,12 +148,9 @@ const onObjectOAMEdit = () => {
 const onObjectOAMDelete = (data: { modelId: number; objectId: number; oamId: number; oamTitle: string }) => {
   const { modelId, objectId, oamId, oamTitle } = data
   ElMessageBox.confirm(`确认删除「${oamTitle}」吗？`, '确认信息').then(async () => {
-    await deleteObjectOAMById(modelId, objectId, oamId)
+    const { msg } = await deleteObjectOAMById(modelId, objectId, oamId)
+    ElMessage.success(msg)
     await getOAMTree()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   })
 }
 

src/views/model/object/components/ModelObject.vue

@@ -54,15 +54,15 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createObject(state.formData)
+        const { msg } = await createObject(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
-        ElMessage.success('新增成功')
         emit('success')
       }
       else {
-        await updateObject(state.formData)
+        const { msg } = await updateObject(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
-        ElMessage.success('修改成功')
         emit('success')
       }
     }
@@ -98,7 +98,6 @@ defineExpose({
     state.dialogVisible = true
     getData(modelId, objectId)
   },
-
 })
 </script>
 

src/views/model/object_attr/index.vue

@@ -121,9 +121,9 @@ function onAttrEdit(row: any) {
 
 async function onAttrDelete(row: any) {
   const attrId = row.attrId
-  await deleteObjectAttrById(modelId, objectId, attrId)
-  ElMessage.success('删除成功')
-  getData()
+  const { msg } = await deleteObjectAttrById(modelId, objectId, attrId)
+  ElMessage.success(msg)
+  await getData()
 }
 
 function onAttrCancel(row: any, index: number) {
@@ -137,14 +137,14 @@ function onAttrCancel(row: any, index: number) {
 async function onAttrSave(row: any) {
   row.isEdit = false
   if (state.actionType === 1) {
-    await createObjectAttr(row)
+    const { msg } = await createObjectAttr(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('新增成功')
   }
   else {
-    await updateObjectAttr(row)
+    const { msg } = await updateObjectAttr(row)
+    ElMessage.success(msg)
     state.dialogVisible = false
-    ElMessage.success('修改成功')
   }
   await getData()
 }

src/views/system/group/components/Group.vue

@@ -48,19 +48,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createGroup(state.formData)
+        const { msg } = await createGroup(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateGroup(state.formData)
+        const { msg } = await updateGroup(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }

src/views/system/group/components/User.vue

@@ -64,19 +64,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createUser(state.formData)
+        const { msg } = await createUser(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateUser(state.formData)
+        const { msg } = await updateUser(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }

src/views/system/group/index.vue

@@ -96,12 +96,9 @@ const onGroupEdit = (data?: any) => {
 // 删除部门
 const onGroupDelete = (node: Node, data: any) => {
   ElMessageBox.confirm(`确认删除「${data.label}」吗？`, '确认信息').then(async () => {
-    await deleteGroupById(data.groupId)
+    const { msg } = await deleteGroupById(data.groupId)
+    ElMessage.success(msg)
     await getGroupData()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 
@@ -126,31 +123,22 @@ const onUserEdit = (row: any) => {
 // 密码重置
 const onPasswordReset = (data?: any) => {
   ElMessageBox.confirm('温馨提示：系统默认重置密码为 888888？', '确认').then(async () => {
-    await resetPassword(data.accountId)
-    ElMessage.success({
-      message: '密码重置成功',
-      center: true,
-    })
+    const { msg } = await resetPassword(data.accountId)
+    ElMessage.success(msg)
   }).catch(() => {})
 }
 
 // 修改状态
 const onChangeStatus = async (status: number, row: any) => {
-  await updateUserStatus(row.accountId, status)
-  ElMessage.success({
-    message: '修改成功',
-    center: true,
-  })
+  const { msg } = await updateUserStatus(row.accountId, status)
+  ElMessage.success(msg)
 }
 
 // 删除用户账号
 const onUserDelete = (row: any) => {
   ElMessageBox.confirm('温馨提示：系统默认重置密码为 888888？', '确认').then(async () => {
-    await deleteUserById(row.accountId)
-    ElMessage.success({
-      message: '删除',
-      center: true,
-    })
+    const { msg } = await deleteUserById(row.accountId)
+    ElMessage.success(msg)
   }).catch(() => {})
 }
 

src/views/system/permit/role/index.vue

@@ -61,12 +61,9 @@ function onRoleEdit(_row: any) {
 
 function onRoleDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.roleName}」吗？`, '确认信息').then(async () => {
-    await deleteRoleById(row.roleId)
+    const { msg } = await deleteRoleById(row.roleId)
+    ElMessage.success(msg)
     await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 </script>

src/views/system/position/components/Position.vue

@@ -44,19 +44,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createPosition(state.formData)
+        const { msg } = await createPosition(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updatePosition(state.formData)
+        const { msg } = await updatePosition(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }

src/views/system/position/index.vue

@@ -39,12 +39,9 @@ function onPositionEdit(row: any) {
 
 function onPositionDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.positionName}」吗？`, '确认信息').then(async () => {
-    await deletePositionById(row.positionId)
+    const { msg } = await deletePositionById(row.positionId)
+    ElMessage.success(msg)
     await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 </script>

src/views/system/role/components/Role.vue

@@ -44,19 +44,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createRole(state.formData)
+        const { msg } = await createRole(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateRole(state.formData)
+        const { msg } = await updateRole(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }

src/views/system/role/index.vue

@@ -41,12 +41,9 @@ function onRoleEdit(row: any) {
 
 function onRoleDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.roleName}」吗？`, '确认信息').then(async () => {
-    await deleteRoleById(row.roleId)
+    const { msg } = await deleteRoleById(row.roleId)
+    ElMessage.success(msg)
     await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 </script>

src/views/system/setting/group_cat/components/GroupCat.vue

@@ -44,19 +44,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createGroupCat(state.formData)
+        const { msg } = await createGroupCat(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateGroupCat(state.formData)
+        const { msg } = await updateGroupCat(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }
@@ -87,7 +85,6 @@ defineExpose({
     state.dialogVisible = true
     getData(groupCatId)
   },
-
 })
 </script>
 

src/views/system/setting/group_cat/index.vue

@@ -28,8 +28,6 @@ onMounted(() => {
   getDataList()
 })
 
-function onCreate() {}
-
 function onGroupCatAdd() {
   groupCatRef.value.showAddModel()
 }
@@ -41,12 +39,9 @@ function onGroupCatEdit(row: any) {
 
 function onGroupCatDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.groupCatTitle}」吗？`, '确认信息').then(async () => {
-    await deleteGroupCatById(row.groupCatId)
+    const { msg } = await deleteGroupCatById(row.groupCatId)
+    ElMessage.success(msg)
     await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 </script>

src/views/system/setting/oc_cat/components/OcCat.vue

@@ -45,19 +45,17 @@ function onSubmit() {
   formRef.value && formRef.value.validate(async (valid) => {
     if (valid) {
       if (state.actionType === 1) {
-        await createOcCat(state.formData)
+        const { msg } = await createOcCat(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
       else {
-        await updateOcCat(state.formData)
+        const { msg } = await updateOcCat(state.formData)
+        ElMessage.success(msg)
         state.dialogVisible = false
         emit('success')
       }
-      ElMessage.success({
-        message: '保存成功',
-        center: true,
-      })
     }
   })
 }

src/views/system/setting/oc_cat/index.vue

@@ -111,12 +111,9 @@ const onOcCatEdit = (row: { ocCatId: number }) => {
 const onOcCatDelete = (row: any) => {
   const { ocTypeId, ocCatId, ocCatTitle } = row
   ElMessageBox.confirm(`确认删除「${ocCatTitle}」吗？`, '确认信息').then(async () => {
-    await deleteOcCatById(ocTypeId, ocCatId)
+    const { msg } = await deleteOcCatById(ocTypeId, ocCatId)
+    ElMessage.success(msg)
     await getOcCatData()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   })
 }
 </script>

src/views/system/setting/task_cat/index.vue

@@ -39,12 +39,9 @@ function onTaskCatEdit(row: any) {
 
 function onTaskCatDel(row: any) {
   ElMessageBox.confirm(`确认删除「${row.taskCatTitle}」吗？`, '确认信息').then(async () => {
-    await deleteTaskCatById(row.taskCatId)
+    const { msg } = await deleteTaskCatById(row.taskCatId)
+    ElMessage.success(msg)
     await getDataList()
-    ElMessage.success({
-      message: '删除成功',
-      center: true,
-    })
   }).catch(() => {})
 }
 </script>