From 1c0f01cc462d37e146c34127d2883ca51e26d508 Mon Sep 17 00:00:00 2001 From: 曹睿 <360930172@qq.com> Date: 星期二, 24 六月 2025 17:12:32 +0800 Subject: [PATCH] fix: 修复PIMTable不支持懒加载问题。修复【来票登记】金额格式化显示NaN问题。 style: 重构来票登记页面。 feat: 完善文件上传组件功能。【来票台账】底部添加合计。【来票登记】添加上传附件 --- src/components/FileUpload/index.vue | 144 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 106 insertions(+), 38 deletions(-) diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 2ad850b..e39a6ed 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -5,6 +5,7 @@ :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" + :data="data" :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed" @@ -21,18 +22,40 @@ <!-- 涓婁紶鎻愮ず --> <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 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"> + <transition-group + 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> </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="handleDelete(index)" + type="danger" + v-if="!disabled" + > 鍒犻櫎</el-link + > </div> </li> </transition-group> @@ -41,34 +64,49 @@ <script setup> import { getToken } from "@/utils/auth"; +import Sortable from "sortablejs"; const props = defineProps({ modelValue: [String, Object, Array], + // 涓婁紶鎺ュ彛鍦板潃 + action: { + type: String, + default: "/common/upload", + }, + // 涓婁紶鎼哄甫鐨勫弬鏁� + data: { + 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, + }, }); const { proxy } = getCurrentInstance(); @@ -76,47 +114,53 @@ 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 + "/common/upload"); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧� +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) ); -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; + }); + } else { + fileList.value = []; + return []; + } + }, + { deep: true, immediate: true } +); // 涓婁紶鍓嶆牎妫�鏍煎紡鍜屽ぇ灏� function handleBeforeUpload(file) { // 鏍℃鏂囦欢绫诲瀷 if (props.fileType.length) { - const fileName = file.name.split('.'); + const fileName = file.name.split("."); const fileExt = fileName[fileName.length - 1]; const isTypeOk = props.fileType.indexOf(fileExt) >= 0; if (!isTypeOk) { - proxy.$modal.msgError(`鏂囦欢鏍煎紡涓嶆纭紝璇蜂笂浼�${props.fileType.join("/")}鏍煎紡鏂囦欢!`); + proxy.$modal.msgError( + `鏂囦欢鏍煎紡涓嶆纭紝璇蜂笂浼�${props.fileType.join("/")}鏍煎紡鏂囦欢!` + ); return false; } } // 鏍℃鏂囦欢鍚嶆槸鍚﹀寘鍚壒娈婂瓧绗� - if (file.name.includes(',')) { - proxy.$modal.msgError('鏂囦欢鍚嶄笉姝g‘锛屼笉鑳藉寘鍚嫳鏂囬�楀彿!'); + if (file.name.includes(",")) { + proxy.$modal.msgError("鏂囦欢鍚嶄笉姝g‘锛屼笉鑳藉寘鍚嫳鏂囬�楀彿!"); return false; } // 鏍℃鏂囦欢澶у皬 @@ -140,6 +184,7 @@ // 涓婁紶澶辫触 function handleUploadError(err) { proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触"); + proxy.$modal.closeLoading(); } // 涓婁紶鎴愬姛鍥炶皟 @@ -165,7 +210,9 @@ // 涓婁紶缁撴潫澶勭悊 function uploadedSuccessfully() { if (number.value > 0 && uploadList.value.length === number.value) { - fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value); + fileList.value = fileList.value + .filter((f) => f.url !== undefined) + .concat(uploadList.value); uploadList.value = []; number.value = 0; emit("update:modelValue", listToString(fileList.value)); @@ -192,11 +239,31 @@ strs += list[i].url + separator; } } - return strs != '' ? strs.substr(0, strs.length - 1) : ''; + return strs != "" ? strs.substr(0, strs.length - 1) : ""; } -</script> +// 鍒濆鍖栨嫋鎷芥帓搴� +onMounted(() => { + if (props.drag) { + nextTick(() => { + const element = document.querySelector(".upload-file-list"); + Sortable.create(element, { + 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)); + }, + }); + }); + } +}); +</script> <style scoped lang="scss"> +.file-upload-darg { + opacity: 0.5; + background: #c8ebfb; +} .upload-file-uploader { margin-bottom: 5px; } @@ -205,6 +272,7 @@ line-height: 2; margin-bottom: 10px; position: relative; + transition: none !important; } .upload-file-list .ele-upload-list__item-content { display: flex; -- Gitblit v1.9.3