Browse Source

Merge remote-tracking branch 'remotes/origin/intex_online20250427' into intex

intex
songguoqiang 2 days ago
parent
commit
16f5f945fb
  1. 2
      src/components/Descriptions/src/Descriptions.vue
  2. 2
      src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue
  3. 4
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
  4. 3
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
  5. 4
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  6. 4
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

2
src/components/Descriptions/src/Descriptions.vue

@ -141,7 +141,7 @@ updateSort(schema.value)
:key="item.field" :key="item.field"
v-bind="getBindItemValue(item)" v-bind="getBindItemValue(item)"
:label-align="labelAlign" :label-align="labelAlign"
:label-class-name="labelClassName" :label-class-name="item.labelClassName||labelClassName"
:class-name="valueClassName || item.labelClassName" :class-name="valueClassName || item.labelClassName"
:width="width" :width="width"
:span="item.span" :span="item.span"

2
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['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 // taxAmount */100,2
row['taxAmount'] = (row['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 // row['taxAmount'] = (row['beforeTaxAmount'] * formRef.value.formRef.formModel['taxRate'])/100 //

4
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

@ -461,4 +461,8 @@ onMounted(async () => {
color:var(--el-color-danger); color:var(--el-color-danger);
font-weight:700; font-weight:700;
} }
::v-deep(.detail-label-color-blue){
color: rgb(0, 115, 255)!important;
text-align: center;
}
</style> </style>

3
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@ -1212,6 +1212,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
formatter: accountantFormart, formatter: accountantFormart,
detail: { detail: {
formatter: accountantFormartDetail, formatter: accountantFormartDetail,
labelClassName: 'detail-label-color-blue'
}, },
sortTableDefault: 6, sortTableDefault: 6,
@ -1250,6 +1251,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
formatter: accountantFormart, formatter: accountantFormart,
detail: { detail: {
formatter: accountantFormartDetail, formatter: accountantFormartDetail,
labelClassName: 'detail-label-color-blue'
}, },
sortTableDefault: 6, sortTableDefault: 6,
@ -1286,6 +1288,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
formatter: accountantFormart, formatter: accountantFormart,
detail: { detail: {
formatter: accountantFormartDetail, formatter: accountantFormartDetail,
labelClassName: 'detail-label-color-blue'
}, },
sortTableDefault: 6, sortTableDefault: 6,

4
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -1786,5 +1786,9 @@ onMounted(async () => {
.red-text { .red-text {
color: var(--el-color-danger); color: var(--el-color-danger);
font-weight: 700; font-weight: 700;
}
::v-deep(.detail-label-color-blue){
color: rgb(0, 115, 255)!important;
text-align: center;
} }
</style> </style>

4
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -1580,13 +1580,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
formatter: accountantFormart, formatter: accountantFormart,
detail: { detail: {
formatter: accountantFormartDetail, formatter: accountantFormartDetail,
labelClassName: 'detail-label-color-blue'
}, },
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
isTable: false, isTable: false,
isSearch: false, isSearch: false,
isDetail: true, isDetail: true,
}, },
{ {
label: '材料款税额',//'供应商维护税额', label: '材料款税额',//'供应商维护税额',
@ -1619,6 +1619,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
formatter: accountantFormart, formatter: accountantFormart,
detail: { detail: {
formatter: accountantFormartDetail, formatter: accountantFormartDetail,
labelClassName: 'detail-label-color-blue'
}, },
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,
@ -1654,6 +1655,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
formatter: accountantFormart, formatter: accountantFormart,
detail: { detail: {
formatter: accountantFormartDetail, formatter: accountantFormartDetail,
labelClassName: 'detail-label-color-blue'
}, },
sortTableDefault: 6, sortTableDefault: 6,
isForm: false, isForm: false,

Loading…
Cancel
Save