From 432ddf1abeaa9dcac86f628913af1f2a03cfe22f Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期三, 18 六月 2025 09:00:09 +0800
Subject: [PATCH] 1.昭德-文档管理上传图片联调 2.昭德-完善生产加工模块 3.昭德-后端协商数据格式页面渲染问题
---
src/views/archiveManagement/mould/archiveDialog.vue | 49 ++++++-
src/components/FileUpload/index.vue | 269 ++++++++++++++++++++++++++++++--------------
src/views/archiveManagement/index.vue | 7 +
3 files changed, 227 insertions(+), 98 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index e68df58..d8aa818 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -12,6 +12,7 @@
:on-success="handleUploadSuccess"
:show-file-list="false"
:headers="headers"
+ :http-request="UploadImage"
class="upload-file-uploader"
ref="fileUpload"
v-if="!disabled"
@@ -22,18 +23,44 @@
<!-- 涓婁紶鎻愮ず -->
<div class="el-upload__tip" v-if="showTip && !disabled">
璇蜂笂浼�
- <template v-if="fileSize"> 澶у皬涓嶈秴杩� <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
- <template v-if="fileType"> 鏍煎紡涓� <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+ <template v-if="fileSize">
+ 澶у皬涓嶈秴杩� <b style="color: #f56c6c">{{ fileSize }}MB</b>
+ </template>
+ <template v-if="fileType">
+ 鏍煎紡涓� <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+ </template>
鐨勬枃浠�
</div>
<!-- 鏂囦欢鍒楄〃 -->
- <transition-group ref="uploadFileList" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
- <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
- <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
- <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+ <transition-group
+ ref="uploadFileList"
+ class="upload-file-list el-upload-list el-upload-list--text"
+ name="el-fade-in-linear"
+ tag="ul"
+ >
+ <li
+ :key="file.uid"
+ class="el-upload-list__item ele-upload-list__item-content"
+ v-for="(file, index) in fileList"
+ >
+ <el-link :href="`${file.url}`" :underline="false" target="_blank">
+ <span class="el-icon-document"> {{ file.bucketFilename }} </span>
</el-link>
<div class="ele-upload-list__item-content-action">
- <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled"> 鍒犻櫎</el-link>
+ <el-link
+ :underline="false"
+ @click="handleDownload(index)"
+ type="primary"
+ v-if="!disabled"
+ > 涓嬭浇</el-link
+ >
+ <el-link
+ :underline="false"
+ @click="handleDelete(index)"
+ type="danger"
+ v-if="!disabled"
+ > 鍒犻櫎</el-link
+ >
</div>
</li>
</transition-group>
@@ -41,82 +68,143 @@
</template>
<script setup>
-import { getToken } from "@/utils/auth"
-import Sortable from 'sortablejs'
-
+import { getToken } from "@/utils/auth";
+import Sortable from "sortablejs";
+import axios from "axios";
const props = defineProps({
modelValue: [String, Object, Array],
// 涓婁紶鎺ュ彛鍦板潃
action: {
type: String,
- default: "/common/upload"
+ default: "/common/minioUploads",
},
// 涓婁紶鎼哄甫鐨勫弬鏁�
data: {
- type: Object
+ type: Object,
},
// 鏁伴噺闄愬埗
limit: {
type: Number,
- default: 5
+ default: 5,
},
// 澶у皬闄愬埗(MB)
fileSize: {
type: Number,
- default: 5
+ default: 5,
},
// 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg']
fileType: {
type: Array,
- default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf"]
+ default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf"],
},
// 鏄惁鏄剧ず鎻愮ず
isShowTip: {
type: Boolean,
- default: true
+ default: true,
},
// 绂佺敤缁勪欢锛堜粎鏌ョ湅鏂囦欢锛�
disabled: {
type: Boolean,
- default: false
+ default: false,
},
// 鎷栧姩鎺掑簭
drag: {
type: Boolean,
- default: true
- }
-})
+ default: true,
+ },
+});
-const { proxy } = getCurrentInstance()
-const emit = defineEmits()
-const number = ref(0)
-const uploadList = ref([])
-const baseUrl = import.meta.env.VITE_APP_BASE_API
-const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action) // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
-const headers = ref({ Authorization: "Bearer " + getToken() })
-const fileList = ref([])
+const { proxy } = getCurrentInstance();
+const emit = defineEmits();
+const number = ref(0);
+const uploadList = ref([]);
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + props.action); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+const headers = ref({ Authorization: "Bearer " + getToken() });
+const fileList = ref([]);
const showTip = computed(
() => props.isShowTip && (props.fileType || props.fileSize)
-)
+);
+const init = () =>{
+ fileList.value = [];
+ uploadList.value = [];
+ number.value = 0;
+}
+const editInit = (val) => {
+ console.log("editInit", val);
+};
+defineExpose({
+ init,
+ editInit
+});
+watch(
+ () => props.modelValue,
+ (val) => {
+ if (val) {
+ let temp = 1;
+ // 棣栧厛灏嗗�艰浆涓烘暟缁�
+ const list = Array.isArray(val) ? val : props.modelValue.split(",");
+ // 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
+ fileList.value = list.map((item) => {
+ if (typeof item === "string") {
+ item = { name: item, url: item };
+ }
+ item.uid = item.uid || new Date().getTime() + temp++;
+ return item;
+ });
+ } else {
+ fileList.value = [];
+ return [];
+ }
+ },
+ { deep: true, immediate: true }
+);
-watch(() => props.modelValue, val => {
- if (val) {
- let temp = 1
- // 棣栧厛灏嗗�艰浆涓烘暟缁�
- const list = Array.isArray(val) ? val : props.modelValue.split(',')
- // 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
- fileList.value = list.map(item => {
- if (typeof item === "string") {
- item = { name: item, url: item }
- }
- item.uid = item.uid || new Date().getTime() + temp++
- return item
+const UploadImage = (param) => {
+ const formData = new FormData();
+ formData.append("files", param.file);
+ axios
+ .post(uploadFileUrl.value, formData, {
+ headers: {
+ "Content-Type": "multipart/form-data",
+ ...headers.value,
+ },
+ onUploadProgress: (progressEvent) => {
+ // 杩涘害鏉℃洿鏂�
+ const percent = Math.round(
+ (progressEvent.loaded * 100) / progressEvent.total
+ );
+ param.onProgress({ percent });
+ },
})
- } else {
- fileList.value = []
- return []
+ .then((response) => {
+ if (response.data.code === 200) {
+ handleUploadSuccess(response.data, param.file);
+ // 鏇存柊鐖剁粍浠�
+ emit("update:modelValue", fileList.value);
+ } else {
+ param.onError(new Error(response.data.msg));
+ }
+ })
+ .catch((error) => {
+ param.onError(error);
+ });
+};
+
+// 涓嬭浇鏂囦欢
+function handleDownload(index) {
+ const url = fileList.value[index].downloadUrl;
+ if (!url) {
+ proxy.$modal.msgError("鏂囦欢閾炬帴涓嶅瓨鍦紝鏃犳硶涓嬭浇");
+ return;
}
-},{ deep: true, immediate: true })
+ // 璇诲彇棰勮鍥剧墖鐨勬暟鎹�
+ const link = document.createElement("a");
+ link.href = url; // 閾炬帴鍦板潃
+ link.download = fileList.value[index].bucketFilename; // 璁剧疆涓嬭浇鏂囦欢鍚�
+ link.click();
+}
+
// 涓婁紶鍓嶆牎妫�鏍煎紡鍜屽ぇ灏�
function handleBeforeUpload(file) {
@@ -131,62 +219,66 @@
// }
// }
// 鏍℃鏂囦欢鍚嶆槸鍚﹀寘鍚壒娈婂瓧绗�
- if (file.name.includes(',')) {
- proxy.$modal.msgError('鏂囦欢鍚嶄笉姝ｇ‘锛屼笉鑳藉寘鍚嫳鏂囬�楀彿!')
- return false
+ if (file.name.includes(",")) {
+ proxy.$modal.msgError("鏂囦欢鍚嶄笉姝ｇ‘锛屼笉鑳藉寘鍚嫳鏂囬�楀彿!");
+ return false;
}
// 鏍℃鏂囦欢澶у皬
if (props.fileSize) {
- const isLt = file.size / 1024 / 1024 < props.fileSize
+ const isLt = file.size / 1024 / 1024 < props.fileSize;
if (!isLt) {
- proxy.$modal.msgError(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 ${props.fileSize} MB!`)
- return false
+ proxy.$modal.msgError(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 ${props.fileSize} MB!`);
+ return false;
}
}
- proxy.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...")
- number.value++
- return true
+ proxy.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...");
+ number.value++;
+ return true;
}
// 鏂囦欢涓暟瓒呭嚭
function handleExceed() {
- proxy.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${props.limit} 涓�!`)
+ proxy.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${props.limit} 涓�!`);
}
// 涓婁紶澶辫触
function handleUploadError(err) {
- proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触")
- proxy.$modal.closeLoading()
+ proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触");
+ proxy.$modal.closeLoading();
}
// 涓婁紶鎴愬姛鍥炶皟
function handleUploadSuccess(res, file) {
if (res.code === 200) {
- uploadList.value.push({ name: res.fileName, url: res.fileName })
- uploadedSuccessfully()
+ console.log("涓婁紶鎴愬姛", res);
+ uploadList.value.push(res.data[0])
+ uploadedSuccessfully();
+ // proxy.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛");
} else {
- number.value--
- proxy.$modal.closeLoading()
- proxy.$modal.msgError(res.msg)
- proxy.$refs.fileUpload.handleRemove(file)
- uploadedSuccessfully()
+ number.value--;
+ proxy.$modal.closeLoading();
+ proxy.$modal.msgError(res.msg);
+ proxy.$refs.fileUpload.handleRemove(file);
+ uploadedSuccessfully();
}
}
// 鍒犻櫎鏂囦欢
function handleDelete(index) {
- fileList.value.splice(index, 1)
- emit("update:modelValue", listToString(fileList.value))
+ fileList.value.splice(index, 1);
+ emit("update:modelValue", listToString(fileList.value));
}
// 涓婁紶缁撴潫澶勭悊
function uploadedSuccessfully() {
if (number.value > 0 && uploadList.value.length === number.value) {
- fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value)
- uploadList.value = []
- number.value = 0
- emit("update:modelValue", listToString(fileList.value))
- proxy.$modal.closeLoading()
+ fileList.value = fileList.value
+ .filter((f) => f.url !== undefined)
+ .concat(uploadList.value);
+ uploadList.value = [];
+ number.value = 0;
+ emit("update:modelValue");
+ proxy.$modal.closeLoading();
}
}
@@ -194,40 +286,41 @@
function getFileName(name) {
// 濡傛灉鏄痷rl閭ｄ箞鍙栨渶鍚庣殑鍚嶅瓧 濡傛灉涓嶆槸鐩存帴杩斿洖
if (name.lastIndexOf("/") > -1) {
- return name.slice(name.lastIndexOf("/") + 1)
+ return name.slice(name.lastIndexOf("/") + 1);
} else {
- return name
+ return name;
}
}
// 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅�
function listToString(list, separator) {
- let strs = ""
- separator = separator || ","
+ let strs = "";
+ separator = separator || ",";
for (let i in list) {
if (list[i].url) {
- strs += list[i].url + separator
+ strs += list[i].url + separator;
}
}
- return strs != '' ? strs.substr(0, strs.length - 1) : ''
+ return strs != "" ? strs.substr(0, strs.length - 1) : "";
}
// 鍒濆鍖栨嫋鎷芥帓搴�
onMounted(() => {
if (props.drag && !props.disabled) {
nextTick(() => {
- const element = proxy.$refs.uploadFileList?.$el || proxy.$refs.uploadFileList
+ const element =
+ proxy.$refs.uploadFileList?.$el || proxy.$refs.uploadFileList;
Sortable.create(element, {
- ghostClass: 'file-upload-darg',
+ ghostClass: "file-upload-darg",
onEnd: (evt) => {
- const movedItem = fileList.value.splice(evt.oldIndex, 1)[0]
- fileList.value.splice(evt.newIndex, 0, movedItem)
- emit('update:modelValue', listToString(fileList.value))
- }
- })
- })
+ const movedItem = fileList.value.splice(evt.oldIndex, 1)[0];
+ fileList.value.splice(evt.newIndex, 0, movedItem);
+ emit("update:modelValue", listToString(fileList.value));
+ },
+ });
+ });
}
-})
+});
</script>
<style scoped lang="scss">
.file-upload-darg {
@@ -259,7 +352,7 @@
.ele-upload-list__item-content-action .el-link {
margin-right: 10px;
}
-.el-icon-document{
- padding-left: 10px;
+.el-icon-document {
+ padding: 10px;
}
</style>
diff --git a/src/views/archiveManagement/index.vue b/src/views/archiveManagement/index.vue
index d5951dc..486522f 100644
--- a/src/views/archiveManagement/index.vue
+++ b/src/views/archiveManagement/index.vue
@@ -130,6 +130,8 @@
@centerDialogVisible="centerDialogVisible"
:row="row"
@submitForm="submitForm"
+ ref="archiveDialogs"
+
>
</archiveDialog>
</el-card>
@@ -210,11 +212,13 @@
queryParams.treeId = data.id;
getArchiveListData();
};
+const archiveDialogs = ref(null); // 琛ㄦ牸缁勪欢寮曠敤
// add
const add = () => {
row.value = {}; // 娓呯┖琛屾暟鎹紝纭繚鏄柊澧炴ā寮�
dialogVisible.value = true;
newName.value = ""; // 娓呯┖杈撳叆妗�
+ archiveDialogs.value.initForm(); // 閲嶇疆琛ㄥ崟
};
// 澶勭悊鍒嗛〉鍙樺寲
const handlePageChange = ({ page }) => {
@@ -448,7 +452,8 @@
const handleEdit = (rows) => {
row.value = rows;
dialogVisible.value = true;
- console.log("缂栬緫鑺傜偣:", row.value);
+ archiveDialogs.value.editForm(rows); // 璋冪敤缂栬緫鏂规硶
+ // console.log("缂栬緫琛屾暟鎹�:", archiveDialogs.value);
};
// 绉婚櫎鎳掑姞杞斤紝鐩存帴鑾峰彇鏁版嵁
diff --git a/src/views/archiveManagement/mould/archiveDialog.vue b/src/views/archiveManagement/mould/archiveDialog.vue
index 521ae1a..844bd1a 100644
--- a/src/views/archiveManagement/mould/archiveDialog.vue
+++ b/src/views/archiveManagement/mould/archiveDialog.vue
@@ -36,10 +36,11 @@
</el-row>
</template>
<fileUpload
- v-model="ruleForm.file"
+ ref="fileUploadRef"
:fileSize="1024"
:fileType="['pdf', 'docx', 'txt', 'xlsx', 'pptx....']"
:limit="10"
+ v-model:modelValue="modelValue"
/>
</el-dialog>
</template>
@@ -48,6 +49,7 @@
import { ref, watch } from "vue";
import { addOrEditArchive } from "@/api/archiveManagement";
import fileUpload from "@/components/FileUpload/index.vue";
+import { ElMessage } from "element-plus";
const centerDialogVisible = defineModel("centerDialogVisible", {
type: Boolean,
@@ -72,6 +74,7 @@
name: "",
type: "",
status: "",
+ storageBlobDTO: [], // 纭繚 storageBlobDTO 鏄竴涓暟缁�
};
};
@@ -93,13 +96,31 @@
type: [{ required: true, message: "璇烽�夋嫨鏂囨。绫诲瀷", trigger: "blur" }],
status: [{ required: true, message: "璇烽�夋嫨鏂囨。鐘舵��", trigger: "blur" }],
};
+const fileUploadRef = ref(null);
+const initForm = () => {
+ ruleForm.value = {}
+ fileUploadRef.value.init()
+};
+const editForm = (val) => {
+ ruleForm.value = copyForm.value;
+ // fileUploadRef.value.editInit(ruleForm.value);
+ nextTick(() => {
+ // console.log("缂栬緫琛ㄥ崟鏁版嵁:", fileUploadRef.value);
+ fileUploadRef.value.editInit(val);
+ });
+};
+defineExpose({
+ initForm,
+ editForm,
+});
const options = [
{ value: "鏈夋晥", label: "鏈夋晥" },
{ value: "鏃犳晥", label: "鏃犳晥" },
{ value: "浣滃簾", label: "浣滃簾" },
];
-const emit = defineEmits(["submitForm"]);
+const emit = defineEmits(["submitForm", "update:modelValue"]);
+const modelValue = ref([]);
const submit = async () => {
// 楠岃瘉琛ㄥ崟
if (!ruleFormRef.value) return;
@@ -109,15 +130,25 @@
if (!valid) {
return;
}
-
+ ruleForm.value.storageBlobDTO = modelValue.value; // 纭繚 ruleForm 鏄渶鏂扮殑
// 璋冪敤 API
- let res = await addOrEditArchive(ruleForm.value);
- console.log("API 鍝嶅簲:", res);
-
+ try {
+ const res = await addOrEditArchive(ruleForm.value);
+ ElMessage({
+ type: "success",
+ message: res.msg || "鎿嶄綔鎴愬姛",
+ });
+ emit("submitForm", res);
+ } catch (error) {
+ ElMessage({
+ type: "error",
+ message: error.msg || "鎿嶄綔澶辫触",
+ });
+ console.error("API 璋冪敤澶辫触:", error);
+ return;
+ }
// 鍙戦�� emit 浜嬩欢
- emit("submitForm", res);
- console.log("emit submitForm 宸插彂閫�");
-
+
// 鍏抽棴瀵硅瘽妗�
centerDialogVisible.value = false;
} catch (error) {
--
Gitblit v1.9.3