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 a5ca68f1..484114d0 100644 --- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js +++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js @@ -59,4 +59,46 @@ $(function (){ } } }) + function customRequired() { + let timer = null + let timer_count = 0 + clearInterval(timer) + timer = setInterval(() => { + timer_count ++ + const dom = $('.custom_required') + let tableDom = $('.table_custom_required') + if(tableDom.length) { + tableDom = tableDom.eq(0).parents('tr').children('.table_custom_required') + tableDom.each(function (){ + const i = $(this).index() + const requiredDom = $(this).parents('table').find('thead').find('th').eq(i).find('span').eq(0) + const t = requiredDom.text().replace('*', '') + requiredDom.html('*' + t) + }) + clearInterval(timer) + } + if(dom.length) { + dom.each(function (){ + const requiredDom = $(this).parent().prev().find('label') + let t = requiredDom.html() + t.replace('*', ''); + t = '*' + t + requiredDom.html(t) + }) + clearInterval(timer) + } + if(timer_count == 20) { + clearInterval(timer) + } + },500) + } + var currentUrl = location.href + const listenerUrl = setInterval(() => { + const isChange = currentUrl != location.href + if(isChange) { + currentUrl = location.href + customRequired() + } + }, 500) + customRequired() }) diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 1a33c713..834cec5f 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -296,7 +296,7 @@ - + @@ -325,20 +325,20 @@ - - - - - - + + @@ -969,10 +969,10 @@ }" attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user" class="btn-primary"/> - - - - + + + + @@ -1008,10 +1008,10 @@ attrs="{'invisible': [('assemble_status', '!=', '0')]}" class="btn-primary"/> - - - - + + + + diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml index cd15a91b..f055ffba 100644 --- a/sf_tool_management/wizard/wizard_view.xml +++ b/sf_tool_management/wizard/wizard_view.xml @@ -195,7 +195,7 @@ - + @@ -208,6 +208,7 @@ @@ -229,6 +230,7 @@ @@ -251,6 +253,7 @@ @@ -273,6 +276,7 @@ @@ -294,6 +298,7 @@ @@ -315,6 +320,7 @@ @@ -335,13 +341,15 @@ - + - - + + @@ -350,13 +358,16 @@ - - + + - - - - + + + +