From 9eaf23ff3f58302ce63acb9681ec11493b8a577b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Mon, 18 May 2026 15:46:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=AF=B9=E6=8C=82=E8=B4=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_purchase/__manifest__.py | 3 ++- yuthon_purchase/static/src/scss/purchase_order.scss | 5 +++++ yuthon_purchase/views/inherit_purchase_order_views.xml | 1 + .../src/components/yuthon_report/simple_bank_report.js | 5 +++++ .../static/src/components/yuthon_report/yuthon_report.scss | 5 +++++ 5 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 yuthon_purchase/static/src/scss/purchase_order.scss diff --git a/yuthon_purchase/__manifest__.py b/yuthon_purchase/__manifest__.py index 57283d0c4..d69a46666 100644 --- a/yuthon_purchase/__manifest__.py +++ b/yuthon_purchase/__manifest__.py @@ -21,7 +21,8 @@ 'application': True, 'assets': { 'web.assets_backend': [ - 'yuthon_purchase/static/xml/misc.xml' + 'yuthon_purchase/static/xml/misc.xml', + 'yuthon_purchase/static/src/scss/purchase_order.scss' ], } diff --git a/yuthon_purchase/static/src/scss/purchase_order.scss b/yuthon_purchase/static/src/scss/purchase_order.scss new file mode 100644 index 000000000..1c1796958 --- /dev/null +++ b/yuthon_purchase/static/src/scss/purchase_order.scss @@ -0,0 +1,5 @@ +.o_m2o_mutil_line { + white-space: normal !important; + word-break: break-all !important; + word-wrap: break-word !important; +} diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml index 709a3db4f..28ffbcb1d 100644 --- a/yuthon_purchase/views/inherit_purchase_order_views.xml +++ b/yuthon_purchase/views/inherit_purchase_order_views.xml @@ -186,6 +186,7 @@ purchase_type == 'fixed_asset' and [('product_tag_ids.name', 'in', ['固定资产'])] or purchase_type == 'sporadic' and [('product_tag_ids.name', 'not in', ['固定资产'])] or [] + o_m2o_mutil_line diff --git a/yuthon_report/static/src/components/yuthon_report/simple_bank_report.js b/yuthon_report/static/src/components/yuthon_report/simple_bank_report.js index 31d4cfcfb..e630a5ee5 100644 --- a/yuthon_report/static/src/components/yuthon_report/simple_bank_report.js +++ b/yuthon_report/static/src/components/yuthon_report/simple_bank_report.js @@ -40,6 +40,11 @@ class SimpleBankReport extends Component { theme: agGrid.themeMaterial, columnDefs: columns, rowData: [], + rowClassRules: { + 'ag-row-registered': function(params) { + return params.data && params.data.状态 === '挂账'; + } + }, sideBar: this.config.sideBar ? { toolPanels: [ { diff --git a/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss b/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss index 21619d483..2a4c26ac5 100644 --- a/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss +++ b/yuthon_report/static/src/components/yuthon_report/yuthon_report.scss @@ -81,3 +81,8 @@ justify-content: flex-start; text-align: left; } + + /* 挂账状态行金黄色背景 */ + .ag-row-registered { + background-color: #fffbeb !important; + }