From 6bea4a03b32c48d72cee59e46c90accdf07b8b35 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 四月 2026 17:59:22 +0800
Subject: [PATCH] 阳光彩印 1.协同审批管理不再需要选择审批人 2.审批管理添加审批流联调 3.销售发货、采购台账、销售报价不再需要选择审批人
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 98 ++-----------------------------------------------
1 files changed, 4 insertions(+), 94 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 34c6425..1269621 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>
@@ -230,7 +184,6 @@
</div>
</template>
</el-dialog>
- <filePreview ref="filePreviewRef" />
</div>
</template>
@@ -242,11 +195,9 @@
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";
const emit = defineEmits(['close'])
const { proxy } = getCurrentInstance()
@@ -263,45 +214,16 @@
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 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: {
- approveTime: "",
approveId: "",
- approveUser: "",
approveDeptId: "",
approveReason: "",
checkResult: "",
@@ -336,9 +258,6 @@
dialogFormVisible.value = true;
currentQuotation.value = {}
currentPurchase.value = {}
- userListNoPageByTenantId().then((res) => {
- userList.value = res.data;
- });
form.value = {...row}
// 绔嬪嵆娓呴櫎琛ㄥ崟楠岃瘉鐘舵�侊紙鍥犱负瀛楁鏄痙isabled鐨勶紝涓嶉渶瑕侀獙璇侊級
nextTick(() => {
@@ -371,18 +290,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 }
- } catch (e) {
- }
- }
+ currentQuotation.value = records[0] || {}
}).finally(() => {
quotationLoading.value = false
})
@@ -495,4 +405,4 @@
width: 200px;
height: 60px;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3