合并企业版代码(未测试,先提交到测试分支)

This commit is contained in:
qihao.gong@jikimo.com
2023-04-14 17:42:23 +08:00
parent 7a7b3d7126
commit d28525526a
1300 changed files with 513579 additions and 5426 deletions

View File

@@ -12,7 +12,7 @@
'category': 'sf',
'author': 'jikimo',
'website': 'https://sf.cs.jikimo.com',
'depends': ['sf_base', 'sf_manufacturing', 'barcodes', ],
'depends': ['sf_manufacturing', 'barcodes', ],
'data': [
# 定义权限组放在最上面
# 权限组
@@ -33,6 +33,9 @@
],
'assets': {
'web.assets_backend': [
'sf_machine_connect/static/src/js/*'
],
},
'installable': True,

View File

@@ -18,14 +18,23 @@ export class CodeField extends Component {
setup() {
super.setup();
}
async onBarcodeBtnClick() {
async onBarcodeBtnClick() {
// console.log(BarcodeScanner)
const barcode = await BarcodeScanner.scanBarcode();
// console.log(typeof barcode)
// alert(barcode)
if (barcode) {
await this.onBarcodeScanned(barcode);
// console.log("存在")
// alert('存在')
await this.onBarcodeScanned(barcode);
if ("vibrate" in browser.navigator) {
browser.navigator.vibrate(100);
}
} else {
// console.log("不存在")
// alert('不存在')
this.notification.add(this.env._t("Please, scan again !"), {
type: "warning",
});