From d82b549af16c8e44b30206e68a36150f87d0946a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 30 十月 2025 17:03:42 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
utils/common.js | 7 +++----
pages/caigourukujiaoyan/form.vue | 15 +++++++++++----
.hbuilderx/launch.json | 4 ++--
pages/shengchanlingliao/form.vue | 9 ++++++++-
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index a7d9080..4dd14cd 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -21,11 +21,11 @@
"type" : "uni-app:app-ios"
},
{
- "customPlaygroundType" : "local",
+ "customPlaygroundType" : "device",
"localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
"openVueDevtools" : true,
"packageName" : "com.shebeiguanli.www",
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
}
]
diff --git a/pages/caigourukujiaoyan/form.vue b/pages/caigourukujiaoyan/form.vue
index dfe29ec..4e6e826 100644
--- a/pages/caigourukujiaoyan/form.vue
+++ b/pages/caigourukujiaoyan/form.vue
@@ -4,7 +4,7 @@
<view class="form-item">
<view class="title">鏉＄爜:</view>
<view class="right">
- <input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @blur="getCode(hform.HBarCode)" @input="handleInput" />
+ <input v-model="hform.HBarCode" :focus="HBarCodeFocus" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @blur="getCode(hform.HBarCode)" />
</view>
<uni-icons type="scan"
style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -271,8 +271,13 @@
async refreshHBarCodeFocus() {
this.HBarCodeFocus = false
this.hform.HBarCode = ''
- await this.$nextTick()
- this.HBarCodeFocus = true
+ // this.$nextTick(() => {
+ // this.HBarCodeFocus = true
+ // })
+ setTimeout(() => {
+ this.HBarCodeFocus = true;
+ }, 300);
+
},
//鎵爜
toScanCode() {
@@ -723,17 +728,19 @@
}
//鏄剧ず琛ㄤ綋鏄庣粏
this.DisBillEntryList()
+ this.refreshHBarCodeFocus()
//娓呯┖鏁伴噺
this.hform.HQty = ''
} else {
CommonUtils.playSound(0);
+ this.refreshHBarCodeFocus()
uni.showToast({
title: res.data.Message,
icon: 'none'
})
}
- this.refreshHBarCodeFocus()
+
} catch (e) {
CommonUtils.playSound(0)
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
index b32460f..3c4ae63 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/form.vue
@@ -357,7 +357,12 @@
this.HBarCodeFocus = false
this.hform.HBarCode = ''
await this.$nextTick()
- this.HBarCodeFocus = true
+ // await this.$nextTick(() => {
+ // this.HBarCodeFocus = true
+ // })
+ setTimeout(() => {
+ this.HBarCodeFocus = true;
+ }, 300);
},
async refreshHBillNoFocus() {
this.HBillNoFocus = false
@@ -810,11 +815,13 @@
this.refreshHBarCodeFocus()
//鏄剧ず琛ㄤ綋鏄庣粏
this.DisBillEntryList()
+ this.refreshHBarCodeFocus()
//娓呯┖鏁伴噺
this.hform.HQty = ''
} else {
this.refreshHBarCodeFocus()
CommonUtils.playSound(0);
+ this.refreshHBarCodeFocus()
uni.showToast({
title: res.data.Message,
icon: 'none'
diff --git a/utils/common.js b/utils/common.js
index c4778dc..5898bb7 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -312,10 +312,9 @@
method,
}) {
if (this.requestLock) {
- console.warn("璇ヨ姹傝閿佸畾,涓嶈兘閲嶅璇锋眰!!!")
+ console.log("璇ヨ姹傝閿佸畾,涓嶈兘閲嶅璇锋眰!!!")
return
}
-
this.requestLock = true
return new Promise((resolve, reject) => {
// that = that || this;
@@ -386,14 +385,14 @@
innerAudioContext.play(); // 鎾斁闊抽
innerAudioContext.onPlay(() => {
- console.log('寮�濮嬫挱鏀�');
+ //console.log('寮�濮嬫挱鏀�');
});
innerAudioContext.onError((res) => {
console.log(res.errMsg);
console.log(res.errCode);
});
innerAudioContext.onPause(function() {
- console.log('鎾斁鍑虹幇閿欒锛岄攢姣�');
+ //console.log('鎾斁鏆傚仠锛岄攢姣�');
innerAudioContext.destroy();
})
}
--
Gitblit v1.9.1