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

Accept Merge Request #166: (feature/优化代码结构 -> develop)

Browse Source 
Merge Request: 优化平板扫码绑定托盘的渲染方式以及按钮位置

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/166?initial=true
This commit is contained in:
马广威
2023-04-26 17:38:46 +08:00
parent 453dd71bf4 69aa731990
commit 7a0d4a0dfd
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_machine_connect/static/src/js/barcode_button.js
View File

@@ -98,9 +98,8 @@ export class CodeField extends Component {
}]); }]);
console.log(updatetrayRecord) console.log(updatetrayRecord)
}); });
this.props.update(records[0].code, records[0].tray_id); this.props.update(records[0].code);
location.replace(location.href) $('.o_form_button_save').click();
// location.reload()
} else { } else {
if (records[0].state === '占用') { if (records[0].state === '占用') {
console.log('此托盘已占用，请检查') console.log('此托盘已占用，请检查')

1
sf_machine_connect/static/src/xml/barcode_button.xml
View File

@@ -12,7 +12,6 @@
aria-label="Scan barcode" aria-label="Scan barcode"
title="Scan barcode" title="Scan barcode"
data-tooltip="Scan barcode" data-tooltip="Scan barcode"
style="position: absolute !important;"
/> />
</div> </div>

2
sf_machine_connect/views/compensation.xml
View File

@@ -19,8 +19,6 @@
class="btn-primary" attrs='{"invisible": ["|", class="btn-primary" attrs='{"invisible": ["|",
("state","!=","progress"),("user_permissions","=",False)]}'/> ("state","!=","progress"),("user_permissions","=",False)]}'/>
<span>&#32;</span> <span>&#32;</span>
<!-- <field name="button_up_all_state" attrs='{"invisible": ["|",-->
<!-- ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
<button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发" <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
class="btn-primary" context="{'default_workorder_id': id}" attrs='{"invisible": ["|", class="btn-primary" context="{'default_workorder_id': id}" attrs='{"invisible": ["|",
("state","!=","progress"),("user_permissions","=",False)]}'/> ("state","!=","progress"),("user_permissions","=",False)]}'/>