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/views/basicData/product/ImportExcel/index.vue | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/src/views/basicData/product/ImportExcel/index.vue b/src/views/basicData/product/ImportExcel/index.vue
index c25d254..2afbb64 100644
--- a/src/views/basicData/product/ImportExcel/index.vue
+++ b/src/views/basicData/product/ImportExcel/index.vue
@@ -2,16 +2,10 @@
<el-button type="info" plain icon="Upload" @click="handleImport">
瀵煎叆
</el-button>
- <el-dialog v-model="upload.open" :title="upload.title">
- <FileUpload
- ref="fileUploadRef"
- accept=".xlsx, .xls"
- :headers="upload.headers"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :showTip="false"
- @success="handleFileSuccess"
- />
+ <el-dialog v-model="upload.open" :title="upload.title" @close="handleDialogClose">
+ <FileUpload ref="fileUploadRef" accept=".xlsx, .xls" :headers="upload.headers" :action="uploadUrl"
+ :disabled="upload.isUploading" :showTip="true" @success="handleFileSuccess"
+ :downloadTemplate="handleDownloadTemplate" />
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
@@ -22,15 +16,19 @@
</template>
<script setup>
-import { reactive } from "vue";
+import { reactive, computed } from "vue";
import { getToken } from "@/utils/auth.js";
import { FileUpload } from "@/components/Upload";
import { ElMessage } from "element-plus";
+import { downloadProductModelImportTemplate } from "@/api/basicData/product.js";
defineOptions({
name: "浜у搧缁存姢瀵煎叆",
});
+const props = defineProps({
+ productId: { type: [String, Number], default: "" },
+});
const emits = defineEmits(["uploadSuccess"]);
const fileUploadRef = ref();
const upload = reactive({
@@ -42,11 +40,20 @@
isUploading: false,
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
headers: { Authorization: "Bearer " + getToken() },
- // 涓婁紶鐨勫湴鍧�
- url: import.meta.env.VITE_APP_BASE_API + "/system/supplier/import",
});
+// 涓婁紶鐨勫湴鍧�锛堟惡甯� productId 鍙傛暟锛屼紶缁欏悗绔殑 importProduct 鎺ュ彛锛�
+const uploadUrl = computed(
+ () =>
+ import.meta.env.VITE_APP_BASE_API +
+ "/basic/product/import" +
+ (props.productId ? `?productId=${props.productId}` : "")
+);
// 鐐瑰嚮瀵煎叆
const handleImport = () => {
+ if (!props.productId) {
+ ElMessage({ message: "璇峰厛閫夋嫨浜у搧", type: "warning" });
+ return;
+ }
upload.open = true;
upload.title = "浜у搧瀵煎叆";
};
@@ -55,14 +62,54 @@
fileUploadRef.value.uploadApi();
};
+// 鍏抽棴寮圭獥鏃舵竻闄ゅ凡閫夋枃浠�
+const handleDialogClose = () => {
+ fileUploadRef.value?.clearFiles?.();
+};
+
const handleFileSuccess = (response) => {
const { code, msg } = response;
if (code == 200) {
- ElMessage({ message: "瀵煎叆鎴愬姛", type: "success" });
+ ElMessage({ message: msg || "瀵煎叆鎴愬姛", type: "success" });
upload.open = false;
emits("uploadSuccess");
} else {
ElMessage({ message: msg, type: "error" });
}
};
+
+// 涓嬭浇 Excel 瀵煎叆妯℃澘
+const handleDownloadTemplate = () => {
+ downloadProductModelImportTemplate()
+ .then((blobData) => {
+ const blob =
+ blobData instanceof Blob
+ ? blobData
+ : new Blob([blobData], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" });
+ const url = window.URL.createObjectURL(blob);
+ const link = document.createElement("a");
+ link.href = url;
+ link.download = "浜у搧瀵煎叆妯℃澘.xlsx";
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ window.URL.revokeObjectURL(url);
+ ElMessage({ message: "妯℃澘涓嬭浇鎴愬姛", type: "success" });
+ })
+ .catch(() => {
+ ElMessage({ message: "妯℃澘涓嬭浇澶辫触", type: "error" });
+ });
+};
</script>
+
+<style scoped>
+.import-tip {
+ margin-top: 12px;
+ font-size: 12px;
+ color: var(--el-text-color-secondary);
+}
+
+.import-tip .el-button {
+ margin-left: 8px;
+}
+</style>
--
Gitblit v1.9.3