From a705d805c9d1db58129e968c05b81b892cd53216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=84=B1?= Date: Mon, 11 Mar 2024 15:39:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2=E5=BC=BA=E5=88=B6=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E5=AD=97=E6=AE=B5=E5=8F=8A=E6=A0=87=E8=AF=86=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E3=80=90=E8=A1=A8=E6=A0=BC=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/src/js/custom_form_status_indicator.js | 2 +- .../views/equipment_maintenance_standards_views.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js index 9825eeec..5bc820cf 100644 --- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js +++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js @@ -134,7 +134,7 @@ $(function () { var currentUrl = location.href const customRequiredDom = { label: ['label[for=production_line_id]','label[for=date_approve]','label[for=partner_id]', 'label[for=validity_date]', '.o_horizontal[role=radiogroup][aria-label="公司类别"]', 'label[for=vat]', 'label[for=phone]', 'label[for=mobile]', 'label[for=email]', 'label[for=category_id]','label[for=date_order]','label[for=picking_type_id]'], - table: ['product_template_id', 'product_uom_qty', 'price_unit','product_id','product_qty'] + table: ['product_template_id', 'product_uom_qty', 'price_unit','product_id','product_qty', 'name', 'fault_type', 'maintenance_standards', 'Period'] } const listenerUrl = setInterval(() => { const isChange = currentUrl != location.href diff --git a/sf_maintenance/views/equipment_maintenance_standards_views.xml b/sf_maintenance/views/equipment_maintenance_standards_views.xml index 986f51c4..4932f3de 100644 --- a/sf_maintenance/views/equipment_maintenance_standards_views.xml +++ b/sf_maintenance/views/equipment_maintenance_standards_views.xml @@ -31,12 +31,12 @@ - - - - - - + + + + + + From f639e59b9105adb2ad895b795bcb0e2c57a15e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=84=B1?= Date: Fri, 15 Mar 2024 10:10:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A2=91=E7=B9=81?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/src/js/custom_form_status_indicator.js | 6 ++++-- sf_maintenance/views/maintenance_views.xml | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jikimo_frontend/static/src/js/custom_form_status_indicator.js b/jikimo_frontend/static/src/js/custom_form_status_indicator.js index 7c149de8..2bed0804 100644 --- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js +++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js @@ -19,7 +19,9 @@ const filedRequiredList = { 'brand_id': { multiple: false, noLabel: false }, 'type_id': { multiple: false, noLabel: false }, 'taper_type_id': { multiple: false, noLabel: false }, - + 'eq_maintenance_id': { multiple: false, noLabel: false }, + 'overhaul_id': { multiple: false, noLabel: false }, + 'overhaul_period': { multiple: false, noLabel: false }, 'maintenance_equipment_category_id': { multiple: false, noLabel: false }, 'maintenance_type': { multiple: false, noLabel: false }, @@ -147,7 +149,7 @@ $(function () { dom.each(function () { const requiredDom = $(this).parent().prev().find('label') let t = requiredDom.html() - if (t.indexOf('c*') < 0) { + if (t && t.indexOf('c*') < 0) { t = '*' + t } requiredDom.html(t) diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 9a57f29a..9233c7c9 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -981,16 +981,16 @@ - + - + -