Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

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('<i style="color: red;margin-left: -4px">*</i>', '');
-                    t = '<i style="color: red;margin-left: -4px">*</i>' + t
+                    if(t.indexOf('c*') < 0) {
+                        t = '<i class="c*" style="color: red;margin-left: -4px">*</i>' + t
+                    }
                     requiredDom.html(t)
                 })
                 clearInterval(timer)

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 = ''