add

src/api/flow.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 审批流程表列表
+export function apiFlowLists(params: any) {
+    return request.get({ url: '/oa.flow/lists', params })
+}
+
+// 添加审批流程表
+export function apiFlowAdd(params: any) {
+    return request.post({ url: '/oa.flow/add', params })
+}
+
+// 编辑审批流程表
+export function apiFlowEdit(params: any) {
+    return request.post({ url: '/oa.flow/edit', params })
+}
+
+// 删除审批流程表
+export function apiFlowDelete(params: any) {
+    return request.post({ url: '/oa.flow/delete', params })
+}
+
+// 审批流程表详情
+export function apiFlowDetail(params: any) {
+    return request.get({ url: '/oa.flow/detail', params })
+}

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

@@ -18,7 +18,7 @@
                 <menuLi></menuLi>
 
             </div>
-           
+
             <div class="flex">
                 <div class="navbar-item" v-if="!isMobile">
                     <full-screen />
@@ -67,8 +67,7 @@ const settingStore = useSettingStore()
     margin-left: 50px;
 }
 
-.pointer{
+.pointer {
     cursor: pointer;
 }
-
 </style>

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

@@ -1,35 +1,28 @@
 <template>
-                 <div class="menu-li">
+    <div class="menu-li">
-                    <div class="flex items-center px-2 pointer" @click="menuClick(item.id)" v-for="(item,index) in menuList" v-show="item.paths !='workbench'"> 
+        <div class="flex items-center px-2 pointer" @click="menuClick(item.id)" v-for="(item, index) in menuList"
-                        {{ item.name }}
+            v-show="item.paths != 'workbench'">
-                    </div>
+            {{ item.name }}
-                </div>
+        </div>
+    </div>
 </template>
 
 <script setup>
-import {getUserInfoByID,getUserInfo} from "@/api/user"
+import { getUserInfoByID, getUserInfo } from "@/api/user"
 import useUserStore from '@/stores/modules/user'
 const userStore = useUserStore()
+const menuList = reactive([])
 
-
+const menuClick = (id) => {
-
-const menuList=reactive([])
-getUserInfo().then(res=>{
-res.menu.forEach(item => {
-    menuList.push(item)
-});
-
-})
-const menuClick=(id)=>{
     userStore.getUserInfoByID(id)
-
+    localStorage.setItem('menuId', id);
-
-
-    // console.log(id)
 }
-   
+
+getUserInfo().then(res => {
+    res.menu.forEach(item => {
+        menuList.push(item)
+    });
+    userStore.getUserInfoByID(localStorage?.getItem('menuId') || menuList[1].id)
+})
+
 </script>
-
-<style lang="scss" scoped>
-
-</style>

src/views/examined/editFlow.vue

@@ -118,27 +118,6 @@
                 <el-form-item label="抄送人ID" prop="copy_unames">
                     <el-input v-model="formData.copy_to[0].name" clearable @click="isCompany = true" placeholder="请输入抄送人" />
                 </el-form-item>
-
-                <!-- <el-form-item label="创建人ID" prop="admin_id">
-          <el-input
-            v-model="formData.admin_id"
-            clearable
-            placeholder="请输入创建人ID"
-          />
-        </el-form-item> -->
-                <!-- <el-form-item label="状态 1启用，0禁用" prop="status">
-          <el-select v-model="formData.status">
-            <el-option label="启用" value="1"></el-option>
-            <el-option label="禁用" value="2"></el-option>
-          </el-select>
-        </el-form-item> -->
-                <!-- <el-form-item label="删除人ID" prop="delete_user_id">
-          <el-input
-            v-model="formData.delete_user_id"
-            clearable
-            placeholder="请输入删除人ID"
-          />
-        </el-form-item> -->
             </el-form>
         </popup>
         <el-dialog v-model="isCompany" title="选择人员" width="60%">

src/views/examined/examinedFlow.vue

@@ -38,12 +38,7 @@
                     <el-table-column label="流程说明" prop="remark" show-overflow-tooltip />
                     <el-table-column label="流程数据序列化" prop="flow_list" show-overflow-tooltip />
                     <el-table-column label="创建人ID" prop="admin_id" show-overflow-tooltip />
-                    <!-- <el-table-column label="状态" prop="status" show-overflow-tooltip>
+
-            <template #default="{ row }">
-              <span v-if="row.status == 1">启用</span>
-              <span v-if="row.status == 0">禁用</span>
-            </template>
-          </el-table-column> -->
                     <el-table-column label="账号状态" min-width="100" v-perms="['auth.admin/edit']">
                         <template #default="{ row }">
                             <el-switch v-if="row.root != 1" v-model="row.status" :active-value="1" :inactive-value="0"

src/views/flow_type/edit.vue

@@ -2,6 +2,18 @@
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="组织名称" prop="org_id" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                    <el-select v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt" class="flex-1">
+                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="部门名称" prop="department_ids"
+                    :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                    <el-select v-model="formData.department_ids" multiple placeholder="请选择部门" class="flex-1">
+                        <el-option v-for="item in list2" :key="item.value" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="所属分类" prop="type">
                     <el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择所属分类">
                         <el-option v-for="(item, index) in dictData.flow_type" :key="index" :label="item.name"
@@ -9,17 +21,15 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="审批名称" prop="title">
+                    {{ dictData.show_status }}
                     <el-input v-model="formData.title" clearable placeholder="请输入审批名称" />
                 </el-form-item>
                 <el-form-item label="审批标识" prop="name">
                     <el-input v-model="formData.name" clearable placeholder="请输入审批标识" />
                 </el-form-item>
-                <el-form-item label="应用部门" prop="department_ids">
+                <el-form-item label="状态" prop="status" v-if="mode == 'edit'">
-                    <el-input v-model="formData.department_ids" clearable placeholder="请输入应用部门" />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
                     <el-radio-group v-model="formData.status" placeholder="请选择状态">
-                        <el-radio v-for="(item, index) in dictData.show_status" :key="index" :label="parseInt(item.value)">
+                        <el-radio v-for="(item, index) in dictData.flow_type_status" :key="index" :label="(item.value)">
                             {{ item.name }}
                         </el-radio>
                     </el-radio-group>
@@ -33,9 +43,11 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiFlowTypeAdd, apiFlowTypeEdit, apiFlowTypeDetail } from '@/api/flow_type'
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
-defineProps({
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+
+let props = defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
         default: () => ({})
@@ -45,7 +57,8 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-
+const list1 = reactive([])
+const list2 = reactive([])
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -58,8 +71,9 @@ const formData = reactive({
     type: '',
     title: '',
     name: '',
-    department_ids: '',
+    department_ids: [],
     status: '',
+    org_id: "",
 })
 
 
@@ -101,7 +115,9 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
+    formData.status = String(formData.status)
+    formData.department_ids = data.department_ids.map(str => parseInt(str))
+    deptrmt(formData.org_id)
 
 }
 
@@ -128,6 +144,7 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
+    getlist()
 }
 
 // 关闭回调
@@ -136,6 +153,24 @@ const handleClose = () => {
 }
 
 
+//获取所有组织
+const getlist = () => {
+    getAll().then((res) => {
+        Object.assign(list1, res)
+
+    })
+}
+//获取部门
+const deptrmt = (e: any) => {
+    getlist1(e)
+
+}
+//获取所有部门
+const getlist1 = (id: any) => {
+    deptAll({ 'org_id': id }).then((res) => {
+        list2.splice(0, list2.length, ...res)
+    })
+}
 
 defineExpose({
     open,

src/views/flow_type/index.vue

@@ -38,12 +38,8 @@
                     </el-table-column>
                     <el-table-column label="审批名称" prop="title" show-overflow-tooltip />
                     <el-table-column label="审批标识" prop="name" show-overflow-tooltip />
-                    <el-table-column label="应用部门" prop="department_ids" show-overflow-tooltip />
+                    <el-table-column label="应用部门" prop="dept_name" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status">
+                    <el-table-column label="状态" prop="status_text" />
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.show_status" :value="row.status" />
-                        </template>
-                    </el-table-column>
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['oa.flow_type/edit']" type="primary" link @click="handleEdit(row)">
@@ -67,8 +63,7 @@
 <script lang="ts" setup name="flowTypeLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiFlowTypeLists, apiFlowTypeDelete } from '@/api/flow_type'
+import { apiFlowTypeLists, apiFlowTypeDelete, apiFlowTypeDetail } from '@/api/flow_type'
-import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
@@ -92,7 +87,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('flow_type,show_status')
+const { dictData } = useDictData('flow_type,flow_type_status')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -109,10 +104,11 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any) => {
+    let res = await apiFlowTypeDetail({ id: data.id })
     showEdit.value = true
     await nextTick()
     editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
+    editRef.value?.setFormData(res)
 }
 
 // 删除

src/views/flows/edit.vue

@@ -0,0 +1,280 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
+                <el-col>
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="审批流名称" prop="name">
+                                <el-input v-model="formData.name" clearable placeholder="请输入审批流名称" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="审批类型" prop="flow_cate">
+                                <!-- <el-select v-model="formData.flow_cate" placeholder="审批类型" clearable
+                                    :style="{ width: '100%' }">
+                                    <el-option label="日常审批" :value="1"></el-option>
+                                    <el-option label="报销审批" :value="2"></el-option>
+                                    <el-option label="发票审批" :value="3"></el-option>
+                                    <el-option label="合同审批" :value="4"></el-option>
+                                </el-select> -->
+                                <el-select class="flex-1" v-model="formData.flow_cate" clearable placeholder="请选择所属分类">
+                                    <el-option v-for="(item, index) in dictData.flow_type" :key="index" :label="item.name"
+                                        :value="parseInt(item.value)" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col>
+                            <el-form-item label="流程说明" prop="remark">
+                                <el-input v-model="formData.remark" clearable type="textarea" placeholder="请输入流程说明" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item label="流程类型" prop="flow_detail.check_type" clearable :style="{ width: '100%' }">
+                        <el-radio-group v-model="formData.check_type" @change="checkTypeFn">
+                            <el-radio :label="1">固定审批</el-radio>
+                            <el-radio :label="2">授权审批人</el-radio>
+                            <el-radio :label="3">可回退审批 </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </el-col>
+                <p v-if="formData.flow_detail.type == 1">
+                    <el-row v-for="(item, index) in formData.flow_detail.step">
+                        <el-col :span="12">
+                            <el-form-item label="审批流程">
+                                <el-select v-model="formData.flow_detail.step[index].type" placeholder="审批类型" clearable
+                                    :style="{ width: '100%' }">
+                                    <el-option label="当前部门负责人" value="1"></el-option>
+                                    <el-option label="上一级部门负责人" value="2"></el-option>
+                                    <el-option label="指定用户(任意一人)" value="3"></el-option>
+                                    <el-option label="指定用户(多人会签)" value="4"></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12" v-if="item.type == '3' || item.type == '4'">
+                            <el-form-item label="指定人员">
+                                <el-input clearable v-model="item.user[0].name" placeholder="指定人员" @click="openDialog" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-col :span="24">
+                        <el-form-item prop="field126">
+                            <el-button type="primary" @click="
+                                formData.flow_detail.step.push({
+                                    type: '',
+                                    user: [{ id: '', name: '' }],
+                                })
+                                ">其他联系人</el-button>
+                        </el-form-item>
+                    </el-col>
+                </p>
+                <el-row v-if="formData.flow_detail.type == 2">
+                    <el-col :span="12">
+                        <el-form-item label="">
+                            <span>无需审批</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <p v-if="formData.flow_detail.type == 3">
+                    <el-row v-for="(item, index) in formData.flow_detail.step">
+                        <el-col :span="12">
+                            <el-form-item label="审批流程" prop="copy_uids">
+                                <el-input v-model="item.type" clearable placeholder="请输入流程名称">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="指定人员">
+                                <el-input v-model="item.user[0].name" @click="openDialog" readonly clearable
+                                    placeholder="指定人员" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-col :span="24">
+                        <el-form-item prop="field126">
+                            <el-button type="primary" @click="
+                                formData.flow_detail.step.push({
+                                    type: '',
+                                    user: [{ id: '', name: '' }],
+                                })
+                                ">其他联系人</el-button>
+                        </el-form-item>
+                    </el-col>
+                </p>
+
+                <el-form-item label="抄送人ID" prop="copy_unames">
+                    <el-input v-model="formData.copy_to[0].name" clearable @click="openDialog" placeholder="请输入抄送人" />
+                </el-form-item>
+            </el-form>
+        </popup>
+        <personnelSelector ref="personnel" @confirm="submituser" />
+    </div>
+</template>
+
+<script lang="ts" setup name="flowEdit">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import { apiFlowAdd, apiFlowEdit } from "@/api/flow";
+import { apiFlowTypeLists } from '@/api/flow_type'
+import personnelSelector from '@/components/personnelselector/index.vue'
+import { ref } from "vue"
+import type { PropType } from "vue";
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({}),
+    },
+});
+
+const personnel = ref('')
+const isCompany = ref(false);
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == "edit" ? "编辑审批流程表" : "新增审批流程表";
+});
+
+// 表单数据
+const formData = reactive({
+    id: "",
+    name: "",
+    check_type: "",
+    type: "",
+    flow_cate: "",
+    remark: "",
+    flow_detail: {
+        type: 1,
+        step: [{ type: "", user: [{ id: "", name: "" }] }],
+    },
+    copy_to: [{ id: "", name: "" }],
+    // "name": "",
+    // "flow_cate": "",
+    // "check_type": "",
+    // "remark": "",
+    "flow_list": [
+        {
+            "flow_step": ""
+        },
+        {
+            "flow_step": "",
+            "flow_user": []
+        }
+    ],
+    "copy_uids": []
+});
+
+//单选框改变时清空单选下的表单数据
+const checkTypeFn = () => {
+    formData.flow_detail.step = [{ type: "", user: [{ id: "", name: "" }] }];
+};
+// 表单验证
+const formRules = reactive<any>({
+    name: [
+        {
+            required: true,
+            message: "请输入审批流名称",
+            trigger: ["blur"],
+        },
+    ],
+    check_type: [
+        {
+            required: true,
+            message: "请输入1固定审批,2授权审批人",
+            trigger: ["blur"],
+        },
+    ],
+    type: [
+        {
+            required: true,
+            message: "请输入应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票,8合同",
+            trigger: ["blur"],
+        },
+    ],
+    flow_cate: [
+        {
+            required: true,
+            message: "请输入应用审批类型id",
+            trigger: ["blur"],
+        },
+    ],
+
+    remark: [
+        {
+            required: true,
+            message: "请输入流程说明",
+            trigger: ["blur"],
+        },
+    ],
+});
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    // let res = await apiFlowDetil(data.id);
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = res[key];
+        }
+    }
+    formData.flow_detail.type = Number(formData.flow_detail.type);
+};
+
+const getDetail = async (row: Record<string, any>) => {
+    // const data = await apiFlowDetail({
+    //     id: row.id,
+    // });
+    // setFormData(data);
+};
+
+const a = {};
+// 提交按钮
+const handleSubmit = async () => {
+
+    console.log(formData)
+    return
+    await formRef.value?.validate();
+    // mode.value == "edit"
+    //     ? await apiFlowCreat(formData)
+    //     : await apiFlowCreat(formData);
+    popupRef.value?.close();
+    emit("success");
+};
+
+const submituser = (e) => {
+    console.log(e, "e")
+}
+
+//打开弹窗
+const open = (type = "add") => {
+    mode.value = type;
+    popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+    emit("close");
+};
+
+const openDialog = () => {
+    personnel.value?.open()
+}
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail,
+});
+</script>

src/views/flows/index.vue

@@ -0,0 +1,107 @@
+<template>
+    <div>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['flow/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="审批流名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="审批类型" prop="flow_cate" show-overflow-tooltip />
+                    <el-table-column label="审批流类型" prop="check_type" show-overflow-tooltip />
+                    <el-table-column label="流程说明" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['oa.flow/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['oa.flow/delete']" type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="flowLists">
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import { apiFlowLists, apiFlowDelete, apiFlowDetail } from '@/api/flow'
+import EditPopup from "./edit.vue";
+import feedback from '@/utils/feedback'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+// 是否显示编辑框
+const showEdit = ref(false);
+
+// 查询条件
+const queryParams = reactive({
+    name: "",
+    check_type: "",
+    type: "",
+    flow_cate: "",
+    department_ids: "",
+    copy_uids: "",
+    remark: "",
+    flow_list: "",
+    admin_id: "",
+    status: "",
+    delete_user_id: "",
+});
+
+// 选中数据
+const selectData = ref<any[]>([]);
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id);
+};
+
+// 获取字典数据
+const { dictData } = useDictData('flow_type')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiFlowLists,
+    params: queryParams,
+});
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true;
+    await nextTick();
+    editRef.value?.open("add");
+};
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiFlowDetail({ id: data.id })
+    showEdit.value = true;
+    await nextTick();
+    editRef.value?.open("edit");
+    editRef.value?.setFormData(res);
+};
+
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm("确定要删除？");
+    await apiFlowDelete({ id });
+    getLists();
+};
+
+getLists();
+</script>

src/views/quality_professional_category/edit.vue

@@ -179,11 +179,8 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-
-
     await formRef.value?.validate()
 
-
     const data = { ...formData }
     mode.value == 'edit'
         ? await professionalcategoryEdit(data)