From 2e397a2c6491b37a269ac4013f8a5bf86da031a6 Mon Sep 17 00:00:00 2001 From: XuZhiqiang Date: Fri, 19 Jun 2026 00:07:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix(workspace):=20=E7=BB=9F=E4=B8=80=20ERP?= =?UTF-8?q?=20=E9=87=91=E9=A2=9D=E6=9B=B4=E6=96=B0=E4=BA=8B=E4=BB=B6=20emi?= =?UTF-8?q?t=20=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/erp/finance/payment/modules/item-form.vue | 8 ++++---- .../views/erp/finance/receipt/modules/item-form.vue | 8 ++++---- .../src/views/erp/purchase/in/modules/item-form.vue | 12 ++++++------ .../views/erp/purchase/order/modules/item-form.vue | 8 ++++---- .../views/erp/purchase/return/modules/item-form.vue | 12 ++++++------ .../src/views/erp/sale/order/modules/item-form.vue | 8 ++++---- .../src/views/erp/sale/out/modules/item-form.vue | 12 ++++++------ .../src/views/erp/sale/return/modules/item-form.vue | 12 ++++++------ .../views/erp/finance/payment/modules/item-form.vue | 8 ++++---- .../views/erp/finance/receipt/modules/item-form.vue | 8 ++++---- .../src/views/erp/purchase/in/modules/item-form.vue | 12 ++++++------ .../views/erp/purchase/order/modules/item-form.vue | 8 ++++---- .../views/erp/purchase/return/modules/item-form.vue | 12 ++++++------ .../src/views/erp/sale/order/modules/item-form.vue | 8 ++++---- .../src/views/erp/sale/out/modules/item-form.vue | 12 ++++++------ .../src/views/erp/sale/return/modules/item-form.vue | 12 ++++++------ .../views/erp/finance/payment/modules/item-form.vue | 8 ++++---- .../views/erp/finance/receipt/modules/item-form.vue | 8 ++++---- .../src/views/erp/purchase/in/modules/item-form.vue | 12 ++++++------ .../views/erp/purchase/order/modules/item-form.vue | 8 ++++---- .../views/erp/purchase/return/modules/item-form.vue | 12 ++++++------ .../src/views/erp/sale/order/modules/item-form.vue | 8 ++++---- .../src/views/erp/sale/out/modules/item-form.vue | 12 ++++++------ .../src/views/erp/sale/return/modules/item-form.vue | 12 ++++++------ 24 files changed, 120 insertions(+), 120 deletions(-) diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue b/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue index 3b2289bb7..777d702db 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:total-price', - 'update:payment-price', + 'update:totalPrice', + 'update:paymentPrice', ]); const tableData = ref([]); // 表格数据 @@ -110,8 +110,8 @@ watch( ); const finalPaymentPrice = paymentPrice - (props.discountPrice || 0); // 通知父组件更新 - emit('update:total-price', totalPrice); - emit('update:payment-price', finalPaymentPrice); + emit('update:totalPrice', totalPrice); + emit('update:paymentPrice', finalPaymentPrice); }, { deep: true }, ); diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue index 5563f5252..be48f695a 100644 --- a/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:total-price', - 'update:receipt-price', + 'update:totalPrice', + 'update:receiptPrice', ]); const tableData = ref([]); // 表格数据 @@ -110,8 +110,8 @@ watch( ); const finalReceiptPrice = receiptPrice - (props.discountPrice || 0); // 通知父组件更新 - emit('update:total-price', totalPrice); - emit('update:receipt-price', finalReceiptPrice); + emit('update:totalPrice', totalPrice); + emit('update:receiptPrice', finalReceiptPrice); }, { deep: true }, ); diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue b/apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue index 81f33b230..d53b4fe7f 100644 --- a/apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/purchase/in/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antd/src/views/erp/purchase/order/modules/item-form.vue b/apps/web-antd/src/views/erp/purchase/order/modules/item-form.vue index 106ebd322..98eb5a413 100644 --- a/apps/web-antd/src/views/erp/purchase/order/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/purchase/order/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:total-price', + 'update:discountPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -113,8 +113,8 @@ watch( : erpPriceMultiply(totalPrice, props.discountPercent / 100); const finalTotalPrice = totalPrice - discountPrice!; // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/item-form.vue b/apps/web-antd/src/views/erp/purchase/return/modules/item-form.vue index afa352131..93413dfa3 100644 --- a/apps/web-antd/src/views/erp/purchase/return/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/purchase/return/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antd/src/views/erp/sale/order/modules/item-form.vue b/apps/web-antd/src/views/erp/sale/order/modules/item-form.vue index a9f9c8a27..f167080b0 100644 --- a/apps/web-antd/src/views/erp/sale/order/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/sale/order/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:total-price', + 'update:discountPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -113,8 +113,8 @@ watch( : erpPriceMultiply(totalPrice, props.discountPercent / 100); const finalTotalPrice = totalPrice - discountPrice!; // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antd/src/views/erp/sale/out/modules/item-form.vue b/apps/web-antd/src/views/erp/sale/out/modules/item-form.vue index 5b03eeb69..b451f7a90 100644 --- a/apps/web-antd/src/views/erp/sale/out/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/sale/out/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antd/src/views/erp/sale/return/modules/item-form.vue b/apps/web-antd/src/views/erp/sale/return/modules/item-form.vue index dcf559394..f345f1fb9 100644 --- a/apps/web-antd/src/views/erp/sale/return/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/sale/return/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antdv-next/src/views/erp/finance/payment/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/finance/payment/modules/item-form.vue index 61cab62a3..47d356a7f 100644 --- a/apps/web-antdv-next/src/views/erp/finance/payment/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/finance/payment/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:total-price', - 'update:payment-price', + 'update:totalPrice', + 'update:paymentPrice', ]); const tableData = ref([]); // 表格数据 @@ -110,8 +110,8 @@ watch( ); const finalPaymentPrice = paymentPrice - (props.discountPrice || 0); // 通知父组件更新 - emit('update:total-price', totalPrice); - emit('update:payment-price', finalPaymentPrice); + emit('update:totalPrice', totalPrice); + emit('update:paymentPrice', finalPaymentPrice); }, { deep: true }, ); diff --git a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/item-form.vue index 6f32c4d6c..4491b51e0 100644 --- a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:total-price', - 'update:receipt-price', + 'update:totalPrice', + 'update:receiptPrice', ]); const tableData = ref([]); // 表格数据 @@ -110,8 +110,8 @@ watch( ); const finalReceiptPrice = receiptPrice - (props.discountPrice || 0); // 通知父组件更新 - emit('update:total-price', totalPrice); - emit('update:receipt-price', finalReceiptPrice); + emit('update:totalPrice', totalPrice); + emit('update:receiptPrice', finalReceiptPrice); }, { deep: true }, ); diff --git a/apps/web-antdv-next/src/views/erp/purchase/in/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/purchase/in/modules/item-form.vue index c720ea3bd..683a1880e 100644 --- a/apps/web-antdv-next/src/views/erp/purchase/in/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/purchase/in/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antdv-next/src/views/erp/purchase/order/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/purchase/order/modules/item-form.vue index f2f5aa143..c409d0413 100644 --- a/apps/web-antdv-next/src/views/erp/purchase/order/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/purchase/order/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:total-price', + 'update:discountPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -113,8 +113,8 @@ watch( : erpPriceMultiply(totalPrice, props.discountPercent / 100); const finalTotalPrice = totalPrice - discountPrice!; // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antdv-next/src/views/erp/purchase/return/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/purchase/return/modules/item-form.vue index d56218a49..349910f27 100644 --- a/apps/web-antdv-next/src/views/erp/purchase/return/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/purchase/return/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antdv-next/src/views/erp/sale/order/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/sale/order/modules/item-form.vue index b1dc708e8..95c722035 100644 --- a/apps/web-antdv-next/src/views/erp/sale/order/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/sale/order/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:total-price', + 'update:discountPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -113,8 +113,8 @@ watch( : erpPriceMultiply(totalPrice, props.discountPercent / 100); const finalTotalPrice = totalPrice - discountPrice!; // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antdv-next/src/views/erp/sale/out/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/sale/out/modules/item-form.vue index 80f4b832c..42af1d4b2 100644 --- a/apps/web-antdv-next/src/views/erp/sale/out/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/sale/out/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-antdv-next/src/views/erp/sale/return/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/sale/return/modules/item-form.vue index d67376843..94946bd61 100644 --- a/apps/web-antdv-next/src/views/erp/sale/return/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/sale/return/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/item-form.vue b/apps/web-ele/src/views/erp/finance/payment/modules/item-form.vue index c22e49f83..8314d48e7 100644 --- a/apps/web-ele/src/views/erp/finance/payment/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/finance/payment/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:total-price', - 'update:payment-price', + 'update:totalPrice', + 'update:paymentPrice', ]); const tableData = ref([]); // 表格数据 @@ -110,8 +110,8 @@ watch( ); const finalPaymentPrice = paymentPrice - (props.discountPrice || 0); // 通知父组件更新 - emit('update:total-price', totalPrice); - emit('update:payment-price', finalPaymentPrice); + emit('update:totalPrice', totalPrice); + emit('update:paymentPrice', finalPaymentPrice); }, { deep: true }, ); diff --git a/apps/web-ele/src/views/erp/finance/receipt/modules/item-form.vue b/apps/web-ele/src/views/erp/finance/receipt/modules/item-form.vue index 1226cad4b..09fe4b03e 100644 --- a/apps/web-ele/src/views/erp/finance/receipt/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/finance/receipt/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:total-price', - 'update:receipt-price', + 'update:totalPrice', + 'update:receiptPrice', ]); const tableData = ref([]); // 表格数据 @@ -110,8 +110,8 @@ watch( ); const finalReceiptPrice = receiptPrice - (props.discountPrice || 0); // 通知父组件更新 - emit('update:total-price', totalPrice); - emit('update:receipt-price', finalReceiptPrice); + emit('update:totalPrice', totalPrice); + emit('update:receiptPrice', finalReceiptPrice); }, { deep: true }, ); diff --git a/apps/web-ele/src/views/erp/purchase/in/modules/item-form.vue b/apps/web-ele/src/views/erp/purchase/in/modules/item-form.vue index 6ec8a500c..b6ce46521 100644 --- a/apps/web-ele/src/views/erp/purchase/in/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/purchase/in/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-ele/src/views/erp/purchase/order/modules/item-form.vue b/apps/web-ele/src/views/erp/purchase/order/modules/item-form.vue index 0d32f3a62..9d1e89f23 100644 --- a/apps/web-ele/src/views/erp/purchase/order/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/purchase/order/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:total-price', + 'update:discountPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -113,8 +113,8 @@ watch( : erpPriceMultiply(totalPrice, props.discountPercent / 100); const finalTotalPrice = totalPrice - discountPrice!; // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-ele/src/views/erp/purchase/return/modules/item-form.vue b/apps/web-ele/src/views/erp/purchase/return/modules/item-form.vue index 93e24edd9..5cefbf2f1 100644 --- a/apps/web-ele/src/views/erp/purchase/return/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/purchase/return/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-ele/src/views/erp/sale/order/modules/item-form.vue b/apps/web-ele/src/views/erp/sale/order/modules/item-form.vue index 0a0aef785..904230910 100644 --- a/apps/web-ele/src/views/erp/sale/order/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/sale/order/modules/item-form.vue @@ -32,8 +32,8 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:total-price', + 'update:discountPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -113,8 +113,8 @@ watch( : erpPriceMultiply(totalPrice, props.discountPercent / 100); const finalTotalPrice = totalPrice - discountPrice!; // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-ele/src/views/erp/sale/out/modules/item-form.vue b/apps/web-ele/src/views/erp/sale/out/modules/item-form.vue index 3ec5996b3..60581f8e1 100644 --- a/apps/web-ele/src/views/erp/sale/out/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/sale/out/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); diff --git a/apps/web-ele/src/views/erp/sale/return/modules/item-form.vue b/apps/web-ele/src/views/erp/sale/return/modules/item-form.vue index 3e169a983..3c70bc686 100644 --- a/apps/web-ele/src/views/erp/sale/return/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/sale/return/modules/item-form.vue @@ -34,9 +34,9 @@ const props = withDefaults(defineProps(), { const emit = defineEmits([ 'update:items', - 'update:discount-price', - 'update:other-price', - 'update:total-price', + 'update:discountPrice', + 'update:otherPrice', + 'update:totalPrice', ]); const tableData = ref([]); // 表格数据 @@ -122,9 +122,9 @@ watch( const finalTotalPrice = discountedPrice + (props.otherPrice || 0); // 通知父组件更新 - emit('update:discount-price', discountPrice); - emit('update:other-price', props.otherPrice || 0); - emit('update:total-price', finalTotalPrice); + emit('update:discountPrice', discountPrice); + emit('update:otherPrice', props.otherPrice || 0); + emit('update:totalPrice', finalTotalPrice); }, { deep: true }, ); From e1731f539472d214721b87bb4bea50e7be0e632c Mon Sep 17 00:00:00 2001 From: XuZhiqiang Date: Fri, 19 Jun 2026 00:18:56 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix(workspace):=20=E4=BF=AE=E5=A4=8D=20ERP?= =?UTF-8?q?=20=E6=98=8E=E7=BB=86=E8=8D=89=E7=A8=BF=E5=92=8C=E6=94=B6?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E9=87=91=E9=A2=9D=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web-antd/src/api/erp/purchase/in/index.ts | 1 + .../src/api/erp/purchase/order/index.ts | 1 + .../src/api/erp/purchase/return/index.ts | 2 ++ apps/web-antd/src/api/erp/sale/order/index.ts | 1 + apps/web-antd/src/api/erp/sale/out/index.ts | 2 ++ .../web-antd/src/api/erp/sale/return/index.ts | 2 ++ .../web-antd/src/api/erp/stock/check/index.ts | 1 + apps/web-antd/src/api/erp/stock/in/index.ts | 11 ++++---- apps/web-antd/src/api/erp/stock/move/index.ts | 1 + apps/web-antd/src/api/erp/stock/out/index.ts | 1 + .../erp/finance/payment/modules/item-form.vue | 26 +++++++++-------- .../erp/finance/receipt/modules/item-form.vue | 28 ++++++++++--------- .../src/api/erp/purchase/in/index.ts | 1 + .../src/api/erp/purchase/order/index.ts | 1 + .../src/api/erp/purchase/return/index.ts | 2 ++ .../src/api/erp/sale/order/index.ts | 1 + .../src/api/erp/sale/out/index.ts | 2 ++ .../src/api/erp/sale/return/index.ts | 2 ++ .../src/api/erp/stock/check/index.ts | 1 + .../src/api/erp/stock/in/index.ts | 11 ++++---- .../src/api/erp/stock/move/index.ts | 1 + .../src/api/erp/stock/out/index.ts | 1 + .../erp/finance/payment/modules/item-form.vue | 26 +++++++++-------- .../erp/finance/receipt/modules/item-form.vue | 28 ++++++++++--------- apps/web-ele/src/api/erp/purchase/in/index.ts | 1 + .../src/api/erp/purchase/order/index.ts | 1 + .../src/api/erp/purchase/return/index.ts | 3 +- apps/web-ele/src/api/erp/sale/order/index.ts | 1 + apps/web-ele/src/api/erp/sale/out/index.ts | 2 ++ apps/web-ele/src/api/erp/sale/return/index.ts | 2 ++ apps/web-ele/src/api/erp/stock/check/index.ts | 1 + apps/web-ele/src/api/erp/stock/in/index.ts | 11 ++++---- apps/web-ele/src/api/erp/stock/move/index.ts | 1 + apps/web-ele/src/api/erp/stock/out/index.ts | 1 + .../erp/finance/payment/modules/item-form.vue | 27 ++++++++++-------- .../erp/finance/receipt/modules/item-form.vue | 27 ++++++++++-------- 36 files changed, 144 insertions(+), 88 deletions(-) diff --git a/apps/web-antd/src/api/erp/purchase/in/index.ts b/apps/web-antd/src/api/erp/purchase/in/index.ts index 060e1bcb8..df23762ad 100644 --- a/apps/web-antd/src/api/erp/purchase/in/index.ts +++ b/apps/web-antd/src/api/erp/purchase/in/index.ts @@ -28,6 +28,7 @@ export namespace ErpPurchaseInApi { export interface PurchaseInItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-antd/src/api/erp/purchase/order/index.ts b/apps/web-antd/src/api/erp/purchase/order/index.ts index e59dcf68e..66954dc08 100644 --- a/apps/web-antd/src/api/erp/purchase/order/index.ts +++ b/apps/web-antd/src/api/erp/purchase/order/index.ts @@ -34,6 +34,7 @@ export namespace ErpPurchaseOrderApi { /** 采购订单项信息 */ export interface PurchaseOrderItem { id?: number; // 订单项编号 + seq?: number; // 前端行号 orderId?: number; // 采购订单编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-antd/src/api/erp/purchase/return/index.ts b/apps/web-antd/src/api/erp/purchase/return/index.ts index 315ceeadb..3e1a26739 100644 --- a/apps/web-antd/src/api/erp/purchase/return/index.ts +++ b/apps/web-antd/src/api/erp/purchase/return/index.ts @@ -11,6 +11,7 @@ export namespace ErpPurchaseReturnApi { returnTime?: Date; // 退货时间 totalCount?: number; // 合计数量 totalPrice: number; // 合计金额，单位：元 + refundPrice?: number; // 已退款金额，单位：元 discountPercent?: number; // 折扣百分比 discountPrice?: number; // 折扣金额 status?: number; // 状态 @@ -24,6 +25,7 @@ export namespace ErpPurchaseReturnApi { export interface PurchaseReturnItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-antd/src/api/erp/sale/order/index.ts b/apps/web-antd/src/api/erp/sale/order/index.ts index c190a3dc1..ec46d9fbf 100644 --- a/apps/web-antd/src/api/erp/sale/order/index.ts +++ b/apps/web-antd/src/api/erp/sale/order/index.ts @@ -28,6 +28,7 @@ export namespace ErpSaleOrderApi { /** 销售订单项 */ export interface SaleOrderItem { id?: number; // 订单项编号 + seq?: number; // 前端行号 orderId?: number; // 采购订单编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-antd/src/api/erp/sale/out/index.ts b/apps/web-antd/src/api/erp/sale/out/index.ts index a3e335af6..85f5a6686 100644 --- a/apps/web-antd/src/api/erp/sale/out/index.ts +++ b/apps/web-antd/src/api/erp/sale/out/index.ts @@ -12,6 +12,7 @@ export namespace ErpSaleOutApi { outTime?: Date; // 出库时间 totalCount?: number; // 合计数量 totalPrice?: number; // 合计金额，单位：元 + receiptPrice?: number; // 已收款金额，单位：元 status?: number; // 状态 remark?: string; // 备注 discountPercent?: number; // 折扣百分比 @@ -28,6 +29,7 @@ export namespace ErpSaleOutApi { export interface SaleOutItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-antd/src/api/erp/sale/return/index.ts b/apps/web-antd/src/api/erp/sale/return/index.ts index a0624cba2..18af37581 100644 --- a/apps/web-antd/src/api/erp/sale/return/index.ts +++ b/apps/web-antd/src/api/erp/sale/return/index.ts @@ -11,6 +11,7 @@ export namespace ErpSaleReturnApi { returnTime?: Date; // 退货时间 totalCount?: number; // 合计数量 totalPrice?: number; // 合计金额，单位：元 + refundPrice?: number; // 已退款金额，单位：元 status?: number; // 状态 remark?: string; // 备注 discountPercent?: number; // 折扣百分比 @@ -27,6 +28,7 @@ export namespace ErpSaleReturnApi { export interface SaleReturnItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-antd/src/api/erp/stock/check/index.ts b/apps/web-antd/src/api/erp/stock/check/index.ts index b6f9d0bea..c67ea62b1 100644 --- a/apps/web-antd/src/api/erp/stock/check/index.ts +++ b/apps/web-antd/src/api/erp/stock/check/index.ts @@ -21,6 +21,7 @@ export namespace ErpStockCheckApi { /** 库存盘点项 */ export interface StockCheckItem { id?: number; // 编号 + seq?: number; // 前端行号 warehouseId?: number; // 仓库编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-antd/src/api/erp/stock/in/index.ts b/apps/web-antd/src/api/erp/stock/in/index.ts index e68c05b36..b6e4a50ef 100644 --- a/apps/web-antd/src/api/erp/stock/in/index.ts +++ b/apps/web-antd/src/api/erp/stock/in/index.ts @@ -23,15 +23,16 @@ export namespace ErpStockInApi { /** 其它入库单产品信息 */ export interface StockInItem { id?: number; // 编号 - warehouseId: number; // 仓库编号 - productId: number; // 产品编号 + seq?: number; // 前端行号 + warehouseId?: number; // 仓库编号 + productId?: number; // 产品编号 productName?: string; // 产品名称 productUnitId?: number; // 产品单位编号 productUnitName?: string; // 产品单位名称 productBarCode?: string; // 产品条码 - count: number; // 数量 - productPrice: number; // 产品单价 - totalPrice: number; // 总价 + count?: number; // 数量 + productPrice?: number; // 产品单价 + totalPrice?: number; // 总价 stockCount?: number; // 库存数量 remark?: string; // 备注 } diff --git a/apps/web-antd/src/api/erp/stock/move/index.ts b/apps/web-antd/src/api/erp/stock/move/index.ts index 0120a9b45..aaf09b22f 100644 --- a/apps/web-antd/src/api/erp/stock/move/index.ts +++ b/apps/web-antd/src/api/erp/stock/move/index.ts @@ -26,6 +26,7 @@ export namespace ErpStockMoveApi { count: number; // 数量 fromWarehouseId?: number; // 来源仓库ID id?: number; // ID + seq?: number; // 前端行号 productBarCode: string; // 产品条形码 productId?: number; // 产品ID productName?: string; // 产品名称 diff --git a/apps/web-antd/src/api/erp/stock/out/index.ts b/apps/web-antd/src/api/erp/stock/out/index.ts index 1ecb89233..94588e1bb 100644 --- a/apps/web-antd/src/api/erp/stock/out/index.ts +++ b/apps/web-antd/src/api/erp/stock/out/index.ts @@ -20,6 +20,7 @@ export namespace ErpStockOutApi { /** 其它出库单产品信息 */ export interface StockOutItem { id?: number; // 编号 + seq?: number; // 前端行号 warehouseId?: number; // 仓库编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue b/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue index 777d702db..3aadbe5fd 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/item-form.vue @@ -128,13 +128,15 @@ const handleOpenPurchaseIn = () => { const handleAddPurchaseIn = (rows: ErpPurchaseInApi.PurchaseIn[]) => { rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const paidPrice = row.paymentPrice ?? 0; const newItem: ErpFinancePaymentApi.FinancePaymentItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.PURCHASE_IN, - bizNo: row.no, - totalPrice: row.totalPrice, - paidPrice: row.paymentPrice, - paymentPrice: row.totalPrice - row.paymentPrice, + bizNo: row.no ?? '', + totalPrice, + paidPrice, + paymentPrice: totalPrice - paidPrice, remark: undefined, }; tableData.value.push(newItem); @@ -154,13 +156,15 @@ const handleOpenSaleReturn = () => { const handleAddSaleReturn = (rows: ErpPurchaseReturnApi.PurchaseReturn[]) => { rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const refundPrice = row.refundPrice ?? 0; const newItem: ErpFinancePaymentApi.FinancePaymentItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.PURCHASE_RETURN, - bizNo: row.no, - totalPrice: -row.totalPrice, - paidPrice: -row.refundPrice, - paymentPrice: -row.totalPrice + row.refundPrice, + bizNo: row.no ?? '', + totalPrice: -totalPrice, + paidPrice: -refundPrice, + paymentPrice: -totalPrice + refundPrice, remark: undefined, }; tableData.value.push(newItem); @@ -202,7 +206,7 @@ const validate = () => { // 检查每行的付款金额 for (let i = 0; i < tableData.value.length; i++) { const item = tableData.value[i]; - if (!item.paymentPrice || item.paymentPrice <= 0) { + if (!item?.paymentPrice || item.paymentPrice <= 0) { throw new Error(`第 ${i + 1} 行：本次付款必须大于0`); } } diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue index be48f695a..1ec800ab5 100644 --- a/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue +++ b/apps/web-antd/src/views/erp/finance/receipt/modules/item-form.vue @@ -128,14 +128,15 @@ function handleOpenSaleOut() { function handleAddSaleOut(rows: ErpSaleOutApi.SaleOut[]) { rows.forEach((row) => { - // TODO 芋艿 + const totalPrice = row.totalPrice ?? 0; + const receiptedPrice = row.receiptPrice ?? 0; const newItem: ErpFinanceReceiptApi.FinanceReceiptItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.SALE_OUT, - bizNo: row.no, - totalPrice: row.totalPrice, - receiptedPrice: row.receiptPrice, - receiptPrice: row.totalPrice - row.receiptPrice, + bizNo: row.no ?? '', + totalPrice, + receiptedPrice, + receiptPrice: totalPrice - receiptedPrice, remark: undefined, }; tableData.value.push(newItem); @@ -154,15 +155,16 @@ function handleOpenSaleReturn() { } function handleAddSaleReturn(rows: ErpSaleReturnApi.SaleReturn[]) { - // TODO 芋艿 rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const refundPrice = row.refundPrice ?? 0; const newItem: ErpFinanceReceiptApi.FinanceReceiptItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.SALE_RETURN, - bizNo: row.no, - totalPrice: -row.totalPrice, - receiptedPrice: -row.refundPrice, - receiptPrice: -row.totalPrice + row.refundPrice, + bizNo: row.no ?? '', + totalPrice: -totalPrice, + receiptedPrice: -refundPrice, + receiptPrice: -totalPrice + refundPrice, remark: undefined, }; tableData.value.push(newItem); @@ -204,7 +206,7 @@ function validate() { // 检查每行的收款金额 for (let i = 0; i < tableData.value.length; i++) { const item = tableData.value[i]; - if (!item.receiptPrice || item.receiptPrice <= 0) { + if (!item?.receiptPrice || item.receiptPrice <= 0) { throw new Error(`第 ${i + 1} 行：本次收款必须大于0`); } } diff --git a/apps/web-antdv-next/src/api/erp/purchase/in/index.ts b/apps/web-antdv-next/src/api/erp/purchase/in/index.ts index 060e1bcb8..df23762ad 100644 --- a/apps/web-antdv-next/src/api/erp/purchase/in/index.ts +++ b/apps/web-antdv-next/src/api/erp/purchase/in/index.ts @@ -28,6 +28,7 @@ export namespace ErpPurchaseInApi { export interface PurchaseInItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-antdv-next/src/api/erp/purchase/order/index.ts b/apps/web-antdv-next/src/api/erp/purchase/order/index.ts index e59dcf68e..66954dc08 100644 --- a/apps/web-antdv-next/src/api/erp/purchase/order/index.ts +++ b/apps/web-antdv-next/src/api/erp/purchase/order/index.ts @@ -34,6 +34,7 @@ export namespace ErpPurchaseOrderApi { /** 采购订单项信息 */ export interface PurchaseOrderItem { id?: number; // 订单项编号 + seq?: number; // 前端行号 orderId?: number; // 采购订单编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-antdv-next/src/api/erp/purchase/return/index.ts b/apps/web-antdv-next/src/api/erp/purchase/return/index.ts index 315ceeadb..3e1a26739 100644 --- a/apps/web-antdv-next/src/api/erp/purchase/return/index.ts +++ b/apps/web-antdv-next/src/api/erp/purchase/return/index.ts @@ -11,6 +11,7 @@ export namespace ErpPurchaseReturnApi { returnTime?: Date; // 退货时间 totalCount?: number; // 合计数量 totalPrice: number; // 合计金额，单位：元 + refundPrice?: number; // 已退款金额，单位：元 discountPercent?: number; // 折扣百分比 discountPrice?: number; // 折扣金额 status?: number; // 状态 @@ -24,6 +25,7 @@ export namespace ErpPurchaseReturnApi { export interface PurchaseReturnItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-antdv-next/src/api/erp/sale/order/index.ts b/apps/web-antdv-next/src/api/erp/sale/order/index.ts index c190a3dc1..ec46d9fbf 100644 --- a/apps/web-antdv-next/src/api/erp/sale/order/index.ts +++ b/apps/web-antdv-next/src/api/erp/sale/order/index.ts @@ -28,6 +28,7 @@ export namespace ErpSaleOrderApi { /** 销售订单项 */ export interface SaleOrderItem { id?: number; // 订单项编号 + seq?: number; // 前端行号 orderId?: number; // 采购订单编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-antdv-next/src/api/erp/sale/out/index.ts b/apps/web-antdv-next/src/api/erp/sale/out/index.ts index a3e335af6..85f5a6686 100644 --- a/apps/web-antdv-next/src/api/erp/sale/out/index.ts +++ b/apps/web-antdv-next/src/api/erp/sale/out/index.ts @@ -12,6 +12,7 @@ export namespace ErpSaleOutApi { outTime?: Date; // 出库时间 totalCount?: number; // 合计数量 totalPrice?: number; // 合计金额，单位：元 + receiptPrice?: number; // 已收款金额，单位：元 status?: number; // 状态 remark?: string; // 备注 discountPercent?: number; // 折扣百分比 @@ -28,6 +29,7 @@ export namespace ErpSaleOutApi { export interface SaleOutItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-antdv-next/src/api/erp/sale/return/index.ts b/apps/web-antdv-next/src/api/erp/sale/return/index.ts index a0624cba2..18af37581 100644 --- a/apps/web-antdv-next/src/api/erp/sale/return/index.ts +++ b/apps/web-antdv-next/src/api/erp/sale/return/index.ts @@ -11,6 +11,7 @@ export namespace ErpSaleReturnApi { returnTime?: Date; // 退货时间 totalCount?: number; // 合计数量 totalPrice?: number; // 合计金额，单位：元 + refundPrice?: number; // 已退款金额，单位：元 status?: number; // 状态 remark?: string; // 备注 discountPercent?: number; // 折扣百分比 @@ -27,6 +28,7 @@ export namespace ErpSaleReturnApi { export interface SaleReturnItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-antdv-next/src/api/erp/stock/check/index.ts b/apps/web-antdv-next/src/api/erp/stock/check/index.ts index b6f9d0bea..c67ea62b1 100644 --- a/apps/web-antdv-next/src/api/erp/stock/check/index.ts +++ b/apps/web-antdv-next/src/api/erp/stock/check/index.ts @@ -21,6 +21,7 @@ export namespace ErpStockCheckApi { /** 库存盘点项 */ export interface StockCheckItem { id?: number; // 编号 + seq?: number; // 前端行号 warehouseId?: number; // 仓库编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-antdv-next/src/api/erp/stock/in/index.ts b/apps/web-antdv-next/src/api/erp/stock/in/index.ts index e68c05b36..b6e4a50ef 100644 --- a/apps/web-antdv-next/src/api/erp/stock/in/index.ts +++ b/apps/web-antdv-next/src/api/erp/stock/in/index.ts @@ -23,15 +23,16 @@ export namespace ErpStockInApi { /** 其它入库单产品信息 */ export interface StockInItem { id?: number; // 编号 - warehouseId: number; // 仓库编号 - productId: number; // 产品编号 + seq?: number; // 前端行号 + warehouseId?: number; // 仓库编号 + productId?: number; // 产品编号 productName?: string; // 产品名称 productUnitId?: number; // 产品单位编号 productUnitName?: string; // 产品单位名称 productBarCode?: string; // 产品条码 - count: number; // 数量 - productPrice: number; // 产品单价 - totalPrice: number; // 总价 + count?: number; // 数量 + productPrice?: number; // 产品单价 + totalPrice?: number; // 总价 stockCount?: number; // 库存数量 remark?: string; // 备注 } diff --git a/apps/web-antdv-next/src/api/erp/stock/move/index.ts b/apps/web-antdv-next/src/api/erp/stock/move/index.ts index 0120a9b45..aaf09b22f 100644 --- a/apps/web-antdv-next/src/api/erp/stock/move/index.ts +++ b/apps/web-antdv-next/src/api/erp/stock/move/index.ts @@ -26,6 +26,7 @@ export namespace ErpStockMoveApi { count: number; // 数量 fromWarehouseId?: number; // 来源仓库ID id?: number; // ID + seq?: number; // 前端行号 productBarCode: string; // 产品条形码 productId?: number; // 产品ID productName?: string; // 产品名称 diff --git a/apps/web-antdv-next/src/api/erp/stock/out/index.ts b/apps/web-antdv-next/src/api/erp/stock/out/index.ts index 1ecb89233..94588e1bb 100644 --- a/apps/web-antdv-next/src/api/erp/stock/out/index.ts +++ b/apps/web-antdv-next/src/api/erp/stock/out/index.ts @@ -20,6 +20,7 @@ export namespace ErpStockOutApi { /** 其它出库单产品信息 */ export interface StockOutItem { id?: number; // 编号 + seq?: number; // 前端行号 warehouseId?: number; // 仓库编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-antdv-next/src/views/erp/finance/payment/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/finance/payment/modules/item-form.vue index 47d356a7f..8650b3a77 100644 --- a/apps/web-antdv-next/src/views/erp/finance/payment/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/finance/payment/modules/item-form.vue @@ -128,13 +128,15 @@ const handleOpenPurchaseIn = () => { const handleAddPurchaseIn = (rows: ErpPurchaseInApi.PurchaseIn[]) => { rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const paidPrice = row.paymentPrice ?? 0; const newItem: ErpFinancePaymentApi.FinancePaymentItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.PURCHASE_IN, - bizNo: row.no, - totalPrice: row.totalPrice, - paidPrice: row.paymentPrice, - paymentPrice: row.totalPrice - row.paymentPrice, + bizNo: row.no ?? '', + totalPrice, + paidPrice, + paymentPrice: totalPrice - paidPrice, remark: undefined, }; tableData.value.push(newItem); @@ -154,13 +156,15 @@ const handleOpenSaleReturn = () => { const handleAddSaleReturn = (rows: ErpPurchaseReturnApi.PurchaseReturn[]) => { rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const refundPrice = row.refundPrice ?? 0; const newItem: ErpFinancePaymentApi.FinancePaymentItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.PURCHASE_RETURN, - bizNo: row.no, - totalPrice: -row.totalPrice, - paidPrice: -row.refundPrice, - paymentPrice: -row.totalPrice + row.refundPrice, + bizNo: row.no ?? '', + totalPrice: -totalPrice, + paidPrice: -refundPrice, + paymentPrice: -totalPrice + refundPrice, remark: undefined, }; tableData.value.push(newItem); @@ -202,7 +206,7 @@ const validate = () => { // 检查每行的付款金额 for (let i = 0; i < tableData.value.length; i++) { const item = tableData.value[i]; - if (!item.paymentPrice || item.paymentPrice <= 0) { + if (!item?.paymentPrice || item.paymentPrice <= 0) { throw new Error(`第 ${i + 1} 行：本次付款必须大于0`); } } diff --git a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/item-form.vue b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/item-form.vue index 4491b51e0..34c305b9d 100644 --- a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/item-form.vue +++ b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/item-form.vue @@ -128,14 +128,15 @@ function handleOpenSaleOut() { function handleAddSaleOut(rows: ErpSaleOutApi.SaleOut[]) { rows.forEach((row) => { - // TODO 芋艿 + const totalPrice = row.totalPrice ?? 0; + const receiptedPrice = row.receiptPrice ?? 0; const newItem: ErpFinanceReceiptApi.FinanceReceiptItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.SALE_OUT, - bizNo: row.no, - totalPrice: row.totalPrice, - receiptedPrice: row.receiptPrice, - receiptPrice: row.totalPrice - row.receiptPrice, + bizNo: row.no ?? '', + totalPrice, + receiptedPrice, + receiptPrice: totalPrice - receiptedPrice, remark: undefined, }; tableData.value.push(newItem); @@ -154,15 +155,16 @@ function handleOpenSaleReturn() { } function handleAddSaleReturn(rows: ErpSaleReturnApi.SaleReturn[]) { - // TODO 芋艿 rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const refundPrice = row.refundPrice ?? 0; const newItem: ErpFinanceReceiptApi.FinanceReceiptItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.SALE_RETURN, - bizNo: row.no, - totalPrice: -row.totalPrice, - receiptedPrice: -row.refundPrice, - receiptPrice: -row.totalPrice + row.refundPrice, + bizNo: row.no ?? '', + totalPrice: -totalPrice, + receiptedPrice: -refundPrice, + receiptPrice: -totalPrice + refundPrice, remark: undefined, }; tableData.value.push(newItem); @@ -204,7 +206,7 @@ function validate() { // 检查每行的收款金额 for (let i = 0; i < tableData.value.length; i++) { const item = tableData.value[i]; - if (!item.receiptPrice || item.receiptPrice <= 0) { + if (!item?.receiptPrice || item.receiptPrice <= 0) { throw new Error(`第 ${i + 1} 行：本次收款必须大于0`); } } diff --git a/apps/web-ele/src/api/erp/purchase/in/index.ts b/apps/web-ele/src/api/erp/purchase/in/index.ts index 060e1bcb8..df23762ad 100644 --- a/apps/web-ele/src/api/erp/purchase/in/index.ts +++ b/apps/web-ele/src/api/erp/purchase/in/index.ts @@ -28,6 +28,7 @@ export namespace ErpPurchaseInApi { export interface PurchaseInItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-ele/src/api/erp/purchase/order/index.ts b/apps/web-ele/src/api/erp/purchase/order/index.ts index e59dcf68e..66954dc08 100644 --- a/apps/web-ele/src/api/erp/purchase/order/index.ts +++ b/apps/web-ele/src/api/erp/purchase/order/index.ts @@ -34,6 +34,7 @@ export namespace ErpPurchaseOrderApi { /** 采购订单项信息 */ export interface PurchaseOrderItem { id?: number; // 订单项编号 + seq?: number; // 前端行号 orderId?: number; // 采购订单编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-ele/src/api/erp/purchase/return/index.ts b/apps/web-ele/src/api/erp/purchase/return/index.ts index 84b2a8a77..3e1a26739 100644 --- a/apps/web-ele/src/api/erp/purchase/return/index.ts +++ b/apps/web-ele/src/api/erp/purchase/return/index.ts @@ -11,7 +11,7 @@ export namespace ErpPurchaseReturnApi { returnTime?: Date; // 退货时间 totalCount?: number; // 合计数量 totalPrice: number; // 合计金额，单位：元 - refundPrice: number; + refundPrice?: number; // 已退款金额，单位：元 discountPercent?: number; // 折扣百分比 discountPrice?: number; // 折扣金额 status?: number; // 状态 @@ -25,6 +25,7 @@ export namespace ErpPurchaseReturnApi { export interface PurchaseReturnItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-ele/src/api/erp/sale/order/index.ts b/apps/web-ele/src/api/erp/sale/order/index.ts index c190a3dc1..ec46d9fbf 100644 --- a/apps/web-ele/src/api/erp/sale/order/index.ts +++ b/apps/web-ele/src/api/erp/sale/order/index.ts @@ -28,6 +28,7 @@ export namespace ErpSaleOrderApi { /** 销售订单项 */ export interface SaleOrderItem { id?: number; // 订单项编号 + seq?: number; // 前端行号 orderId?: number; // 采购订单编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-ele/src/api/erp/sale/out/index.ts b/apps/web-ele/src/api/erp/sale/out/index.ts index a3e335af6..85f5a6686 100644 --- a/apps/web-ele/src/api/erp/sale/out/index.ts +++ b/apps/web-ele/src/api/erp/sale/out/index.ts @@ -12,6 +12,7 @@ export namespace ErpSaleOutApi { outTime?: Date; // 出库时间 totalCount?: number; // 合计数量 totalPrice?: number; // 合计金额，单位：元 + receiptPrice?: number; // 已收款金额，单位：元 status?: number; // 状态 remark?: string; // 备注 discountPercent?: number; // 折扣百分比 @@ -28,6 +29,7 @@ export namespace ErpSaleOutApi { export interface SaleOutItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-ele/src/api/erp/sale/return/index.ts b/apps/web-ele/src/api/erp/sale/return/index.ts index a0624cba2..18af37581 100644 --- a/apps/web-ele/src/api/erp/sale/return/index.ts +++ b/apps/web-ele/src/api/erp/sale/return/index.ts @@ -11,6 +11,7 @@ export namespace ErpSaleReturnApi { returnTime?: Date; // 退货时间 totalCount?: number; // 合计数量 totalPrice?: number; // 合计金额，单位：元 + refundPrice?: number; // 已退款金额，单位：元 status?: number; // 状态 remark?: string; // 备注 discountPercent?: number; // 折扣百分比 @@ -27,6 +28,7 @@ export namespace ErpSaleReturnApi { export interface SaleReturnItem { count?: number; id?: number; + seq?: number; // 前端行号 orderItemId?: number; productBarCode?: string; productId?: number; diff --git a/apps/web-ele/src/api/erp/stock/check/index.ts b/apps/web-ele/src/api/erp/stock/check/index.ts index b6f9d0bea..c67ea62b1 100644 --- a/apps/web-ele/src/api/erp/stock/check/index.ts +++ b/apps/web-ele/src/api/erp/stock/check/index.ts @@ -21,6 +21,7 @@ export namespace ErpStockCheckApi { /** 库存盘点项 */ export interface StockCheckItem { id?: number; // 编号 + seq?: number; // 前端行号 warehouseId?: number; // 仓库编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-ele/src/api/erp/stock/in/index.ts b/apps/web-ele/src/api/erp/stock/in/index.ts index e68c05b36..b6e4a50ef 100644 --- a/apps/web-ele/src/api/erp/stock/in/index.ts +++ b/apps/web-ele/src/api/erp/stock/in/index.ts @@ -23,15 +23,16 @@ export namespace ErpStockInApi { /** 其它入库单产品信息 */ export interface StockInItem { id?: number; // 编号 - warehouseId: number; // 仓库编号 - productId: number; // 产品编号 + seq?: number; // 前端行号 + warehouseId?: number; // 仓库编号 + productId?: number; // 产品编号 productName?: string; // 产品名称 productUnitId?: number; // 产品单位编号 productUnitName?: string; // 产品单位名称 productBarCode?: string; // 产品条码 - count: number; // 数量 - productPrice: number; // 产品单价 - totalPrice: number; // 总价 + count?: number; // 数量 + productPrice?: number; // 产品单价 + totalPrice?: number; // 总价 stockCount?: number; // 库存数量 remark?: string; // 备注 } diff --git a/apps/web-ele/src/api/erp/stock/move/index.ts b/apps/web-ele/src/api/erp/stock/move/index.ts index 0120a9b45..aaf09b22f 100644 --- a/apps/web-ele/src/api/erp/stock/move/index.ts +++ b/apps/web-ele/src/api/erp/stock/move/index.ts @@ -26,6 +26,7 @@ export namespace ErpStockMoveApi { count: number; // 数量 fromWarehouseId?: number; // 来源仓库ID id?: number; // ID + seq?: number; // 前端行号 productBarCode: string; // 产品条形码 productId?: number; // 产品ID productName?: string; // 产品名称 diff --git a/apps/web-ele/src/api/erp/stock/out/index.ts b/apps/web-ele/src/api/erp/stock/out/index.ts index 1ecb89233..94588e1bb 100644 --- a/apps/web-ele/src/api/erp/stock/out/index.ts +++ b/apps/web-ele/src/api/erp/stock/out/index.ts @@ -20,6 +20,7 @@ export namespace ErpStockOutApi { /** 其它出库单产品信息 */ export interface StockOutItem { id?: number; // 编号 + seq?: number; // 前端行号 warehouseId?: number; // 仓库编号 productId?: number; // 产品编号 productName?: string; // 产品名称 diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/item-form.vue b/apps/web-ele/src/views/erp/finance/payment/modules/item-form.vue index 8314d48e7..b281656f4 100644 --- a/apps/web-ele/src/views/erp/finance/payment/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/finance/payment/modules/item-form.vue @@ -128,14 +128,15 @@ const handleOpenPurchaseIn = () => { const handleAddPurchaseIn = (rows: ErpPurchaseInApi.PurchaseIn[]) => { rows.forEach((row) => { - // TODO @芋艿 + const totalPrice = row.totalPrice ?? 0; + const paidPrice = row.paymentPrice ?? 0; const newItem: ErpFinancePaymentApi.FinancePaymentItem = { - bizId: row.id as any, + bizId: row.id ?? 0, bizType: ErpBizType.PURCHASE_IN, - bizNo: row.no as any, - totalPrice: row.totalPrice as any, - paidPrice: row.paymentPrice as any, - paymentPrice: (row.totalPrice as any) - (row.paymentPrice as any), + bizNo: row.no ?? '', + totalPrice, + paidPrice, + paymentPrice: totalPrice - paidPrice, remark: undefined, }; tableData.value.push(newItem); @@ -155,13 +156,15 @@ const handleOpenSaleReturn = () => { const handleAddSaleReturn = (rows: ErpPurchaseReturnApi.PurchaseReturn[]) => { rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const refundPrice = row.refundPrice ?? 0; const newItem: ErpFinancePaymentApi.FinancePaymentItem = { - bizId: row.id as any, + bizId: row.id ?? 0, bizType: ErpBizType.PURCHASE_RETURN, - bizNo: row.no as any, - totalPrice: -row.totalPrice, - paidPrice: -row.refundPrice, - paymentPrice: -row.totalPrice + row.refundPrice, + bizNo: row.no ?? '', + totalPrice: -totalPrice, + paidPrice: -refundPrice, + paymentPrice: -totalPrice + refundPrice, remark: undefined, }; tableData.value.push(newItem); @@ -203,7 +206,7 @@ const validate = () => { // 检查每行的付款金额 for (let i = 0; i < tableData.value.length; i++) { const item = tableData.value[i]; - if (item!.paymentPrice || item!.paymentPrice <= 0) { + if (!item?.paymentPrice || item.paymentPrice <= 0) { throw new Error(`第 ${i + 1} 行：本次付款必须大于0`); } } diff --git a/apps/web-ele/src/views/erp/finance/receipt/modules/item-form.vue b/apps/web-ele/src/views/erp/finance/receipt/modules/item-form.vue index 09fe4b03e..dd34ac9f4 100644 --- a/apps/web-ele/src/views/erp/finance/receipt/modules/item-form.vue +++ b/apps/web-ele/src/views/erp/finance/receipt/modules/item-form.vue @@ -127,15 +127,16 @@ function handleOpenSaleOut() { } function handleAddSaleOut(rows: ErpSaleOutApi.SaleOut[]) { - // TODO @芋艿 rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const receiptedPrice = row.receiptPrice ?? 0; const newItem: ErpFinanceReceiptApi.FinanceReceiptItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.SALE_OUT, - bizNo: row.no, - totalPrice: row.totalPrice, - receiptedPrice: row.receiptPrice, - receiptPrice: row.totalPrice - row.receiptPrice, + bizNo: row.no ?? '', + totalPrice, + receiptedPrice, + receiptPrice: totalPrice - receiptedPrice, remark: undefined, }; tableData.value.push(newItem); @@ -155,13 +156,15 @@ function handleOpenSaleReturn() { function handleAddSaleReturn(rows: ErpSaleReturnApi.SaleReturn[]) { rows.forEach((row) => { + const totalPrice = row.totalPrice ?? 0; + const refundPrice = row.refundPrice ?? 0; const newItem: ErpFinanceReceiptApi.FinanceReceiptItem = { - bizId: row.id, + bizId: row.id ?? 0, bizType: ErpBizType.SALE_RETURN, - bizNo: row.no, - totalPrice: -row.totalPrice, - receiptedPrice: -row.refundPrice, - receiptPrice: -row.totalPrice + row.refundPrice, + bizNo: row.no ?? '', + totalPrice: -totalPrice, + receiptedPrice: -refundPrice, + receiptPrice: -totalPrice + refundPrice, remark: undefined, }; tableData.value.push(newItem); @@ -203,7 +206,7 @@ function validate() { // 检查每行的收款金额 for (let i = 0; i < tableData.value.length; i++) { const item = tableData.value[i]; - if (item!.receiptPrice || item!.receiptPrice <= 0) { + if (!item?.receiptPrice || item.receiptPrice <= 0) { throw new Error(`第 ${i + 1} 行：本次收款必须大于0`); } } From 1e4436561c7682f5af10a6a518e7fe60f4a2aa98 Mon Sep 17 00:00:00 2001 From: XuZhiqiang Date: Fri, 19 Jun 2026 10:52:59 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix(workspace):=20=E6=94=B6=E6=95=9B=20MP?= =?UTF-8?q?=E3=80=81ERP=20=E5=92=8C=20demo=20=E7=B1=BB=E5=9E=8B=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/mp/freePublish/index.ts | 15 ++++++++++++++- apps/web-antd/src/views/erp/home/index.vue | 12 ++---------- .../erp/home/modules/time-summary-chart.vue | 4 ++-- .../views/infra/codegen/modules/column-info.vue | 3 ++- .../demo03/inner/modules/demo03-course-form.vue | 3 ++- .../demo03/normal/modules/demo03-course-form.vue | 3 ++- .../views/infra/demo/general/demo01/index.vue | 10 ++++++++-- .../views/infra/demo/general/demo02/index.vue | 10 ++++++++-- .../infra/demo/general/demo03/erp/index.vue | 10 ++++++++-- .../demo03/erp/modules/demo03-course-list.vue | 10 ++++++++-- .../demo03/erp/modules/demo03-grade-list.vue | 10 ++++++++-- .../infra/demo/general/demo03/inner/index.vue | 10 ++++++++-- .../infra/demo/general/demo03/normal/index.vue | 10 ++++++++-- apps/web-antd/src/views/mp/freePublish/index.vue | 2 +- .../src/api/mp/freePublish/index.ts | 15 ++++++++++++++- apps/web-antdv-next/src/views/erp/home/index.vue | 12 ++---------- .../erp/home/modules/time-summary-chart.vue | 4 ++-- .../views/infra/codegen/modules/column-info.vue | 3 ++- .../demo03/inner/modules/demo03-course-form.vue | 3 ++- .../demo03/normal/modules/demo03-course-form.vue | 3 ++- .../views/infra/demo/general/demo01/index.vue | 10 ++++++++-- .../views/infra/demo/general/demo02/index.vue | 10 ++++++++-- .../infra/demo/general/demo03/erp/index.vue | 10 ++++++++-- .../demo03/erp/modules/demo03-course-list.vue | 10 ++++++++-- .../demo03/erp/modules/demo03-grade-list.vue | 10 ++++++++-- .../infra/demo/general/demo03/inner/index.vue | 10 ++++++++-- .../infra/demo/general/demo03/normal/index.vue | 10 ++++++++-- .../src/views/mp/freePublish/index.vue | 2 +- apps/web-ele/src/api/mp/freePublish/index.ts | 15 ++++++++++++++- apps/web-ele/src/views/erp/home/index.vue | 14 ++------------ .../erp/home/modules/time-summary-chart.vue | 4 ++-- .../views/infra/codegen/modules/column-info.vue | 3 ++- .../demo03/inner/modules/demo03-course-form.vue | 3 ++- .../demo03/normal/modules/demo03-course-form.vue | 3 ++- .../views/infra/demo/general/demo01/index.vue | 14 ++++++++++---- .../views/infra/demo/general/demo02/index.vue | 16 +++++++++++----- .../infra/demo/general/demo02/modules/form.vue | 2 +- .../infra/demo/general/demo03/erp/index.vue | 14 ++++++++++---- .../demo03/erp/modules/demo03-course-list.vue | 14 ++++++++++---- .../demo03/erp/modules/demo03-grade-list.vue | 14 ++++++++++---- .../demo/general/demo03/erp/modules/form.vue | 2 +- .../infra/demo/general/demo03/inner/index.vue | 14 ++++++++++---- .../demo03/inner/modules/demo03-course-form.vue | 2 +- .../infra/demo/general/demo03/normal/index.vue | 14 ++++++++++---- .../demo03/normal/modules/demo03-course-form.vue | 2 +- apps/web-ele/src/views/mp/freePublish/index.vue | 2 +- apps/web-ele/src/views/mp/material/index.vue | 8 ++++++-- 47 files changed, 268 insertions(+), 116 deletions(-) diff --git a/apps/web-antd/src/api/mp/freePublish/index.ts b/apps/web-antd/src/api/mp/freePublish/index.ts index bc50efe96..fd7b2596c 100644 --- a/apps/web-antd/src/api/mp/freePublish/index.ts +++ b/apps/web-antd/src/api/mp/freePublish/index.ts @@ -3,6 +3,19 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace MpFreePublishApi { + /** 图文文章内容 */ + export interface FreePublishArticle { + title?: string; + thumbUrl?: string; + picUrl?: string; + url?: string; + } + + /** 图文内容 */ + export interface FreePublishContent { + newsItem?: FreePublishArticle[]; + } + /** 自由发布文章信息 */ export interface FreePublish { id?: number; @@ -12,7 +25,7 @@ export namespace MpFreePublishApi { title: string; author: string; digest: string; - content: string; + content?: FreePublishContent; thumbUrl: string; status: number; publishTime?: Date; diff --git a/apps/web-antd/src/views/erp/home/index.vue b/apps/web-antd/src/views/erp/home/index.vue index efb49045b..2cd3845e7 100644 --- a/apps/web-antd/src/views/erp/home/index.vue +++ b/apps/web-antd/src/views/erp/home/index.vue @@ -12,10 +12,6 @@ import TimeSummaryChart from './modules/time-summary-chart.vue'; defineOptions({ name: 'ErpHome' }); const loading = ref(false); // 加载中 - -/** 图表组件引用 */ -const saleChartRef = ref(); -const purchaseChartRef = ref();