From 5a4e3dd3ceedfba25426f469c7c7cd1a024348c3 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 28 Feb 2025 14:21:49 +0800 Subject: [PATCH 1/6] 11 --- src/views/wallet/wallet-qb/index.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue index 4dfd118..f8f9ae5 100644 --- a/src/views/wallet/wallet-qb/index.vue +++ b/src/views/wallet/wallet-qb/index.vue @@ -17,8 +17,8 @@ - - + + - - - {{ $t("common.queryBtn") }} {{ $t("common.resetBtn") }} From 6389f1ed1ca8f14f3f639ad74a9975e7e7783fff Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 28 Feb 2025 14:27:10 +0800 Subject: [PATCH 2/6] 111 --- src/views/wallet/wallet-qb/index.vue | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue index f8f9ae5..81bfed5 100644 --- a/src/views/wallet/wallet-qb/index.vue +++ b/src/views/wallet/wallet-qb/index.vue @@ -94,23 +94,18 @@
{{ displayPrice(row.balance) }}
- - - - - - - + + + @@ -162,7 +157,7 @@ const resetQuery = () => { // 导出excel const exportExcel = () => { postDownBlobFile( - "/wallet/wallet-manage/export", + "/wallet/wallet-manage/export-qb", Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }), "walletManage.xlsx", ) @@ -170,7 +165,7 @@ const exportExcel = () => { const getSummaries = (param: any) => { const { columns, data } = param - const totalColumns = ["balance", "totalExpense", "totalRecharge"] + const totalColumns = ["balance"] const totalRow = Array.from({ length: columns.length }) columns.forEach((i: any, index: number) => { if (totalColumns.includes(i.property)) { From d97d3b10367af994281f35f67f7219b9a42431d4 Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 28 Feb 2025 14:30:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=92=B1=E5=8C=85=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wallet/wallet-qb/index.vue | 40 ++-------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue index 4dfd118..af6056a 100644 --- a/src/views/wallet/wallet-qb/index.vue +++ b/src/views/wallet/wallet-qb/index.vue @@ -52,7 +52,7 @@ { postDownBlobFile( "/wallet/wallet-manage/export", Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }), - "walletManage.xlsx", + "wallet_walletRecord.xlsx", ) } @@ -218,39 +218,3 @@ const handleDelete = async (ids: string[]) => { } } - - From 2ac2e906ca0c9be0738d63bb3d7c6ea94a331aec Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 28 Feb 2025 14:36:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=87=8D=E7=BD=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hard/hard-order/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index 952a09e..ade84b7 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -295,7 +295,7 @@ const resetQuery = () => { selectObjs.value = [] state.queryForm.deptId = "" state.queryForm.deptIds = [] - draggableDepTreeRef.value.resetData() + // draggableDepTreeRef.value.resetData() getDataList() } From 9ccdfc2a12e2d2b3c06918dcffb59bbdebba5f3b Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 28 Feb 2025 15:08:09 +0800 Subject: [PATCH 5/6] 111 --- src/views/wallet/wallet-xf/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue index 2d5bdac..5fdc020 100644 --- a/src/views/wallet/wallet-xf/index.vue +++ b/src/views/wallet/wallet-xf/index.vue @@ -17,6 +17,9 @@ + + + From cf76c556909b0aadadbb6beda46a1cfb10d5633e Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 28 Feb 2025 18:23:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8C=85=E8=A3=85=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/supermarketAuxiliaryCode.vue | 26 ++++++++++++++++--- .../components/supermarketUnit.vue | 2 +- .../supermarketerp/supermarketSpu/form.vue | 7 +++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue index e5dfa19..f9c80b5 100644 --- a/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue +++ b/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue @@ -31,9 +31,22 @@ > - + + + + + @@ -47,20 +60,27 @@ const supermarketAuxiliaryCodeEntityList = defineModel("supermarketAuxiliaryCode default: [ { id: nanoid(5), + unit: "", barCode: "", }, ], }) +defineProps<{ + smErpUnitEntityList: any[] +}>() + const editableTableRef = ref() const validRules = { - barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }], + unit: [{ required: true, message: "包装单位不能为空", trigger: "blur" }], + // barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }], } // 底部表格行新增 const pushEvent = () => { const newRow: any = { id: nanoid(5), + unit: "", barCode: "", isNew: true, } diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue index cb7a348..038ff39 100644 --- a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue +++ b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue @@ -59,7 +59,7 @@ - +