add

src/api/approve.ts

@@ -0,0 +1,22 @@
+import request from '@/utils/request'
+
+// 列表
+export function flowapproveLists(params: any) {
+    return request.get({ url: '/oa.flow_approve/lists', params })
+}
+
+//详情
+export function flowapproveDetail(params: any) {
+    return request.get({ url: '/oa.flow_approve/detail', params })
+}
+
+//处理审批
+export function flowapproveCheck(params: any) {
+    return request.post({ url: '/oa.flow_approve/check', params })
+}
+
+
+//撤销审批
+export function flowapproveRevoke(params: any) {
+    return request.post({ url: '/oa.flow_approve/revoke', params })
+}

src/components/flowDetail/index.vue

@@ -0,0 +1,207 @@
+<template>
+    <div class="edit-popup">
+        <el-card>
+            <el-descriptions :column="3" title="审批详情" border>
+                <el-descriptions-item label="审批主题" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.title }}
+                </el-descriptions-item>
+                <el-descriptions-item label="审批流程" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.flow_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="审核状态" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.check_status_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="申请人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.create_user_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="当前审批人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.current_check_user }}
+                </el-descriptions-item>
+                <el-descriptions-item label="抄送人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.copy_user }}
+                </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="审批流程" label-align="left" align="left">
+                    <el-steps :active="activeStep" simple :align-center="true">
+                        <el-step :title="getStep(item, index)" :icon="index == 0 ? Avatar : Clock"
+                            v-for="(item, index) in formData.step" :key="index" />
+                    </el-steps>
+                </el-descriptions-item>
+                <el-descriptions-item label="审批记录" label-align="left" align="left">
+                    <el-steps direction="vertical" :active="formData.record.length" :align-center="true" :space="50"
+                        style="margin-top: 20px">
+                        <el-step :title="item.check_time + item.title" v-for="(item, index) in formData.record"
+                            :key="index" />
+                    </el-steps>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="操作" label-align="left" align="left"
+                    v-if="formData?.current_check_user_ids?.includes(String(userInfo.id))">
+                    <el-form-item label="意见">
+                        <el-input v-model="remark" clearable placeholder="请输入" type="textarea" />
+                    </el-form-item>
+                    <el-form-item label="审批">
+                        <el-button type="primary" @click="checkFn(1)">
+                            通过
+                        </el-button>
+                        <el-button @click="checkFn(2)">
+                            拒绝
+                        </el-button>
+                    </el-form-item>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="操作" label-align="left" align="left"
+                    v-if="formData?.check_status == 0 && formData.create_user == userInfo.id">
+                    <el-form-item label="意见">
+                        <el-input v-model="remark" clearable placeholder="请输入" type="textarea" />
+                    </el-form-item>
+                    <el-form-item label="审批">
+                        <el-button @click="revokeFn">
+                            撤销
+                        </el-button>
+                    </el-form-item>
+                </el-descriptions-item>
+            </el-descriptions>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEdit">
+import Popup from '@/components/popup/index.vue'
+import { Avatar, Clock } from '@element-plus/icons-vue'
+import { flowapproveDetail, flowapproveCheck, flowapproveRevoke } from '@/api/approve.ts'
+import { defineProps } from "vue"
+import useUserStore from '@/stores/modules/user'
+const userStore = useUserStore()
+const userInfo = computed(() => userStore.userInfo)
+
+const props = defineProps({
+    approve_id: Number
+})
+
+let activeStep = ref(0)
+const remark = ref('')
+
+const emit = defineEmits(['success', 'close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+// 表单数据
+const formData = reactive({
+    "id": 11,
+    "title": "",
+    "create_user": 1,
+    "check_status": 0,
+    "flow_name": "",
+    "check_status_text": "",
+    "current_check_user": "",
+    "create_user_name": "admin",
+    "copy_user": "admin",
+    "content": {
+
+    },
+    "step": [
+        {
+            "flow_step": 0,
+            "flow_user": "",
+            "is_active": 0,
+            "flow_step_text": ""
+        },
+        {
+            "flow_step": 2,
+            "flow_user": "测试添加管理,测试",
+            "is_active": 1,
+            "flow_step_text": "指定用户（任意一人）"
+        },
+        {
+            "flow_step": 2,
+            "flow_user": "测试添加管理,测试",
+            "is_active": 0,
+            "flow_step_text": "指定用户（任意一人）"
+        },
+        {
+            "flow_step": 3,
+            "flow_user": "究极张伟,赵明军",
+            "is_active": 0,
+            "flow_step_text": "指定用户（多人会签）"
+        }
+    ],
+    "record": [
+        {
+            "title": "admin提交了此申请",
+            "content": "提交申请",
+            "check_time": "2024-02-03",
+            "status": 0,
+            "status_text": "发起申请"
+        }
+    ]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+// 撤销申请
+const revokeFn = () => {
+    flowapproveRevoke({
+        id: props.approve_id,
+        revoke_reason: remark.value
+    })
+}
+
+// 审核操作
+const checkFn = (i) => {
+    flowapproveCheck({
+        id: props.approve_id,
+        check_status: i,
+        check_reason: remark.value
+    })
+}
+
+const getStep = (item, index) => {
+    if (index == 0) { return formData.create_user_name + '创建' }
+    else { return item.flow_step_text }
+}
+
+flowapproveDetail({ id: props.approve_id }).then(res => {
+    activeStep.value = res.step.findIndex(item => item.is_active == 1)
+    setFormData(res)
+})
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+
+
+<style lang="scss">
+.el-step.is-simple .el-step__icon {
+    margin-top: 15px;
+}
+</style>

src/components/flowProcess/index.vue

@@ -52,12 +52,15 @@
 import { ref, reactive, defineProps } from 'vue'
 import { apiFlowTypeLists, } from '@/api/flow_type'
 import { apiFlowLists, apiFlowDetail, apiFlowDelete } from '@/api/flow'
+import { useRoute } from "vue-router"
+const route = useRoute()
 
 const emits = defineEmits(["confirm"]);
 
 const formData = reactive({
     flow_type: "",
-    flow_path: ""
+    flow_path: "",
+    path: route.fullPath
 })
 
 const flowTyprList = ref([])
@@ -103,4 +106,7 @@ const numberToChinese = (num) => {
 }
 // 选中数据子父传递
 getFlowtypeList()
+
+console.log(route.fullPath, "route")
+
 </script>

src/components/popup/index.vue

@@ -12,7 +12,7 @@
             <!-- 自定义内容 -->
             <slot>{{ content }}</slot>
             <!-- 底部弹窗页脚 -->
-            <template #footer>
+            <template #footer v-if="showFootBtn">
                 <div class="dialog-footer">
                     <el-button v-if="cancelButtonText" @click="handleEvent('cancel')">
                         {{ cancelButtonText }}
@@ -77,6 +77,11 @@ export default defineComponent({
         customClass: {
             type: String,
             default: ''
+        },
+        showFootBtn: {
+            // 是否显示底部按钮
+            type: Boolean,
+            default: true
         }
     },
     emits: ['confirm', 'cancel', 'close', 'open'],

src/views/InvoicingRequests/index.vue

@@ -95,6 +95,9 @@ const protype = reactive([])
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from "vue-router";
+const route = useRoute()
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框

src/views/bid_document_examination/detail.vue

@@ -5,63 +5,90 @@
     <div class="detail-popup">
         <popup ref="popupRef" title="投标审查详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-descriptions title="基本信息" :column="3" border>
-                <el-descriptions-item label="标书编号" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_document_no }}</el-descriptions-item>
-                <el-descriptions-item label="购买人员" label-align="left" align="left" label-class-name="my-label">{{ formData.buyer }}</el-descriptions-item>
-                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
-                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.project_name }}</el-descriptions-item>
-                <el-descriptions-item label="招标公司名称" label-align="left" align="left" label-class-name="my-label">{{ formData.invite_tenders_company_name }}</el-descriptions-item>
-                <el-descriptions-item label="投标公司名称" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_company_name }}</el-descriptions-item>
-                <el-descriptions-item label="购买标书金额" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_document_amount }}</el-descriptions-item>
-                <el-descriptions-item label="招标项目资金来源" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_project_fund_source }}</el-descriptions-item>
-                <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{ formData.bidding_time }}</el-descriptions-item>
-                <el-descriptions-item label="购买标书时间" label-align="left" align="left" label-class-name="my-label">{{ formData.buy_date }}</el-descriptions-item>
-                <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_type }}</el-descriptions-item>
-                <el-descriptions-item label="投标地址" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_address }}</el-descriptions-item>
-                <el-descriptions-item label="是否需要保证金" label-align="left" align="left" label-class-name="my-label">{{ formData.is_margin }}</el-descriptions-item>
-                <el-descriptions-item label="保证金金额" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount }}</el-descriptions-item>
-                <el-descriptions-item label="保证金退还时间" label-align="left" align="left" label-class-name="my-label">{{ formData.margin_amount_return_date }}</el-descriptions-item>
-                <el-descriptions-item label="开标日期" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_opening_date }}</el-descriptions-item>
-                <el-descriptions-item label="招标项目概况" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_project_overview }}</el-descriptions-item>
-                <el-descriptions-item label="项目简介" label-align="left" align="left" label-class-name="my-label">{{ formData.project_desc }}</el-descriptions-item>
+                <el-descriptions-item label="标书编号" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bid_document_no }}</el-descriptions-item>
+                <el-descriptions-item label="购买人员" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.buyer }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.project_name }}</el-descriptions-item>
+                <el-descriptions-item label="招标公司名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.invite_tenders_company_name }}</el-descriptions-item>
+                <el-descriptions-item label="投标公司名称" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bid_company_name }}</el-descriptions-item>
+                <el-descriptions-item label="购买标书金额" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bid_document_amount }}</el-descriptions-item>
+                <el-descriptions-item label="招标项目资金来源" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bidding_project_fund_source }}</el-descriptions-item>
+                <el-descriptions-item label="投标时间" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bidding_time }}</el-descriptions-item>
+                <el-descriptions-item label="购买标书时间" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.buy_date }}</el-descriptions-item>
+                <el-descriptions-item label="招标方式" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bid_type }}</el-descriptions-item>
+                <el-descriptions-item label="投标地址" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bid_address }}</el-descriptions-item>
+                <el-descriptions-item label="是否需要保证金" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.is_margin }}</el-descriptions-item>
+                <el-descriptions-item label="保证金金额" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.margin_amount }}</el-descriptions-item>
+                <el-descriptions-item label="保证金退还时间" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.margin_amount_return_date }}</el-descriptions-item>
+                <el-descriptions-item label="开标日期" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bid_opening_date }}</el-descriptions-item>
+                <el-descriptions-item label="招标项目概况" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.bid_project_overview }}</el-descriptions-item>
+                <el-descriptions-item label="项目简介" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.project_desc }}</el-descriptions-item>
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.annex && formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
-
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                target="_blank">文件{{ index + 1 }}查看</el-link>
                         </div>
                     </div>
                     <div v-else> 暂无附件</div>
                 </el-descriptions-item>
-
             </el-descriptions>
             <el-descriptions title="技术审查" :column="1" border style="margin-top:30px">
-                <el-descriptions-item label="技术协议偏差" label-align="left" align="left" label-class-name="my-label">{{ formData.technical_protocol_deviation }}</el-descriptions-item>
-                <el-descriptions-item label="协议偏差处理方案" label-align="left" align="left" label-class-name="my-label">{{ formData.protocol_deviation_handling_plan }}</el-descriptions-item>
-
-
+                <el-descriptions-item label="技术协议偏差" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.technical_protocol_deviation }}</el-descriptions-item>
+                <el-descriptions-item label="协议偏差处理方案" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.protocol_deviation_handling_plan }}</el-descriptions-item>
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.technical_review_annex && formData.technical_review_annex.length > 0">
-                        <div v-for="(item, index) in formData.technical_review_annex" style="margin-left: 5px;display: block;">
-                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+                        <div v-for="(item, index) in formData.technical_review_annex"
+                            style="margin-left: 5px;display: block;">
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
                     </div>
                     <div v-else> 暂无附件</div>
                 </el-descriptions-item>
-
             </el-descriptions>
             <el-descriptions title="商务审查" :column="3" border style="margin-top:30px">
-                <el-descriptions-item label="总金额" label-align="left" align="left" label-class-name="my-label">{{ formData.total_amount }}</el-descriptions-item>
-                <el-descriptions-item label="税率" label-align="left" align="left" label-class-name="my-label">{{ formData.tax_rate }}</el-descriptions-item>
-                <el-descriptions-item label="付款方式" label-align="left" align="left" label-class-name="my-label">{{ formData.pay_type }}</el-descriptions-item>
-                <el-descriptions-item label="付款比例" label-align="left" align="left" label-class-name="my-label">{{ formData.pay_rate }}</el-descriptions-item>
-                <el-descriptions-item label="商务合同偏差" label-align="left" align="left" label-class-name="my-label">{{ formData.business_contract_deviation }}</el-descriptions-item>
-                <el-descriptions-item label="偏差处理方案" label-align="left" align="left" label-class-name="my-label">{{ formData.business_contract_deviation_handling_plan }}</el-descriptions-item>
+                <el-descriptions-item label="总金额" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.total_amount }}</el-descriptions-item>
+                <el-descriptions-item label="税率" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.tax_rate }}</el-descriptions-item>
+                <el-descriptions-item label="付款方式" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.pay_type }}</el-descriptions-item>
+                <el-descriptions-item label="付款比例" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.pay_rate }}</el-descriptions-item>
+                <el-descriptions-item label="商务合同偏差" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.business_contract_deviation }}</el-descriptions-item>
+                <el-descriptions-item label="偏差处理方案" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.business_contract_deviation_handling_plan }}</el-descriptions-item>
 
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
-                    <div v-if="formData.business_contract_deviation_annex && formData.business_contract_deviation_annex.length > 0">
-                        <div v-for="(item, index) in formData.business_contract_deviation_annex" style="margin-left: 5px;display: block;">
-                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+                    <div
+                        v-if="formData.business_contract_deviation_annex && formData.business_contract_deviation_annex.length > 0">
+                        <div v-for="(item, index) in formData.business_contract_deviation_annex"
+                            style="margin-left: 5px;display: block;">
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
                     </div>
@@ -84,9 +111,8 @@
                     <el-table-column label="报价单价" prop="sale_price" show-overflow-tooltip />
                     <el-table-column label="报价金额" prop="sale_amount" show-overflow-tooltip />
                 </el-table>
-
-
             </el-row>
+            <flowDetail :approve_id="formData?.approve_id" />
         </popup>
     </div>
 </template>
@@ -97,7 +123,6 @@ import Popup from '@/components/popup/index.vue'
 import { apiCustomDetail } from '@/api/custom'
 import { timeFormat } from '@/utils/util'
 import { apiBidDocumentExaminationDetailLists } from '@/api/bid_document_examination_detail'
-
 import type { PropType } from 'vue'
 defineProps({
     dictData: {

src/views/bid_document_examination/index.vue

@@ -76,12 +76,12 @@ import {
     apiBidDocumentExaminationLists, apiBidDocumentExaminationDelete,
     apiBidDocumentExaminationDetail
 } from '@/api/bid_document_examination'
-import { timeFormat } from '@/utils/util'
 import { apiBidBuyBiddingDocumentLists } from '@/api/bid_buy_bidding_document'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
-import projectTable from "@/components/project/index.vue"
+
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
@@ -146,12 +146,17 @@ const handledetail = async (data: any) => {
     detailRef.value?.setFormData(res)
 }
 //获取购买标书列表
-
 const documentlists = async () => {
     let res = await apiBidBuyBiddingDocumentLists({ page_no: 1, page_size: 9999 })
     documentList.value = res.lists
 
 }
+import { useRoute } from "vue-router";
+const route = useRoute()
+if (route.query?.listId) {
+    handledetail({ id: route.query.listId })
+}
+
 documentlists()
 getLists()
 </script>

src/views/bidbbond/index.vue

@@ -78,6 +78,10 @@ import { bidapplyLists, bidapplyDelete, bidapplyDetail } from '@/api/bidbbond'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from "vue-router";
+const route = useRoute()
+
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框

src/views/contract_negotiation/index.vue

@@ -84,6 +84,9 @@ import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from "vue-router";
+const route = useRoute()
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框

src/views/copyApproval/edit.vue

@@ -0,0 +1,115 @@
+<template>
+    <div class="edit-popup">
+
+        <popup ref="popupRef" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
+            <el-card>
+                <el-descriptions :column="3" title="审批详情" border>
+                    <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.org_name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.dept_name</el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审核状态" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps :space="50" :active="1" simple :align-center="true">
+                            <el-step title="Step 1" :icon="Avatar" />
+                            <el-step title="Step 2" :icon="Clock" />
+                            <el-step title="Step 3" :icon="Clock" />
+                            <el-step title="Step 3" :icon="Clock" />
+                            <el-step title="Step 3" :icon="Clock" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <el-steps direction="vertical" :active="1" :align-center="true" :space="50"
+                            style="margin-top: 20px">
+                            <el-step title="Step 1" />
+                            <el-step title="Step 2" />
+                            <el-step title="Step 3" />
+                        </el-steps>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+        </popup>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEdit">
+import Popup from '@/components/popup/index.vue'
+import { Avatar, Clock } from '@element-plus/icons-vue'
+
+const emit = defineEmits(['success', 'close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+
+// 表单数据
+const formData = reactive({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss">
+.el-step.is-simple .el-step__icon {
+    margin-top: 15px;
+}
+</style>

src/views/copyApproval/index.vue

@@ -0,0 +1,85 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="审核状态" prop="project_type">
+                    <el-select v-model="queryParams.check_status">
+                        <el-option v-for="(item, index) in dictData.check_status" :key="index" :label="item.name"
+                            :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="序号" type="index" width="55" />
+                    <el-table-column label="审批主题" prop="title" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="create_user" show-overflow-tooltip />
+                    <el-table-column label="审核状态" prop="check_status" show-overflow-tooltip />
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="审批类型" prop="flow_type_name" show-overflow-tooltip />
+                    <el-table-column label="审批流程" prop="flow_name" show-overflow-tooltip />
+                    <el-table-column label="当前审批人" prop="current_check_user" show-overflow-tooltip />
+                    <el-table-column label="抄送人" prop="copy_user" show-overflow-tooltip />
+                    <el-table-column label="操作" width="150" fixed="right">
+                        <template #default="{ row }">
+                            <router-link :to="{
+                                path: row.path,
+                                query: { listId: row.content_id }
+                            }">
+                                <el-button v-perms="['safety.safety_target/edit']" type="primary" link>
+                                    详情
+                                </el-button>
+                            </router-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { flowapproveLists } from '@/api/approve.ts'
+
+// 查询条件
+const queryParams = reactive({
+    type: 3,
+    check_status: '',
+})
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('check_status')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: flowapproveLists,
+    params: queryParams
+})
+
+
+
+
+
+getLists()
+</script>
+

src/views/disposeApproval/edit.vue

@@ -0,0 +1,128 @@
+<template>
+    <div class="edit-popup">
+
+        <popup ref="popupRef" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose" :showFootBtn="false">
+
+
+            <el-card>
+                <el-descriptions :column="3" title="审批详情" border>
+                    <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.org_name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.dept_name</el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审核状态" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+
+                    <el-descriptions-item label="审批流程" label-align="left" align="left" label-class-name="my-label">
+                        formData.name
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps :space="50" :active="1" simple :align-center="true">
+                            <el-step title="Step 1" :icon="Avatar" />
+                            <el-step title="Step 2" :icon="Clock" />
+                            <el-step title="Step 3" :icon="Clock" />
+                            <el-step title="Step 3" :icon="Clock" />
+                            <el-step title="Step 3" :icon="Clock" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <el-steps direction="vertical" :active="1" :align-center="true" :space="50"
+                            style="margin-top: 20px">
+                            <el-step title="Step 1" />
+                            <el-step title="Step 2" />
+                            <el-step title="Step 3" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left">
+                        <el-button type="primary" @click="handleSubmit">
+                            通过
+                        </el-button>
+                        <el-button>
+                            通过
+                        </el-button>
+
+                    </el-descriptions-item>
+
+                </el-descriptions>
+            </el-card>
+        </popup>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEdit">
+import Popup from '@/components/popup/index.vue'
+import { Avatar, Clock } from '@element-plus/icons-vue'
+
+const emit = defineEmits(['success', 'close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+
+// 表单数据
+const formData = reactive({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss">
+.el-step.is-simple .el-step__icon {
+    margin-top: 15px;
+}
+</style>

src/views/disposeApproval/index.vue

@@ -0,0 +1,80 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="审核状态" prop="project_type">
+                    <el-select v-model="queryParams.check_status">
+                        <el-option v-for="(item, index) in dictData.check_status" :key="index" :label="item.name"
+                            :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="序号" type="index" width="55" />
+                    <el-table-column label="审批主题" prop="title" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="create_user" show-overflow-tooltip />
+                    <el-table-column label="审核状态" prop="check_status" show-overflow-tooltip />
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="审批类型" prop="flow_type_name" show-overflow-tooltip />
+                    <el-table-column label="审批流程" prop="flow_name" show-overflow-tooltip />
+                    <el-table-column label="当前审批人" prop="current_check_user" show-overflow-tooltip />
+                    <el-table-column label="抄送人" prop="copy_user" show-overflow-tooltip />
+                    <el-table-column label="操作" width="150" fixed="right">
+                        <template #default="{ row }">
+                            <router-link :to="{
+                                path: row.path,
+                                query: { listId: row.content_id }
+                            }">
+                                <el-button v-perms="['safety.safety_target/edit']" type="primary" link>
+                                    详情
+                                </el-button>
+                            </router-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { flowapproveLists } from '@/api/approve.ts'
+
+// 查询条件
+const queryParams = reactive({
+    type: 2,
+    check_status: '',
+})
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('check_status')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: flowapproveLists,
+    params: queryParams
+})
+getLists()
+</script>
+

src/views/finance_payment_apply/index.vue

@@ -94,13 +94,16 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { paymentapplyLists, paymentapplyDelete, paymentapplyDetail } from '@/api/paymentrequest'
-import { timeFormat } from '@/utils/util'
-import { getAllProjectTypes } from '@/api/projecttype'
+
 import { apiProcurementContractLists } from '@/api/procurement_contract'
-const protype = reactive([])
+
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from "vue-router";
+const route = useRoute()
+
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const list = ref([])

src/views/finance_payment_plan/index.vue

@@ -88,6 +88,9 @@ const protype = reactive([])
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from "vue-router";
+const route = useRoute()
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框

src/views/finance_receipt_record/index.vue

@@ -85,6 +85,9 @@ const protype = reactive([])
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from "vue-router";
+const route = useRoute()
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框

src/views/finance_refund_record/index.vue

@@ -91,6 +91,9 @@ const protype = reactive([])
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from "vue-router";
+const route = useRoute()
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框

src/views/launchApproval/edit.vue

@@ -0,0 +1,148 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
+            <el-card>
+                <el-descriptions :column="3" title="审批详情" border>
+                    <el-descriptions-item label="审批主题" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.title }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.flow_name }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审核状态" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="申请人" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.create_user_name }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审批人" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.current_check_user }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left" label-class-name="my-label">
+                        {{ formData.copy_user }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps :active="1" simple :align-center="true">
+                            <el-step :title="getStep(item, index)" :icon="index == 0 ? Avatar : Clock"
+                                v-for="(item, index) in formData.step" :key="index" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <el-steps direction="vertical" :active="formData.record.length" :align-center="true" :space="50"
+                            style="margin-top: 20px">
+                            <el-step :title="item.check_time + item.title" v-for="(item, index) in formData.record"
+                                :key="index" />
+                        </el-steps>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectEdit">
+import Popup from '@/components/popup/index.vue'
+import { Avatar, Clock } from '@element-plus/icons-vue'
+import { flowapproveDetail } from '@/api/approve.ts'
+
+const emit = defineEmits(['success', 'close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+// 表单数据
+const formData = reactive({
+    "id": 11,
+    "title": "",
+    "create_user": 1,
+    "check_status": 0,
+    "flow_name": "",
+    "check_status_text": "",
+    "current_check_user": "",
+    "create_user_name": "admin",
+    "copy_user": "admin",
+    "content": {
+
+    },
+    "step": [
+        {
+            "flow_step": 0,
+            "flow_user": "",
+            "is_active": 0,
+            "flow_step_text": ""
+        },
+        {
+            "flow_step": 2,
+            "flow_user": "测试添加管理,测试",
+            "is_active": 1,
+            "flow_step_text": "指定用户（任意一人）"
+        },
+        {
+            "flow_step": 2,
+            "flow_user": "测试添加管理,测试",
+            "is_active": 0,
+            "flow_step_text": "指定用户（任意一人）"
+        },
+        {
+            "flow_step": 3,
+            "flow_user": "究极张伟,赵明军",
+            "is_active": 0,
+            "flow_step_text": "指定用户（多人会签）"
+        }
+    ],
+    "record": [
+        {
+            "title": "admin提交了此申请",
+            "content": "提交申请",
+            "check_time": "2024-02-03",
+            "status": 0,
+            "status_text": "发起申请"
+        }
+    ]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+const getStep = (item, index) => {
+    if (index == 0) { return formData.create_user_name + '创建' }
+    else { return item.flow_step_text }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+
+
+</script>
+<style lang="scss">
+.el-step.is-simple .el-step__icon {
+    margin-top: 15px;
+}
+</style>

src/views/launchApproval/index.vue

@@ -0,0 +1,85 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="审核状态" prop="project_type">
+                    <el-select v-model="queryParams.check_status">
+                        <el-option v-for="(item, index) in dictData.check_status" :key="index" :label="item.name"
+                            :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="序号" type="index" width="55" />
+                    <el-table-column label="审批主题" prop="title" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="create_user" show-overflow-tooltip />
+                    <el-table-column label="审核状态" prop="check_status" show-overflow-tooltip />
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="审批类型" prop="flow_type_name" show-overflow-tooltip />
+                    <el-table-column label="审批流程" prop="flow_name" show-overflow-tooltip />
+                    <el-table-column label="当前审批人" prop="current_check_user" show-overflow-tooltip />
+                    <el-table-column label="抄送人" prop="copy_user" show-overflow-tooltip />
+                    <el-table-column label="操作" width="150" fixed="right">
+                        <template #default="{ row }">
+                            <router-link :to="{
+                                path: row.path,
+                                query: { listId: row.content_id }
+                            }">
+                                <el-button v-perms="['safety.safety_target/edit']" type="primary" link>
+                                    详情
+                                </el-button>
+                            </router-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { flowapproveLists } from '@/api/approve.ts'
+
+// 查询条件
+const queryParams = reactive({
+    type: 1,
+    check_status: '',
+})
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('check_status')
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: flowapproveLists,
+    params: queryParams
+})
+
+
+
+
+
+getLists()
+</script>
+

src/views/material_purchase_request/index.vue

@@ -69,6 +69,9 @@ const protype = reactive([])
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from "vue-router";
+const route = useRoute()
+
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框

src/views/safety_target/index.vue

@@ -23,7 +23,8 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['safety.safety_target/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['safety.safety_target/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
 
@@ -58,7 +59,8 @@
                             <el-button v-perms="['safety.safety_target/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['safety.safety_target/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['safety.safety_target/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <!-- <el-button v-perms="['safety.safety_target/detail']" link @click="handledetail(row)">