add

src/layout/default/components/header/index.vue

@@ -10,15 +10,16 @@
                 <div class="navbar-item">
                     <refresh />
                 </div>
+                <div class="flex items-center px-2">
+                    <msg />
+                </div>
                 <div class="flex items-center px-2" v-if="!isMobile && settingStore.showCrumb">
                     <breadcrumb />
                 </div>
             </div>
             <div class="flex">
                 <menuLi></menuLi>
-
             </div>
-
             <div class=" flex">
                 <div class="navbar-item" v-if="!isMobile">
                     <full-screen />
@@ -45,6 +46,7 @@ import UserDropDown from './user-drop-down.vue'
 import Setting from '../setting/index.vue'
 import MultipleTabs from './multiple-tabs.vue'
 import menuLi from './menuLi.vue'
+// import msg from './msg.vue'
 
 import useSettingStore from '@/stores/modules/setting'
 const appStore = useAppStore()

src/utils/Notifce.js

@@ -0,0 +1,38 @@
+export class ElNotifica {
+    static instance = null
+
+    static getInstance() {
+        return this.instance ?? (this.instance = new ElNotifica())
+    }
+    success(message, title = '提示') {
+        ElNotification({
+            title,
+            message,
+            type: 'success',
+        })
+    }
+    warning(message, title = '提示') {
+        ElNotification({
+            title,
+            message,
+            type: 'warning',
+        })
+    }
+    error(message, title = '提示') {
+        ElNotification({
+            title,
+            message,
+            type: 'error',
+        })
+    }
+    info(message, title = '提示') {
+        ElNotification({
+            title,
+            message,
+            type: 'info',
+        })
+    }
+
+}
+const Notifce = ElNotifica.getInstance()
+export default Notifce

src/views/oa_Initiate/detail.vue

@@ -72,8 +72,7 @@
                             v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
                             回退
                         </el-button>
-                        <el-button type="info" @click="form.check = 3, handCheck()"
+                        <el-button type="info" @click=" showBackDialog = true" v-if="formData.admin_id == userStore.id">
-                            v-if="formData.admin_id == userStore.id">
                             撤回
                         </el-button>
                     </el-descriptions-item>
@@ -89,6 +88,16 @@
                 <personnelselector ref="personnel" @confirm="submituser" type="1">
                 </personnelselector>
             </div>
+
+            <el-dialog v-model="showBackDialog" title="撤回审批" width="550px">
+                <el-form-item label="撤回原因">
+                    <el-input v-model="form.content" type="textarea"> </el-input>
+                </el-form-item>
+                <el-form-item label="">
+                    <el-button type="primary" @click="backFn">撤回</el-button>
+                    <el-button @click="resetParams">取消</el-button>
+                </el-form-item>
+            </el-dialog>
         </popup>
     </div>
 </template>
@@ -106,6 +115,7 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const showPerDialog = ref(false);
 const personnel = ref(null);
 const userStore = useUserStore().userInfo;
+const showBackDialog = ref(false)
 
 // 表单数据
 const formData = reactive({
@@ -134,6 +144,11 @@ const form = reactive({
 })
 
 
+const backFn = () => {
+    if (!form.content) return feedback.msgError("请填写撤回原因");
+    form.check = 3
+    handCheck()
+}
 const userclick = async () => {
     showPerDialog.value = true;
     await nextTick();

src/views/oa_Initiate/index.vue

@@ -33,7 +33,7 @@
                 </el-form-item>
             </el-form>
             <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                <el-table :data="pager.lists">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="申请人" prop="user_name" show-overflow-tooltip />
                     <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
@@ -54,8 +54,7 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" :dict-data="dictData" @success="getLists"
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" :type="type" @close="showEdit = false" />
-            :type="type" @close="showEdit = false" />
         <detailPopup v-if="showDetail" ref="detailRef" @reEdit="reEdit" @success="showDetail = false, getLists()"
             @close="showDetail = false, getLists()" />
 
@@ -65,12 +64,12 @@
 <script lang="ts" setup >
 import { ref, shallowRef, nextTick, reactive } from 'vue'
 import { usePaging } from '@/hooks/usePaging';
-import { apiOaWorkLists } from '@/api/oa_work'
+import { apiOaFlowTypeLists, apiOaoaApproveLists, apiOaoaApproveDetail } from "@/api/oa_Initiate"
-import { apiOaFlowTypeLists, apiOaoaApproveLists, apiOaoaApproveAdd, apiOaoaApproveDetail } from "@/api/oa_Initiate"
 import EditPopup from './edit.vue'
 import detailPopup from './detail.vue'
 import { apiOaFlowTypeDetail } from '@/api/oa_flow_type'
 
+
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
@@ -86,6 +85,7 @@ const queryParams = reactive({
 })
 
 
+
 // 编辑
 const handleEdit = async (id: any, cate = '', extend = '') => {
     type.value = cate