From 98a53588c381bdcdea111cb1deddc06f6c7f1c28 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 09 四月 2026 14:12:09 +0800
Subject: [PATCH] fix(用户管理): 修复编辑用户时部门显示问题并增加员工密码初始化
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index c3fb6d1..80baf46 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -104,7 +104,7 @@
<h4>浜у搧鏄庣粏</h4>
<el-table :data="currentQuotation.products || []" border style="width: 100%">
<el-table-column prop="product" label="浜у搧鍚嶇О" />
- <el-table-column prop="specificationModel" label="瑙勬牸鍨嬪彿" />
+ <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" />
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">楼{{ Number(scope.row.unitPrice ?? 0).toFixed(2) }}</template>
@@ -115,6 +115,19 @@
<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>
@@ -197,10 +210,6 @@
<div v-if="!activity.isShen" class="node-reason">
<span>瀹℃壒鎰忚锛�</span>{{ activity.approveNodeReason }}
</div>
- <div v-if="!activity.isShen" class="node-reason">
- <span>绛惧悕锛�</span>
- <img :src="activity.urlTem" class="signImg" alt="" v-if="activity.urlTem"/>
- </div>
<div v-else-if="activity.isShen">
<el-form-item
:prop="'activities.' + index + '.approveNodeReason'"
@@ -221,6 +230,7 @@
</div>
</template>
</el-dialog>
+ <filePreview ref="filePreviewRef" />
</div>
</template>
@@ -234,8 +244,9 @@
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 { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
+import { getQuotationDetail, getQuotationList } from "@/api/salesManagement/salesQuotation.js";
import { getPurchaseByCode } from "@/api/procurementManagement/procurementLedger.js";
+import filePreview from "@/components/filePreview/index.vue";
const emit = defineEmits(['close'])
const { proxy } = getCurrentInstance()
@@ -257,8 +268,34 @@
const currentQuotation = ref({})
const purchaseLoading = ref(false)
const currentPurchase = 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 data = reactive({
form: {
@@ -334,9 +371,18 @@
const quotationNo = row?.approveReason;
if (quotationNo) {
quotationLoading.value = true
- getQuotationList({ quotationNo }).then((res) => {
+ getQuotationList({ quotationNo }).then(async (res) => {
const records = res?.data?.records || []
- currentQuotation.value = records[0] || {}
+ 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) {
+ }
+ }
}).finally(() => {
quotationLoading.value = false
})
@@ -449,4 +495,4 @@
width: 200px;
height: 60px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3