From ace1b66fe094e791216f6c46f4bd628e1c23b2dd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:09:01 +0800
Subject: [PATCH] 协同办公系统模块优化
---
src/views/collaborativeApproval/approvalProcess/index.vue | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index afc2529..3815b70 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<!-- 鏍囩椤靛垏鎹笉鍚岀殑瀹℃壒绫诲瀷 -->
- <el-tabs v-model="activeTab" @tab-change="handleTabChange" class="approval-tabs">
- <el-tab-pane label="鍗忓悓瀹℃壒" name="1"></el-tab-pane>
+ <el-tabs v-if="!fixedApproveType" v-model="activeTab" @tab-change="handleTabChange" class="approval-tabs">
+ <el-tab-pane label="鑷敱鍗忓悓瀹℃壒" name="1"></el-tab-pane>
<el-tab-pane label="璇峰亣绠＄悊" name="2"></el-tab-pane>
<el-tab-pane label="閿�鍞鎵�" name="3"></el-tab-pane>
<el-tab-pane label="鎶ラ攢瀹℃壒" name="4"></el-tab-pane>
@@ -35,6 +35,7 @@
>
</div>
<div>
+ <el-button v-if="[3, 5].includes(currentApproveType)" @click="openFlowDefinition">娴佺▼閰嶇疆</el-button>
<el-button type="primary" @click="openForm('add')" v-if="currentApproveType !== 6">鏂板</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
@@ -56,25 +57,30 @@
<info-form-dia ref="infoFormDia" @close="handleQuery" :approveType="currentApproveType"></info-form-dia>
<approval-dia ref="approvalDia" @close="handleQuery" :approveType="currentApproveType"></approval-dia>
<FileList ref="fileListRef" />
+ <FlowDefinitionDia ref="flowDefinitionRef" />
</div>
</template>
<script setup>
import FileList from "./fileList.vue";
import { Search } from "@element-plus/icons-vue";
-import {onMounted, ref, computed, reactive, toRefs, nextTick, getCurrentInstance} from "vue";
+import {onMounted, ref, computed, reactive, toRefs, nextTick, getCurrentInstance, watch} from "vue";
import {ElMessageBox} from "element-plus";
import { useRoute } from 'vue-router';
import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
import {approveProcessDelete, approveProcessListPage} from "@/api/collaborativeApproval/approvalProcess.js";
import useUserStore from "@/store/modules/user";
+import FlowDefinitionDia from "./components/flowDefinitionDia.vue";
const userStore = useUserStore();
const route = useRoute();
+const props = defineProps({
+ approveType: { type: [Number, String], default: null }
+})
+const fixedApproveType = computed(() => props.approveType !== null && props.approveType !== undefined)
-// 褰撳墠閫変腑鐨勬爣绛鹃〉锛岄粯璁や负鍏嚭绠＄悊
-const activeTab = ref('1');
+const activeTab = ref(String(props.approveType || '1'));
// 褰撳墠瀹℃壒绫诲瀷锛屾牴鎹�変腑鐨勬爣绛鹃〉璁＄畻
const currentApproveType = computed(() => {
@@ -104,6 +110,7 @@
const isLeaveType = currentApproveType.value === 2; // 璇峰亣绠＄悊
const isReimburseType = currentApproveType.value === 4; // 鎶ラ攢绠＄悊
const isQuotationType = currentApproveType.value === 6; // 鎶ヤ环瀹℃壒
+ const isBusinessApproval = [1, 3, 5].includes(currentApproveType.value)
// 鍩虹鍒楅厤缃�
const baseColumns = [
@@ -150,10 +157,11 @@
width: 220
},
{
- label: isQuotationType ? "鎶ヤ环鍗曞彿" : "瀹℃壒浜嬬敱",
- prop: "approveReason",
+ label: isBusinessApproval ? "涓氬姟缂栧彿" : (isQuotationType ? "鎶ヤ环鍗曞彿" : "瀹℃壒浜嬬敱"),
+ prop: isBusinessApproval ? "businessNo" : "approveReason",
width: 200
},
+ ...(isBusinessApproval ? [{ label: "瀹℃壒鏍囬", prop: "businessTitle", width: 220 }] : []),
{
label: "鐢宠浜�",
prop: "approveUserName",
@@ -168,6 +176,9 @@
prop: "price",
width: 120
});
+ }
+ if ([1, 3, 5].includes(currentApproveType.value)) {
+ baseColumns.push({ label: currentApproveType.value === 3 ? "鍚堝悓閲戦锛堝厓锛�" : "閲戦锛堝厓锛�", prop: "amount", width: 140 })
}
// 鏃ユ湡鍒楋紙鏍规嵁绫诲瀷鍔ㄦ�侀厤缃級
@@ -205,7 +216,7 @@
clickFun: (row) => {
openForm("edit", row);
},
- disabled: (row) => currentApproveType.value === 6 || row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
+ disabled: (row) => currentApproveType.value === 6 || ![0, 3].includes(row.approveStatus) || row.approveUser !== userStore.id
},
{
name: "瀹℃牳",
@@ -244,6 +255,7 @@
});
const infoFormDia = ref()
const approvalDia = ref()
+const flowDefinitionRef = ref()
const { proxy } = getCurrentInstance()
// 鏌ヨ鍒楄〃
@@ -287,12 +299,12 @@
}
const url = urlMap[type] || urlMap[0]
const nameMap = {
- 0: "鍗忓悓瀹℃壒绠＄悊琛�",
- 1: "鍏嚭绠＄悊瀹℃壒琛�",
+ 0: "鑷敱鍗忓悓瀹℃壒琛�",
+ 1: "鑷敱鍗忓悓瀹℃壒琛�",
2: "璇峰亣绠＄悊瀹℃壒琛�",
- 3: "鍑哄樊绠＄悊瀹℃壒琛�",
+ 3: "閿�鍞悎鍚屽鎵硅〃",
4: "鎶ラ攢绠＄悊瀹℃壒琛�",
- 5: "閲囪喘鐢宠瀹℃壒琛�",
+ 5: "閲囪喘璁″垝瀹℃壒琛�",
6: "鎶ヤ环瀹℃壒琛�",
7: "鍑哄簱瀹℃壒琛�",
}
@@ -316,6 +328,7 @@
approvalDia.value?.openDialog(type, row)
})
};
+const openFlowDefinition = () => flowDefinitionRef.value?.open(currentApproveType.value)
// 鍒犻櫎
const handleDelete = () => {
@@ -326,7 +339,7 @@
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
return;
}
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "瀵煎嚭", {
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚垹闄わ紝鏄惁纭鍒犻櫎锛�", "鍒犻櫎", {
confirmButtonText: "纭",
cancelButtonText: "鍙栨秷",
type: "warning",
@@ -359,6 +372,13 @@
// 鏌ヨ鍒楄〃
getList();
});
+
+watch(() => props.approveType, value => {
+ if (value !== null && value !== undefined) {
+ activeTab.value = String(value)
+ handleQuery()
+ }
+})
</script>
<style scoped>
--
Gitblit v1.9.3