@@ -54,9 +54,9 @@
- {{ `${tag.name.slice(0, 5)}...` }}
+ {{ `${tag.name.slice(0, 5)}...` }}
- {{ tag.name }}
+ {{ tag.name }}
-
@@ -75,7 +75,7 @@
-
![]()
+
@@ -102,7 +102,7 @@ import TextOverTips from '@/components/text-over-tips';
import HoverImagePreview from '@/components/hover-image-preview';
import ImgLazyLoad from '@/components/img-lazy-load';
-import icon1 from '@/assets/img/media-account/icon-delete.png';
+// import icon1 from '@/assets/img/media-account/icon-delete.png';
import icon2 from '../../img/icon-no-text.png';
const emits = defineEmits(['sorterChange', 'delete', 'select', 'selectAll', 'edit']);
From fcacd6fc1c1dd89b2f847f3c7f428e93015200ce Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Mon, 22 Sep 2025 11:26:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?refactor(material-center):=20=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=8F=90=E4=BA=A4=E5=8A=A0=E8=BD=BD=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 `add-raw-material-drawer` 中添加了 `submitLoading` 状态，确保在提交过程中显示加载状态
- 在 `delete-file-modal` 中添加了 `loading` 状态，并更新了删除按钮的样式以显示加载状态
---
.../add-raw-material-drawer/index.vue | 37 +++++++++++--------
.../components/table/delete-file-modal.vue | 23 ++++++++----
2 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue b/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
index 26a803c..5fd8aa5 100644
--- a/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
+++ b/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
@@ -259,23 +259,28 @@ export default defineComponent({
};
const onConfirm = async () => {
- const hasUploading = uploadData.value.some((item) => item.uploadStatus === EnumUploadStatus.uploading);
- if (hasUploading) {
- modalRef.value = Modal.warning({
- title: '上传未完成',
- content:
当前原料正在上传中，关闭弹窗将导致上传失败，请等待上传完成后再点击“确定”
,
- okText: '我知道了',
- centered: true,
- });
- return;
- }
+ try {
+ submitLoading.value = true;
+ const hasUploading = uploadData.value.some((item) => item.uploadStatus === EnumUploadStatus.uploading);
+ if (hasUploading) {
+ modalRef.value = Modal.warning({
+ title: '上传未完成',
+ content:
当前原料正在上传中，关闭弹窗将导致上传失败，请等待上传完成后再点击“确定”
,
+ okText: '我知道了',
+ centered: true,
+ });
+ return;
+ }
- const raw_materials = uploadData.value.filter((item) => item.uploadStatus !== EnumUploadStatus.error);
- const { code } = await postBatchRawMaterial({ raw_materials });
- if (code === 200) {
- message.success('上传成功');
- emit('update');
- onClose();
+ const raw_materials = uploadData.value.filter((item) => item.uploadStatus !== EnumUploadStatus.error);
+ const { code } = await postBatchRawMaterial({ raw_materials });
+ if (code === 200) {
+ message.success('上传成功');
+ emit('update');
+ onClose();
+ }
+ } finally {
+ submitLoading.value = false;
}
};
const openDeleteModal = (file) => {
diff --git a/src/views/material-center/components/raw-material/components/table/delete-file-modal.vue b/src/views/material-center/components/raw-material/components/table/delete-file-modal.vue
index dac48bc..0cd0b56 100644
--- a/src/views/material-center/components/raw-material/components/table/delete-file-modal.vue
+++ b/src/views/material-center/components/raw-material/components/table/delete-file-modal.vue
@@ -6,7 +6,7 @@
@@ -24,12 +24,14 @@ const emits = defineEmits(['update', 'batchUpdate']);
const visible = ref(false);
const fileId = ref(null);
const fileName = ref('');
+const loading = ref(false);
const isBatch = computed(() => Array.isArray(fileId.value));
function onClose() {
visible.value = false;
fileId.value = null;
+ loading.value = false;
fileName.value = '';
}
@@ -42,14 +44,19 @@ const open = (record) => {
};
async function onDelete() {
- const _fn = isBatch.value ? batchDeleteRawMaterials : deleteRawMaterial;
- const _params = isBatch.value ? { ids: fileId.value } : fileId.value;
- const { code } = await _fn(_params);
- if (code === 200) {
- message.success('删除成功');
- isBatch.value ? emits('batchUpdate') : emits('update');
+ try {
+ loading.value = true;
+ const _fn = isBatch.value ? batchDeleteRawMaterials : deleteRawMaterial;
+ const _params = isBatch.value ? { ids: fileId.value } : fileId.value;
+ const { code } = await _fn(_params);
+ if (code === 200) {
+ message.success('删除成功');
+ isBatch.value ? emits('batchUpdate') : emits('update');
- onClose();
+ onClose();
+ }
+ } finally {
+ loading.value = false;
}
}
From cecca8ea1dbaf937991530f000aa6ef474780834 Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Mon, 22 Sep 2025 11:30:31 +0800
Subject: [PATCH 3/5] =?UTF-8?q?perf(material-center):=20=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=E9=95=BF=E5=BA=A6=E9=99=90?=
=?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../raw-material/components/add-raw-material-drawer/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue b/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
index 5fd8aa5..dfbddbd 100644
--- a/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
+++ b/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
@@ -410,7 +410,7 @@ export default defineComponent({
v-slots={{
tagRender: (val) => {
const { label, value } = val;
- if (label.length > 5) {
+ if (label.length > 4) {
return (
@@ -419,7 +419,7 @@ export default defineComponent({
onClose={() => (record.tag_ids = record.tag_ids.filter((item) => item !== value))}
class="mr-0 !color-#55585F h-20px !lh-20px !text-12px"
>
- {label.slice(0, 5) + '...'}
+ {label.slice(0, 3) + '...'}
From f493550bb44c37acc05a281aad7b0f2ee33f2f72 Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Mon, 22 Sep 2025 13:53:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?refactor(material-center):=20=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E6=A0=87=E7=AD=BE=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=E5=92=8C=E7=BB=84=E4=BB=B6=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/add-raw-material-drawer/index.vue | 12 +++++++-----
.../components/edit-raw-material-modal/index.vue | 9 +++++----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue b/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
index dfbddbd..f15ace5 100644
--- a/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
+++ b/src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
@@ -71,6 +71,7 @@ export default defineComponent({
};
const handleTagChange = (value, option, record) => {
+ // console.log('handleTagChange', value);
if (value.length < 6) {
record.tag_ids = value;
} else {
@@ -88,8 +89,8 @@ export default defineComponent({
return;
}
- if (record.tag_ids.length >= 5) {
- message.warning('最多选择5个');
+ if (record.tag_ids.length === 5) {
+ // message.warning('最多选择5个');
return;
}
@@ -103,7 +104,8 @@ export default defineComponent({
});
e.target.value = '';
- record.tag_ids = [...record.tag_ids, data.id];
+ record.tag_ids = record.tag_ids.filter((item) => item !== inputValue);
+ record.tag_ids.push(data.id);
}
} catch (error) {
message.error('添加标签失败');
@@ -260,7 +262,6 @@ export default defineComponent({
const onConfirm = async () => {
try {
- submitLoading.value = true;
const hasUploading = uploadData.value.some((item) => item.uploadStatus === EnumUploadStatus.uploading);
if (hasUploading) {
modalRef.value = Modal.warning({
@@ -272,6 +273,7 @@ export default defineComponent({
return;
}
+ submitLoading.value = true;
const raw_materials = uploadData.value.filter((item) => item.uploadStatus !== EnumUploadStatus.error);
const { code } = await postBatchRawMaterial({ raw_materials });
if (code === 200) {
@@ -387,7 +389,7 @@ export default defineComponent({
openDeleteModal(record)}
/>