diff --git a/src/design/public.less b/src/design/public.less index 7dfdff95..0ffc48c3 100644 --- a/src/design/public.less +++ b/src/design/public.less @@ -201,6 +201,8 @@ h5 { .ds-green-tag, .ds-blue-tag, .ds-orange-tag, +.ds-cyan-tag, +.ds-gray-tag, .ds-red-tag, .ds-purple-tag, .TIJIAO, @@ -210,18 +212,16 @@ h5 { .YSDBC, .WTJ, .YDC { - padding: 1px 13px; - border-radius: 30px; + padding: 1px 10px; + border-radius: 2px; font-size: 10px; - font-weight: 700 !important; - color: #ffffff; display: inline-block; vertical-align: bottom; } .ds-green-tag { - background-color: rgba(223, 247, 247, 1); - color: rgba(43, 176, 194, 1); + background-color: rgba(227, 237, 223, 1); + color: rgba(99, 153, 61, 1); } .ds-blue-tag { @@ -244,6 +244,16 @@ h5 { color: rgba(137, 124, 222, 1); } +.ds-cyan-tag { + background-color: rgba(230, 245, 245, 1); + color: rgba(70, 159, 166, 1); +} + +.ds-gray-tag { + background-color: rgba(230, 230, 230, 1); + color: rgba(153, 153, 153, 1); +} + // 表格状态使用(定义2) .ds-green-status, .ds-blue-status, diff --git a/src/views/finance/paymentSettlement/index.vue b/src/views/finance/paymentSettlement/index.vue index 20f2d2d4..e3374ae5 100644 --- a/src/views/finance/paymentSettlement/index.vue +++ b/src/views/finance/paymentSettlement/index.vue @@ -154,5 +154,9 @@ const kfz = () => { margin-top: 12px; background: #cccccc; } + + .vben-ds-table-button { + height: auto !important; + } } \ No newline at end of file diff --git a/src/views/operation/invoicExamine/columns.tsx b/src/views/operation/invoicExamine/columns.tsx index 20953663..610d2f54 100644 --- a/src/views/operation/invoicExamine/columns.tsx +++ b/src/views/operation/invoicExamine/columns.tsx @@ -89,7 +89,7 @@ export const columns: BasicColumn[] = [ title: '原币金额', dataIndex: 'originalAmount', width: 100, - align: 'left', + align: 'right', }, { title: '申请人', @@ -119,7 +119,7 @@ export const columns: BasicColumn[] = [ title: '开票税率', dataIndex: 'taxRate', width: 100, - align: 'left', + align: 'right', }, { title: '发票号', diff --git a/src/views/operation/invoicExamine/index.vue b/src/views/operation/invoicExamine/index.vue index 4ce0dde3..52f8e5c1 100644 --- a/src/views/operation/invoicExamine/index.vue +++ b/src/views/operation/invoicExamine/index.vue @@ -1,35 +1,97 @@