From f2c8bd733369da59d5dd2596746550e6ff43e5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=84=B1?= Date: Tue, 27 Feb 2024 17:57:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9*=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E7=A0=81=E6=9E=AA=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 | 5 +++-- sf_manufacturing/static/src/js/customRFID.js | 2 +- 2 files changed, 4 insertions(+), 3 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 484114d0..49c09983 100644 --- a/jikimo_frontend/static/src/js/custom_form_status_indicator.js +++ b/jikimo_frontend/static/src/js/custom_form_status_indicator.js @@ -81,8 +81,9 @@ $(function (){ dom.each(function (){ const requiredDom = $(this).parent().prev().find('label') let t = requiredDom.html() - t.replace('*', ''); - t = '*' + t + if(t.indexOf('c*') < 0) { + t = '*' + t + } requiredDom.html(t) }) clearInterval(timer) diff --git a/sf_manufacturing/static/src/js/customRFID.js b/sf_manufacturing/static/src/js/customRFID.js index 174b60d7..8f775350 100644 --- a/sf_manufacturing/static/src/js/customRFID.js +++ b/sf_manufacturing/static/src/js/customRFID.js @@ -7,7 +7,7 @@ $(document).on('keydown', '.modal.d-block.o_technical_modal,body.o_web_client', setTimeout(() => { RFID = '' }, 200) - if(e.key == 'Enter' && e.keyCode == 13){ + if(e.key == 'Enter' && e.keyCode == 13 || e.key == 'Tab' && e.keyCode == 9){ if(!RFID || RFID.length <= 3) return; dom.children('span').text(RFID) RFID = ''