jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1454: (feature/制造功能优化 -> develop)

Browse Source 
Merge Request: 增加对Enter的判断

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1454?initial=true
This commit is contained in:
马广威
2024-10-24 15:51:11 +08:00
committed by Coding
parent 2b83f82989 cab9e08066
commit c8f25ea4b3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/static/src/js/qr.js
View File

@@ -27,7 +27,7 @@ class QRCodeWidget extends Component {
onGlobalKeyDown(event) { onGlobalKeyDown(event) {
// 如果是Tab键，表示扫码输入结束 // 如果是Tab键，表示扫码输入结束
if (event.key === 'Tab') { if (event.key === 'Tab' || event.key === 'Enter') {
this.qrCodeValue = this.inputBuffer; // 完整条码赋值 this.qrCodeValue = this.inputBuffer; // 完整条码赋值
console.log('完整条码:', this.qrCodeValue); console.log('完整条码:', this.qrCodeValue);
this.onQRCodeChange(this.qrCodeValue); // 调用父组件的 onQRCodeChange 方法 this.onQRCodeChange(this.qrCodeValue); // 调用父组件的 onQRCodeChange 方法

4
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -247,8 +247,8 @@
<field name='process_state' invisible="1"/> <field name='process_state' invisible="1"/>
<field name='tag_type' readonly="1" attrs='{"invisible": [("tag_type","=",False)]}' <field name='tag_type' readonly="1" attrs='{"invisible": [("tag_type","=",False)]}'
decoration-danger="tag_type == '重新加工'"/> decoration-danger="tag_type == '重新加工'"/>
<field name="rfid_code" force_save="1" readonly="0" cache="True" <field name="rfid_code" force_save="1" readonly="1" cache="True"
attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/> attrs="{'invisible': [('rfid_code_old', '!=', False)]}" widget='qrcode_widget'/>
<field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/> <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
</xpath> </xpath>