bonus
/
bonus-material-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://14.103.246.124:16000/bonus/bonus-material-app

This commit is contained in:
hongchao 2025-08-13 14:48:04 +08:00
parent 0758637e3b 08dad7b168
commit 6fb82c59c6
4 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/pages/devicesSearch/ocrSearch.vue
View File

@ -9,10 +9,10 @@
</view>
<view class="table-list-item">
<uni-row :gutter="24" style="display: flex; align-items: center">
<uni-col :span="6">
<uni-col :span="5">
<text>设备编码</text>
</uni-col>
<uni-col :span="10">
<uni-col :span="13">
<view>
<uni-easyinput v-model="queryCodeParams.maCode" placeholder="请输入内容" />
</view>
@ -169,7 +169,7 @@ export default {
cameraReady: false,
deviceReadyTimeout: null,
pluginCheckRetries: 0,
maxRetries: 10,
maxRetries: 5,
// 聚焦相关状态
isFocusing: false,
focusSuccess: false,
@ -181,6 +181,25 @@ export default {
systemInfo: null
}
},
onBackPress(options) {
console.log("进了-----")
// 相机打开时处理返回事件
if (this.showCamera){
console.log('关闭相机...');
try {
this.stopCamera();
} catch (error) {
console.error('关闭相机出错:', error);
} finally {
this.showCamera = false;
this.cameraStarted = false;
this.resetFocusState();
}
return true; // 阻止默认返回行为
}
// 其他情况下允许默认返回
return false;
},
onShow() {
this.initializeCordova();
// 获取设备信息用于相机配置
@ -815,7 +834,7 @@ export default {
}
// 重置聚焦状态
this.resetFocusState();
}
},
}
}
</script>

31
src/pages/devicesSearch/ocrSearch2.vue
View File

@ -9,10 +9,10 @@
</view>
<view class="table-list-item">
<uni-row :gutter="24" style="display: flex; align-items: center">
<uni-col :span="6">
<uni-col :span="5">
<text>设备编码</text>
</uni-col>
<uni-col :span="10">
<uni-col :span="13">
<view>
<uni-easyinput v-model="queryCodeParams.maCode" placeholder="请输入内容" />
</view>
@ -54,7 +54,7 @@
<uni-forms-item label="下次检修时间：" name="nextCheckTime">
<text style="height: 100%;display: flex;align-items: center;">{{ codeData.nextCheckTime }}</text>
</uni-forms-item>
<uni-forms-item label="出入库次数：" name="inOutNum">
<uni-forms-item v-if="codeData.jiJuType===2" label="出入库次数：" name="inOutNum">
<text style="height: 100%;display: flex;align-items: center;">{{ codeData.inOutNum }}</text>
</uni-forms-item>
<uni-forms-item v-if="codeData.jiJuType===2" label="初次入库：" name="inTime">
@ -70,12 +70,12 @@
<text style="height: 100%;display: flex;align-items: center;">{{ codeData.checkNum }}</text>
</uni-forms-item>
<uni-forms-item label="检修员：" name="inspectionPerson">
<text style="height: 100%;display: flex;align-items: center;">{{ codeData.inspectionPerson }}</text>
<text style="height: 100%;display: flex;align-items: center;">{{ codeData.thisCheckTime ? '王鹏' : '' }}</text>
</uni-forms-item>
<uni-forms-item v-if="codeData.jiJuType===2" label="报废：" name="scrapTime">
<text style="height: 100%;display: flex;align-items: center;">{{ codeData.scrapTime }}</text>
</uni-forms-item>
<uni-forms-item label="生产厂家：" name="statusName">
<uni-forms-item v-if="codeData.jiJuType===2" label="生产厂家：" name="statusName">
<text style="height: 100%;display: flex;align-items: center;">{{}}</text>
</uni-forms-item>
<uni-forms-item v-if="codeData.jiJuType===2" label="领料单位：" name="leaseUnit">
@ -169,7 +169,7 @@ export default {
cameraReady: false,
deviceReadyTimeout: null,
pluginCheckRetries: 0,
maxRetries: 10,
maxRetries: 5,
// 聚焦相关状态
isFocusing: false,
focusSuccess: false,
@ -181,6 +181,25 @@ export default {
systemInfo: null
}
},
onBackPress(options) {
console.log("进了-----")
// 相机打开时处理返回事件
if (this.showCamera){
console.log('关闭相机...');
try {
this.stopCamera();
} catch (error) {
console.error('关闭相机出错:', error);
} finally {
this.showCamera = false;
this.cameraStarted = false;
this.resetFocusState();
}
return true; // 阻止默认返回行为
}
// 其他情况下允许默认返回
return false;
},
onShow() {
this.initializeCordova();
// 获取设备信息用于相机配置

2
src/pages/new-purchase/accept/index.vue
View File

@ -228,7 +228,7 @@ const handleItem = (item) => {
const deptName = uni.getStorageSync('deptName')
if (!deptName.includes(singLevel[item.signLevel]) && !isFinished) {
uni.showToast({
title: `请联系${singLevel[item.signLevel]}进行审核`,
title: `请联系${singLevel[item.signLevel || 2]}进行审核`,
icon: 'none',
})
return

2
src/pages/part/parts-accept/index.vue
View File

@ -184,7 +184,7 @@ const handleItem = (item) => {
const deptName = uni.getStorageSync('deptName')
if (!deptName.includes(singLevel[item.signLevel]) && !isFinished) {
uni.showToast({
title: `请联系${singLevel[item.signLevel]}进行审核`,
title: `请联系${singLevel[item.signLevel || 2]}进行审核`,
icon: 'none',
})
return