Accept Merge Request #867: (feature/前端样式修改 -> develop)
Merge Request: 修改*样式,增加扫码枪判断 Created By: @黄焱 Reviewed By: @马广威 Approved By: @马广威 Accepted By: @黄焱 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/867?initial=true
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
Reference in New Issue
Block a user