From 11d7990309ddace2fa600cbeae58e3ab5ac368f9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 20 九月 2026 19:25:45 +0800
Subject: [PATCH] 新疆-融邦 1. 委外管理：新增合作商档案、委外订单、往来台账三个页面及接口；合作商附件弹框支持直接上传/删除并即时保存。 2. 信托基金与代储台账：客户档案加「信托基金 / 代储金额」并对超限标红提示；销售台账拆「卖油 / 代储」页签，代储走油库+储罐+合同金额，卖油保留产品明细；台账列表加审批状态与超限红字；审批中心显示销售合同号并能下钻台账明细。 3. 储罐号带入库存：储罐信息表单加「是否启用 / 用途 / 租客信息」联动与校验；库存管理、批号明细、入库/出库表单与列表补齐储罐号、油品、物流、过磅等字段展示。 4. 出库即发货与往来备件：出库台账区分「发货单 / 油品出库」两类来源并分别处理详情；新增备件出入库流水页面。 5. 车辆管理与残油联动：新增车辆管理页面；油品出入库表单物流信息顺序调整，车牌/车挂牌号联动只读。 6. 油品出库联动发货台账：发货台账加「发货单号 / 销售合同号」筛选，修复油品出库行批号列取错字段。 7. 采购申请模块：新增采购申请页面及接口。 8. 付款流水组件：抽出公共「付款流水」弹框组件，采购付款分栏、收付款台账与委外往来台账复用。 9. 列调整：收付款台账删除「付款金额 / 退货金额」；委外往来台账删除「回款金额」，并去掉金额列右对齐。
---
src/components/ProjectManagement/ProgressReportDialog.vue | 50 +++++---------------------------------------------
1 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/src/components/ProjectManagement/ProgressReportDialog.vue b/src/components/ProjectManagement/ProgressReportDialog.vue
index d9402c2..dc6afe7 100644
--- a/src/components/ProjectManagement/ProgressReportDialog.vue
+++ b/src/components/ProjectManagement/ProgressReportDialog.vue
@@ -116,25 +116,14 @@
</el-row>
<el-form-item label="闄勪欢" prop="attachmentIds">
- <el-upload
- v-model:file-list="fileList"
- :action="upload.url"
- :headers="upload.headers"
- multiple
- name="files"
- :on-success="handleUploadSuccess"
- :on-error="handleUploadError"
- :on-remove="handleRemove"
- >
- <el-button type="primary">涓婁紶鏂囦欢</el-button>
- </el-upload>
+ <FileUpload v-model:file-list="form.storageBlobDTOs" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
- <el-button @click="visible = false">鍙栨秷</el-button>
<el-button type="primary" @click="submit">纭畾</el-button>
+ <el-button @click="visible = false">鍙栨秷</el-button>
</div>
</template>
</el-dialog>
@@ -144,6 +133,7 @@
import { computed, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { getToken } from '@/utils/auth'
+import FileUpload from "@/components/AttachmentUpload/file/index.vue";
const props = defineProps({
modelValue: { type: Boolean, default: false },
@@ -161,11 +151,6 @@
})
const formRef = ref()
-const fileList = ref([])
-const upload = reactive({
- url: import.meta.env.VITE_APP_BASE_API + '/basic/customer-follow/upload',
- headers: { Authorization: 'Bearer ' + getToken() }
-})
const form = ref({
planNodeId: undefined,
@@ -180,7 +165,7 @@
managerName: '',
departmentName: '',
remark: '',
- attachmentIds: []
+ storageBlobDTOs: []
})
const rules = {
@@ -217,9 +202,8 @@
managerName: info.managerName || '',
departmentName: info.departmentName || '',
remark: '',
- attachmentIds: []
+ storageBlobDTOs: []
}
- fileList.value = []
}
watch(
@@ -237,30 +221,6 @@
form.value.completionProgress = 100
form.value.totalProgress = 100
if (!form.value.actualEndTime) form.value.actualEndTime = form.value.reportDate || ''
-}
-
-function handleUploadError() {
- ElMessage.error('涓婁紶鏂囦欢澶辫触')
-}
-
-function handleUploadSuccess(res, file) {
- if (res?.code !== 200) {
- ElMessage.error(res?.msg || '涓婁紶澶辫触')
- return
- }
- const attachmentId = res?.data?.id ?? res?.data?.tempId ?? ''
- if (!attachmentId) return
- form.value.attachmentIds.push(attachmentId)
- try {
- file.attachmentId = attachmentId
- } catch (e) {}
- ElMessage.success('涓婁紶鎴愬姛')
-}
-
-function handleRemove(file) {
- const attachmentId = file?.attachmentId
- if (!attachmentId) return
- form.value.attachmentIds = (form.value.attachmentIds || []).filter(id => id !== attachmentId)
}
async function submit() {
--
Gitblit v1.9.3