From dbf8f8f05d40ed25c5a04fe7e9dce3fcbbab11dc Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Thu, 10 Apr 2025 14:42:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E9=BB=98=E8=AE=A4=E5=80=BC=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/finance/supplierBill/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/finance/supplierBill/index.vue b/src/views/finance/supplierBill/index.vue index d4c0edd..582cfc2 100644 --- a/src/views/finance/supplierBill/index.vue +++ b/src/views/finance/supplierBill/index.vue @@ -21,16 +21,16 @@
账单总金额（全部/本月）
-
{{ state.summaryData.amountPayable }} / {{ state.summaryData.mouthAmountPayable }}
+
{{ state.summaryData.amountPayable || 0 }} / {{ state.summaryData.mouthAmountPayable || 0 }}
已付款总金额（全部/本月）
-
{{ state.summaryData.actualPaymentAmount }} / {{ state.summaryData.mouthActualPaymentAmount }}
+
{{ state.summaryData.actualPaymentAmount || 0 }} / {{ state.summaryData.mouthActualPaymentAmount || 0 }}
未付款总金额（全部/本月）
-
{{ state.summaryData.unPaidAmount }} / {{ state.summaryData.mouthUnPaidAmount }}
+
{{ state.summaryData.unPaidAmount || 0 }} / {{ state.summaryData.mouthUnPaidAmount || 0 }}
 From 8746ebd8c37cee9a96090a887fcc890952984d2b Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Thu, 10 Apr 2025 16:01:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=80=97=E6=9D=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=AD=E5=90=8E=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E9=87=8D=E7=BD=AE=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E5=86=8D=E6=AC=A1=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/consumables/components/add-haocai.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/inventory/consumables/components/add-haocai.vue b/src/views/inventory/consumables/components/add-haocai.vue index 224e90c..31988ad 100644 --- a/src/views/inventory/consumables/components/add-haocai.vue +++ b/src/views/inventory/consumables/components/add-haocai.vue @@ -40,7 +40,7 @@ - + @@ -100,6 +100,8 @@ const basicForm = { conUnit: "", price: undefined, conWarning: undefined, + id: "", + isStock: 1, }; const forms = ref([{ ...basicForm }]); const form = reactive({ @@ -175,7 +177,7 @@ async function submitForms() { } } function reset() { - console.log("reset"); + refform.value.resetFields(); Object.assign(form, basicForm); console.log(form); } From 63aec0761712079c0ba8025101a398e65327dc88 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Thu, 10 Apr 2025 16:42:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0decimal=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E8=AE=A1=E7=AE=97=E5=BA=93=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E4=BD=8D=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/views/inventory/operation_in/index.vue | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2143d7d..aee93eb 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "codemirror": "^5.65.18", "codemirror-editor-vue3": "^2.8.0", "dayjs": "^1.11.13", + "decimal.js": "^10.5.0", "default-passive-events": "^2.0.0", "echarts": "^5.6.0", "element-plus": "^2.9.3", diff --git a/src/views/inventory/operation_in/index.vue b/src/views/inventory/operation_in/index.vue index a830e73..16263cd 100644 --- a/src/views/inventory/operation_in/index.vue +++ b/src/views/inventory/operation_in/index.vue @@ -226,7 +226,7 @@