From b59518d5c068ae8e6e32cce90ccf281bf81dc54a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 14:34:39 +0800
Subject: [PATCH] feat(collaborativeApproval): 添加用印审批功能支持
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 189 ++++++++++++++++++++++++-----------------------
1 files changed, 97 insertions(+), 92 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 80baf46..90802a5 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -39,39 +39,6 @@
</el-form-item>
</el-col>
</el-row>
- <!-- 瀹℃壒浜洪�夋嫨锛堝姩鎬佽妭鐐癸級 -->
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鐢宠浜猴細" prop="approveUser">
- <el-select
- v-model="form.approveUser"
- placeholder="閫夋嫨浜哄憳"
- disabled
- >
- <el-option
- v-for="user in userList"
- :key="user.userId"
- :label="user.nickName"
- :value="user.userId"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鐢宠鏃ユ湡锛�" prop="approveTime">
- <el-date-picker
- v-model="form.approveTime"
- type="date"
- placeholder="璇烽�夋嫨鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- clearable
- style="width: 100%"
- disabled
- />
- </el-form-item>
- </el-col>
- </el-row>
</el-form>
<!-- 鎶ヤ环瀹℃壒锛氬睍绀烘姤浠疯鎯咃紙澶嶇敤閿�鍞姤浠�"鏌ョ湅璇︽儏瀵硅瘽妗�"鍐呭缁撴瀯锛� -->
@@ -115,19 +82,6 @@
<div v-if="currentQuotation.remark" style="margin-top: 20px;">
<h4>澶囨敞</h4>
<p>{{ currentQuotation.remark }}</p>
- </div>
-
- <div v-if="quotationAttachments.length > 0" style="margin-top: 20px;">
- <h4>闄勪欢</h4>
- <el-table :data="quotationAttachments" border style="width: 100%">
- <el-table-column prop="name" label="闄勪欢鍚嶇О" min-width="360" show-overflow-tooltip />
- <el-table-column label="鎿嶄綔" width="160" align="center">
- <template #default="{ row }">
- <el-button link type="primary" size="small" @click="downloadAttachment(row)">涓嬭浇</el-button>
- <el-button link type="primary" size="small" @click="previewAttachment(row)">棰勮</el-button>
- </template>
- </el-table-column>
- </el-table>
</div>
</template>
</template>
@@ -173,6 +127,43 @@
</el-table-column>
<el-table-column prop="taxInclusiveTotalPrice" label="鍚◣鎬讳环">
<template #default="scope">楼{{ Number(scope.row.taxInclusiveTotalPrice ?? 0).toFixed(2) }}</template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </template>
+ </template>
+ </el-skeleton>
+ </div>
+
+ <!-- 鐢ㄥ嵃瀹℃壒锛氬睍绀虹敤鍗扮敵璇疯鎯� -->
+ <div v-if="isSealApproval" style="margin: 10px 0 18px;">
+ <el-divider content-position="left">鐢ㄥ嵃璇︽儏</el-divider>
+ <el-skeleton :loading="sealLoading" animated>
+ <template #template>
+ <el-skeleton-item variant="h3" style="width: 30%" />
+ <el-skeleton-item variant="text" style="width: 100%" />
+ </template>
+ <template #default>
+ <el-empty v-if="!currentSeal || !currentSeal.applicationNum" description="鏈煡璇㈠埌瀵瑰簲鐢ㄥ嵃鐢宠璇︽儏" />
+ <template v-else>
+ <el-descriptions :column="2" border>
+ <el-descriptions-item label="鐢宠缂栧彿">{{ currentSeal.applicationNum }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏍囬">{{ currentSeal.title }}</el-descriptions-item>
+ <el-descriptions-item label="鐢ㄥ嵃绫诲瀷">{{ getSealTypeText(currentSeal.sealType) }}</el-descriptions-item>
+ <el-descriptions-item label="绱ф�ョ▼搴�">{{ getUrgencyText(currentSeal.urgency) }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鍘熷洜" :span="2">{{ currentSeal.reason }}</el-descriptions-item>
+ </el-descriptions>
+ <div v-if="currentSeal.commonFileList?.length" style="margin-top: 20px;">
+ <h4>闄勪欢</h4>
+ <el-table :data="currentSeal.commonFileList" border style="width: 100%">
+ <el-table-column label="闄勪欢鍚嶇О" show-overflow-tooltip>
+ <template #default="scope">{{ scope.row.name }}</template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="150" align="center">
+ <template #default="scope">
+ <el-button link type="primary" size="small" @click="previewSealFile(scope.row)">棰勮</el-button>
+ <el-button link type="primary" size="small" @click="downloadSealFile(scope.row)">涓嬭浇</el-button>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -242,11 +233,11 @@
updateApproveNode
} from "@/api/collaborativeApproval/approvalProcess.js";
import useUserStore from "@/store/modules/user.js";
-import {userListNoPageByTenantId} from "@/api/system/user.js";
import { WarningFilled, Edit, Check, MoreFilled } from '@element-plus/icons-vue'
-import { getQuotationDetail, getQuotationList } from "@/api/salesManagement/salesQuotation.js";
+import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
import { getPurchaseByCode } from "@/api/procurementManagement/procurementLedger.js";
-import filePreview from "@/components/filePreview/index.vue";
+import { getSealDetail } from "@/api/collaborativeApproval/sealManagement.js";
+import FilePreview from '@/components/filePreview/index.vue'
const emit = defineEmits(['close'])
const { proxy } = getCurrentInstance()
@@ -263,45 +254,20 @@
const formRef = ref(null);
const userStore = useUserStore()
const productOptions = ref([]);
-const userList = ref([])
const quotationLoading = ref(false)
const currentQuotation = ref({})
const purchaseLoading = ref(false)
const currentPurchase = ref({})
+const sealLoading = ref(false)
+const currentSeal = ref({})
const filePreviewRef = ref()
const isQuotationApproval = computed(() => Number(props.approveType) === 6)
const isPurchaseApproval = computed(() => Number(props.approveType) === 5)
-
-const normalizeQuotationFiles = (raw) => {
- const list =
- (raw && Array.isArray(raw.salesLedgerFiles) && raw.salesLedgerFiles) ||
- (raw && Array.isArray(raw.quotationFiles) && raw.quotationFiles) ||
- (raw && Array.isArray(raw.fileList) && raw.fileList) ||
- (raw && Array.isArray(raw.files) && raw.files) ||
- []
- return list
- .map((item) => ({
- id: item?.id,
- name: item?.fileName || item?.name || item?.originalName || item?.filename || "闄勪欢",
- url: item?.fileUrl || item?.url || item?.path || item?.tempPath,
- }))
- .filter((i) => i.url)
-}
-
-const quotationAttachments = computed(() => normalizeQuotationFiles(currentQuotation.value))
-
-const downloadAttachment = (row) => {
- proxy.$download.name(row.url)
-}
-const previewAttachment = (row) => {
- filePreviewRef.value?.open?.(row.url)
-}
+const isSealApproval = computed(() => Number(props.approveType) === 9)
const data = reactive({
form: {
- approveTime: "",
approveId: "",
- approveUser: "",
approveDeptId: "",
approveReason: "",
checkResult: "",
@@ -336,9 +302,6 @@
dialogFormVisible.value = true;
currentQuotation.value = {}
currentPurchase.value = {}
- userListNoPageByTenantId().then((res) => {
- userList.value = res.data;
- });
form.value = {...row}
// 绔嬪嵆娓呴櫎琛ㄥ崟楠岃瘉鐘舵�侊紙鍥犱负瀛楁鏄痙isabled鐨勶紝涓嶉渶瑕侀獙璇侊級
nextTick(() => {
@@ -371,18 +334,9 @@
const quotationNo = row?.approveReason;
if (quotationNo) {
quotationLoading.value = true
- getQuotationList({ quotationNo }).then(async (res) => {
+ getQuotationList({ quotationNo }).then((res) => {
const records = res?.data?.records || []
- const first = records[0] || {}
- currentQuotation.value = first
- if (first?.id && normalizeQuotationFiles(first).length === 0) {
- try {
- const detailRes = await getQuotationDetail({ id: first.id })
- const detail = detailRes?.data || detailRes || {}
- currentQuotation.value = { ...first, ...detail }
- } catch (e) {
- }
- }
+ currentQuotation.value = records[0] || {}
}).finally(() => {
quotationLoading.value = false
})
@@ -403,6 +357,19 @@
purchaseLoading.value = false
})
}
+ }
+
+ // 鐢ㄥ嵃瀹℃壒锛氭寜瀹℃壒娴佺▼ DB 涓婚敭锛坮ow.id锛夋煡鐢ㄥ嵃鐢宠璇︽儏
+ if (isSealApproval.value) {
+ sealLoading.value = true
+ getSealDetail(row.id).then((res) => {
+ currentSeal.value = res.data || {}
+ }).catch((err) => {
+ console.error('鏌ヨ鐢ㄥ嵃璇︽儏澶辫触:', err)
+ proxy.$modal.msgError('鏌ヨ鐢ㄥ嵃璇︽儏澶辫触')
+ }).finally(() => {
+ sealLoading.value = false
+ })
}
approveProcessDetails(row.approveId).then((res) => {
@@ -429,6 +396,42 @@
productOptions.value = res.data;
});
};
+// 鐢ㄥ嵃绫诲瀷鏂囨湰
+const getSealTypeText = (sealType) => {
+ const map = { official: '鍏珷', contract: '鍚堝悓涓撶敤绔�', finance: '璐㈠姟涓撶敤绔�', legal: '娉曚汉绔�' }
+ return map[sealType] || sealType || '鏈煡'
+}
+// 绱ф�ョ▼搴︽枃鏈�
+const getUrgencyText = (urgency) => {
+ const map = { normal: '鏅��', urgent: '绱ф��', 'very-urgent': '鐗规��' }
+ return map[urgency] || urgency || '鏈煡'
+}
+// 棰勮闄勪欢锛圲RL 涓哄畬鏁村湴鍧�锛屽師鏍锋墦寮�锛屼笉鎷� host锛�
+const previewSealFile = (row) => {
+ const url = row.previewURL || row.previewUrl || row.url
+ if (url && filePreviewRef.value) {
+ filePreviewRef.value.openUrl(url)
+ } else {
+ proxy.$modal.msgWarning('鏂囦欢鍦板潃鏃犳晥锛屾棤娉曢瑙�')
+ }
+}
+// 涓嬭浇闄勪欢锛堥敋鐐规柟寮忥紝URL 涓哄畬鏁村湴鍧�锛�
+const downloadSealFile = (row) => {
+ const url = row.downloadURL || row.downloadUrl || row.url
+ if (url) {
+ const filename = row.originalFilename || row.name || row.fileName || 'download'
+ const a = document.createElement('a')
+ a.href = url
+ a.download = filename
+ a.target = '_blank'
+ a.rel = 'noopener noreferrer'
+ document.body.appendChild(a)
+ a.click()
+ document.body.removeChild(a)
+ } else {
+ proxy.$modal.msgWarning('鏂囦欢鍦板潃鏃犳晥锛屾棤娉曚笅杞�')
+ }
+}
// 鎻愪氦瀹℃壒
const submitForm = (status) => {
const filteredActivities = activities.value.filter(activity => activity.isShen);
@@ -457,6 +460,8 @@
currentQuotation.value = {}
purchaseLoading.value = false
currentPurchase.value = {}
+ sealLoading.value = false
+ currentSeal.value = {}
emit('close')
};
defineExpose({
@@ -495,4 +500,4 @@
width: 200px;
height: 60px;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3