From 47472c355fb87725dda499f701f5dcd2443fb474 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 29 Apr 2025 15:54:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?YT-2575=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E8=AE=B0=E5=BD=95=E7=9A=84=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=93=9D=E8=89=B2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9B=BE=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Descriptions/src/Descriptions.vue | 2 +- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 4 ++++ .../supplierinvoiceRecordMain.data.ts | 3 +++ .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 4 ++++ .../supplierinvoiceRequestMain.data.ts | 4 +++- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index e680925dd..6c5eee756 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -141,7 +141,7 @@ updateSort(schema.value) :key="item.field" v-bind="getBindItemValue(item)" :label-align="labelAlign" - :label-class-name="labelClassName" + :label-class-name="item.labelClassName||labelClassName" :class-name="valueClassName || item.labelClassName" :width="width" :span="item.span" diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 30261cc3f..32a404957 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -461,4 +461,8 @@ onMounted(async () => { color:var(--el-color-danger); font-weight:700; } +::v-deep(.detail-label-color-blue){ + color: rgb(0, 115, 255)!important; + text-align: center; +} diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index a2c062272..268dfd5a4 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1212,6 +1212,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive { .red-text { color: var(--el-color-danger); font-weight: 700; +} + ::v-deep(.detail-label-color-blue){ + color: rgb(0, 115, 255)!important; + text-align: center; } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 5bdb446a6..d98ea3621 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1580,13 +1580,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive Date: Wed, 30 Apr 2025 10:10:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E8=AE=A1=E5=8D=95=E4=BB=B75?= =?UTF-8?q?=E4=BD=8D=E6=94=B9=E6=88=9011=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index 9b9443fd4..1bb231c8f 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -197,7 +197,7 @@ const inputNumberChange = (field, index, row, val) => { row['allocationPrice'] = row['beforeTaxAmount']/row['qty'] - row['price'] // 合计单价 = 销售单价 + 模具分摊单价 - row['sumPrice'] = (row['price'] + row['allocationPrice']).toFixed(5) + row['sumPrice'] = (row['price'] + row['allocationPrice']).toFixed(11) // 税额：taxAmount 未税价格*税率/100,四舍五入保留2位小数 row['taxAmount'] = (row['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 //含税金额